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

Fix https://github.com/firefly-iii/firefly-iii/issues/6743

Browse Source
This commit is contained in:
James Cole
2022-12-27 20:00:18 +01:00
parent f350948fb2
commit 75ce777090
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Amount.php
View File

@@ -72,20 +72,20 @@ class Amount
public function formatFlat(string $symbol, int $decimalPlaces, string $amount, bool $coloured = null): string
{
$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);
}

2
app/Support/Steam.php
View File

@@ -116,7 +116,7 @@ class Steam
if(false !== stripos($number,'e')) {
$number = sprintf('%.24f',$number);
}
Log::debug(sprintf('Trying bcround("%s",%d)', $number, $precision));
if (str_contains($number, '.')) {
if ($number[0] !== '-') {