kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Wrote tests for Limit Controller

Browse Source
This commit is contained in:
James Cole
2014-08-09 10:01:37 +02:00
parent f792c7add7
commit c06e2380a5
6 changed files with 285 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/controllers/LimitController.php
View File

@@ -50,21 +50,19 @@ class LimitController extends BaseController
return View::make('limits.delete')->with('limit', $limit);
}
public function destroy($limitId)
public function destroy(\Limit $limit)
{
$limit = $this->_limits->find($limitId);
$success = $this->_limits->destroy($limit);
if ($limit) {
$limit->delete();
if (Input::get('from') == 'date') {
return Redirect::route('budgets.index');
} else {
return Redirect::route('budgets.index.budget');
}
if ($success) {
Session::flash('success', 'The envelope was deleted.');
} else {
return View::make('error')->with('message', 'No such limit!');
Session::flash('error', 'Could not delete the envelope. Check the logs to be sure.');
}
if (Input::get('from') == 'date') {
return Redirect::route('budgets.index');
} else {
return Redirect::route('budgets.index.budget');
}
}
@@ -106,34 +104,29 @@ class LimitController extends BaseController
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function update($limitId = null)
public function update(\Limit $limit)
{
/** @var \Limit $limit */
$limit = $this->_limits->find($limitId);
if ($limit) {
$limit->startdate = new \Carbon\Carbon(Input::get('date'));
$limit->repeat_freq = Input::get('period');
$limit->repeats = !is_null(Input::get('repeats')) && Input::get('repeats') == '1' ? 1 : 0;
$limit->amount = floatval(Input::get('amount'));
if (!$limit->save()) {
Session::flash('error', 'Could not save new limit: ' . $limit->errors()->first());
$limit->startdate = new \Carbon\Carbon(Input::get('date'));
$limit->repeat_freq = Input::get('period');
$limit->repeats = !is_null(Input::get('repeats')) && Input::get('repeats') == '1' ? 1 : 0;
$limit->amount = floatval(Input::get('amount'));
if (!$limit->save()) {
Session::flash('error', 'Could not save new limit: ' . $limit->errors()->first());
return Redirect::route('budgets.limits.edit', [$limit->id, 'from' => Input::get('from')])->withInput();
return Redirect::route('budgets.limits.edit', [$limit->id, 'from' => Input::get('from')])->withInput();
} else {
Session::flash('success', 'Limit saved!');
foreach ($limit->limitrepetitions()->get() as $rep) {
$rep->delete();
}
if (Input::get('from') == 'date') {
return Redirect::route('budgets.index');
} else {
Session::flash('success', 'Limit saved!');
foreach ($limit->limitrepetitions()->get() as $rep) {
$rep->delete();
}
if (Input::get('from') == 'date') {
return Redirect::route('budgets.index');
} else {
return Redirect::route('budgets.index.budget');
}
return Redirect::route('budgets.index.budget');
}
}
return View::make('error')->with('message', 'No limit!');
}