kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup should trigger scan.

Browse Source
This commit is contained in:
James Cole
2022-12-30 20:38:54 +01:00
parent 333c348117
commit 742c84269b
12 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Json/RecurrenceController.php
View File

@@ -107,17 +107,16 @@ class RecurrenceController extends Controller
$repetition->weekend = (int)$request->get('weekend');
$actualEnd = clone $end;
if('until_date' === $endsAt) {
if ('until_date' === $endsAt) {
$actualEnd = $endDate ?? clone $end;
$occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd);
}
if('times' === $endsAt) {
if ('times' === $endsAt) {
$occurrences = $this->recurring->getXOccurrences($repetition, $actualStart, $repetitions);
}
if('times' !== $endsAt && 'until_date' !== $endsAt) {
if ('times' !== $endsAt && 'until_date' !== $endsAt) {
// 'forever'
$occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd);
}
/** @var Carbon $current */