IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug that occurs when the transaction journal does not have the field "transaction_currency_code"

Browse Source
This commit is contained in:
James Cole 2016-03-07 19:52:59 +01:00
parent c5fb734e42
commit 6ad10f1772
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Support/Amount.php
View File

@ -75,8 +75,9 @@ class Amount
if ($journal->isWithdrawal()) { if ($journal->isWithdrawal()) {
$float = floatval($journal->source_amount); $float = floatval($journal->source_amount);
} }
$formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY); $formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
$result = $formatter->formatCurrency($float, $journal->transaction_currency_code); $currencyCode = $journal->transaction_currency_code ?? $journal->transactionCurrency->code;
$result = $formatter->formatCurrency($float, $currencyCode);
if ($coloured === true && $float == 0) { if ($coloured === true && $float == 0) {
return '<span style="color:#999">' . $result . '</span>'; // always grey. return '<span style="color:#999">' . $result . '</span>'; // always grey.