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

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

Browse Source
This commit is contained in:
James Cole
2024-07-06 15:50:20 +02:00
parent d5667c7ef6
commit dc675707f9
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,8 @@ class ShowController extends Controller
$transformer->setParameters(new ParameterBag()); $transformer->setParameters(new ParameterBag());
$array = $transformer->transform($recurrence); $array = $transformer->transform($recurrence);
$groups = $this->recurring->getTransactions($recurrence); $groups = $this->recurring->getTransactions($recurrence);
$today = today(config('app.timezone')); $today = today(config('app.timezone'));
$array['repeat_until'] = null !== $array['repeat_until'] ? new Carbon($array['repeat_until']) : null; $array['repeat_until'] = null !== $array['repeat_until'] ? new Carbon($array['repeat_until']) : null;

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

@@ -408,10 +408,15 @@ class RecurringRepository implements RecurringRepositoryInterface
private function filterMaxDate(?Carbon $max, array $occurrences): array private function filterMaxDate(?Carbon $max, array $occurrences): array
{ {
if (null === $max) {
return $occurrences;
}
$filtered = []; $filtered = [];
if (null === $max) {
foreach ($occurrences as $date) {
if ($date->gt(today())) {
$filtered[] = $date;
}
}
return $filtered;
}
foreach ($occurrences as $date) { foreach ($occurrences as $date) {
if ($date->lte($max) && $date->gt(today())) { if ($date->lte($max) && $date->gt(today())) {
$filtered[] = $date; $filtered[] = $date;

3
app/Transformers/RecurrenceTransformer.php
View File

@@ -128,7 +128,8 @@ class RecurrenceTransformer extends AbstractTransformer
]; ];
// get the (future) occurrences for this specific type of repetition: // get the (future) occurrences for this specific type of repetition:
$occurrences = $this->repository->getXOccurrencesSince($repetition, $fromDate, new Carbon(), 5); $amount = 'daily' === $repetition->repetition_type ? 9 : 5;
$occurrences = $this->repository->getXOccurrencesSince($repetition, $fromDate, now(), $amount);
/** @var Carbon $carbon */ /** @var Carbon $carbon */
foreach ($occurrences as $carbon) { foreach ($occurrences as $carbon) {