IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-24 09:50:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Cole 2024-11-03 19:42:48 +01:00
parent ab31a72199
commit ae60cd5b28
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Recurring/ShowController.php
View File

@ -115,6 +115,15 @@ class ShowController extends Controller
$array['attachments'][] = $item; $array['attachments'][] = $item;
} }
if(null !== $array['nr_of_repetitions']) {
$left = $array['nr_of_repetitions'] - $array['journal_count'];
$left = max(0, $left);
// limit each repetition to X occurrences:
foreach($array['repetitions'] as $index => $repetition) {
$array['repetitions'][$index]['occurrences'] = array_slice($repetition['occurrences'], 0, $left);
}
}
$subTitle = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]); $subTitle = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]);
return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today')); return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today'));

2
resources/lang/en_US/firefly.php
View File

@ -755,7 +755,7 @@ return [
'instructions_rule_from_journal' => 'Create a rule based on one of your transactions. Complement or submit the form below.', 'instructions_rule_from_journal' => 'Create a rule based on one of your transactions. Complement or submit the form below.',
'rule_is_strict' => 'strict rule', 'rule_is_strict' => 'strict rule',
'rule_is_not_strict' => 'non-strict rule', 'rule_is_not_strict' => 'non-strict rule',
'rule_help_stop_processing' => 'When you check this box, later rules in this group will not be executed.', 'rule_help_stop_processing' => 'When you check this box, later rules in this group will not be executed if this particular rule is executed.',
'rule_help_strict' => 'In strict rules ALL triggers must fire for the action(s) to be executed. In non-strict rules, ANY trigger is enough for the action(s) to be executed.', 'rule_help_strict' => 'In strict rules ALL triggers must fire for the action(s) to be executed. In non-strict rules, ANY trigger is enough for the action(s) to be executed.',
'rule_help_active' => 'Inactive rules will never fire.', 'rule_help_active' => 'Inactive rules will never fire.',
'stored_new_rule' => 'Stored new rule with title ":title"', 'stored_new_rule' => 'Stored new rule with title ":title"',