ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated checkout blades

Browse Source
This commit is contained in:
snipe
2025-11-17 12:15:38 +00:00
parent 64cbe0c960
commit 9c4cd69106
11 changed files with 154 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/accessories/checkout.blade.php
View File

@@ -44,7 +44,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{{ $accessory->company->name }}</p>
<p class="form-control-static">{!! $accessory->company->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
@@ -53,9 +53,9 @@
@if ($accessory->category)
<!-- accessory name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('admin/accessories/general.accessory_category') }}</label>
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{{ $accessory->category->name }}</p>
<p class="form-control-static">{!! $accessory->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif

29
resources/views/account/view-assets.blade.php
View File

@@ -219,7 +219,7 @@
{{ trans('general.company') }}
</div>
<div class="col-md-9">
{{ $user->company->name }}
{!! $user->company->present()->formattedNameLink !!}
</div>
</div>
@@ -383,7 +383,7 @@
{{ trans('general.department') }}
</div>
<div class="col-md-9">
{{ $user->department->name }}
{!! $user->department->present()->formattedNameLink !!}
</div>
</div>
@endif
@@ -504,7 +504,7 @@
</td>
<td>
@if (($asset->model) && ($asset->model->category))
{{ $asset->model->category->name }}
{!! $asset->model->category->present()->formattedNameLink !!}
@endif
</td>
<td>
@@ -519,7 +519,7 @@
<label class="label label-default">{{ trans('general.deployed') }}</label>
</td>
<td>
{{ $asset->model->name }}
{!! ($asset->model) ? $asset->model->present()->formattedNameLink : trans('general.deleted') !!}
</td>
<td>
{{ $asset->model->model_number }}
@@ -531,7 +531,7 @@
{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}
</td>
<td>
{{ ($asset->location) ? $asset->location->name : '' }}
{!! ($asset->defaultLoc) ? $asset->defaultLoc->present()->formattedNameLink : trans('general.deleted') !!}
</td>
<td>
{{ ($asset->expected_checkin) ? $asset->expected_checkin_formatted_date : '' }}
@@ -568,6 +568,8 @@
</tbody>
</table>
</div><!-- /asset -->
<div class="tab-pane" id="licenses">
<table
@@ -595,7 +597,6 @@
<th class="col-md-2">{{ trans('admin/licenses/form.to_name') }}</th>
<th class="col-md-2">{{ trans('admin/licenses/form.to_email') }}</th>
<th class="col-md-2">{{ trans('general.category') }}</th>
</tr>
</thead>
<tbody>
@@ -607,7 +608,6 @@
<td>
@can('viewKeys', $license)
<code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $license->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $license->id }}">{{ $license->serial }}</span></span></code>
@else
------------
@endcan
@@ -619,12 +619,15 @@
------------
@endcan
</td>
@can('viewKeys', $license)
<td>{{$license->license_email}}</td>
@else
------------
@endcan
<td>{{ ($license->category) ? $license->category->name : trans('general.deleted') }}</td>
<td>
@can('viewKeys', $license)
{{$license->license_email}}
@else
------------
@endcan
</td>
<td>{!! ($license->category) ? $license->category->present()->formattedNameLink : trans('general.deleted') !!}</td>
</tr>
@endforeach
</tbody>

22
resources/views/components/checkout.blade.php
View File

@@ -25,6 +25,28 @@
@endif
<div class="box-body">
@if ($component->company)
<!-- accessory name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $component->company->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
@if ($component->category)
<!-- accessory name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $component->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
<!-- Asset -->
@include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id', 'company_id' => $component->company_id, 'required' => 'true', 'value' => old('asset_id')])

21
resources/views/consumables/checkout.blade.php
View File

@@ -36,16 +36,29 @@
</div>
</div>
@endif
@if ($consumable->category)
<!-- consumable name -->
@if ($consumable->company)
<!-- accessory name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{{ $consumable->category->name }}</p>
<p class="form-control-static">{!! $consumable->company->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
@if ($consumable->category)
<!-- category name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $consumable->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
<!-- total -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('admin/components/general.total') }}</label>

10
resources/views/consumables/view.blade.php
View File

