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

Manage related transactions.

Browse Source
This commit is contained in:
James Cole
2014-12-04 20:38:45 +01:00
parent 4720519aef
commit c9b2e29ba0
20 changed files with 259 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/ReportController.php
View File

@@ -174,7 +174,11 @@ class ReportController extends BaseController
$withdrawals = $journals->filter(
function (TransactionJournal $journal) {
if ($journal->transactionType->type == 'Withdrawal' && count($journal->budgets) == 0) {
return $journal;
// count groups related to balance.
if ($journal->transactiongroups()->where('relation', 'balance')->count() == 0) {
return $journal;
}
}
}
);
@@ -184,10 +188,15 @@ class ReportController extends BaseController
$deposits = $journals->filter(
function (TransactionJournal $journal) {
if ($journal->transactionType->type == 'Deposit' && count($journal->budgets) == 0) {
return $journal;
// count groups related to balance.
if ($journal->transactiongroups()->where('relation', 'balance')->count() == 0) {
return $journal;
}
}
}
);
/*
* Filter transfers (not yet used)
*/