diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 80874551e..6fee34652 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -399,17 +399,43 @@ }'> - # - {{ trans('general.image') }} - {{ trans('general.category') }} - {{ trans('admin/hardware/table.asset_tag') }} - {{ trans('general.name') }} - {{ trans('admin/hardware/table.asset_model') }} - {{ trans('admin/hardware/table.serial') }} - {{ trans('admin/hardware/form.default_location') }} + + # + + + {{ trans('general.image') }} + + + {{ trans('general.category') }} + + + {{ trans('admin/hardware/table.asset_tag') }} + + {{ trans('general.name') }} + + {{ trans('admin/hardware/table.asset_model') }} + + + {{ trans('admin/hardware/table.serial') }} + + + {{ trans('admin/hardware/form.default_location') }} + + @can('self.view_purchase_cost') - {{ trans('general.purchase_cost') }} + + {{ trans('general.purchase_cost') }} + @endcan + + {{ trans('admin/hardware/form.eol_date') }} + + + {{ trans('general.last_audit') }} + + + {{ trans('general.next_audit_date') }} + @foreach ($field_array as $db_column => $field_name) {{ $field_name }} @endforeach @@ -436,21 +462,40 @@ {{ $asset->model->category->name }} @endif - {{ $asset->asset_tag }} - {{ $asset->name }} + + {{ $asset->asset_tag }} + + + {{ $asset->name }} + @if ($asset->physical=='1') {{ $asset->model->name }} @endif - {{ $asset->serial }} - {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }} + + {{ $asset->serial }} + + + {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }} + @can('self.view_purchase_cost') {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!} @endcan + + {{ ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) : null }} + + + + {{ Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false) }} + + + {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }} + + @foreach ($field_array as $db_column => $field_value) {{ $asset->{$db_column} }}