From d7e6a7b125b8b818bc56ca93152204f26bcd332e Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 3 Feb 2022 13:16:20 +0100 Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/5670 --- app/Api/V1/Controllers/Models/Rule/TriggerController.php | 4 ++-- app/Api/V1/Requests/Models/Rule/TriggerRequest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Api/V1/Controllers/Models/Rule/TriggerController.php b/app/Api/V1/Controllers/Models/Rule/TriggerController.php index 7f5f2eae8d..528f1e6755 100644 --- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php +++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php @@ -145,11 +145,11 @@ class TriggerController extends Controller // add a range: $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); } - if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) { + if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) { $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } - // file the rule(s) + // fire the rule(s) $ruleEngine->fire(); return response()->json([], 204); diff --git a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php index 8226b88c2b..89d4c359a8 100644 --- a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php @@ -55,7 +55,7 @@ class TriggerRequest extends FormRequest */ private function getDate(string $field): ?Carbon { - return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field)); + return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($this->query($field),0,10)); } /** @@ -63,7 +63,7 @@ class TriggerRequest extends FormRequest */ private function getAccounts(): array { - return $this->get('accounts'); + return $this->get('accounts') ?? []; } /**