From c8bfb623e2b60ea21e33268580d439417dd7c7d3 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Mon, 13 Feb 2023 09:36:08 +0100 Subject: [PATCH] Apply the future booking limit to the booking page --- application/controllers/Booking.php | 2 ++ assets/js/pages/booking.js | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/application/controllers/Booking.php b/application/controllers/Booking.php index e70cd52b..479b6b2c 100755 --- a/application/controllers/Booking.php +++ b/application/controllers/Booking.php @@ -133,6 +133,7 @@ class Booking extends EA_Controller { $display_login_button = setting('display_login_button'); $display_delete_personal_information = setting('display_delete_personal_information'); $book_advance_timeout = setting('book_advance_timeout'); + $future_booking_limit = setting('future_booking_limit'); $theme = request('theme', setting('theme', 'default')); if (empty($theme) || ! file_exists(__DIR__ . '/../../assets/css/themes/' . $theme . '.min.css')) @@ -225,6 +226,7 @@ class Booking extends EA_Controller { 'first_weekday' => $first_weekday, 'display_cookie_notice' => $display_cookie_notice, 'display_any_provider' => setting('display_any_provider'), + 'future_booking_limit' => setting('future_booking_limit'), 'appointment_data' => $appointment, 'provider_data' => $provider, 'customer_data' => $customer, diff --git a/assets/js/pages/booking.js b/assets/js/pages/booking.js index ee8115c8..1e6dd4cc 100644 --- a/assets/js/pages/booking.js +++ b/assets/js/pages/booking.js @@ -82,12 +82,14 @@ App.Pages.Booking = (function () { App.Utils.UI.initializeDatepicker($selectDate, { inline: true, + minDate: new Date(), + maxDate: moment().add(vars('future_booking_limit'), 'days').toDate(), onChange: (selectedDates) => { App.Http.Booking.getAvailableHours(moment(selectedDates[0]).format('YYYY-MM-DD')); updateConfirmFrame(); }, - onMonthChange: () => { + onMonthChange: (selectedDates, dateStr, instance) => { setTimeout(() => { const displayedMonthMoment = moment(instance.currentYearElement.value + '-' + (Number(instance.monthsDropdownContainer.value) + 1) + '-01'); @@ -99,7 +101,7 @@ App.Pages.Booking = (function () { }, 500); }, - onYearChange: () => { + onYearChange: (selectedDates, dateStr, instance) => { setTimeout(() => { const displayedMonthMoment = moment(instance.currentYearElement.value + '-' + (Number(instance.monthsDropdownContainer.value) + 1) + '-01');