diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index a85f11b437..a7a652ed99 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -732,718 +732,723 @@ @if (!empty($asset->{$field->db_column_name()})) {{-- Hidden span used as copy target --}} {{-- It's tempting to break out the HTML into separate lines for this, but it results in extra spaces being added onto the end of the coipied value --}} - - - {{-- Clipboard icon --}} - - @endif - @if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!='')) - - - @endif - - @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} )) - @can('assets.view.encrypted_custom_fields') - @php - $fieldSize = strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()})) - @endphp - @if ($fieldSize > 0) - *********** - @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) - - {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} - - @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) - {{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }} - @else - {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} - @endif - @endif + @if (($field->field_encrypted=='1') && (Gate::allows('assets.view.encrypted_custom_fields'))) + + @elseif (($field->field_encrypted=='1') && (Gate::denies('assets.view.encrypted_custom_fields'))) + @else - {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }} - @endcan - - @else - @if (($field->format=='BOOLEAN') && ($asset->{$field->db_column_name()}!='')) - {!! ($asset->{$field->db_column_name()} == 1) ? "" : "" !!} - @elseif (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) - {{ $asset->{$field->db_column_name()} }} - @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) - {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }} - @else - {!! nl2br(e($asset->{$field->db_column_name()})) !!} + @endif - @endif + {{-- Clipboard icon --}} + + @endif + @if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!='') && (Gate::allows('assets.view.encrypted_custom_fields'))) + + @endif - @if ($asset->{$field->db_column_name()}=='') -   + @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} )) + @can('assets.view.encrypted_custom_fields') + @php + $fieldSize = strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()})) + @endphp + @if ($fieldSize > 0) + *********** + @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) + + {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + + @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) + {{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }} + @else + {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + @endif + @endif + @else + {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }} + @endcan + + @else + @if (($field->format=='BOOLEAN') && ($asset->{$field->db_column_name()}!='')) + {!! ($asset->{$field->db_column_name()} == 1) ? "" : "" !!} + @elseif (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) + {{ $asset->{$field->db_column_name()} }} + @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) + {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }} + @else + {!! nl2br(e($asset->{$field->db_column_name()})) !!} + @endif + + @endif + + @if ($asset->{$field->db_column_name()}=='') +   + @endif + + + @endforeach + @endif + + + @if ($asset->purchase_date) +
+
+ + {{ trans('admin/hardware/form.date') }} + +
+
+ {{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }} + - + {{ Carbon::parse($asset->purchase_date)->diffForHumans(['parts' => 3]) }} + +
+
+ @endif + + @if ($asset->purchase_cost) +
+
+ + {{ trans('admin/hardware/form.cost') }} + +
+
+ @if (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @elseif (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @else + {{ $snipeSettings->default_currency }} + @endif + {{ Helper::formatCurrencyOutput($asset->purchase_cost)}} + +
+
+ @endif + @if(($asset->components->count() > 0) && ($asset->purchase_cost)) +
+
+ + {{ trans('admin/hardware/table.components_cost') }} + +
+
+ @if (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @elseif (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @else + {{ $snipeSettings->default_currency }} + @endif + {{Helper::formatCurrencyOutput($asset->getComponentCost())}} +
+
+ @endif + @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date)) +
+
+ + {{ trans('admin/hardware/table.current_value') }} + +
+
+ @if (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @elseif (($asset->id) && ($asset->location)) + {{ $asset->location->currency }} + @else + {{ $snipeSettings->default_currency }} + @endif + {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}} + + +
+
+ @endif + @if ($asset->order_number) +
+
+ + {{ trans('general.order_number') }} + +
+
+ {{ $asset->order_number }} +
+
+ @endif + + @if ($asset->supplier) +
+
+ + {{ trans('general.supplier') }} + +
+
+ @can ('superuser') + + {{ $asset->supplier->name }} + + @else + {{ $asset->supplier->name }} + @endcan +
+
+ @endif + + + @if ($asset->warranty_months) +
+
+ + {{ trans('admin/hardware/form.warranty') }} + +
+
+ {{ trans_choice('general.months_plural', $asset->warranty_months) }} + @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!='')) + + + {{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }} + @endif
- @endforeach - @endif + +
+
+ + {{ trans('admin/hardware/form.warranty_expires') }} - @if ($asset->purchase_date) -
-
- - {{ trans('admin/hardware/form.date') }} - -
-
- {{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }} - - - {{ Carbon::parse($asset->purchase_date)->diffForHumans(['parts' => 3]) }} - -
-
- @endif - - @if ($asset->purchase_cost) -
-
- - {{ trans('admin/hardware/form.cost') }} - -
-
- @if (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @elseif (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @else - {{ $snipeSettings->default_currency }} - @endif - {{ Helper::formatCurrencyOutput($asset->purchase_cost)}} - -
-
- @endif - @if(($asset->components->count() > 0) && ($asset->purchase_cost)) -
-
- - {{ trans('admin/hardware/table.components_cost') }} - -
-
- @if (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @elseif (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @else - {{ $snipeSettings->default_currency }} - @endif - {{Helper::formatCurrencyOutput($asset->getComponentCost())}} -
-
- @endif - @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date)) -
-
- - {{ trans('admin/hardware/table.current_value') }} - -
-
- @if (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @elseif (($asset->id) && ($asset->location)) - {{ $asset->location->currency }} - @else - {{ $snipeSettings->default_currency }} - @endif - {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}} - - -
-
- @endif - @if ($asset->order_number) -
-
- - {{ trans('general.order_number') }} - -
-
- {{ $asset->order_number }} -
-
- @endif - - @if ($asset->supplier) -
-
- - {{ trans('general.supplier') }} - -
-
- @can ('superuser') - - {{ $asset->supplier->name }} - - @else - {{ $asset->supplier->name }} - @endcan -
-
- @endif - - - @if ($asset->warranty_months) -
-
- - {{ trans('admin/hardware/form.warranty') }} - -
-
- {{ trans_choice('general.months_plural', $asset->warranty_months) }} - @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!='')) - - - {{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }} - - @endif -
-
- -
-
- - {{ trans('admin/hardware/form.warranty_expires') }} - - - -
-
- @if ($asset->purchase_date) - {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }} - - - {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 3]) }} - + +
+
@if ($asset->purchase_date) - {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '' : '' !!} + {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }} + - + {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 3]) }} + + @if ($asset->purchase_date) + {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '' : '' !!} + @endif + @else + {{ trans('general.na_no_purchase_date') }} @endif - @else - {{ trans('general.na_no_purchase_date') }} - @endif +
-
- @endif + @endif - @if (($asset->model) && ($asset->depreciation)) -
-
- - {{ trans('general.depreciation') }} - + @if (($asset->model) && ($asset->depreciation)) +
+
+ + {{ trans('general.depreciation') }} + +
+
+ {{ $asset->depreciation->name }} + ({{ trans_choice('general.months_plural', $asset->depreciation->months) }}) +
-
- {{ $asset->depreciation->name }} - ({{ trans_choice('general.months_plural', $asset->depreciation->months) }}) -
-
-
-
- - {{ trans('admin/hardware/form.fully_depreciated') }} - -
-
- @if ($asset->purchase_date) - {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }} - - - {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 3]) }} - @else - {{ trans('general.na_no_purchase_date') }} - @endif - -
-
- @endif - - @if (($asset->asset_eol_date) && ($asset->purchase_date)) -
-
- - {{ trans('admin/hardware/form.eol_rate') }} - -
-
- {{ (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) }} - {{ trans('admin/hardware/form.months') }} - -
-
- @endif - @if ($asset->asset_eol_date) -
-
- - {{ trans('admin/hardware/form.eol_date') }} +
+
+ + {{ trans('admin/hardware/form.fully_depreciated') }} + +
+
@if ($asset->purchase_date) - {!! $asset->asset_eol_date < date("Y-m-d") ? '' : '' !!} + {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }} + - + {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 3]) }} + @else + {{ trans('general.na_no_purchase_date') }} @endif - + +
-
- @if ($asset->asset_eol_date) - {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }} - - - {{ Carbon::parse($asset->asset_eol_date)->locale(app()->getLocale())->diffForHumans(['parts' => 3]) }} - @else - {{ trans('general.na_no_purchase_date') }} - @endif - @if ($asset->eol_explicit =='1') - - - - @endif + @endif + + @if (($asset->asset_eol_date) && ($asset->purchase_date)) +
+
+ + {{ trans('admin/hardware/form.eol_rate') }} + +
+
+ {{ (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) }} + {{ trans('admin/hardware/form.months') }} + +
-
- @endif + @endif + @if ($asset->asset_eol_date) +
+
+ + {{ trans('admin/hardware/form.eol_date') }} + @if ($asset->purchase_date) + {!! $asset->asset_eol_date < date("Y-m-d") ? '' : '' !!} + @endif + +
+
+ @if ($asset->asset_eol_date) + {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }} + - + {{ Carbon::parse($asset->asset_eol_date)->locale(app()->getLocale())->diffForHumans(['parts' => 3]) }} + @else + {{ trans('general.na_no_purchase_date') }} + @endif + @if ($asset->eol_explicit =='1') + + + + @endif +
+
+ @endif -
-
- - {{ trans('admin/hardware/form.notes') }} - -
-
- {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!} -
-
- - @if ($asset->location)
- {{ trans('general.location') }} + {{ trans('admin/hardware/form.notes') }}
- @can('superuser') - + {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!} +
+
+ + @if ($asset->location) +
+
+ + {{ trans('general.location') }} + +
+
+ @can('superuser') + + {{ $asset->location->name }} + + @else {{ $asset->location->name }} - - @else - {{ $asset->location->name }} - @endcan + @endcan +
-
- @endif + @endif - @if ($asset->defaultLoc) -
-
- - {{ trans('admin/hardware/form.default_location') }} - -
-
- @can('superuser') - + @if ($asset->defaultLoc) +
+
+ + {{ trans('admin/hardware/form.default_location') }} + +
+
+ @can('superuser') + + {{ $asset->defaultLoc->name }} + + @else {{ $asset->defaultLoc->name }} - - @else - {{ $asset->defaultLoc->name }} - @endcan + @endcan +
-
- @endif + @endif + + @if ($asset->created_at!='') +
+
+ + {{ trans('general.created_at') }} + +
+
+ {{ Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }} +
+
+ @endif + + @if ($asset->updated_at!='') +
+
+ + {{ trans('general.updated_at') }} + +
+
+ {{ Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }} +
+
+ @endif + + @if ($asset->expected_checkin!='') +
+
+ + {{ trans('general.expected_checkin') }} + +
+
+ {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }} +
+
+ @endif + + @if ($asset->last_checkin!='') +
+
+ + {{ trans('admin/hardware/table.last_checkin_date') }} + +
+
+ {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }} +
+
+ @endif + + - @if ($asset->created_at!='')
- {{ trans('general.created_at') }} + {{ trans('general.checkouts_count') }}
- {{ Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }} + {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}
- @endif - @if ($asset->updated_at!='') +
- {{ trans('general.updated_at') }} + {{ trans('general.checkins_count') }}
- {{ Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }} + {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}
- @endif - @if ($asset->expected_checkin!='') +
- {{ trans('general.expected_checkin') }} + {{ trans('general.user_requests_count') }}
- {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }} + {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
- @endif - @if ($asset->last_checkin!='') -
-
- - {{ trans('admin/hardware/table.last_checkin_date') }} - -
-
- {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }} -
+
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + @foreach ($asset->licenseseats as $seat) + @if ($seat->license) + + + + + + + @endif + @endforeach + +
{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('table.actions') }}
{{ $seat->license->name }} + @can('viewKeys', $seat->license) + + @else + ------------ + @endcan + + {{ Helper::getFormattedDateObject($seat->license->expiration_date, 'date', false) }} + + {{ trans('general.checkin') }} +
+
+
+
+ +
+ +
+
+ + + + + + + + + + + + + @foreach ($asset->components as $component) + + + @if (is_null($component->deleted_at)) + + + + + + + + purchase_cost *$component->pivot->assigned_qty) ?> + + @endif + @endforeach + + + + + + + + +
{{ trans('general.name') }}{{ trans('general.qty') }}{{ trans('general.purchase_cost') }}{{trans('admin/hardware/form.serial')}}{{trans('general.checkin')}}
+ {{ $component->name }} + {{ $component->pivot->assigned_qty }} + @if ($component->purchase_cost!='') + {{ trans('general.cost_each', ['amount' => Helper::formatCurrencyOutput($component->purchase_cost)]) }} + @endif + {{ $component->serial }} + {{ trans('general.checkin') }} +
+ {{ $totalCost }}
+
+
+
+ + +
+
+
+ + @include('partials.asset-bulk-actions') + + +
+ + + +
- @endif - -
-
- - {{ trans('general.checkouts_count') }} - -
-
- {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }} -
-
+
+
+
-
-
- - {{ trans('general.checkins_count') }} - -
-
- {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }} -
-
+
-
-
- - {{ trans('general.user_requests_count') }} - -
-
- {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }} -
-
+
-
-
- - +

