From 97db618cd8f02801d3a2eda8aee355ec0b5b4d22 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 24 Jan 2016 15:58:16 +0100 Subject: [PATCH] Some code cleanup and reordering --- app/Http/Controllers/AttachmentController.php | 39 +- app/Http/Controllers/CategoryController.php | 54 +-- app/Http/Controllers/Controller.php | 5 +- app/Http/Controllers/CsvController.php | 2 +- app/Http/Controllers/CurrencyController.php | 4 +- app/Http/Controllers/JsonController.php | 123 +++---- app/Http/Controllers/ProfileController.php | 34 +- app/Http/Controllers/ReportController.php | 135 ++++--- app/Http/Controllers/RuleController.php | 341 +++++++++--------- app/Http/Controllers/RuleGroupController.php | 174 +++++---- 10 files changed, 453 insertions(+), 458 deletions(-) diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 00f351c5e9..22aabdf8fe 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -34,26 +34,6 @@ class AttachmentController extends Controller View::share('title', trans('firefly.attachments')); } - - /** - * @param Attachment $attachment - * - * @return \Illuminate\View\View - */ - public function edit(Attachment $attachment) - { - $subTitleIcon = 'fa-pencil'; - $subTitle = trans('firefly.edit_attachment', ['name' => $attachment->filename]); - - // put previous url in session if not redirect from store (not "return_to_edit"). - if (Session::get('attachments.edit.fromUpdate') !== true) { - Session::put('attachments.edit.url', URL::previous()); - } - Session::forget('attachments.edit.fromUpdate'); - - return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle')); - } - /** * @param Attachment $attachment * @@ -118,6 +98,25 @@ class AttachmentController extends Controller } } + /** + * @param Attachment $attachment + * + * @return \Illuminate\View\View + */ + public function edit(Attachment $attachment) + { + $subTitleIcon = 'fa-pencil'; + $subTitle = trans('firefly.edit_attachment', ['name' => $attachment->filename]); + + // put previous url in session if not redirect from store (not "return_to_edit"). + if (Session::get('attachments.edit.fromUpdate') !== true) { + Session::put('attachments.edit.url', URL::previous()); + } + Session::forget('attachments.edit.fromUpdate'); + + return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle')); + } + /** * @param Attachment $attachment * diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index d564789c21..1b59519808 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -144,33 +144,6 @@ class CategoryController extends Controller return view('categories.noCategory', compact('list', 'subTitle')); } - /** - * @param SCRI $repository - * @param Category $category - * - * @param $date - * - * @return \Illuminate\View\View - */ - public function showWithDate(SCRI $repository, Category $category, $date) - { - $carbon = new Carbon($date); - $range = Preferences::get('viewRange', '1M')->data; - $start = Navigation::startOfPeriod($carbon, $range); - $end = Navigation::endOfPeriod($carbon, $range); - $subTitle = $category->name; - - $hideCategory = true; // used in list. - $page = intval(Input::get('page')); - - $set = $repository->getJournalsInRange($category, $page, $start, $end); - $count = $repository->countJournalsInRange($category, $start, $end); - $journals = new LengthAwarePaginator($set, $count, 50, $page); - $journals->setPath('categories/show/' . $category->id . '/' . $date); - - return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle', 'carbon')); - } - /** * @param SCRI $repository * @param Category $category @@ -232,6 +205,33 @@ class CategoryController extends Controller return view('categories.show', compact('category', 'journals', 'entries', 'hideCategory', 'subTitle')); } + /** + * @param SCRI $repository + * @param Category $category + * + * @param $date + * + * @return \Illuminate\View\View + */ + public function showWithDate(SCRI $repository, Category $category, $date) + { + $carbon = new Carbon($date); + $range = Preferences::get('viewRange', '1M')->data; + $start = Navigation::startOfPeriod($carbon, $range); + $end = Navigation::endOfPeriod($carbon, $range); + $subTitle = $category->name; + + $hideCategory = true; // used in list. + $page = intval(Input::get('page')); + + $set = $repository->getJournalsInRange($category, $page, $start, $end); + $count = $repository->countJournalsInRange($category, $start, $end); + $journals = new LengthAwarePaginator($set, $count, 50, $page); + $journals->setPath('categories/show/' . $category->id . '/' . $date); + + return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle', 'carbon')); + } + /** * @param CategoryFormRequest $request * @param SCRI $repository diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 6241057961..ae59eb0af3 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -22,11 +22,10 @@ class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; - /** @var string|\Symfony\Component\Translation\TranslatorInterface */ - protected $monthFormat; - /** @var string|\Symfony\Component\Translation\TranslatorInterface */ protected $monthAndDayFormat; + /** @var string|\Symfony\Component\Translation\TranslatorInterface */ + protected $monthFormat; /** * Controller constructor. diff --git a/app/Http/Controllers/CsvController.php b/app/Http/Controllers/CsvController.php index 7b5dd68f9e..75fa433460 100644 --- a/app/Http/Controllers/CsvController.php +++ b/app/Http/Controllers/CsvController.php @@ -31,7 +31,7 @@ class CsvController extends Controller protected $wizard; /** - * + * @codeCoverageIgnore */ public function __construct() { diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index c7422c7195..d62ba35cb1 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -6,6 +6,7 @@ use FireflyIII\Http\Requests\CurrencyFormRequest; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Input; +use Log; use Preferences; use Session; use URL; @@ -171,7 +172,8 @@ class CurrencyController extends Controller if (Auth::user()->hasRole('owner')) { $currency = $repository->store($data); Session::flash('success', trans('firefly.created_currency', ['name' => $currency->name])); - + } else { + Log::error('User ' . Auth::user()->id . ' is not admin, but tried to store a currency.'); } if (intval(Input::get('create_another')) === 1) { diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 6122b42f6f..939f227027 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -26,45 +26,14 @@ class JsonController extends Controller { /** * JsonController constructor. + * + * @codeCoverageIgnore */ public function __construct() { parent::__construct(); } - /** - * @return \Illuminate\Http\JsonResponse - */ - public function endTour() - { - Preferences::set('tour', false); - - return Response::json('true'); - } - - /** - * @param RuleTrigger|null $trigger - * - * @return \Illuminate\Http\JsonResponse - */ - public function trigger(RuleTrigger $trigger = null) - { - $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; - $keys = array_keys(Config::get('firefly.rule-triggers')); - $triggers = []; - foreach ($keys as $key) { - if ($key != 'user_action') { - $triggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice'); - } - } - - $view = view('rules.partials.trigger', compact('triggers', 'trigger', 'count'))->render(); - - - return Response::json(['html' => $view]); - } - - /** * @param RuleAction|null $action * @@ -85,34 +54,6 @@ class JsonController extends Controller return Response::json(['html' => $view]); } - /** - * - */ - public function tour() - { - $pref = Preferences::get('tour', true); - if (!$pref) { - abort(404); - } - $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end']; - $steps = []; - foreach ($headers as $header) { - $steps[] = [ - 'element' => '#' . $header, - 'title' => trans('help.' . $header . '-title'), - 'content' => trans('help.' . $header . '-text'), - ]; - } - $steps[0]['orphan'] = true;// orphan and backdrop for first element. - $steps[0]['backdrop'] = true; - $steps[1]['placement'] = 'left';// sidebar position left: - $steps[7]['orphan'] = true; // final in the center again. - $steps[7]['backdrop'] = true; - $template = view('json.tour')->render(); - - return Response::json(['steps' => $steps, 'template' => $template]); - } - /** * @param BillRepositoryInterface $repository * @@ -242,6 +183,16 @@ class JsonController extends Controller return Response::json($return); } + /** + * @return \Illuminate\Http\JsonResponse + */ + public function endTour() + { + Preferences::set('tour', false); + + return Response::json('true'); + } + /** * Returns a JSON list of all beneficiaries. * @@ -297,6 +248,34 @@ class JsonController extends Controller } + /** + * + */ + public function tour() + { + $pref = Preferences::get('tour', true); + if (!$pref) { + abort(404); + } + $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end']; + $steps = []; + foreach ($headers as $header) { + $steps[] = [ + 'element' => '#' . $header, + 'title' => trans('help.' . $header . '-title'), + 'content' => trans('help.' . $header . '-text'), + ]; + } + $steps[0]['orphan'] = true;// orphan and backdrop for first element. + $steps[0]['backdrop'] = true; + $steps[1]['placement'] = 'left';// sidebar position left: + $steps[7]['orphan'] = true; // final in the center again. + $steps[7]['backdrop'] = true; + $template = view('json.tour')->render(); + + return Response::json(['steps' => $steps, 'template' => $template]); + } + /** * @param JournalRepositoryInterface $repository * @param $what @@ -321,4 +300,26 @@ class JsonController extends Controller } + /** + * @param RuleTrigger|null $trigger + * + * @return \Illuminate\Http\JsonResponse + */ + public function trigger(RuleTrigger $trigger = null) + { + $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; + $keys = array_keys(Config::get('firefly.rule-triggers')); + $triggers = []; + foreach ($keys as $key) { + if ($key != 'user_action') { + $triggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice'); + } + } + + $view = view('rules.partials.trigger', compact('triggers', 'trigger', 'count'))->render(); + + + return Response::json(['html' => $view]); + } + } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index f8253d7408..89c82545b6 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -80,23 +80,6 @@ class ProfileController extends Controller return redirect(route('profile')); } - /** - * - * @param string $old - * @param string $new1 - * - * @return string|bool - */ - protected function validatePassword($old, $new1) - { - if ($new1 == $old) { - return trans('firefly.should_change'); - } - - return true; - - } - /** * @param DeleteAccountFormRequest $request * @@ -132,5 +115,22 @@ class ProfileController extends Controller return redirect(route('index')); } + /** + * + * @param string $old + * @param string $new1 + * + * @return string|bool + */ + protected function validatePassword($old, $new1) + { + if ($new1 == $old) { + return trans('firefly.should_change'); + } + + return true; + + } + } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 0f973c6c16..87b0f4054b 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -35,74 +35,6 @@ class ReportController extends Controller } - /** - * @param ARI $repository - * - * @return View - * @internal param ReportHelperInterface $helper - */ - public function index(ARI $repository) - { - $start = Session::get('first'); - $months = $this->helper->listOfMonths($start); - - // does the user have shared accounts? - $accounts = $repository->getAccounts(['Default account', 'Asset account']); - // get id's for quick links: - $accountIds = []; - /** @var Account $account */ - foreach ($accounts as $account) { - $accountIds [] = $account->id; - } - $accountList = join(',', $accountIds); - - - return view( - 'reports.index', compact( - 'months', 'accounts', 'start', 'accountList' - ) - ); - } - - /** - * @param $reportType - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return View - */ - public function defaultYear($reportType, Carbon $start, Carbon $end, Collection $accounts) - { - $incomeTopLength = 8; - $expenseTopLength = 8; - - $accountReport = $this->helper->getAccountReport($start, $end, $accounts); - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); - - Session::flash('gaEventCategory', 'report'); - Session::flash('gaEventAction', 'year'); - Session::flash('gaEventLabel', $start->format('Y')); - - // and some id's, joined: - $accountIds = []; - /** @var Account $account */ - foreach ($accounts as $account) { - $accountIds[] = $account->id; - } - $accountIds = join(',', $accountIds); - - return view( - 'reports.default.year', - compact( - 'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end', - 'expenses', 'incomeTopLength', 'expenseTopLength' - ) - ); - } - - /** * @param $reportType * @param Carbon $start @@ -181,6 +113,73 @@ class ReportController extends Controller ); } + /** + * @param $reportType + * @param Carbon $start + * @param Carbon $end + * @param Collection $accounts + * + * @return View + */ + public function defaultYear($reportType, Carbon $start, Carbon $end, Collection $accounts) + { + $incomeTopLength = 8; + $expenseTopLength = 8; + + $accountReport = $this->helper->getAccountReport($start, $end, $accounts); + $incomes = $this->helper->getIncomeReport($start, $end, $accounts); + $expenses = $this->helper->getExpenseReport($start, $end, $accounts); + + Session::flash('gaEventCategory', 'report'); + Session::flash('gaEventAction', 'year'); + Session::flash('gaEventLabel', $start->format('Y')); + + // and some id's, joined: + $accountIds = []; + /** @var Account $account */ + foreach ($accounts as $account) { + $accountIds[] = $account->id; + } + $accountIds = join(',', $accountIds); + + return view( + 'reports.default.year', + compact( + 'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end', + 'expenses', 'incomeTopLength', 'expenseTopLength' + ) + ); + } + + /** + * @param ARI $repository + * + * @return View + * @internal param ReportHelperInterface $helper + */ + public function index(ARI $repository) + { + $start = Session::get('first'); + $months = $this->helper->listOfMonths($start); + + // does the user have shared accounts? + $accounts = $repository->getAccounts(['Default account', 'Asset account']); + // get id's for quick links: + $accountIds = []; + /** @var Account $account */ + foreach ($accounts as $account) { + $accountIds [] = $account->id; + } + $accountList = join(',', $accountIds); + + + return view( + 'reports.index', compact( + 'months', 'accounts', 'start', 'accountList' + ) + ); + } + /** * @param $reportType * @param Carbon $start diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index e323aefdbb..518d104b38 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -40,48 +40,6 @@ class RuleController extends Controller View::share('mainTitleIcon', 'fa-random'); } - /** - * @param RuleFormRequest $request - * @param RuleRepositoryInterface $repository - * @param RuleGroup $ruleGroup - * - * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function store(RuleFormRequest $request, RuleRepositoryInterface $repository, RuleGroup $ruleGroup) - { - - - // process the rule itself: - $data = [ - 'rule_group_id' => $ruleGroup->id, - 'title' => $request->get('title'), - 'trigger' => $request->get('trigger'), - 'description' => $request->get('description'), - 'rule-triggers' => $request->get('rule-trigger'), - 'rule-trigger-values' => $request->get('rule-trigger-value'), - 'rule-trigger-stop' => $request->get('rule-trigger-stop'), - 'rule-actions' => $request->get('rule-action'), - 'rule-action-values' => $request->get('rule-action-value'), - 'rule-action-stop' => $request->get('rule-action-stop'), - 'stop_processing' => $request->get('stop_processing'), - ]; - - $rule = $repository->store($data); - Session::flash('success', trans('firefly.stored_new_rule', ['title' => $rule->title])); - Preferences::mark(); - - if (intval(Input::get('create_another')) === 1) { - // set value so create routine will not overwrite URL: - Session::put('rules.rule.create.fromStore', true); - - return redirect(route('rules.rule.create', [$request->input('what')]))->withInput(); - } - - // redirect to previous URL. - return redirect(Session::get('rules.rule.create.url')); - - } - /** * @param RuleGroup $ruleGroup * @@ -124,6 +82,57 @@ class RuleController extends Controller ); } + /** + * @param Rule $rule + * + * @return View + * @internal param RuleRepositoryInterface $repository + */ + public function delete(Rule $rule) + { + $subTitle = trans('firefly.delete_rule', ['title' => $rule->title]); + + // put previous url in session + Session::put('rules.rule.delete.url', URL::previous()); + Session::flash('gaEventCategory', 'rules'); + Session::flash('gaEventAction', 'delete-rule'); + + return view('rules.rule.delete', compact('rule', 'subTitle')); + } + + /** + * @param Rule $rule + * @param RuleRepositoryInterface $repository + * + * @return \Illuminate\Http\RedirectResponse + */ + public function destroy(RuleRepositoryInterface $repository, Rule $rule) + { + + $title = $rule->title; + $repository->destroy($rule); + + Session::flash('success', trans('firefly.deleted_rule', ['title' => $title])); + Preferences::mark(); + + + return redirect(Session::get('rules.rule.delete.url')); + } + + /** + * @param RuleRepositoryInterface $repository + * @param Rule $rule + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function down(RuleRepositoryInterface $repository, Rule $rule) + { + $repository->moveDown($rule); + + return redirect(route('rules.index')); + + } + /** * @param Rule $rule * @@ -164,6 +173,124 @@ class RuleController extends Controller ); } + /** + * @return View + */ + public function index() + { + $ruleGroups = Auth::user() + ->ruleGroups() + ->orderBy('active', 'DESC') + ->orderBy('order', 'ASC') + ->with( + [ + 'rules' => function ($query) { + $query->orderBy('active', 'DESC'); + $query->orderBy('order', 'ASC'); + + }, + 'rules.ruleTriggers' => function ($query) { + $query->orderBy('order', 'ASC'); + }, + 'rules.ruleActions' => function ($query) { + $query->orderBy('order', 'ASC'); + }, + ] + )->get(); + + return view('rules.index', compact('ruleGroups')); + } + + /** + * @param RuleRepositoryInterface $repository + * @param Rule $rule + * + * @return \Illuminate\Http\JsonResponse + */ + public function reorderRuleActions(RuleRepositoryInterface $repository, Rule $rule) + { + $ids = Input::get('actions'); + if (is_array($ids)) { + $repository->reorderRuleActions($rule, $ids); + } + + return Response::json(true); + + } + + /** + * @param RuleRepositoryInterface $repository + * @param Rule $rule + * + * @return \Illuminate\Http\JsonResponse + */ + public function reorderRuleTriggers(RuleRepositoryInterface $repository, Rule $rule) + { + $ids = Input::get('triggers'); + if (is_array($ids)) { + $repository->reorderRuleTriggers($rule, $ids); + } + + return Response::json(true); + + } + + /** + * @param RuleFormRequest $request + * @param RuleRepositoryInterface $repository + * @param RuleGroup $ruleGroup + * + * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function store(RuleFormRequest $request, RuleRepositoryInterface $repository, RuleGroup $ruleGroup) + { + + + // process the rule itself: + $data = [ + 'rule_group_id' => $ruleGroup->id, + 'title' => $request->get('title'), + 'trigger' => $request->get('trigger'), + 'description' => $request->get('description'), + 'rule-triggers' => $request->get('rule-trigger'), + 'rule-trigger-values' => $request->get('rule-trigger-value'), + 'rule-trigger-stop' => $request->get('rule-trigger-stop'), + 'rule-actions' => $request->get('rule-action'), + 'rule-action-values' => $request->get('rule-action-value'), + 'rule-action-stop' => $request->get('rule-action-stop'), + 'stop_processing' => $request->get('stop_processing'), + ]; + + $rule = $repository->store($data); + Session::flash('success', trans('firefly.stored_new_rule', ['title' => $rule->title])); + Preferences::mark(); + + if (intval(Input::get('create_another')) === 1) { + // set value so create routine will not overwrite URL: + Session::put('rules.rule.create.fromStore', true); + + return redirect(route('rules.rule.create', [$request->input('what')]))->withInput(); + } + + // redirect to previous URL. + return redirect(Session::get('rules.rule.create.url')); + + } + + /** + * @param RuleRepositoryInterface $repository + * @param Rule $rule + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function up(RuleRepositoryInterface $repository, Rule $rule) + { + $repository->moveUp($rule); + + return redirect(route('rules.index')); + + } + /** * @param RuleRepositoryInterface $repository * @param RuleFormRequest $request @@ -204,136 +331,6 @@ class RuleController extends Controller return redirect(Session::get('rules.rule.edit.url')); } - /** - * @param Rule $rule - * - * @return View - * @internal param RuleRepositoryInterface $repository - */ - public function delete(Rule $rule) - { - $subTitle = trans('firefly.delete_rule', ['title' => $rule->title]); - - // put previous url in session - Session::put('rules.rule.delete.url', URL::previous()); - Session::flash('gaEventCategory', 'rules'); - Session::flash('gaEventAction', 'delete-rule'); - - return view('rules.rule.delete', compact('rule', 'subTitle')); - } - - - /** - * @param Rule $rule - * @param RuleRepositoryInterface $repository - * - * @return \Illuminate\Http\RedirectResponse - */ - public function destroy(RuleRepositoryInterface $repository, Rule $rule) - { - - $title = $rule->title; - $repository->destroy($rule); - - Session::flash('success', trans('firefly.deleted_rule', ['title' => $title])); - Preferences::mark(); - - - return redirect(Session::get('rules.rule.delete.url')); - } - - /** - * @param RuleRepositoryInterface $repository - * @param Rule $rule - * - * @return \Illuminate\Http\JsonResponse - */ - public function reorderRuleTriggers(RuleRepositoryInterface $repository, Rule $rule) - { - $ids = Input::get('triggers'); - if (is_array($ids)) { - $repository->reorderRuleTriggers($rule, $ids); - } - - return Response::json(true); - - } - - /** - * @param RuleRepositoryInterface $repository - * @param Rule $rule - * - * @return \Illuminate\Http\JsonResponse - */ - public function reorderRuleActions(RuleRepositoryInterface $repository, Rule $rule) - { - $ids = Input::get('actions'); - if (is_array($ids)) { - $repository->reorderRuleActions($rule, $ids); - } - - return Response::json(true); - - } - - - /** - * @return View - */ - public function index() - { - $ruleGroups = Auth::user() - ->ruleGroups() - ->orderBy('active', 'DESC') - ->orderBy('order', 'ASC') - ->with( - [ - 'rules' => function ($query) { - $query->orderBy('active', 'DESC'); - $query->orderBy('order', 'ASC'); - - }, - 'rules.ruleTriggers' => function ($query) { - $query->orderBy('order', 'ASC'); - }, - 'rules.ruleActions' => function ($query) { - $query->orderBy('order', 'ASC'); - }, - ] - )->get(); - - return view('rules.index', compact('ruleGroups')); - } - - - /** - * @param RuleRepositoryInterface $repository - * @param Rule $rule - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function up(RuleRepositoryInterface $repository, Rule $rule) - { - $repository->moveUp($rule); - - return redirect(route('rules.index')); - - } - - /** - * @param RuleRepositoryInterface $repository - * @param Rule $rule - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function down(RuleRepositoryInterface $repository, Rule $rule) - { - $repository->moveDown($rule); - - return redirect(route('rules.index')); - - } - /** * @param Rule $rule * diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index e0dda063ea..6df34944a1 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -49,90 +49,6 @@ class RuleGroupController extends Controller return view('rules.rule-group.create', compact('subTitleIcon', 'subTitle')); } - - /** - * @param RuleGroupFormRequest $request - * @param RuleGroupRepositoryInterface $repository - * - * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function store(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository) - { - $data = [ - 'title' => $request->input('title'), - 'description' => $request->input('description'), - 'user' => Auth::user()->id, - ]; - - $ruleGroup = $repository->store($data); - - Session::flash('success', trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title])); - Preferences::mark(); - - if (intval(Input::get('create_another')) === 1) { - // set value so create routine will not overwrite URL: - Session::put('rules.rule-group.create.fromStore', true); - - return redirect(route('rules.rule-group.create'))->withInput(); - } - - // redirect to previous URL. - return redirect(Session::get('rules.rule-group.create.url')); - } - - /** - * @param RuleGroup $ruleGroup - * - * @return View - */ - public function edit(RuleGroup $ruleGroup) - { - $subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); - - // put previous url in session if not redirect from store (not "return_to_edit"). - if (Session::get('rules.rule-group.edit.fromUpdate') !== true) { - Session::put('rules.rule-group.edit.url', URL::previous()); - } - Session::forget('rules.rule-group.edit.fromUpdate'); - Session::flash('gaEventCategory', 'rules'); - Session::flash('gaEventAction', 'edit-rule-group'); - - return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle')); - - } - - /** - * @param RuleGroupFormRequest $request - * @param RuleGroupRepositoryInterface $repository - * @param RuleGroup $ruleGroup - * - * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function update(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) - { - $data = [ - 'title' => $request->input('title'), - 'description' => $request->input('description'), - 'active' => intval($request->input('active')) == 1, - ]; - - $repository->update($ruleGroup, $data); - - Session::flash('success', trans('firefly.updated_rule_group', ['title' => $ruleGroup->title])); - Preferences::mark(); - - if (intval(Input::get('return_to_edit')) === 1) { - // set value so edit routine will not overwrite URL: - Session::put('rules.rule-group.edit.fromUpdate', true); - - return redirect(route('rules.rule-group.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]); - } - - // redirect to previous URL. - return redirect(Session::get('rules.rule-group.edit.url')); - - } - /** * @param RuleGroupRepositoryInterface $repository * @param RuleGroup $ruleGroup @@ -177,6 +93,70 @@ class RuleGroupController extends Controller return redirect(Session::get('rules.rule-group.delete.url')); } + /** + * @param RuleGroupRepositoryInterface $repository + * @param RuleGroup $ruleGroup + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function down(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) + { + $repository->moveDown($ruleGroup); + + return redirect(route('rules.index')); + + } + + /** + * @param RuleGroup $ruleGroup + * + * @return View + */ + public function edit(RuleGroup $ruleGroup) + { + $subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); + + // put previous url in session if not redirect from store (not "return_to_edit"). + if (Session::get('rules.rule-group.edit.fromUpdate') !== true) { + Session::put('rules.rule-group.edit.url', URL::previous()); + } + Session::forget('rules.rule-group.edit.fromUpdate'); + Session::flash('gaEventCategory', 'rules'); + Session::flash('gaEventAction', 'edit-rule-group'); + + return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle')); + + } + + /** + * @param RuleGroupFormRequest $request + * @param RuleGroupRepositoryInterface $repository + * + * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function store(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository) + { + $data = [ + 'title' => $request->input('title'), + 'description' => $request->input('description'), + 'user' => Auth::user()->id, + ]; + + $ruleGroup = $repository->store($data); + + Session::flash('success', trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title])); + Preferences::mark(); + + if (intval(Input::get('create_another')) === 1) { + // set value so create routine will not overwrite URL: + Session::put('rules.rule-group.create.fromStore', true); + + return redirect(route('rules.rule-group.create'))->withInput(); + } + + // redirect to previous URL. + return redirect(Session::get('rules.rule-group.create.url')); + } /** * @param RuleGroupRepositoryInterface $repository @@ -193,16 +173,34 @@ class RuleGroupController extends Controller } /** + * @param RuleGroupFormRequest $request * @param RuleGroupRepositoryInterface $repository * @param RuleGroup $ruleGroup * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function down(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) + public function update(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) { - $repository->moveDown($ruleGroup); + $data = [ + 'title' => $request->input('title'), + 'description' => $request->input('description'), + 'active' => intval($request->input('active')) == 1, + ]; - return redirect(route('rules.index')); + $repository->update($ruleGroup, $data); + + Session::flash('success', trans('firefly.updated_rule_group', ['title' => $ruleGroup->title])); + Preferences::mark(); + + if (intval(Input::get('return_to_edit')) === 1) { + // set value so edit routine will not overwrite URL: + Session::put('rules.rule-group.edit.fromUpdate', true); + + return redirect(route('rules.rule-group.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]); + } + + // redirect to previous URL. + return redirect(Session::get('rules.rule-group.edit.url')); }