Fix #2456

app/Http/Controllers/BillController.php

@@ -54,6 +54,7 @@ class BillController extends Controller
 
     /**
      * BillController constructor.
+     *
      * @codeCoverageIgnore
      */
     public function __construct()
@@ -124,7 +125,7 @@ class BillController extends Controller
      * Destroy a bill.
      *
      * @param Request $request
-     * @param Bill $bill
+     * @param Bill    $bill
      *
      * @return RedirectResponse|\Illuminate\Routing\Redirector
      */
@@ -143,7 +144,7 @@ class BillController extends Controller
      * Edit a bill.
      *
      * @param Request $request
-     * @param Bill $bill
+     * @param Bill    $bill
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
@@ -232,35 +233,45 @@ class BillController extends Controller
      * Rescan bills for transactions.
      *
      * @param Request $request
-     * @param Bill $bill
+     * @param Bill    $bill
      *
      * @return RedirectResponse|\Illuminate\Routing\Redirector
      * @throws \FireflyIII\Exceptions\FireflyException
      */
     public function rescan(Request $request, Bill $bill)
     {
+        $total = 0;
         if (false === $bill->active) {
             $request->session()->flash('warning', (string)trans('firefly.cannot_scan_inactive_bill'));
+
+            return redirect(route('bills.show', [$bill->id]));
         }
+        $set = new Collection;
         if (true === $bill->active) {
             $set   = $this->billRepository->getRulesForBill($bill);
             $total = 0;
-            foreach ($set as $rule) {
-                // simply fire off all rules?
-                /** @var TransactionMatcher $matcher */
-                $matcher = app(TransactionMatcher::class);
-                $matcher->setSearchLimit(100000); // large upper limit
-                $matcher->setTriggeredLimit(100000); // large upper limit
-                $matcher->setRule($rule);
-                $matchingTransactions = $matcher->findTransactionsByRule();
-                $total                += count($matchingTransactions);
-                $this->billRepository->linkCollectionToBill($bill, $matchingTransactions);
-            }
-
-
-            $request->session()->flash('success', (string)trans('firefly.rescanned_bill', ['total' => $total]));
-            app('preferences')->mark();
         }
+        if (0 === $set->count()) {
+            $request->session()->flash('error', (string)trans('firefly.no_rules_for_bill'));
+
+            return redirect(route('bills.show', [$bill->id]));
+        }
+
+        foreach ($set as $rule) {
+            // simply fire off all rules?
+            /** @var TransactionMatcher $matcher */
+            $matcher = app(TransactionMatcher::class);
+            $matcher->setSearchLimit(100000); // large upper limit
+            $matcher->setTriggeredLimit(100000); // large upper limit
+            $matcher->setRule($rule);
+            $matchingTransactions = $matcher->findTransactionsByRule();
+            $total                += count($matchingTransactions);
+            $this->billRepository->linkCollectionToBill($bill, $matchingTransactions);
+        }
+
+
+        $request->session()->flash('success', (string)trans('firefly.rescanned_bill', ['total' => $total]));
+        app('preferences')->mark();
 
         return redirect(route('bills.show', [$bill->id]));
     }
@@ -269,7 +280,7 @@ class BillController extends Controller
      * Show a bill.
      *
      * @param Request $request
-     * @param Bill $bill
+     * @param Bill    $bill
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
@@ -325,6 +336,7 @@ class BillController extends Controller
                 }
             );
         }
+
         // @codeCoverageIgnoreEnd
 
 
@@ -368,7 +380,7 @@ class BillController extends Controller
      * Update a bill.
      *
      * @param BillFormRequest $request
-     * @param Bill $bill
+     * @param Bill            $bill
      *
      * @return RedirectResponse
      */

app/Repositories/Bill/BillRepository.php

@@ -415,10 +415,10 @@ class BillRepository implements BillRepositoryInterface
     {
         return $bill->transactionJournals()
                     ->before($end)->after($start)->get(
-            [
+                [
-                'transaction_journals.id', 'transaction_journals.date',
+                    'transaction_journals.id', 'transaction_journals.date',
-                'transaction_journals.transaction_group_id',
+                    'transaction_journals.transaction_group_id',
-            ]
+                ]
             );
     }
 
@@ -544,14 +544,14 @@ class BillRepository implements BillRepositoryInterface
     /**
      * Link a set of journals to a bill.
      *
-     * @param Bill       $bill
+     * @param Bill  $bill
      * @param array $transactions
      */
     public function linkCollectionToBill(Bill $bill, array $transactions): void
     {
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            $journal          = $transaction->transactionJournal;
+            $journal          = $bill->user->transactionJournals()->find((int)$transaction['transaction_journal_id']);
             $journal->bill_id = $bill->id;
             $journal->save();
             Log::debug(sprintf('Linked journal #%d to bill #%d', $journal->id, $bill->id));