+ {{ trans('general.accessories_assigned') }} +

+ + +
+ + -
-
-
- - - - - - - - - - - - @foreach ($asset->licenseseats as $seat) - @if ($seat->license) - - - - - - - @endif - @endforeach - + +
+
+
+ + +
{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('table.actions') }}
{{ $seat->license->name }} - @can('viewKeys', $seat->license) - - @else - ------------ - @endcan - - {{ Helper::getFormattedDateObject($seat->license->expiration_date, 'date', false) }} - - {{ trans('general.checkin') }} -
-
-
-
- -
- -
-
- - - - - - - - - - - - - @foreach ($asset->components as $component) + + + - @if (is_null($component->deleted_at)) - - - - - - - - purchase_cost *$component->pivot->assigned_qty) ?> - - @endif - @endforeach - - - - - - - - -
{{ trans('general.name') }}{{ trans('general.qty') }}{{ trans('general.purchase_cost') }}{{trans('admin/hardware/form.serial')}}{{trans('general.checkin')}}
- {{ $component->name }} - {{ $component->pivot->assigned_qty }} - @if ($component->purchase_cost!='') - {{ trans('general.cost_each', ['amount' => Helper::formatCurrencyOutput($component->purchase_cost)]) }} - @endif - {{ $component->serial }} - {{ trans('general.checkin') }} -
- {{ $totalCost }}
-
-
-
- - -
-
-
- - @include('partials.asset-bulk-actions') - - -
- - - -
-
- - -
-
-
- - -
- - -
- -

