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

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

Browse Source
This commit is contained in:
James Cole
2024-03-03 13:45:05 +01:00
parent bf7f4f9887
commit cb8fa4e1f4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -375,6 +375,12 @@ class RecurringRepository implements RecurringRepositoryInterface
app('log')->debug('Now in getXOccurrencesSince()'); app('log')->debug('Now in getXOccurrencesSince()');
$skipMod = $repetition->repetition_skip + 1; $skipMod = $repetition->repetition_skip + 1;
$occurrences = []; $occurrences = [];
// to fix #8616, take a few days from both dates, then filter the list to make sure no entries
// from today or before are saved.
$date->subDays(4);
$afterDate->subDays(4);
if ('daily' === $repetition->repetition_type) { if ('daily' === $repetition->repetition_type) {
$occurrences = $this->getXDailyOccurrencesSince($date, $afterDate, $count, $skipMod); $occurrences = $this->getXDailyOccurrencesSince($date, $afterDate, $count, $skipMod);
} }
@@ -407,7 +413,7 @@ class RecurringRepository implements RecurringRepositoryInterface
} }
$filtered = []; $filtered = [];
foreach ($occurrences as $date) { foreach ($occurrences as $date) {
if ($date->lte($max)) { if ($date->lte($max) && $date->gt(today())) {
$filtered[] = $date; $filtered[] = $date;
} }
} }