From d610302e79a3b0107e88d0bd7e859d4d04d48280 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 30 Aug 2017 07:00:17 +0200
Subject: [PATCH] Code for #782

---
 .../Json/AutoCompleteController.php           | 32 ++++++++++++++++
 app/Http/Controllers/JsonController.php       | 38 -------------------
 routes/web.php                                |  4 +-
 3 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php
index dbcbf45ab0..49a7fbc377 100644
--- a/app/Http/Controllers/Json/AutoCompleteController.php
+++ b/app/Http/Controllers/Json/AutoCompleteController.php
@@ -50,6 +50,20 @@ class AutoCompleteController extends Controller
 
     }
 
+    /**
+     * @param JournalCollectorInterface $collector
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function allTransactionJournals(JournalCollectorInterface $collector)
+    {
+        $collector->setLimit(250)->setPage(1);
+        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
     /**
      * Returns a JSON list of all beneficiaries.
      *
@@ -134,4 +148,22 @@ class AutoCompleteController extends Controller
         return Response::json($return);
     }
 
+    /**
+     * @param JournalCollectorInterface $collector
+     * @param string                    $what
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function transactionJournals(JournalCollectorInterface $collector, string $what)
+    {
+        $type  = config('firefly.transactionTypesByWhat.' . $what);
+        $types = [$type];
+
+        $collector->setTypes($types)->setLimit(250)->setPage(1);
+        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
+        sort($return);
+
+        return Response::json($return);
+    }
+
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index 06a4aa4d1d..f9162ed690 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -16,9 +16,7 @@ namespace FireflyIII\Http\Controllers;
 use Amount;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -62,22 +60,6 @@ class JsonController extends Controller
         return Response::json(['html' => $view]);
     }
 
-    /**
-     * @param JournalCollectorInterface $collector
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function allTransactionJournals(JournalCollectorInterface $collector)
-    {
-        $collector->setLimit(100)->setPage(1);
-        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
-        sort($return);
-
-        return Response::json($return);
-
-
-    }
-
     /**
      * @param BillRepositoryInterface $repository
      *
@@ -230,26 +212,6 @@ class JsonController extends Controller
 
     }
 
-    /**
-     * @param JournalCollectorInterface $collector
-     * @param string                    $what
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function transactionJournals(JournalCollectorInterface $collector, string $what)
-    {
-        $type  = config('firefly.transactionTypesByWhat.' . $what);
-        $types = [$type];
-
-        $collector->setTypes($types)->setLimit(100)->setPage(1);
-        $return = array_unique($collector->getJournals()->pluck('description')->toArray());
-        sort($return);
-
-        return Response::json($return);
-
-
-    }
-
     /**
      * @param JournalRepositoryInterface $repository
      *
diff --git a/routes/web.php b/routes/web.php
index d68231e4bd..7a952d5a0a 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -443,9 +443,9 @@ Route::group(
     Route::get('box/out', ['uses' => 'JsonController@boxOut', 'as' => 'box.out']);
     Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.unpaid']);
     Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.paid']);
-    Route::get('transaction-journals/all', ['uses' => 'JsonController@allTransactionJournals', 'as' => 'all-transaction-journals']);
+    Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allTransactionJournals', 'as' => 'all-transaction-journals']);
     Route::get('transaction-journals/with-id/{tj}', ['uses' => 'Json\AutoCompleteController@journalsWithId', 'as' => 'journals-with-id']);
-    Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals', 'as' => 'transaction-journals']);
+    Route::get('transaction-journals/{what}', ['uses' => 'Json\AutoCompleteController@transactionJournals', 'as' => 'transaction-journals']);
     Route::get('transaction-types', ['uses' => 'JsonController@transactionTypes', 'as' => 'transaction-types']);
     Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
     Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']);