- {{ trans('general.accessories_assigned') }} -

- - -
- -
-
- - -
-
-
- - - -
-
-
-
- - -
- -
-
- - - - - - - - - - - - - - - -
{{ trans('general.date') }}{{ trans('general.created_by') }}{{ trans('general.file_name') }}{{ trans('general.notes') }}{{ trans('general.download') }}{{ trans('admin/hardware/table.changed')}}{{ trans('admin/settings/general.login_ip') }}{{ trans('admin/settings/general.login_user_agent') }}{{ trans('general.action_source') }}
-
-
-
- - -
+
+ + + + + + + + + + + + + +
{{ trans('general.date') }}{{ trans('general.created_by') }}{{ trans('general.file_name') }}{{ trans('general.notes') }}{{ trans('general.download') }}{{ trans('admin/hardware/table.changed')}}{{ trans('admin/settings/general.login_ip') }}{{ trans('admin/settings/general.login_user_agent') }}{{ trans('general.action_source') }}
-
-
-
- -
-
-
- @if ($asset->model) - @can('view', $asset->model) -
-
-
- -
-
-
- @endcan - @endif -
- - +
+ +
+
+ +
+
+
+
- @can('update', \App\Models\Asset::class) - @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id]) - @endcan -@stop - @section('moar_scripts') - @include ('partials.bootstrap-table') +
+
+
+ +
+
+
-@stop + @if ($asset->model) + @can('view', $asset->model) +
+
+
+ +
+
+
+ @endcan + @endif + + + + + @can('update', \App\Models\Asset::class) + @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id]) + @endcan + @stop + @section('moar_scripts') + @include ('partials.bootstrap-table') + + @stop