diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 3745e92442..9f354fd3cc 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -15,6 +15,8 @@ use Redirect; use Response; use Session; use View; +use URL; + /** * Class TransactionController @@ -291,7 +293,7 @@ class TransactionController extends Controller return Redirect::route('transactions.create', $request->input('what'))->withInput(); } - return Redirect::route('transactions.index', $request->input('what')); + return Redirect::to(URL::previous()); } @@ -318,7 +320,7 @@ class TransactionController extends Controller } - return Redirect::route('transactions.index', $journalData['what']); + return Redirect::to(URL::previous()); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index f32718ca75..2b41702c09 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -12,7 +12,7 @@ use Illuminate\Contracts\Events\Dispatcher as DispatcherContract; use Illuminate\Database\QueryException; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; use Log; - +use Reminder; /** * Class EventServiceProvider * @@ -60,6 +60,15 @@ class EventServiceProvider extends ServiceProvider ); + PiggyBank::deleting(function(PiggyBank $piggyBank) { + $reminders = $piggyBank->reminders()->get(); + /** @var Reminder $reminder */ + foreach($reminders as $reminder) { + $reminder->delete(); + } + }); + + Account::deleted( function (Account $account) {