kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole
2022-12-27 21:13:42 +01:00
parent dd0c36d464 5e654786be
commit cae0b1798a
19 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Support/Amount.php
View File

@@ -70,21 +70,21 @@ class Amount
*/
public function formatFlat(string $symbol, int $decimalPlaces, string $amount, bool $coloured = null): string
{
$locale = app('steam')->getLocale();
$locale = app('steam')->getLocale();
$rounded = app('steam')->bcround($amount, $decimalPlaces);
$coloured = $coloured ?? true;
$fmt = new NumberFormatter($locale, NumberFormatter::CURRENCY);
$fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $symbol);
$fmt->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, $decimalPlaces);
$fmt->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, $decimalPlaces);
$result = $fmt->format((float)app('steam')->bcround($amount, $decimalPlaces)); // intentional float
$result = $fmt->format((float)$rounded); // intentional float
if (true === $coloured) {
if (1 === bccomp($amount, '0')) {
if (1 === bccomp($rounded, '0')) {
return sprintf('<span class="text-success">%s</span>', $result);
}
if (-1 === bccomp($amount, '0')) {
if (-1 === bccomp($rounded, '0')) {
return sprintf('<span class="text-danger">%s</span>', $result);
}