kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 19:01:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1605

Browse Source
This commit is contained in:
James Cole
2018-08-14 06:40:21 +02:00
parent e125254687
commit 11be33e942
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Support/Twig/Extension/TransactionJournal.php
View File

@@ -157,6 +157,7 @@ class TransactionJournal extends Twig_Extension
$totals[$currencyId]['amount'] = bcadd($transaction->amount, $totals[$currencyId]['amount']); $totals[$currencyId]['amount'] = bcadd($transaction->amount, $totals[$currencyId]['amount']);
if (null !== $transaction->foreign_currency_id) { if (null !== $transaction->foreign_currency_id) {
$foreignAmount = $transaction->foreign_amount ?? '0';
$foreignId = $transaction->foreign_currency_id; $foreignId = $transaction->foreign_currency_id;
$foreign = $transaction->foreignCurrency; $foreign = $transaction->foreignCurrency;
if (!isset($totals[$foreignId])) { if (!isset($totals[$foreignId])) {
@@ -166,7 +167,7 @@ class TransactionJournal extends Twig_Extension
]; ];
} }
$totals[$foreignId]['amount'] = bcadd( $totals[$foreignId]['amount'] = bcadd(
$transaction->foreign_amount, $foreignAmount,
$totals[$foreignId]['amount'] $totals[$foreignId]['amount']
); );
} }