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

Include virtual balance in transaction overview #735

Browse Source
This commit is contained in:
James Cole
2017-08-07 20:36:23 +02:00
parent 5d837c3ee4
commit b29fabf76c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Repositories/Journal/JournalTasker.php
View File

@@ -191,6 +191,9 @@ class JournalTasker implements JournalTaskerInterface
$journalId = intval($transaction->transaction_journal_id); $journalId = intval($transaction->transaction_journal_id);
$identifier = intval($transaction->identifier); $identifier = intval($transaction->identifier);
// also add the virtual balance to the balance:
$virtualBalance = strval($transaction->account->virtual_balance);
// go! // go!
$sum = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') $sum = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('account_id', $transaction->account_id) ->where('account_id', $transaction->account_id)
@@ -224,6 +227,6 @@ class JournalTasker implements JournalTaskerInterface
} }
)->sum('transactions.amount'); )->sum('transactions.amount');
return strval($sum); return bcadd(strval($sum), $virtualBalance);
} }
} }