DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -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 @endphp
@foreach ($licenses as $license) @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> @endif
<td>{{ $lcounter }}</td>
<td>{{ $license->name }}</td>
<td>{{ $license->serial }}</td>
<td>{{ $license->assetlog->first()->created_at }}</td>
</tr>
@php
$lcounter++
@endphp
@endforeach @endforeach
</table> </table>
@endif @endif
@ -150,15 +152,15 @@
@foreach ($accessories as $accessory) @foreach ($accessories as $accessory)
@if ($accessory) @if ($accessory)
<tr> <tr>
<td>{{ $acounter }}</td> <td>{{ $acounter }}</td>
<td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td> <td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
<td>{{ $accessory->category->name }}</td> <td>{{ $accessory->category->name }}</td>
<td>{{ $accessory->assetlog->first()->created_at }}</td> <td>{{ $accessory->assetlog->first()->created_at }}</td>
</tr> </tr>
@php @php
$acounter++ $acounter++
@endphp @endphp
@endif @endif
@endforeach @endforeach
</table> </table>
@ -185,16 +187,17 @@
@endphp @endphp
@foreach ($consumables as $consumable) @foreach ($consumables as $consumable)
@if ($consumable)
<tr> <tr>
<td>{{ $ccounter }}</td> <td>{{ $ccounter }}</td>
<td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}</td> <td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}</td>
<td>{{ $consumable->category->name }}</td> <td>{{ $consumable->category->name }}</td>
<td>{{ $consumable->assetlog->first()->created_at }}</td> <td>{{ $consumable->assetlog->first()->created_at }}</td>
</tr> </tr>
@php @php
$ccounter++ $ccounter++
@endphp @endphp
@endif
@endforeach @endforeach
</table> </table>
@endif @endif