mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Fixes #4170 - asset maintenance type not showing
This commit is contained in:
parent
e2bac62e36
commit
c0b39701cc
|
@ -201,11 +201,11 @@
|
||||||
@if (is_null($improvement->deleted_at))
|
@if (is_null($improvement->deleted_at))
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="{{ route('hardware.show', $improvement->asset_id) }}">{{ $improvement->asset->name }}</a></td>
|
<td><a href="{{ route('hardware.show', $improvement->asset_id) }}">{{ $improvement->asset->name }}</a></td>
|
||||||
<td>{{ $improvement->improvement_type }}</td>
|
<td>{{ $improvement->asset_maintenance_type }}</td>
|
||||||
<td>{{ $improvement->start_date }}</td>
|
<td>{{ $improvement->start_date }}</td>
|
||||||
<td>{{ $improvement->completion_date }}</td>
|
<td>{{ $improvement->completion_date }}</td>
|
||||||
<td>{{ $improvement->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}</td>
|
<td>{{ $improvement->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}</td>
|
||||||
<td>{{ sprintf( trans( 'general.currency' ) . '%01.2f', $improvement->cost) }}</td>
|
<td>{{ sprintf( $snipeSettings->default_currency. '%01.2f', $improvement->cost) }}</td>
|
||||||
<?php $totalCost += $improvement->cost; ?>
|
<?php $totalCost += $improvement->cost; ?>
|
||||||
<td><a href="{{ route('maintenances.edit', $improvement->id) }}" class="btn btn-warning"><i class="fa fa-pencil icon-white"></i></a>
|
<td><a href="{{ route('maintenances.edit', $improvement->id) }}" class="btn btn-warning"><i class="fa fa-pencil icon-white"></i></a>
|
||||||
</td>
|
</td>
|
||||||
|
@ -222,7 +222,7 @@
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td>{{sprintf(trans( 'general.currency' ) . '%01.2f', $totalCost)}}</td>
|
<td>{{sprintf($snipeSettings->default_currency . '%01.2f', $totalCost)}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
|
|
Loading…
Reference in a new issue