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

Fixed some transaction list filter issues.

Browse Source
This commit is contained in:
James Cole
2017-02-15 21:55:50 +01:00
parent a5f8aa914f
commit 8f5289b7dc
4 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -506,6 +506,7 @@ class JournalCollector implements JournalCollectorInterface
{
$this->joinOpposingTables();
/**
$accountIds = $this->accountIds;
$this->query->where(
function (EloquentBuilder $q1) use ($accountIds) {
@@ -535,6 +536,7 @@ class JournalCollector implements JournalCollectorInterface
);
}
);
* **/
return $this;
}
@@ -637,12 +639,12 @@ class JournalCollector implements JournalCollectorInterface
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;
$journalId = $transaction->transaction_journal_id;
$amount = Steam::positive($transaction->transaction_amount);
$accountIds = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
sort($accountIds);
$key = $journalId . '-' . join(',', $accountIds) . '-' . $amount;
Log::debug(sprintf('Key is %s', $key));
if (!isset($count[$key])) {
// not yet counted? add to new set and count it:
$new->push($transaction);