kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-16 17:57:29 +00:00
Code Issues Projects Releases Wiki Activity

Expand filter

Browse Source
This commit is contained in:
James Cole
2017-02-11 09:34:04 +01:00
parent 3914796e4e
commit aa2d78f36a
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Helpers/Collector/JournalCollector.php
View File

@@ -32,6 +32,7 @@ use Illuminate\Database\Query\JoinClause;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Log;
use Steam;
/**
* Maybe this is a good idea after all...
@@ -235,7 +236,7 @@ class JournalCollector implements JournalCollectorInterface
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$repository->setUser($this->user);
$accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
$accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
if ($accounts->count() > 0) {
$accountIds = $accounts->pluck('id')->toArray();
$this->query->whereIn('transactions.account_id', $accountIds);
@@ -628,16 +629,27 @@ class JournalCollector implements JournalCollectorInterface
{
if ($this->filterTransfers) {
$count = [];
$new = new Collection;
$new = new Collection;
/** @var Transaction $transaction */
foreach($set as $transaction) {
$journalId =$transaction->transaction_journal_id;
if(!isset($count[$journalId]) ) {
foreach ($set as $transaction) {
if ($transaction->transaction_type_type !== TransactionType::TRANSFER) {
$new->push($transaction);
continue;
}
// make property string:
$journalId = $transaction->transaction_journal_id;
$amount = Steam::positive($transaction->transaction_amount);
$source = $transaction->account_id;
$dest = $transaction->opposing_account_id;
$key = $journalId . $source . $dest . $amount;
if (!isset($count[$key])) {
// not yet counted? add to new set and count it:
$new->push($transaction);
$count[$journalId] = 1;
$count[$key] = 1;
}
}
return $new;
}

19
app/Support/Steam.php
View File

@@ -26,7 +26,6 @@ use FireflyIII\Models\Transaction;
class Steam
{
/**
*
* @param \FireflyIII\Models\Account $account
@@ -202,8 +201,6 @@ class Steam
return $list;
}
// parse PHP size:
/**
* @param $string
*
@@ -239,4 +236,20 @@ class Steam
}
// parse PHP size:
/**
* @param string $amount
*
* @return string
*/
public function positive(string $amount): string
{
if (bccomp($amount, '0') === 1) {
$amount = bcmul($amount, '-1');
}
return $amount;
}
}