kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 20:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Update code to work with filters.

Browse Source
This commit is contained in:
James Cole
2017-04-28 20:08:25 +02:00
parent c83dfc44d6
commit 7e11691ea4
12 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Repositories/Account/AccountTasker.php
View File

@@ -106,8 +106,7 @@ class AccountTasker implements AccountTaskerInterface
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end);
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->withOpposingAccount()
->enableInternalFilter();
->withOpposingAccount();
$transactions = $collector->getJournals();
$transactions = $transactions->filter(
function (Transaction $transaction) {
@@ -149,8 +148,7 @@ class AccountTasker implements AccountTaskerInterface
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end);
$collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
->withOpposingAccount()
->enableInternalFilter();
->withOpposingAccount();
$transactions = $collector->getJournals();
$transactions = $transactions->filter(
function (Transaction $transaction) {

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

@@ -228,8 +228,7 @@ class CategoryRepository implements CategoryRepositoryInterface
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end);
$collector->setCategories($categories)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->withOpposingAccount()
->enableInternalFilter();
->withOpposingAccount();
$transactions = $collector->getJournals();
// loop transactions:
@@ -260,7 +259,7 @@ class CategoryRepository implements CategoryRepositoryInterface
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end)->withOpposingAccount();
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])->enableInternalFilter();
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]);
$collector->withoutCategory();
$transactions = $collector->getJournals();
$result = [
@@ -312,8 +311,7 @@ class CategoryRepository implements CategoryRepositoryInterface
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end);
$collector->setCategories($categories)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
->withOpposingAccount()
->enableInternalFilter();
->withOpposingAccount();
$transactions = $collector->getJournals();
// loop transactions:
@@ -345,7 +343,7 @@ class CategoryRepository implements CategoryRepositoryInterface
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end)->withOpposingAccount();
$collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])->enableInternalFilter();
$collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]);
$collector->withoutCategory();
$transactions = $collector->getJournals();
$result = [