Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #10820
James Cole5de5e08b1dd0
diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.phpindex 24c7dc0860..13a361a0f6 100644--- a/app/Http/Controllers/Rule/SelectController.php+++ b/app/Http/Controllers/Rule/SelectController.php@@ -74,20 +74,16 @@ class SelectController extends Controller/** @var User $user */$user = auth()->user();$accounts = implode(',', $request->get('accounts'));- $startDate = new Carbon($request->get('start'));- $endDate = new Carbon($request->get('end'));// create new rule engine:$newRuleEngine = app(RuleEngineInterface::class);$newRuleEngine->setUser($user);// add extra operators:- $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);- $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);$newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]);// set rules:- $newRuleEngine->setRules(new Collection([$rule]));+ $newRuleEngine->setRules(new Collection()->push($rule));$newRuleEngine->fire();$resultCount = $newRuleEngine->getResults();@@ -107,11 +103,9 @@ class SelectController extends Controllerreturn redirect(route('rules.index'));}// does the user have shared accounts?- $first = session('first', today(config('app.timezone'))->subYear())->format('Y-m-d');- $today = today(config('app.timezone'))->format('Y-m-d');$subTitle = (string) trans('firefly.apply_rule_selection', ['title' => $rule->title]);- return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));+ return view('rules.rule.select-transactions', compact( 'rule', 'subTitle'));}/**diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.phpindex 4f1b3137b2..a8dc159ce9 100644--- a/app/Http/Controllers/RuleGroup/ExecutionController.php+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php@@ -42,8 +42,6 @@ use Illuminate\View\View;*/class ExecutionController extends Controller{- private RuleGroupRepositoryInterface $ruleGroupRepository;-/*** ExecutionController constructor.*/@@ -56,7 +54,6 @@ class ExecutionController extends Controllerapp('view')->share('title', (string) trans('firefly.rules'));app('view')->share('mainTitleIcon', 'fa-random');- $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);return $next($request);}@@ -74,15 +71,11 @@ class ExecutionController extends Controller/** @var User $user */$user = auth()->user();$accounts = implode(',', $request->get('accounts'));- $startDate = new Carbon($request->get('start'));- $endDate = new Carbon($request->get('end'));// create new rule engine:$newRuleEngine = app(RuleEngineInterface::class);$newRuleEngine->setUser($user);// add extra operators:- $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);- $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);$newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]);// set rules:@@ -104,10 +97,8 @@ class ExecutionController extends Controller*/public function selectTransactions(RuleGroup $ruleGroup){- $first = session('first')->format('Y-m-d');- $today = today(config('app.timezone'))->format('Y-m-d');$subTitle = (string) trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);- return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));+ return view('rules.rule-group.select-transactions', compact( 'ruleGroup', 'subTitle'));}}diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.phpindex 0cbdba1784..d5564d7bc4 100644--- a/app/Http/Requests/SelectTransactionsRequest.php+++ b/app/Http/Requests/SelectTransactionsRequest.php@@ -41,8 +41,6 @@ class SelectTransactionsRequest extends FormRequestpublic function rules(): array{return [- 'start' => 'required|date|after:1970-01-02|before:2038-01-17|before:end|required_with:end',- 'end' => 'required|date|after:1970-01-02|before:2038-01-17|after:start|required_with:start','accounts' => 'required','accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',];diff --git a/changelog.md b/changelog.mdindex 785e14af69..33c6b58bbf 100644--- a/changelog.md+++ b/changelog.md@@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).- [Issue 10808](https://github.com/firefly-iii/firefly-iii/issues/10808) (cron job Error: Undefined variable $preference) reported by @MexerSam- [Issue 10813](https://github.com/firefly-iii/firefly-iii/issues/10813) (Error "Argument #2 ($symbol) must be of type string" while try open subscriptions section) reported by @mrResident- #10819+- #10820### APIdiff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twigindex 842458804f..81abe48208 100644--- a/resources/views/rules/rule-group/select-transactions.twig+++ b/resources/views/rules/rule-group/select-transactions.twig@@ -24,8 +24,6 @@</p><div class="row"><div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">- {{ ExpandedForm.date('start', first) }}- {{ ExpandedForm.date('end', today) }}{{ AccountForm.assetAccountCheckList('accounts', {'select_all': true,'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}</div></div>diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twigindex aae7bc3b9a..a6575e53f9 100644--- a/resources/views/rules/rule/select-transactions.twig+++ b/resources/views/rules/rule/select-transactions.twig@@ -23,8 +23,6 @@</p><div class="row"><div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">- {{ ExpandedForm.date('start', first) }}- {{ ExpandedForm.date('end', today) }}{{ AccountForm.assetAccountCheckList('accounts', {'select_all': true, 'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}</div></div>