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

More narrow result for popup. [skip ci]

Browse Source
This commit is contained in:
James Cole 2016-05-19 13:38:12 +02:00
parent b22dd29835
commit 04dee404c0
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,15 +212,18 @@ class ReportController extends Controller
private function incomeEntry(array $attributes): string private function incomeEntry(array $attributes): string
{ {
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class); $repository = app(AccountRepositoryInterface::class);
$account = $repository->find(intval($attributes['accountId'])); $account = $repository->find(intval($attributes['accountId']));
$types = [TransactionType::DEPOSIT, TransactionType::TRANSFER]; $types = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
$journals = $repository->journalsInPeriod(new Collection([$account]), $types, $attributes['startDate'], $attributes['endDate']); $journals = $repository->journalsInPeriod(new Collection([$account]), $types, $attributes['startDate'], $attributes['endDate']);
$destinations = $attributes['accounts']->pluck('id')->toArray();
// filter for transfers and withdrawals FROM the given $account // filter for transfers and withdrawals FROM the given $account
$journals = $journals->filter( $journals = $journals->filter(
function (TransactionJournal $journal) use ($account) { function (TransactionJournal $journal) use ($account, $destinations) {
if ($journal->source_account_id === $account->id) { if (
$journal->source_account_id === $account->id &&
in_array($journal->destination_account_id, $destinations)
) {
return $journal; return $journal;
} }
} }