DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

One more fix for #6175 (non-accessories)

Browse source
This commit is contained in:
snipe 2018-10-31 10:23:47 -07:00
parent 5da9120870
commit 2cecd5e056
1 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
resources/views/users/print.blade.php
View file

@ -113,16 +113,18 @@
@endphp
@foreach ($licenses as $license)
@if ($license)
<tr>
<td>{{ $lcounter }}</td>
<td>{{ $license->name }}</td>
<td>{{ $license->serial }}</td>
<td>{{ $license->assetlog->first()->created_at }}</td>
</tr>
@php
$lcounter++
@endphp
<tr>
<td>{{ $lcounter }}</td>
<td>{{ $license->name }}</td>
<td>{{ $license->serial }}</td>
<td>{{ $license->assetlog->first()->created_at }}</td>
</tr>
@php
$lcounter++
@endphp
@endif
@endforeach
</table>
@endif
@ -150,15 +152,15 @@
@foreach ($accessories as $accessory)
@if ($accessory)
<tr>
<td>{{ $acounter }}</td>
<td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
<td>{{ $accessory->category->name }}</td>
<td>{{ $accessory->assetlog->first()->created_at }}</td>
</tr>
@php
$acounter++
@endphp
<tr>
<td>{{ $acounter }}</td>
<td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
<td>{{ $accessory->category->name }}</td>
<td>{{ $accessory->assetlog->first()->created_at }}</td>
</tr>
@php
$acounter++
@endphp
@endif
@endforeach
</table>
@ -185,16 +187,17 @@
@endphp
@foreach ($consumables as $consumable)
<tr>
<td>{{ $ccounter }}</td>
<td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}</td>
<td>{{ $consumable->category->name }}</td>
<td>{{ $consumable->assetlog->first()->created_at }}</td>
</tr>
@php
$ccounter++
@endphp
@if ($consumable)
<tr>
<td>{{ $ccounter }}</td>
<td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}</td>
<td>{{ $consumable->category->name }}</td>
<td>{{ $consumable->assetlog->first()->created_at }}</td>
</tr>
@php
$ccounter++
@endphp
@endif
@endforeach
</table>
@endif