From 11385494ebedc076d12086128c98407627f38454 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 20 Sep 2016 08:57:08 +0200 Subject: [PATCH] Fix for income entry. --- app/Http/Controllers/Popup/ReportController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 7727114bfb..2a9ca73a4d 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -223,11 +223,14 @@ class ReportController extends Controller $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 + $journals = $journals->filter( function (TransactionJournal $journal) use ($account, $destinations) { + $currentSources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray(); + $currentDest = TransactionJournal::destinationAccountList($journal)->pluck('id')->toArray(); if ( - $journal->source_account_id === $account->id - && in_array($journal->destination_account_id, $destinations) + !empty(array_intersect([$account->id], $currentSources)) + && !empty(array_intersect($destinations, $currentDest)) ) { return true; }