kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 19:01:39 +00:00
Code Issues Projects Releases Wiki Activity

Rename journal collector to more fitting transaction collector.

Browse Source
This commit is contained in:
James Cole
2018-08-11 14:33:47 +02:00
parent 96baf5d3c7
commit 9914c0791e
75 changed files with 595 additions and 1833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\Account;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use FireflyIII\User;
@@ -108,12 +108,12 @@ class AccountTasker implements AccountTaskerInterface
// get all expenses for the given accounts in the given period!
// also transfers!
// get all transactions:
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
/** @var TransactionCollectorInterface $collector */
$collector = app(TransactionCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end);
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->withOpposingAccount();
$transactions = $collector->getJournals();
$transactions = $collector->getTransactions();
$transactions = $transactions->filter(
function (Transaction $transaction) {
// return negative amounts only.
@@ -150,12 +150,12 @@ class AccountTasker implements AccountTaskerInterface
// get all expenses for the given accounts in the given period!
// also transfers!
// get all transactions:
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
/** @var TransactionCollectorInterface $collector */
$collector = app(TransactionCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($start, $end);
$collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
->withOpposingAccount();
$transactions = $collector->getJournals();
$transactions = $collector->getTransactions();
$transactions = $transactions->filter(
function (Transaction $transaction) {
// return positive amounts only.