From 6870d13b725a3fbf8073eb1e7688d8b87c250528 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Mar 2015 18:14:17 +0100 Subject: [PATCH] Removed repeated expenses. --- .../Controllers/RepeatedExpenseController.php | 217 ------------------ app/Http/routes.php | 1 - 2 files changed, 218 deletions(-) delete mode 100644 app/Http/Controllers/RepeatedExpenseController.php diff --git a/app/Http/Controllers/RepeatedExpenseController.php b/app/Http/Controllers/RepeatedExpenseController.php deleted file mode 100644 index df3d920f10..0000000000 --- a/app/Http/Controllers/RepeatedExpenseController.php +++ /dev/null @@ -1,217 +0,0 @@ -accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']) - ); - - return view('repeatedExpense.create', compact('accounts', 'periods'))->with('subTitle', 'Create new repeated expense')->with( - 'subTitleIcon', 'fa-plus' - ); - } - - /** - * @param PiggyBank $repeatedExpense - * - * @return $this - */ - public function delete(PiggyBank $repeatedExpense) - { - $subTitle = 'Delete "' . e($repeatedExpense->name) . '"'; - - return view('repeatedExpense.delete', compact('repeatedExpense', 'subTitle')); - } - - /** - * @param PiggyBank $repeatedExpense - * - * @return \Illuminate\Http\RedirectResponse - */ - public function destroy(PiggyBank $repeatedExpense) - { - - Session::flash('success', 'Repeated expense "' . e($repeatedExpense->name) . '" deleted.'); - - $repeatedExpense->delete(); - - return Redirect::route('repeated.index'); - } - - /** - * @param PiggyBank $repeatedExpense - * - * @return $this - */ - public function edit(PiggyBank $repeatedExpense) - { - - $periods = Config::get('firefly.piggy_bank_periods'); - $accounts = ExpandedForm::makeSelectList( - Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']) - ); - $subTitle = 'Edit repeated expense "' . e($repeatedExpense->name) . '"'; - $subTitleIcon = 'fa-pencil'; - - /* - * Flash some data to fill the form. - */ - $preFilled = ['name' => $repeatedExpense->name, - 'account_id' => $repeatedExpense->account_id, - 'targetamount' => $repeatedExpense->targetamount, - 'reminder_skip' => $repeatedExpense->reminder_skip, - 'rep_every' => $repeatedExpense->rep_every, - 'rep_times' => $repeatedExpense->rep_times, - 'targetdate' => $repeatedExpense->targetdate->format('Y-m-d'), - 'reminder' => $repeatedExpense->reminder, - 'remind_me' => intval($repeatedExpense->remind_me) == 1 || !is_null($repeatedExpense->reminder) ? true : false - ]; - Session::flash('preFilled', $preFilled); - - return view('repeatedExpense.edit', compact('subTitle', 'subTitleIcon', 'repeatedExpense', 'accounts', 'periods', 'preFilled')); - } - - /** - * @return \Illuminate\View\View - */ - public function index() - { - - $subTitle = 'Overview'; - - $expenses = Auth::user()->piggyBanks()->where('repeats', 1)->get(); - $expenses->each( - function (PiggyBank $piggyBank) { - $piggyBank->currentRelevantRep(); - } - ); - - return view('repeatedExpense.index', compact('expenses', 'subTitle')); - } - - /** - * @param PiggyBank $repeatedExpense - * - * @return \Illuminate\View\View - */ - public function show(PiggyBank $repeatedExpense, PiggyBankRepositoryInterface $repository) - { - $subTitle = $repeatedExpense->name; - $today = Carbon::now(); - $repetitions = $repeatedExpense->piggyBankRepetitions()->get(); - - $repetitions->each( - function (PiggyBankRepetition $repetition) use ($repository) { - $repetition->bars = $repository->calculateParts($repetition); - } - ); - - return view('repeatedExpense.show', compact('repetitions', 'repeatedExpense', 'today', 'subTitle')); - } - - /** - * @param PiggyBankFormRequest $request - * @param PiggyBankRepositoryInterface $repository - * - * @return \Illuminate\Http\RedirectResponse - */ - public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository) - { - - $piggyBankData = [ - 'repeats' => true, - 'name' => $request->get('name'), - 'startdate' => new Carbon, - 'account_id' => intval($request->get('account_id')), - 'targetamount' => floatval($request->get('targetamount')), - 'targetdate' => new Carbon($request->get('targetdate')), - 'reminder' => $request->get('reminder'), - 'skip' => intval($request->get('skip')), - 'rep_every' => intval($request->get('rep_every')), - 'rep_length' => $request->get('rep_length'), - 'rep_times' => intval($request->get('rep_times')), - ]; - - $piggyBank = $repository->store($piggyBankData); - - Session::flash('success', 'Stored repeated expense "' . e($piggyBank->name) . '".'); - - if (intval(Input::get('create_another')) === 1) { - return Redirect::route('repeated.create', $request->input('what'))->withInput(); - } - - - return Redirect::route('repeated.index'); - } - - /** - * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind. - * - * @param PiggyBank $repeatedExpense - * - * @return $this - */ - public function update(PiggyBank $repeatedExpense, PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository) - { - $piggyBankData = [ - 'repeats' => false, - 'name' => $request->get('name'), - 'account_id' => intval($request->get('account_id')), - 'targetamount' => floatval($request->get('targetamount')), - 'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null, - 'rep_length' => $request->get('rep_length'), - 'rep_every' => intval($request->get('rep_every')), - 'rep_times' => intval($request->get('rep_times')), - 'remind_me' => intval($request->get('remind_me')) == 1 ? true : false, - 'reminder' => $request->get('reminder'), - ]; - - - $piggyBank = $repository->update($repeatedExpense, $piggyBankData); - - if (intval(Input::get('return_to_edit')) === 1) { - return Redirect::route('repeated.edit', $piggyBank->id); - } - - Session::flash('success', 'Updated repeated expense "' . e($piggyBank->name) . '".'); - - return Redirect::route('repeated.index'); - - } - -} diff --git a/app/Http/routes.php b/app/Http/routes.php index c85d41c34d..4f720a3a4e 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -313,7 +313,6 @@ Route::group( Route::get('/reminder/act/{reminder}', ['uses' => 'ReminderController@act', 'as' => 'reminders.act']); Route::get('/reminder/{reminder}', ['uses' => 'ReminderController@show', 'as' => 'reminders.show']); - /** * Report Controller */