From f67d5f119745c7f7010044d0f2b9fb352aebb025 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 30 Jul 2017 10:21:45 +0200
Subject: [PATCH] Fix bug in filter.

---
 app/Helpers/Collector/JournalCollector.php |  7 ++++---
 app/Helpers/Filter/TransferFilter.php      | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index 0fcecc781b..0d32431651 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -64,22 +64,22 @@ class JournalCollector implements JournalCollectorInterface
             'transaction_journals.bill_id',
             'bills.name as bill_name',
             'bills.name_encrypted as bill_name_encrypted',
-            'transactions.id as id',
 
+            'transactions.id as id',
             'transactions.description as transaction_description',
             'transactions.account_id',
             'transactions.identifier',
             'transactions.transaction_journal_id',
-
             'transactions.amount as transaction_amount',
-
             'transactions.transaction_currency_id as transaction_currency_id',
+
             'transaction_currencies.code as transaction_currency_code',
             'transaction_currencies.symbol as transaction_currency_symbol',
             'transaction_currencies.decimal_places as transaction_currency_dp',
 
             'transactions.foreign_amount as transaction_foreign_amount',
             'transactions.foreign_currency_id as foreign_currency_id',
+
             'foreign_currencies.code as foreign_currency_code',
             'foreign_currencies.symbol as foreign_currency_symbol',
             'foreign_currencies.decimal_places as foreign_currency_dp',
@@ -673,6 +673,7 @@ class JournalCollector implements JournalCollectorInterface
             $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id');
             $this->query->whereNull('opposing.deleted_at');
 
+            $this->fields[]       = 'opposing.id as opposing_id';
             $this->fields[]       = 'opposing.account_id as opposing_account_id';
             $this->fields[]       = 'opposing_accounts.name as opposing_account_name';
             $this->fields[]       = 'opposing_accounts.encrypted as opposing_account_encrypted';
diff --git a/app/Helpers/Filter/TransferFilter.php b/app/Helpers/Filter/TransferFilter.php
index 1aa0b5bd43..ae21934a89 100644
--- a/app/Helpers/Filter/TransferFilter.php
+++ b/app/Helpers/Filter/TransferFilter.php
@@ -41,11 +41,13 @@ class TransferFilter implements FilterInterface
                 continue;
             }
             // make property string:
-            $journalId  = $transaction->transaction_journal_id;
-            $amount     = Steam::positive($transaction->transaction_amount);
-            $accountIds = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
+            $journalId      = $transaction->transaction_journal_id;
+            $amount         = Steam::positive($transaction->transaction_amount);
+            $accountIds     = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
+            $transactionIds = [$transaction->id, intval($transaction->opposing_id)];
             sort($accountIds);
-            $key = $journalId . '-' . join(',', $accountIds) . '-' . $amount;
+            sort($transactionIds);
+            $key = $journalId . '-' . join(',', $transactionIds) . '-' . join(',', $accountIds) . '-' . $amount;
             if (!isset($count[$key])) {
                 // not yet counted? add to new set and count it:
                 $new->push($transaction);