Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-03 11:18:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add missing country

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-10-29 22:29:31 +01:00
parent c0a46b778a
commit 5d5796b8fb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Localization/Defaults/localization.sqlite
View File

Binary file not shown.

10
Localization/Money.php
View File

@ -178,7 +178,7 @@ final class Money implements \Serializable
*/ */
public function getCurrency(int $decimals = 2) : string public function getCurrency(int $decimals = 2) : string
{ {
return ($this->position === 0 ? $this->symbol . ' ' : '') . $this->getAmount($decimals) . ($this->position === 1 ? ' ' . $this->symbol : ''); return ($this->position === 0 && !empty($this->symbol) ? $this->symbol . ' ' : '') . $this->getAmount($decimals) . ($this->position === 1 ? ' ' . $this->symbol : '');
} }
/** /**
@ -194,7 +194,9 @@ final class Money implements \Serializable
*/ */
public function getAmount(int $decimals = 2) : string public function getAmount(int $decimals = 2) : string
{ {
$value = (string) \round($this->value, -self::MAX_DECIMALS + $decimals); $value = $this->value === 0
? \str_repeat('0', self::MAX_DECIMALS)
: (string) \round($this->value, -self::MAX_DECIMALS + $decimals);
$left = \substr($value, 0, -self::MAX_DECIMALS); $left = \substr($value, 0, -self::MAX_DECIMALS);
@ -206,7 +208,9 @@ final class Money implements \Serializable
throw new \Exception(); // @codeCoverageIgnore throw new \Exception(); // @codeCoverageIgnore
} }
return ($decimals > 0) ? \number_format((float) $left, 0, $this->decimal, $this->thousands) . $this->decimal . \substr($right, 0, $decimals) : \str_pad($left, 1, '0'); return $decimals > 0
? \number_format((float) $left, 0, $this->decimal, $this->thousands) . $this->decimal . \substr($right, 0, $decimals)
: \str_pad($left, 1, '0');
} }
/** /**