From c181ef7ec80ce41d184aae792f62205c5f7a38c4 Mon Sep 17 00:00:00 2001 From: Pranshu Tomar Date: Mon, 23 Mar 2020 18:01:06 +0530 Subject: [PATCH] Issue #2712 fixed --- packages/Webkul/BookingProduct/src/Helpers/Booking.php | 3 +-- packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php | 3 +-- packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php | 3 +-- .../views/admin/catalog/products/accordians/booking.blade.php | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/BookingProduct/src/Helpers/Booking.php b/packages/Webkul/BookingProduct/src/Helpers/Booking.php index ddf4be7a9..b2982c0a3 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/Booking.php +++ b/packages/Webkul/BookingProduct/src/Helpers/Booking.php @@ -270,8 +270,7 @@ class Booking ? $bookingProductSlot->slots : ($bookingProductSlot->slots[$requestedDate->format('w')] ?? []); - if ($requestedDate < $currentTime - || $requestedDate < $availableFrom + if ($requestedDate < $availableFrom || $requestedDate > $availableTo ) { return []; diff --git a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php index 50b1cdaaa..a84bdc5bd 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php +++ b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php @@ -38,8 +38,7 @@ class DefaultSlot extends Booking ? Carbon::createFromTimeString($bookingProduct->available_to) : Carbon::createFromTimeString('2080-01-01 00:00:00'); - if ($requestedDate < $currentTime - || $requestedDate < $availableFrom + if ($requestedDate < $availableFrom || $requestedDate > $availableTo ) { return []; diff --git a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php index 3919ef428..490e920e8 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php +++ b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php @@ -39,8 +39,7 @@ class RentalSlot extends Booking ? $bookingProductSlot->slots : $bookingProductSlot->slots[$requestedDate->format('w')]; - if ($requestedDate < $currentTime - || $requestedDate < $availableFrom + if ($requestedDate < $availableFrom || $requestedDate > $availableTo ) { return []; diff --git a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php index 86ec198f1..197baadca 100644 --- a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php +++ b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php @@ -61,7 +61,7 @@ - + @{{ errors.first('booking[available_from]') }}