DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15774 from marcusmoore/feature/sc-27350

Browse source 
Added Checkout ID column to user accessory table
This commit is contained in:
snipe 2024-11-06 18:40:35 +00:00 committed by GitHub
parent b96a312539 ad99b8b456
commit 9c1c93ad52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/en-US/admin/accessories/table.php
View file

@ -6,6 +6,4 @@ return array(
'id' => 'ID',
'require_acceptance' => 'Acceptance',
'title' => 'Accessory Name',
);

8
resources/views/users/view.blade.php
View file

@ -896,7 +896,8 @@
}'>
<thead>
<tr>
<th class="col-md-5">{{ trans('general.name') }}</th>
<th class="col-md-1">{{ trans('general.id') }}</th>
<th class="col-md-4">{{ trans('general.name') }}</th>
<th class-="col-md-5" data-fieldname="note">{{ trans('general.notes') }}</th>
<th class="col-md-1" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
<th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
@ -905,7 +906,8 @@
<tbody>
@foreach ($user->accessories as $accessory)
<tr>
<td>{!!$accessory->present()->nameUrl()!!}</td>
<td>{{ $accessory->pivot->id }}</td>
<td>{!!$accessory->present()->nameUrl()!!}</td>
<td>{!! $accessory->pivot->note !!}</td>
<td>
{!! Helper::formatCurrencyOutput($accessory->purchase_cost) !!}
@ -1210,4 +1212,4 @@ $('#dataConfirmModal').on('show.bs.modal', function (event) {
</script>
@stop
@stop