From 3ef569d280ffd7965dec88831abacc072776263f Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 5 Jan 2017 09:04:12 +0100 Subject: [PATCH] Respond to empty account collection #524 --- .../Category/CategoryRepository.php | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 016b9a8f19..32c2eb2135 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -396,7 +396,17 @@ class CategoryRepository implements CategoryRepositoryInterface { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class, [$this->user]); - $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAccounts($accounts)->setCategories($categories); + $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setCategories($categories); + + + if ($accounts->count() > 0) { + $collector->setAccounts($accounts); + } + if ($accounts->count() === 0) { + $collector->setAllAssetAccounts(); + } + + $set = $collector->getJournals(); $sum = strval($set->sum('transaction_amount')); @@ -414,7 +424,15 @@ class CategoryRepository implements CategoryRepositoryInterface { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class, [$this->user]); - $collector->setRange($start, $end)->setAccounts($accounts)->setTypes([TransactionType::WITHDRAWAL])->withoutCategory(); + $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->withoutCategory(); + + if ($accounts->count() > 0) { + $collector->setAccounts($accounts); + } + if ($accounts->count() === 0) { + $collector->setAllAssetAccounts(); + } + $set = $collector->getJournals(); $set = $set->filter( function (Transaction $transaction) {