From 5084e4c5b930b3bacaeaf8d5122c94011ac00a1d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 20 Oct 2016 17:44:31 +0300 Subject: [PATCH] Fix for default currency symbol --- app/Libraries/Utils.php | 2 +- resources/views/money_script.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index 7bea0a86c7bb..6fd5b9e97c28 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -389,7 +389,7 @@ class Utils if ($decorator == CURRENCY_DECORATOR_NONE) { return $value; - } elseif ($decorator == CURRENCY_DECORATOR_SYMBOL || ! $symbol) { + } elseif ($decorator == CURRENCY_DECORATOR_CODE || ! $symbol) { return "{$value} {$code}"; } elseif ($swapSymbol) { return "{$value} " . trim($symbol); diff --git a/resources/views/money_script.blade.php b/resources/views/money_script.blade.php index fbb581d7b5ff..6a278a7d086e 100644 --- a/resources/views/money_script.blade.php +++ b/resources/views/money_script.blade.php @@ -93,7 +93,7 @@ if (decorator == 'none') { return value; - } else if (decorator == 'code' || !symbol) { + } else if (decorator == '{{ CURRENCY_DECORATOR_CODE }}' || ! symbol) { return value + ' ' + code; } else if (swapSymbol) { return value + ' ' + symbol.trim();