@@ -172,7 +172,7 @@
{{ trans('general.company') }}
</div>
<div class="col-md-9">
{{ $consumable->company->name }}
{!! $consumable->company->present()->formattedNameLink !!}
</div>
</div>
@endif
@@ -184,7 +184,7 @@
{{ trans('general.category') }}
</div>
<div class="col-md-9">
{{ $consumable->category->name }}
{!! $consumable->category->present()->formattedNameLink !!}
</div>
</div>
@endif
@@ -240,7 +240,7 @@
{{ trans('general.location') }}
</div>
<div class="col-md-9">
{{ $consumable->location->name }}
{!! $consumable->location->present()->formattedNameLink !!}
</div>
</div>
@endif
@@ -252,7 +252,7 @@
{{ trans('general.supplier') }}
</div>
<div class="col-md-9">
{{ $consumable->supplier->name }}
{!! $consumable->supplier->present()->formattedNameLink !!}
</div>
</div>
@endif
@@ -264,7 +264,7 @@
{{ trans('general.manufacturer') }}
</div>
<div class="col-md-9">
{{ $consumable->manufacturer->name }}
{!! $consumable->manufacturer->present()->formattedNameLink !!}
</div>
</div>
@endif

21
resources/views/hardware/checkin.blade.php
View File

@@ -41,6 +41,27 @@
@endif
{{csrf_field()}}
@if ($asset->company)
<!-- accessory name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $asset->company->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
@if ($asset->model->category)
<!-- category name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $asset->model->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
<!-- AssetModel name -->
<div class="form-group">
<label for="model" class="col-sm-3 control-label">

24
resources/views/hardware/checkout.blade.php
View File

@@ -26,15 +26,23 @@
</div>
<div class="box-body">
{{csrf_field()}}
@if ($asset->company && $asset->company->name)
@if ($asset->company)
<!-- accessory name -->
<div class="form-group">
<label for="company" class="col-md-3 control-label">
{{ trans('general.company') }}
</label>
<div class="col-md-8">
<p class="form-control-static" style="padding-top: 7px;">
{{ $asset->company->name }}
</p>
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $asset->company->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
@if ($asset->model->category)
<!-- category name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $asset->model->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif

60
resources/views/hardware/view.blade.php
View File

@@ -386,7 +386,8 @@
@if ($asset->location->parent)
<i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i>
@endif
{{ $asset->location->name }}</li>
{!! $asset->location->present()->formattedNameLink !!}
</li>
<li>{{ $asset->location->address }}
@if ($asset->location->address2!='')
{{ $asset->location->address2 }}
@@ -498,7 +499,7 @@
<strong>{{ trans('general.company') }}</strong>
</div>
<div class="col-md-9">
<a href="{{ url('/companies/' . $asset->company->id) }}">{{ $asset->company->name }}</a>
{!! $asset->company->present()->formattedNameLink !!}
</div>
</div>
@endif
@@ -554,7 +555,7 @@
{!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
{{ Helper::getFormattedDateObject($audit_log->created_at, 'datetime', false) }}
@if ($audit_log->user)
(by {{ link_to_route('users.show', $audit_log->user->display_name, [$audit_log->user->id]) }})
({{ link_to_route('users.show', $audit_log->user->display_name, [$audit_log->user->id]) }})
@endif
</div>
@@ -584,17 +585,10 @@
</div>
<div class="col-md-9">
<ul class="list-unstyled">
@can('view', \App\Models\Manufacturer::class)
<li>
<a href="{{ route('manufacturers.show', $asset->model->manufacturer->id) }}">
{{ $asset->model->manufacturer->name }}
</a>
</li>
@else
<li> {{ $asset->model->manufacturer->name }}</li>
@endcan
<li>
{!! $asset->manufacturer->present()->formattedNameLink !!}
</li>
@if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->url!=''))
<li>
@@ -658,17 +652,7 @@
</div>
<div class="col-md-9">
@if (($asset->model) && ($asset->model->category))
<x-copy-to-clipboard copy_what="category">
@can('view', \App\Models\Category::class)
<a href="{{ route('categories.show', $asset->model->category->id) }}">
{{ $asset->model->category->name }}
</a>
@else
{{ $asset->model->category->name }}
@endcan
</x-copy-to-clipboard>
<x-copy-to-clipboard copy_what="category">{!! $asset->model->category->present()->formattedNameLink !!}</x-copy-to-clipboard>
@else
Invalid category
@endif
@@ -684,15 +668,7 @@
</div>
<div class="col-md-9">
@if ($asset->model)
<x-copy-to-clipboard copy_what="model">
@can('view', \App\Models\AssetModel::class)
<a href="{{ route('models.show', $asset->model->id) }}">
{{ $asset->model->name }}
</a>
@else
{{ $asset->model->name }}
@endcan
</x-copy-to-clipboard>
<x-copy-to-clipboard copy_what="model">{!! $asset->model->present()->formattedNameLink !!}</x-copy-to-clipboard>
@endif
</div>
@@ -707,9 +683,7 @@
</div>
<div class="col-md-9">
@if (($asset->model) && ($asset->model->model_number!=''))
<x-copy-to-clipboard copy_what="model_number">
{{ ($asset->model) ? $asset->model->model_number : ''}}
</x-copy-to-clipboard>
<x-copy-to-clipboard copy_what="model_number">{{ ($asset->model) ? $asset->model->model_number : ''}}</x-copy-to-clipboard>
@endif
</div>
</div>
@@ -904,9 +878,7 @@
</strong>
</div>
<div class="col-md-9">
<x-copy-to-clipboard copy_what="order_number">
<a href="{{ route('hardware.index', ['order_number' => $asset->order_number]) }}">{{ $asset->order_number }}</a>
</x-copy-to-clipboard>
<x-copy-to-clipboard copy_what="order_number"><a href="{{ route('hardware.index', ['order_number' => $asset->order_number]) }}">{{ $asset->order_number }}</a></x-copy-to-clipboard>
</div>
</div>
@endif
@@ -919,15 +891,7 @@
</strong>
</div>
<div class="col-md-9">
<x-copy-to-clipboard copy_what="supplier">
@can ('superuser')
<a href="{{ route('suppliers.show', $asset->supplier_id) }}">
{{ $asset->supplier->name }}
</a>
@else
{{ $asset->supplier->name }}
@endcan
</x-copy-to-clipboard>
<x-copy-to-clipboard copy_what="supplier">{!! $asset->supplier->present()->formattedNameLink !!}</x-copy-to-clipboard>
</div>
</div>
@endif

