From 16570481818ea43f736bc858672bd5fbeed44b47 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 1 Nov 2016 18:40:35 +0100
Subject: [PATCH] Fixed bug #370

---
 app/Models/TransactionJournal.php                | 4 +++-
 app/Repositories/Category/CategoryRepository.php | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index f6f17b9429..3c763b7302 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -408,7 +408,9 @@ class TransactionJournal extends TransactionJournalSupport
         if (!self::isJoined($query, 'transaction_types')) {
             $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
         }
-        $query->whereIn('transaction_types.type', $types);
+        if (count($types) > 0) {
+            $query->whereIn('transaction_types.type', $types);
+        }
     }
 
     /**
diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php
index 6880813805..cc0ec6b192 100644
--- a/app/Repositories/Category/CategoryRepository.php
+++ b/app/Repositories/Category/CategoryRepository.php
@@ -260,10 +260,9 @@ class CategoryRepository implements CategoryRepositoryInterface
         // then collection transactions (harder)
         $query = $this->user->transactionJournals()->distinct()
                             ->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                            ->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
-
+                            ->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id')
+                            ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
         if (count($types) > 0) {
-            $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
             $query->whereIn('transaction_types.type', $types);
         }
         if ($accounts->count() > 0) {
@@ -276,7 +275,7 @@ class CategoryRepository implements CategoryRepositoryInterface
         }
 
 
-        $second = $query->get(['transaction_journals.*','transaction_types.type as transaction_type_type']);
+        $second = $query->get(['transaction_journals.*', 'transaction_types.type as transaction_type_type']);
 
         $complete = $complete->merge($first);
         $complete = $complete->merge($second);