mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Add other items' purchase_cost columns to the same permission
This commit is contained in:
parent
b142f8e012
commit
d9a21cce00
|
@ -648,7 +648,7 @@ return [
|
||||||
[
|
[
|
||||||
'permission' => 'self.view_purchase_cost',
|
'permission' => 'self.view_purchase_cost',
|
||||||
'label' => 'View Purchase-Cost Column',
|
'label' => 'View Purchase-Cost Column',
|
||||||
'note' => 'This user can see the purchase cost column of assets assigned to them.',
|
'note' => 'This user can see the purchase cost column of items assigned to them.',
|
||||||
'display' => true,
|
'display' => true,
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
|
@ -536,7 +536,9 @@
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-md-5">{{ trans('general.name') }}</th>
|
<th class="col-md-5">{{ trans('general.name') }}</th>
|
||||||
<th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
|
@can('self.view_purchase_cost')
|
||||||
|
<th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
|
||||||
|
@endcan
|
||||||
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
|
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
@ -544,9 +546,11 @@
|
||||||
@foreach ($user->accessories as $accessory)
|
@foreach ($user->accessories as $accessory)
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ $accessory->name }}</td>
|
<td>{{ $accessory->name }}</td>
|
||||||
<td>
|
@can('self.view_purchase_cost')
|
||||||
{!! Helper::formatCurrencyOutput($accessory->purchase_cost) !!}
|
<td>
|
||||||
</td>
|
{!! Helper::formatCurrencyOutput($accessory->purchase_cost) !!}
|
||||||
|
</td>
|
||||||
|
@endcan
|
||||||
<td class="hidden-print">
|
<td class="hidden-print">
|
||||||
@can('checkin', $accessory)
|
@can('checkin', $accessory)
|
||||||
<a href="{{ route('accessories.checkin.show', array('accessoryID'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
|
<a href="{{ route('accessories.checkin.show', array('accessoryID'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
|
||||||
|
@ -583,7 +587,9 @@
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-md-3">{{ trans('general.name') }}</th>
|
<th class="col-md-3">{{ trans('general.name') }}</th>
|
||||||
<th class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
|
@can('self.view_purchase_cost')
|
||||||
|
<th class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
|
||||||
|
@endcan
|
||||||
<th class="col-md-2">{{ trans('general.date') }}</th>
|
<th class="col-md-2">{{ trans('general.date') }}</th>
|
||||||
<th class="col-md-5">{{ trans('general.notes') }}</th>
|
<th class="col-md-5">{{ trans('general.notes') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -592,9 +598,11 @@
|
||||||
@foreach ($user->consumables as $consumable)
|
@foreach ($user->consumables as $consumable)
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ $consumable->name }}</td>
|
<td>{{ $consumable->name }}</td>
|
||||||
<td>
|
@can('self.view_purchase_cost')
|
||||||
{!! Helper::formatCurrencyOutput($consumable->purchase_cost) !!}
|
<td>
|
||||||
</td>
|
{!! Helper::formatCurrencyOutput($consumable->purchase_cost) !!}
|
||||||
|
</td>
|
||||||
|
@endcan
|
||||||
<td>{{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}</td>
|
<td>{{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}</td>
|
||||||
<td>{{ $consumable->pivot->note }}</td>
|
<td>{{ $consumable->pivot->note }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in a new issue