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

Only use location currency if it's actually set. (#4904)

Browse source 
This changes the depreciation report to only use the currency on a
location if it's actually set to something. Previously, if an asset had
a location it would use the currency even if it was blank rather than
falling back to the default.
This commit is contained in:
Tim Bishop 2018-01-24 16:55:51 +00:00 committed by snipe
parent fcb5eea951
commit bc14f225af
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/views/reports/depreciation.blade.php
View file

@ -99,7 +99,7 @@
@if ($asset->purchase_cost > 0) @if ($asset->purchase_cost > 0)
<td class="align-right"> <td class="align-right">
@if ($asset->location ) @if ($asset->location && $asset->location->currency)
{{ $asset->location->currency }} {{ $asset->location->currency }}
@else @else
{{ $snipeSettings->default_currency }} {{ $snipeSettings->default_currency }}
@ -107,7 +107,7 @@
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }} {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }}
</td> </td>
<td class="align-right"> <td class="align-right">
@if ($asset->location ) @if ($asset->location && $asset->location->currency)
{{ $asset->location->currency }} {{ $asset->location->currency }}
@else @else
{{ $snipeSettings->default_currency }} {{ $snipeSettings->default_currency }}
@ -116,7 +116,7 @@
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }} {{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }}
</td> </td>
<td class="align-right"> <td class="align-right">
@if ($asset->location) @if ($asset->location && $asset->location->currency)
{{ $asset->location->currency }} {{ $asset->location->currency }}
@else @else
{{ $snipeSettings->default_currency }} {{ $snipeSettings->default_currency }}