Merge pull request #4542 from beganovich/v5-fixes-for-client-number-formatting

(v5) Fixes for client number formatting
This commit is contained in:
Benjamin Beganović 2020-12-21 09:09:02 +01:00 committed by GitHub
commit 4b55a69cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -102,15 +102,15 @@ class Number
$swapSymbol = $currency->swap_currency_symbol; $swapSymbol = $currency->swap_currency_symbol;
/* Country settings override client settings */ /* Country settings override client settings */
if (isset($client->country->thousand_separator)) { if (isset($client->country->thousand_separator) && strlen($client->country->thousand_separator) >= 1) {
$thousand = $client->country->thousand_separator; $thousand = $client->country->thousand_separator;
} }
if (isset($client->country->decimal_separator)) { if (isset($client->country->decimal_separator) && strlen($client->country->decimal_separator) >= 1) {
$decimal = $client->country->decimal_separator; $decimal = $client->country->decimal_separator;
} }
if (isset($client->country->swap_currency_symbol)) { if (isset($client->country->swap_currency_symbol) && strlen($client->country->swap_currency_symbol) >= 1) {
$swapSymbol = $client->country->swap_currency_symbol; $swapSymbol = $client->country->swap_currency_symbol;
} }