IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Delete piggy banks.

Browse Source
This commit is contained in:
Sander Dorigo 2014-11-02 16:47:01 +01:00
parent 03aac2f744
commit 0f1437dd6a
5 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/controllers/PiggybankController.php
View File

@ -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');

2
app/lib/FireflyIII/Database/Piggybank.php
View File

@ -51,7 +51,7 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface
*/
public function destroy(Ardent $model)
{
// TODO: Implement destroy() method.
$model->delete();
}
/**

3
app/routes.php
View File

@ -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']);

36
app/views/piggybanks/delete.blade.php Normal file
View File

@ -0,0 +1,36 @@
@extends('layouts.default')
@section('content')
{{Form::open(['class' => 'form-horizontal','url' => route('piggybanks.destroy',$piggybank->id)])}}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="panel panel-red">
<div class="panel-heading">
Delete piggy bank "{{{$piggybank->name}}}"
</div>
<div class="panel-body">
<p>
Are you sure?
</p>
<p>
<button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
<a href="{{URL::previous()}}" class="btn-default btn">Cancel</a >
</p>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<div class="form-group">
<div class="col-sm-8">
</div>
</div>
</div>
</div>
{{Form::close()}}
@stop

2
app/views/piggybanks/index.blade.php
View File

@ -41,7 +41,7 @@
<div class="col-lg-8 col-md-6 col-sm-4">
<div class="btn-group btn-group-xs">
<a href="{{route('piggybanks.edit',$piggybank->id)}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="#" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
<a href="{{route('piggybanks.delete',$piggybank->id)}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>
</div>
</div>
<div class="col-lg-2 col-md-3 col-sm-4">