From b29fabf76cb7033c5c6c5421f34d637c03e4e148 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 7 Aug 2017 20:36:23 +0200 Subject: [PATCH] Include virtual balance in transaction overview #735 --- app/Repositories/Journal/JournalTasker.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index 5aacaa94ac..aba3fa2a57 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -191,6 +191,9 @@ class JournalTasker implements JournalTaskerInterface $journalId = intval($transaction->transaction_journal_id); $identifier = intval($transaction->identifier); + // also add the virtual balance to the balance: + $virtualBalance = strval($transaction->account->virtual_balance); + // go! $sum = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->where('account_id', $transaction->account_id) @@ -224,6 +227,6 @@ class JournalTasker implements JournalTaskerInterface } )->sum('transactions.amount'); - return strval($sum); + return bcadd(strval($sum), $virtualBalance); } }