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

Expand code for reports.

Browse Source
This commit is contained in:
James Cole
2014-12-01 05:57:03 +01:00
parent 0a2cbaa047
commit d7b0106e7d
6 changed files with 219 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/controllers/ReportController.php
View File

@@ -200,50 +200,17 @@ class ReportController extends BaseController
// );
/*
* Filter withdrawals without a counter-transfer (into this account)
* TODO Filter withdrawals without a counter-transfer (into this account)
*/
$withdrawals = $withdrawals->filter(
function (TransactionJournal $journal) {
foreach ($journal->transactions as $transaction) {
if (floatval($transaction->amount) < 0) {
$account = $transaction->account;
// find counter transfer:
$counters = $account->transactions()->where('amount', floatval($transaction->amount) * -1)
->where('account_id', '=', $transaction->account_id)
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('transaction_journals.description', 'LIKE', '%' . e($journal->description) . '%')
->get(['transactions.*']);
if ($counters->count() == 0) {
return $journal;
}
}
}
}
);
/*
* Filter deposits without a counter-transfer (away from this account)
* TODO Filter deposits without a counter-transfer (away from this account)
*/
$deposits = $deposits->filter(
function (TransactionJournal $journal) {
foreach ($journal->transactions as $transaction) {
if (floatval($transaction->amount) > 0) {
$account = $transaction->account;
// find counter transfer:
$counters = $account->transactions()->where('amount', floatval($transaction->amount) * -1)
->where('account_id', '=', $transaction->account_id)
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('transaction_journals.description', 'LIKE', '%' . e($journal->description) . '%')
->get(['transactions.*']);
if ($counters->count() == 0) {
return $journal;
}
}
}
}
);
$journals = $withdrawals->merge($deposits);
return View::make('reports.unbalanced', compact('start', 'end', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon', 'withdrawals', 'deposits'));
return View::make('reports.unbalanced', compact('start', 'end', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon', 'journals'));
}
/**