fixed next recurring date

This commit is contained in:
Denis Duliçi 2023-05-09 10:53:13 +03:00
parent 1295cbd0e8
commit 7e5920d71f

View File

@ -186,26 +186,19 @@ trait Recurring
return $limit; return $limit;
} }
public function getCurrentRecurring()
{
if (! $schedule = $this->getRecurringSchedule()) {
return false;
}
if (! $current = $schedule->current()) {
return false;
}
return $current->getStart();
}
public function getNextRecurring() public function getNextRecurring()
{ {
if (! $schedule = $this->getRecurringSchedule()) { if (! $schedule = $this->getRecurringSchedule()) {
return false; return false;
} }
if (! $next = $schedule->next()) { $schedule = $schedule->startsAfter($this->getRecurringRuleTodayDate());
if ($schedule->count() == 0) {
return false;
}
if (! $next = $schedule->current()) {
return false; return false;
} }