mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-20 19:35:16 +00:00
Also fix delete/destroy redirection routine.
This commit is contained in:
@@ -85,6 +85,9 @@ class TransactionController extends Controller
|
|||||||
$type = strtolower($journal->transactionType->type);
|
$type = strtolower($journal->transactionType->type);
|
||||||
$subTitle = 'Delete ' . e($type) . ' "' . e($journal->description) . '"';
|
$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'));
|
return View::make('transactions.delete', compact('journal', 'subTitle'));
|
||||||
|
|
||||||
|
|
||||||
@@ -97,23 +100,12 @@ class TransactionController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function destroy(TransactionJournal $transactionJournal)
|
public function destroy(TransactionJournal $transactionJournal)
|
||||||
{
|
{
|
||||||
$type = $transactionJournal->transactionType->type;
|
|
||||||
$return = 'withdrawal';
|
|
||||||
|
|
||||||
Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');
|
Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');
|
||||||
|
|
||||||
$transactionJournal->delete();
|
$transactionJournal->delete();
|
||||||
|
|
||||||
switch ($type) {
|
// redirect to previous URL:
|
||||||
case 'Deposit':
|
return Redirect::to(Session::get('transactions.delete.url'));
|
||||||
$return = 'deposit';
|
|
||||||
break;
|
|
||||||
case 'Transfer':
|
|
||||||
$return = 'transfers';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Redirect::route('transactions.index', $return);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user