DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-07-24 13:05:16 +01:00
parent 8d36a75342 172da4d655
commit c4135c71d4
1 changed files with 58 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
resources/views/account/view-assets.blade.php
View file

@ -399,17 +399,43 @@
}'> }'>
<thead> <thead>
<tr> <tr>
<th class="col-md-1">#</th> <th class="col-md-1">
<th class="col-md-1">{{ trans('general.image') }}</th> #
<th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.category') }}</th> </th>
<th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_tag') }}</th> <th class="col-md-1">
<th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.name') }}</th> {{ trans('general.image') }}
<th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_model') }}</th> </th>
<th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.serial') }}</th> <th class="col-md-2" data-switchable="true" data-visible="true">
<th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th> {{ trans('general.category') }}
</th>
<th class="col-md-2" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_tag') }}
</th>
<th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('general.name') }}</th>
<th class="col-md-2" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_model') }}
</th>
<th class="col-md-3" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.serial') }}
</th>
<th class="col-md-2" data-switchable="true" data-visible="false">
{{ trans('admin/hardware/form.default_location') }}
</th>
@can('self.view_purchase_cost') @can('self.view_purchase_cost')
<th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th> <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
{{ trans('general.purchase_cost') }}
</th>
@endcan @endcan
<th class="col-md-2" data-switchable="true" data-visible="false">
{{ trans('admin/hardware/form.eol_date') }}
</th>
<th class="col-md-2" data-switchable="true" data-visible="false">
{{ trans('general.last_audit') }}
</th>
<th class="col-md-2" data-switchable="true" data-visible="false">
{{ trans('general.next_audit_date') }}
</th>
@foreach ($field_array as $db_column => $field_name) @foreach ($field_array as $db_column => $field_name)
<th class="col-md-1" data-switchable="true" data-visible="true">{{ $field_name }}</th> <th class="col-md-1" data-switchable="true" data-visible="true">{{ $field_name }}</th>
@endforeach @endforeach
@ -436,21 +462,40 @@
{{ $asset->model->category->name }} {{ $asset->model->category->name }}
@endif @endif
</td> </td>
<td>{{ $asset->asset_tag }}</td> <td>
<td>{{ $asset->name }}</td> {{ $asset->asset_tag }}
</td>
<td>
{{ $asset->name }}
</td>
<td> <td>
@if ($asset->physical=='1') @if ($asset->physical=='1')
{{ $asset->model->name }} {{ $asset->model->name }}
@endif @endif
</td> </td>
<td>{{ $asset->serial }}</td> <td>
<td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td> {{ $asset->serial }}
</td>
<td>
{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}
</td>
@can('self.view_purchase_cost') @can('self.view_purchase_cost')
<td> <td>
{!! Helper::formatCurrencyOutput($asset->purchase_cost) !!} {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}
</td> </td>
@endcan @endcan
<td>
{{ ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) : null }}
</td>
<td>
{{ Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false) }}
</td>
<td>
{{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
</td>
@foreach ($field_array as $db_column => $field_value) @foreach ($field_array as $db_column => $field_value)
<td> <td>
{{ $asset->{$db_column} }} {{ $asset->{$db_column} }}