From 0c20363b8bf7e75b4bf4d4647bdb4cfa435530fa Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Thu, 12 Nov 2020 14:46:51 +0200 Subject: [PATCH] Correction in the Appointments check datetime availability method --- application/controllers/Appointments.php | 18 +++++------------- application/libraries/Availability.php | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php index d948afdb..0997af48 100755 --- a/application/controllers/Appointments.php +++ b/application/controllers/Appointments.php @@ -578,23 +578,15 @@ class Appointments extends CI_Controller { $provider = $this->providers_model->get_row($appointment['id_users_provider']); - $available_periods = $this->availability->get_available_periods($date, $provider, $exclude_appointment_id); + $available_hours = $this->availability->get_available_hours($date, $service, $provider, $exclude_appointment_id); $is_still_available = FALSE; - foreach ($available_periods as $available_period) + $appointment_hour = date('H:i', strtotime($appointment['start_datetime'])); + + foreach ($available_hours as $available_hour) { - $appointment_start = new DateTime($appointment['start_datetime']); - $appointment_start = $appointment_start->format('H:i'); - - $appointment_end = new DateTime($appointment['start_datetime']); - $appointment_end->add(new DateInterval('PT' . $service['duration'] . 'M')); - $appointment_end = $appointment_end->format('H:i'); - - $available_period_start = date('H:i', strtotime($available_period['start'])); - $available_period_end = date('H:i', strtotime($available_period['end'])); - - if ($available_period_start <= $appointment_start && $available_period_end >= $appointment_end) + if ($appointment_hour === $available_hour) { $is_still_available = TRUE; break; diff --git a/application/libraries/Availability.php b/application/libraries/Availability.php index 55fcf307..a06539ef 100644 --- a/application/libraries/Availability.php +++ b/application/libraries/Availability.php @@ -79,7 +79,7 @@ class Availability { * * @throws Exception */ - public function get_available_periods( + protected function get_available_periods( $date, $provider, $exclude_appointment_id = NULL