diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.php index 6c93d16d12..a59de42168 100644 --- a/app/Exceptions/GracefulNotFoundHandler.php +++ b/app/Exceptions/GracefulNotFoundHandler.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Attachment; use FireflyIII\Models\Bill; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Http\Request; @@ -225,6 +226,10 @@ class GracefulNotFoundHandler extends ExceptionHandler $type = $journal->transactionType->type; $request->session()->reflash(); + if (TransactionType::RECONCILIATION === $type) { + return redirect(route('accounts.index', ['asset'])); + } + return redirect(route('transactions.index', [strtolower($type)])); } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index f4b0edf0e3..96026b11d0 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -944,6 +944,7 @@ return [ 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"', 'deleted_deposit' => 'Successfully deleted deposit ":description"', 'deleted_transfer' => 'Successfully deleted transfer ":description"', + 'deleted_reconciliation' =>'Successfully reconciliation transaction ":description"', 'stored_journal' => 'Successfully created new transaction ":description"', 'stored_journal_no_descr' => 'Successfully created your new transaction', 'updated_journal_no_descr' => 'Successfully updated your transaction', diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index e36c76d0fd..5f06126fab 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -1108,7 +1108,12 @@ try { $title = limitStringLength($group->title); } if('opening balance' === $type) { - + // TODO link to account. + $breadcrumbs->push($title, route('transactions.show', [$group->id])); + return; + } + if('reconciliation' === $type) { + // TODO link to account. $breadcrumbs->push($title, route('transactions.show', [$group->id])); return; }