From 16a7409ce1309be438a0c2b99714618a5a5caca8 Mon Sep 17 00:00:00 2001 From: lea-mink <37537300+lea-mink@users.noreply.github.com> Date: Fri, 20 Apr 2018 23:03:31 +0200 Subject: [PATCH] Matched Asset currency and Asset Maintenance currency in Asset Maintenance view (#5386) * Matched Asset currency and Asset Maintenance currency in Asset Maintenance editing view * Cleaning code & add condition on currency of an asset location --- resources/views/asset_maintenances/edit.blade.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php index 63146bb80..a7a5743e6 100644 --- a/resources/views/asset_maintenances/edit.blade.php +++ b/resources/views/asset_maintenances/edit.blade.php @@ -100,7 +100,13 @@
- {{ $snipeSettings->default_currency }} + + @if (($item->asset) && ($item->asset->location) && ($item->asset->location->currency!='')) + {{ $item->asset->location->currency }} + @else + {{ $snipeSettings->default_currency }} + @endif + {!! $errors->first('cost', ' :message') !!}
@@ -120,8 +126,9 @@ +
- + @stop