From 3d7d1ab57427645cdb79f2460417aa2d7d38a87b Mon Sep 17 00:00:00 2001 From: Pranshu Tomar Date: Mon, 13 Apr 2020 16:50:05 +0530 Subject: [PATCH 1/2] Issue #2784 fixed --- .../BookingProduct/src/Helpers/DefaultSlot.php | 4 +++- .../catalog/products/accordians/booking.blade.php | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php index b49e52c99..30d7786c7 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php +++ b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php @@ -62,8 +62,10 @@ class DefaultSlot extends Booking { $slots = []; + $dayOfWeek = $requestedDate->dayOfWeek; + foreach ($bookingProductSlot->slots as $timeDuration) { - if ($requestedDate->dayOfWeek != $timeDuration['from_day']) { + if ($dayOfWeek != $timeDuration['from_day']) { continue; } 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 cf075f47f..3bca1b92f 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 @@ -4,6 +4,19 @@ margin-top: -13px; left: 100%; } + + .has-control-group .control-group { + width: 50%; + float: left; + } + + .has-control-group .control-group:first-child { + padding-right: 10px; + } + + .has-control-group .control-group:last-child { + padding-left: 10px; + } @stop From 57d2def00f2d621fdd95cea0a9f50c1d45619e3e Mon Sep 17 00:00:00 2001 From: Pranshu Tomar Date: Mon, 13 Apr 2020 16:54:32 +0530 Subject: [PATCH 2/2] Updated changelog --- CHANGELOG for v1.x.x.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index 22893ab88..f2323409f 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -52,6 +52,8 @@ * #2781 [fixed] - Mobile menu is not showing correct sub-menu +* #2784 [fixed] - One booking for many days slot time issue + * #2785 [fixed] - missing address details in checkout page * #2786 [fixed] - Getting error message on adding product to compare product from search page.