fix timeslots array
This commit is contained in:
parent
5dc277d43f
commit
d47e2f45f5
1 changed files with 36 additions and 16 deletions
|
|
@ -208,9 +208,11 @@ class OrderTunnelController extends Controller
|
|||
$isDispo = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* On utilise les méthodes de Carbon pour la comparaison de date, parce que c'est fait pour...
|
||||
*/
|
||||
if (
|
||||
$current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) <
|
||||
$now->add($delaiPrepa)
|
||||
$current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i'))->lessThan($now->add($delaiPrepa))
|
||||
) {
|
||||
$isDispo = false;
|
||||
}
|
||||
|
|
@ -250,10 +252,9 @@ class OrderTunnelController extends Controller
|
|||
'max_orders_per_interval' => $day->max_orders_per_interval
|
||||
);
|
||||
}
|
||||
|
||||
// Génération des plages.
|
||||
// Start today.
|
||||
$today = CarbonImmutable::now()->startOfDay();
|
||||
// On commence le calcul à aujourd'hui + 1 car on ne va pas afficher de créaneaux pour aujourd'hui dans l'interface...
|
||||
$today = CarbonImmutable::now()->addDay()->startOfDay();
|
||||
$weekDay = $today->weekday();
|
||||
// Final boundary (permet de limiter la liste des jours d'exception).
|
||||
$finalday = $today->add($plage_days, 'day');
|
||||
|
|
@ -270,7 +271,12 @@ class OrderTunnelController extends Controller
|
|||
|
||||
for ($i = 0; $i < $plage_days; $i++) {
|
||||
$current = $today->add($i, 'day');
|
||||
$weekDay = $current->weekday();
|
||||
/**
|
||||
* On gère le décalage par rapport au tableau de settings...
|
||||
* Dans le tableau lundi = 0
|
||||
* Dans Carbon dimanche = 0
|
||||
*/
|
||||
$weekDay = $current->weekday() - 1 !== -1 ? $current->weekday() - 1 : 6;
|
||||
$interval = CarbonInterval::createFromFormat('h:i', $plage[$weekDay]['interval'] ?? '00:15');
|
||||
|
||||
// Si c'est un jour exception skip.
|
||||
|
|
@ -301,11 +307,13 @@ class OrderTunnelController extends Controller
|
|||
$currentTime,
|
||||
$endTime
|
||||
);
|
||||
|
||||
$availCreneaux[$current->format('d/m/Y')] = array_merge(
|
||||
$availCreneaux[$current->format('d/m/Y')],
|
||||
$morningCreneaux
|
||||
);
|
||||
// Cela sert à rien d'afficher un jour avec des créneaux sur lesquels le conso ne peut pas cliquer...
|
||||
if ($this->hasCreneauAvailableTime($morningCreneaux)) {
|
||||
$availCreneaux[$current->format('d/m/Y')] = array_merge(
|
||||
$availCreneaux[$current->format('d/m/Y')],
|
||||
$morningCreneaux
|
||||
);
|
||||
}
|
||||
} //end if
|
||||
// Aprem.
|
||||
if (!empty($plage[$weekDay]['afternoon_start'])) {
|
||||
|
|
@ -324,16 +332,28 @@ class OrderTunnelController extends Controller
|
|||
$currentTime,
|
||||
$endTime
|
||||
);
|
||||
|
||||
$availCreneaux[$current->format('d/m/Y')] = array_merge(
|
||||
$availCreneaux[$current->format('d/m/Y')],
|
||||
$afternoonCreneaux
|
||||
);
|
||||
// Cela sert à rien d'afficher un jour avec des créneaux sur lesquels le conso ne peut pas cliquer...
|
||||
if ($this->hasCreneauAvailableTime($afternoonCreneaux)) {
|
||||
$availCreneaux[$current->format('d/m/Y')] = array_merge(
|
||||
$availCreneaux[$current->format('d/m/Y')],
|
||||
$afternoonCreneaux
|
||||
);
|
||||
}
|
||||
} //end if
|
||||
} //end for
|
||||
return $availCreneaux;
|
||||
}
|
||||
|
||||
private function hasCreneauAvailableTime($creneaux)
|
||||
{
|
||||
foreach ($creneaux as $creneau) {
|
||||
if ($creneau[1]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Call ajax pour le composant vue de timeslots.
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue