IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Category information. #159

Browse Source
This commit is contained in:
James Cole
2016-04-03 11:20:55 +02:00
parent 03691c81c2
commit 622a97c8d8
6 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Repositories/Category/SingleCategoryRepository.php
View File

@@ -153,6 +153,28 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
}
/**
* @param Category $category
* @param Collection $accounts
*
* @param Carbon $start
* @param Carbon $end
*
* @return Collection
*/
public function getJournalsForAccountsInRange(Category $category, Collection $accounts, Carbon $start, Carbon $end)
{
$ids = $accounts->pluck('id')->toArray();
return $category->transactionjournals()
->after($start)
->before($end)
->expanded()
->whereIn('source_account.id', $ids)
->whereNotIn('destination_account.id', $ids)
->get(TransactionJournal::QUERYFIELDS);
}
/**
* @param Category $category
* @param int $page
@@ -171,9 +193,6 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
->expanded()
->take(50)
->offset($offset)
->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC')
->get(TransactionJournal::QUERYFIELDS);
}

10
app/Repositories/Category/SingleCategoryRepositoryInterface.php
View File

@@ -79,6 +79,16 @@ interface SingleCategoryRepositoryInterface
*/
public function getJournals(Category $category, $page);
/**
* @param Category $category
* @param Collection $accounts
*
* @param Carbon $start
* @param Carbon $end
*
* @return Collection
*/
public function getJournalsForAccountsInRange(Category $category, Collection $accounts, Carbon $start, Carbon $end);
/**
* @param Category $category