kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Recurring transactions.

Browse Source
This commit is contained in:
James Cole
2021-03-06 16:15:39 +01:00
parent b43ea5c108
commit 2437759368
12 changed files with 663 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Validation/RecurrenceValidation.php
View File

@@ -96,7 +96,7 @@ trait RecurrenceValidation
$data = $validator->getData();
$repetitions = $data['repetitions'] ?? [];
// need at least one transaction
if (0 === count($repetitions)) {
if (!is_countable($repetitions) || 0 === count($repetitions)) {
$validator->errors()->add('repetitions', (string)trans('validation.at_least_one_repetition'));
}
}
@@ -144,11 +144,20 @@ trait RecurrenceValidation
{
$data = $validator->getData();
$repetitions = $data['repetitions'] ?? [];
if (!is_array($repetitions)) {
$validator->errors()->add(sprintf('repetitions.%d.type', 0), (string)trans('validation.valid_recurrence_rep_type'));
return;
}
/**
* @var int $index
* @var array $repetition
*/
foreach ($repetitions as $index => $repetition) {
if(null === $repetition['moment']) {
$repetition['moment'] = '';
}
$repetition['moment'] = $repetition['moment'] ?? 'invalid';
switch ($repetition['type'] ?? 'empty') {
default:
$validator->errors()->add(sprintf('repetitions.%d.type', $index), (string)trans('validation.valid_recurrence_rep_type'));