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

Fix #3284

Browse Source
This commit is contained in:
James Cole
2020-04-22 06:09:29 +02:00
parent b2f1642cfe
commit 44289cbd95
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,8 +110,13 @@ class IndexController extends Controller
$array['first_date'] = new Carbon($array['first_date']); $array['first_date'] = new Carbon($array['first_date']);
$array['repeat_until'] = null === $array['repeat_until'] ? null : new Carbon($array['repeat_until']); $array['repeat_until'] = null === $array['repeat_until'] ? null : new Carbon($array['repeat_until']);
$array['latest_date'] = null === $array['latest_date'] ? null : new Carbon($array['latest_date']); $array['latest_date'] = null === $array['latest_date'] ? null : new Carbon($array['latest_date']);
$array['occurrences'] = array_slice($this->recurring->getOccurrencesInRange($recurrence->recurrenceRepetitions->first(), $today, $year), 0, 1); $array['occurrences'] = [];
$recurring[] = $array;
if (0 !== $recurrence->recurrenceRepetitions->count()) {
$array['ocurrences'] = array_slice($this->recurring->getOccurrencesInRange($recurrence->recurrenceRepetitions->first(), $today, $year), 0, 1);
}
$recurring[] = $array;
} }
$paginator = new LengthAwarePaginator($recurring, $total, $pageSize, $page); $paginator = new LengthAwarePaginator($recurring, $total, $pageSize, $page);
$paginator->setPath(route('recurring.index')); $paginator->setPath(route('recurring.index'));