diff --git a/app/controllers/PiggybankController.php b/app/controllers/PiggybankController.php index 311f060ab9..fd1c871238 100644 --- a/app/controllers/PiggybankController.php +++ b/app/controllers/PiggybankController.php @@ -66,19 +66,13 @@ class PiggybankController extends BaseController * * @return $this */ - public function delete(Piggybank $piggyBank) + public function delete(Piggybank $piggybank) { - throw new NotImplementedException; -// View::share('subTitle', 'Delete "' . $piggyBank->name . '"'); -// if ($piggyBank->repeats == 1) { -// View::share('title', 'Repeated expenses'); -// View::share('mainTitleIcon', 'fa-rotate-right'); -// } else { -// View::share('title', 'Piggy banks'); -// View::share('mainTitleIcon', 'fa-sort-amount-asc'); -// } -// -// return View::make('piggybanks.delete')->with('piggybank', $piggyBank); + View::share('subTitle', 'Delete "' . $piggybank->name . '"'); + View::share('title', 'Piggy banks'); + View::share('mainTitleIcon', 'fa-sort-amount-asc'); + + return View::make('piggybanks.delete')->with('piggybank', $piggybank); } /** @@ -88,20 +82,14 @@ class PiggybankController extends BaseController */ public function destroy(Piggybank $piggyBank) { - throw new NotImplementedException; -// Event::fire('piggybanks.destroy', [$piggyBank]); -// if ($piggyBank->repeats == 1) { -// $route = 'piggybanks.index.repeated'; -// $message = 'Repeated expense'; -// } else { -// $route = 'piggybanks.index.piggybanks'; -// $message = 'Piggybank'; -// } -// $this->_repository->destroy($piggyBank); -// -// Session::flash('success', $message . ' deleted.'); -// -// return Redirect::route($route); + Event::fire('piggybanks.destroy', [$piggyBank]); + + /** @var \FireflyIII\Database\Piggybank $acct */ + $repos = App::make('FireflyIII\Database\Piggybank'); + $repos->destroy($piggyBank); + Session::flash('success', 'Piggy bank deleted.'); + + return Redirect::route('piggybanks.index'); } /** @@ -134,7 +122,7 @@ class PiggybankController extends BaseController ]; Session::flash('prefilled', $prefilled); - return View::make('piggybanks.edit', compact('piggybank', 'accounts', 'periods','prefilled'))->with('title', 'Piggybanks')->with( + return View::make('piggybanks.edit', compact('piggybank', 'accounts', 'periods', 'prefilled'))->with('title', 'Piggybanks')->with( 'mainTitleIcon', 'fa-sort-amount-asc' ) ->with('subTitle', 'Edit piggy bank "' . e($piggybank->name) . '"')->with('subTitleIcon', 'fa-pencil'); diff --git a/app/lib/FireflyIII/Database/Piggybank.php b/app/lib/FireflyIII/Database/Piggybank.php index bf34975eef..9f34185387 100644 --- a/app/lib/FireflyIII/Database/Piggybank.php +++ b/app/lib/FireflyIII/Database/Piggybank.php @@ -51,7 +51,7 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface */ public function destroy(Ardent $model) { - // TODO: Implement destroy() method. + $model->delete(); } /** diff --git a/app/routes.php b/app/routes.php index 5db5c8183b..329edfa3d1 100644 --- a/app/routes.php +++ b/app/routes.php @@ -204,6 +204,7 @@ Route::group( Route::get('/piggybanks/remove/{piggybank}', ['uses' => 'PiggybankController@remove']); Route::get('/piggybanks/edit/{piggybank}', ['uses' => 'PiggybankController@edit','as' => 'piggybanks.edit']); Route::get('/piggybanks/create', ['uses' => 'PiggybankController@create', 'as' => 'piggybanks.create']); + Route::get('/piggybanks/delete/{piggybank}', ['uses' => 'PiggybankController@delete','as' => 'piggybanks.delete']); // Route::get('/repeated',['uses' => 'PiggybankController@repeated','as' => 'piggybanks.index.repeated']); @@ -287,7 +288,7 @@ Route::group( Route::post('/piggybanks/store', ['uses' => 'PiggybankController@store', 'as' => 'piggybanks.store']); #Route::post('/piggybanks/store/repeated', ['uses' => 'PiggybankController@storeRepeated', 'as' => 'piggybanks.store.repeated']); #Route::post('/piggybanks/update/{piggybank}', ['uses' => 'PiggybankController@update', 'as' => 'piggybanks.update']); - #Route::post('/piggybanks/destroy/{piggybank}', ['uses' => 'PiggybankController@destroy', 'as' => 'piggybanks.destroy']); + Route::post('/piggybanks/destroy/{piggybank}', ['uses' => 'PiggybankController@destroy', 'as' => 'piggybanks.destroy']); #Route::post('/piggybanks/mod/{piggybank}', ['uses' => 'PiggybankController@modMoney', 'as' => 'piggybanks.modMoney']); Route::post('/piggybanks/add/{piggybank}', ['uses' => 'PiggybankController@postAdd', 'as' => 'piggybanks.add']); Route::post('/piggybanks/remove/{piggybank}', ['uses' => 'PiggybankController@postRemove', 'as' => 'piggybanks.remove']); diff --git a/app/views/piggybanks/delete.blade.php b/app/views/piggybanks/delete.blade.php new file mode 100644 index 0000000000..52695c20b0 --- /dev/null +++ b/app/views/piggybanks/delete.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.default') +@section('content') +{{Form::open(['class' => 'form-horizontal','url' => route('piggybanks.destroy',$piggybank->id)])}} +
+
+
+
+ Delete piggy bank "{{{$piggybank->name}}}" +
+
+

+ Are you sure? +

+ +

+ + Cancel +

+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ + +{{Form::close()}} +@stop \ No newline at end of file diff --git a/app/views/piggybanks/index.blade.php b/app/views/piggybanks/index.blade.php index 3907dbf830..3ba8bf53a4 100644 --- a/app/views/piggybanks/index.blade.php +++ b/app/views/piggybanks/index.blade.php @@ -41,7 +41,7 @@
- +