From e14a32f76fae946c70d6793c88d3b10edd6e6c34 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 1 Apr 2015 09:23:51 +0200 Subject: [PATCH] Also fix delete/destroy redirection routine. --- app/Http/Controllers/TransactionController.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 51a71fd2b0..17d4b2ae57 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -85,6 +85,9 @@ class TransactionController extends Controller $type = strtolower($journal->transactionType->type); $subTitle = 'Delete ' . e($type) . ' "' . e($journal->description) . '"'; + // put previous url in session + Session::put('transactions.delete.url', URL::previous()); + return View::make('transactions.delete', compact('journal', 'subTitle')); @@ -97,23 +100,12 @@ class TransactionController extends Controller */ public function destroy(TransactionJournal $transactionJournal) { - $type = $transactionJournal->transactionType->type; - $return = 'withdrawal'; - Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.'); $transactionJournal->delete(); - switch ($type) { - case 'Deposit': - $return = 'deposit'; - break; - case 'Transfer': - $return = 'transfers'; - break; - } - - return Redirect::route('transactions.index', $return); + // redirect to previous URL: + return Redirect::to(Session::get('transactions.delete.url')); } /**