From 6ad84ddf83ea999798f564e07a86412c0f439593 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 6 Apr 2023 12:28:11 +0530 Subject: [PATCH 1/2] fix date not initializing on loding room type page when preperation time is set --- themes/hotel-reservation-theme/js/product.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index d2b8bb6fc..6b4bbb46e 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1359,6 +1359,12 @@ var BookingForm = { if (preparation_time) { start_date.setDate(start_date.getDate() + parseInt(preparation_time)); start_date.setHours(0, 0, 0, 0); + if (dateFrom && new Date(dateFrom) < start_date) { + dateFrom = $.datepicker.formatDate('yy-mm-dd', start_date); + dateTo = new Date(start_date); + dateTo.setDate(start_date.getDate() + 1); + dateTo = $.datepicker.formatDate('yy-mm-dd', dateTo); + } } if (max_order_date) { @@ -1382,7 +1388,6 @@ var BookingForm = { max_order_date = $.datepicker.formatDate('dd-mm-yy', max_order_date); } $('#room_date_range').dateRangePicker({ - startDate: $.datepicker.formatDate('dd-mm-yy', new Date()), endDate: max_order_date, startDate: start_date, }).on('datepicker-change', function(event,obj){ From f0de9686b4aff3700d64f3b2d3c0c90d03e68443 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 10 Apr 2023 18:36:08 +0530 Subject: [PATCH 2/2] fix date to update during preperation time --- themes/hotel-reservation-theme/js/product.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index 6b4bbb46e..b4b2c2d38 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1359,11 +1359,13 @@ var BookingForm = { if (preparation_time) { start_date.setDate(start_date.getDate() + parseInt(preparation_time)); start_date.setHours(0, 0, 0, 0); - if (dateFrom && new Date(dateFrom) < start_date) { + if (dateFrom && new Date(dateFrom + ' 00:00:00') < start_date) { dateFrom = $.datepicker.formatDate('yy-mm-dd', start_date); - dateTo = new Date(start_date); - dateTo.setDate(start_date.getDate() + 1); - dateTo = $.datepicker.formatDate('yy-mm-dd', dateTo); + if (new Date(dateTo + ' 00:00:00') <= start_date) { + dateTo = new Date(start_date); + dateTo.setDate(start_date.getDate() + 1); + dateTo = $.datepicker.formatDate('yy-mm-dd', dateTo); + } } }