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

Make budget report actually more useful.

Browse Source
This commit is contained in:
James Cole
2016-12-23 17:50:26 +01:00
parent 08c044fe52
commit e15932fe4a
3 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Support/Models/TransactionJournalSupport.php
View File

@@ -163,7 +163,9 @@ class TransactionJournalSupport extends Model
if ($cache->has()) {
return $cache->get();
}
$transactions = $journal->transactions()->where('amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get();
$transactions = $journal->transactions()
->whereNull('transactions.deleted_at')
->where('transactions.amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get();
$list = new Collection;
/** @var Transaction $t */
foreach ($transactions as $t) {
@@ -255,7 +257,10 @@ class TransactionJournalSupport extends Model
if ($cache->has()) {
return $cache->get();
}
$transactions = $journal->transactions()->where('amount', '<', 0)->orderBy('transactions.account_id')->with('account')->get();
$transactions = $journal->transactions()
->whereNull('transactions.deleted_at')
->where('transactions.amount', '<', 0)
->orderBy('transactions.account_id')->with('account')->get();
$list = new Collection;
/** @var Transaction $t */
foreach ($transactions as $t) {