From f8194ff430fdba82e6dae25400a3ce6373b939c3 Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Mon, 23 Mar 2020 18:59:04 +0530
Subject: [PATCH] Issue #2714 fixed

---
 packages/Webkul/BookingProduct/src/Helpers/Booking.php    | 8 ++++----
 .../Webkul/BookingProduct/src/Helpers/DefaultSlot.php     | 4 ++--
 packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php | 2 +-
 packages/Webkul/BookingProduct/src/Helpers/TableSlot.php  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/Webkul/BookingProduct/src/Helpers/Booking.php b/packages/Webkul/BookingProduct/src/Helpers/Booking.php
index b2982c0a3..ebdcf73d5 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/Booking.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/Booking.php
@@ -178,7 +178,7 @@ class Booking
 
         $availableFrom = ! $bookingProduct->available_from && $bookingProduct->available_from
                          ? Carbon::createFromTimeString($bookingProduct->available_from)
-                         : clone $currentTime;
+                         : Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
 
         $availableTo = ! $bookingProduct->available_from && $bookingProduct->available_to
                        ? Carbon::createFromTimeString($bookingProduct->available_to)
@@ -254,13 +254,13 @@ class Booking
             return [];
         }
 
-        $requestedDate = Carbon::createFromTimeString($date . " 00:00:00");
-
         $currentTime = Carbon::now();
 
+        $requestedDate = Carbon::createFromTimeString($date . " 00:00:00");
+
         $availableFrom = ! $bookingProduct->available_every_week && $bookingProduct->available_from
                          ? Carbon::createFromTimeString($bookingProduct->available_from)
-                         : Carbon::createFromTimeString($currentTime);
+                         : Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
 
         $availableTo = ! $bookingProduct->available_every_week && $bookingProduct->available_from
                        ? Carbon::createFromTimeString($bookingProduct->available_to)
diff --git a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
index a84bdc5bd..b49e52c99 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
@@ -32,7 +32,7 @@ class DefaultSlot extends Booking
 
         $availableFrom = $bookingProduct->available_from
                          ? Carbon::createFromTimeString($bookingProduct->available_from)
-                         : clone $currentTime;
+                         : Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
 
         $availableTo = $bookingProduct->available_to
                        ? Carbon::createFromTimeString($bookingProduct->available_to)
@@ -100,7 +100,7 @@ class DefaultSlot extends Booking
 
         $availableFrom = $bookingProduct->available_from
                          ? Carbon::createFromTimeString($bookingProduct->available_from)
-                         : clone $currentTime;
+                         : Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
 
         $availableTo = $bookingProduct->available_to
                        ? Carbon::createFromTimeString($bookingProduct->available_to)
diff --git a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
index 490e920e8..352c30024 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
@@ -29,7 +29,7 @@ class RentalSlot extends Booking
 
         $availableFrom = ! $bookingProduct->available_every_week && $bookingProduct->available_from
                          ? Carbon::createFromTimeString($bookingProduct->available_from)
-                         : Carbon::createFromTimeString($currentTime);
+                         : Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
 
         $availableTo = ! $bookingProduct->available_every_week && $bookingProduct->available_from
                        ? Carbon::createFromTimeString($bookingProduct->available_to)
diff --git a/packages/Webkul/BookingProduct/src/Helpers/TableSlot.php b/packages/Webkul/BookingProduct/src/Helpers/TableSlot.php
index cfa2f0af1..6862b0e03 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/TableSlot.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/TableSlot.php
@@ -22,7 +22,7 @@ class TableSlot extends Booking
             $bookedQty *= $bookingProduct->table_slot->guest_limit;
         }
 
-        if ($bookingProduct->qty - $bookedQty < $requestedQty) {
+        if ($bookingProduct->qty - $bookedQty < $requestedQty || $this->isSlotExpired($cartItem)) {
             return false;
         }