kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

First set of views will respect decimal places configuration.

Browse Source
This commit is contained in:
James Cole
2016-12-29 09:15:50 +01:00
parent 1e9aaf2d2a
commit 45914b2e9e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Support/Amount.php
View File

@@ -17,7 +17,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use NumberFormatter;
use Preferences as Prefs; use Preferences as Prefs;
/** /**
@@ -51,10 +50,20 @@ class Amount
*/ */
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string
{ {
$locale = setlocale(LC_MONETARY, 0); setlocale(LC_MONETARY, 0);
$float = round($amount, 12); $float = round($amount, 12);
$formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY); $info = localeconv();
$result = $formatter->formatCurrency($float, $format->code); $formatted = number_format($float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep']);
// some complicated switches to format the amount correctly:
$precedes = $amount < 0 ? $info['n_cs_precedes'] : $info['p_cs_precedes'];
$separated = $amount < 0 ? $info['n_sep_by_space'] : $info['p_sep_by_space'];
$space = $separated ? ' ' : '';
$result = $format->symbol . $space . $formatted;
if (!$precedes) {
$result = $space . $formatted . $format->symbol;
}
if ($coloured === true) { if ($coloured === true) {