IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-26 02:40:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more report details.

Browse Source
This commit is contained in:
James Cole 2016-05-15 17:53:00 +02:00
parent eedf6a07f0
commit d2131c371b
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Popup/ReportController.php
View File

@ -185,8 +185,18 @@ class ReportController extends Controller
$repository = app(AccountRepositoryInterface::class);
$account = $repository->find(intval($attributes['accountId']));
$types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
$journals = $repository->journalsInPeriod(new Collection([$account]), $types, $attributes['startDate'], $attributes['endDate']);
$view = view('popup.report.expense-entry', compact('journals', 'account'))->render();
$journals = $repository->journalsInPeriod($attributes['accounts'], $types, $attributes['startDate'], $attributes['endDate']);
// filter for transfers and withdrawals TO the given $account
$journals = $journals->filter(
function (TransactionJournal $journal) use ($account) {
if ($journal->destination_account_id === $account->id) {
return $journal;
}
}
);
$view = view('popup.report.expense-entry', compact('journals', 'account'))->render();
return $view;
}
@ -206,6 +216,16 @@ class ReportController extends Controller
$account = $repository->find(intval($attributes['accountId']));
$types = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
$journals = $repository->journalsInPeriod(new Collection([$account]), $types, $attributes['startDate'], $attributes['endDate']);
// filter for transfers and withdrawals FROM the given $account
$journals = $journals->filter(
function (TransactionJournal $journal) use ($account) {
if ($journal->source_account_id === $account->id) {
return $journal;
}
}
);
$view = view('popup.report.income-entry', compact('journals', 'account'))->render();
return $view;