6
resources/views/layouts/default.blade.php
View File

@@ -1155,14 +1155,12 @@ dir="{{ Helper::determineLanguageDirection() }}">
var clipboard = new ClipboardJS('.js-copy-link');
clipboard.on('success', function(e) {
// Get the clicked element
e.text = e.text.replace(/^\s/, '').trim();
var clickedElement = $(e.trigger);
// Get the target element selector from data attribute
var targetSelector = clickedElement.data('data-clipboard-target');
// Show the alert that the content was copied
clickedElement.tooltip('hide').attr('data-original-title', '{{ trans('general.copied') }}').tooltip('show');
});
// Reference: https://jqueryvalidation.org/validate/
var validator = $('#create-form').validate({
ignore: 'input[type=hidden]',

27
resources/views/licenses/checkin.blade.php
View File

@@ -28,19 +28,32 @@
<!-- license name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
<label class="col-sm-3 control-label">{{ trans('general.name') }}</label>
<div class="col-md-8">
<p class="form-control-static">{{ $licenseSeat->license->name }}</p>
</div>
</div>
<!-- Category -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-9">
<p class="form-control-static">{{ $licenseSeat->license->category->name }}</p>
@if ($licenseSeat->license->company)
<!-- accessory name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $licenseSeat->license->company->present()->formattedNameLink !!}</p>
</div>
</div>
</div>
@endif
@if ($licenseSeat->license->category)
<!-- category name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $licenseSeat->license->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
<!-- Serial -->
@can('viewKeys', $licenseSeat->license)

26
resources/views/licenses/checkout.blade.php
View File

@@ -33,13 +33,27 @@
<p class="form-control-static">{{ $license->name }}</p>
</div>
</div>
<!-- Category -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-9">
<p class="form-control-static">{{ $license->category->name }}</p>
@if ($license->company)
<!-- company name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $license->company->present()->formattedNameLink !!}</p>
</div>
</div>
</div>
@endif
@if ($license->category)
<!-- category name -->
<div class="form-group">
<label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
<div class="col-md-6">
<p class="form-control-static">{!! $license->category->present()->formattedNameLink !!}</p>
</div>
</div>
@endif
<!-- Serial -->
@can('viewKeys', $license)