diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 8d8c829920fa..57df9ebf9099 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -861,6 +861,7 @@ class AccountController extends BaseController $account->currency_id = Input::get('currency_id') ? Input::get('currency_id') : 1; // US Dollar $account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English $account->military_time = Input::get('military_time') ? true : false; + $account->show_currency_code = Input::get('show_currency_code') ? true : false; $account->save(); event(new UserSettingsChanged()); diff --git a/app/Models/Account.php b/app/Models/Account.php index 8b10c90dfa36..baca7d0c78c0 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -290,6 +290,8 @@ class Account extends Eloquent $countryId = false; } + $hideSymbol = $this->show_currency_code || $hideSymbol; + return Utils::formatMoney($amount, $currencyId, $countryId, $hideSymbol); } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 89684f78ec03..bafe82800826 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1143,5 +1143,5 @@ return array( 'invoice_currency' => 'Invoice Currency', 'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.', 'quote_issued_to' => 'Quote issued to', - + 'show_currency_code' => 'Currency Code', ); diff --git a/resources/views/accounts/localization.blade.php b/resources/views/accounts/localization.blade.php index 1ad5de55ff17..f2c28e3684a8 100644 --- a/resources/views/accounts/localization.blade.php +++ b/resources/views/accounts/localization.blade.php @@ -6,6 +6,7 @@ {!! Former::open_for_files()->addClass('warn-on-exit') !!} {{ Former::populate($account) }} {{ Former::populateField('military_time', intval($account->military_time)) }} + {{ Former::populateField('show_currency_code', intval($account->show_currency_code)) }} @include('accounts.nav', ['selected' => ACCOUNT_LOCALIZATION]) @@ -28,6 +29,7 @@ {!! Former::select('datetime_format_id')->addOption('','') ->fromQuery($datetimeFormats, 'label', 'id') !!} {!! Former::checkbox('military_time')->text(trans('texts.enable')) !!} + {{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}}