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

Merge branch 'develop'

Browse source 
# Conflicts:
#	resources/views/hardware/view.blade.php
This commit is contained in:
snipe 2017-09-22 17:04:43 -07:00
parent b29d7beb3a e316444c63
commit 3e222b674a
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -544,11 +544,7 @@
@foreach ($asset->assetmaintenances as $assetMaintenance) @foreach ($asset->assetmaintenances as $assetMaintenance)
@if (is_null($assetMaintenance->deleted_at)) @if (is_null($assetMaintenance->deleted_at))
<tr> <tr>
<td> <td><a href="{{ route('suppliers.show', $assetMaintenance->supplier_id) }}">{{ $assetMaintenance->supplier->name }}</a></td>
@if ($assetMaintenance->supplier)
<a href="{{ route('view/supplier', $assetMaintenance->supplier_id) }}">{{ $assetMaintenance->supplier->name }}</a>
@endif
</td>
<td>{{ $assetMaintenance->title }}</td> <td>{{ $assetMaintenance->title }}</td>
<td>{{ $assetMaintenance->asset_maintenance_type }}</td> <td>{{ $assetMaintenance->asset_maintenance_type }}</td>
<td>{{ $assetMaintenance->start_date }}</td> <td>{{ $assetMaintenance->start_date }}</td>
@ -558,7 +554,7 @@
<td class="text-right"><nobr>{{ $use_currency.$assetMaintenance->cost }}</nobr></td> <td class="text-right"><nobr>{{ $use_currency.$assetMaintenance->cost }}</nobr></td>
<td> <td>
@if ($assetMaintenance->admin) @if ($assetMaintenance->admin)
<a href="{{ config('app.url') }}/admin/users/{{ $assetMaintenance->admin->id }}/view">{{ $assetMaintenance->admin->fullName() }}</a> <a href="{{ route('users.show', $assetMaintenance->admin->id) }}">{{ $assetMaintenance->admin->present()->fullName() }}</a>
@endif @endif
</td> </td>
<?php $totalCost += $assetMaintenance->cost; ?> <?php $totalCost += $assetMaintenance->cost; ?>