maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Multiple attendant number generation must take into consideration the working plan exceptions

Browse source
This commit is contained in:
Alex Tselegidis 2020-11-21 22:16:53 +02:00
parent 9e71255cae
commit 8c836bf10c
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
application/libraries/Availability.php
View file

@ -342,22 +342,29 @@ class Availability {
]); ]);
$working_plan = json_decode($provider['settings']['working_plan'], TRUE); $working_plan = json_decode($provider['settings']['working_plan'], TRUE);
$working_plan_exceptions = json_decode($provider['settings']['working_plan_exceptions'], TRUE);
$working_day = strtolower(date('l', strtotime($date))); $working_day = strtolower(date('l', strtotime($date)));
$working_hours = $working_plan[$working_day]; $date_working_plan = $working_plan[$working_day];
if ( ! $working_hours) // Search if the $date is an custom availability period added outside the normal working plan.
if (isset($working_plan_exceptions[$date]))
{
$date_working_plan = $working_plan_exceptions[$date];
}
if ( ! $date_working_plan)
{ {
return []; return [];
} }
$periods = [ $periods = [
[ [
'start' => new DateTime($date . ' ' . $working_hours['start']), 'start' => new DateTime($date . ' ' . $date_working_plan['start']),
'end' => new DateTime($date . ' ' . $working_hours['end']) 'end' => new DateTime($date . ' ' . $date_working_plan['end'])
] ]
]; ];
$periods = $this->remove_breaks($date, $periods, $working_hours['breaks']); $periods = $this->remove_breaks($date, $periods, $date_working_plan['breaks']);
$periods = $this->remove_unavailability_events($periods, $unavailability_events); $periods = $this->remove_unavailability_events($periods, $unavailability_events);
$hours = []; $hours = [];