IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2907

Browse Source
This commit is contained in:
James Cole 2019-12-20 11:57:57 +01:00
parent 83dd170dcb
commit 18ed19c9d9
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,9 +82,6 @@ class IndexController extends Controller
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
$collection = $this->recurring->get(); $collection = $this->recurring->get();
$today = new Carbon;
$year = new Carbon;
$year->addYear();
// split collection // split collection
$total = $collection->count(); $total = $collection->count();
@ -98,6 +95,14 @@ class IndexController extends Controller
$recurring = []; $recurring = [];
/** @var Recurrence $recurrence */ /** @var Recurrence $recurrence */
foreach ($recurrences as $recurrence) { foreach ($recurrences as $recurrence) {
$today = new Carbon;
$year = new Carbon;
$year->addYear();
if($recurrence->first_date > $today) {
$today =clone $recurrence->first_date;
$year = clone $today;
$year->addYear();
}
$array = $transformer->transform($recurrence); $array = $transformer->transform($recurrence);
$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']);