IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-25 18:30:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/5670

Browse Source
This commit is contained in:
James Cole 2022-02-03 13:16:20 +01:00
parent ddabfbc1ad
commit d7e6a7b125
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Controllers/Models/Rule/TriggerController.php
View File

@ -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);

4
app/Api/V1/Requests/Models/Rule/TriggerRequest.php
View File

@ -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') ?? [];
}
/**