kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 18:58:07 +00:00
Code Issues Projects Releases Wiki Activity

Respond to empty account collection #524

Browse Source
This commit is contained in:
James Cole
2017-01-05 09:04:12 +01:00
parent 6fe28b15df
commit 3ef569d280
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Repositories/Category/CategoryRepository.php
View File

@@ -396,7 +396,17 @@ class CategoryRepository implements CategoryRepositoryInterface
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [$this->user]); $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(); $set = $collector->getJournals();
$sum = strval($set->sum('transaction_amount')); $sum = strval($set->sum('transaction_amount'));
@@ -414,7 +424,15 @@ class CategoryRepository implements CategoryRepositoryInterface
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [$this->user]); $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 = $collector->getJournals();
$set = $set->filter( $set = $set->filter(
function (Transaction $transaction) { function (Transaction $transaction) {