From 9f0be3324bfb5e04ff688cbd4af11624e21a7d33 Mon Sep 17 00:00:00 2001
From: Sanjay <sanjay.bhatt371@webkul.com>
Date: Mon, 4 Apr 2022 11:49:41 +0530
Subject: [PATCH 1/4]  Issue #6217 Fixed

---
 .../Webkul/BookingProduct/src/Resources/lang/ar/app.php   | 2 +-
 .../Webkul/BookingProduct/src/Resources/lang/es/app.php   | 2 +-
 .../Webkul/BookingProduct/src/Resources/lang/fa/app.php   | 2 +-
 .../BookingProduct/src/Resources/lang/hi_IN/app.php       | 2 +-
 .../Webkul/BookingProduct/src/Resources/lang/it/app.php   | 2 +-
 .../Webkul/BookingProduct/src/Resources/lang/nl/app.php   | 2 +-
 .../Webkul/BookingProduct/src/Resources/lang/tr/app.php   | 2 +-
 .../BookingProduct/src/Resources/lang/zh_CN/app.php       | 2 +-
 .../shop/default/products/view/booking/slots.blade.php    | 2 +-
 .../shop/velocity/products/view/booking/rental.blade.php  | 8 ++++----
 .../shop/velocity/products/view/booking/slots.blade.php   | 2 +-
 .../shop/velocity/products/view/booking/table.blade.php   | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/ar/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/ar/app.php
index 84c58e273..f4b86a81a 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/ar/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'معلومات عن الخدمة',
             'location' => 'موقعك',
             'contact' => 'مكالمة',
             'email' => 'البريد الإلكتروني',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/es/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/es/app.php
index 5d0331bde..3c8ed7c1d 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/es/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/es/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'Información de reserva',
             'location' => 'Ubicación',
             'contact' => 'Contacto',
             'email' => 'Correo Electrónico',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/fa/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/fa/app.php
index d451d065d..4cc2972a5 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/fa/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'اطلاعات مربوط به رزرو',
             'location' => 'مکان',
             'contact' => 'مخاطب',
             'email' => 'پست الکترونیک',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/hi_IN/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/hi_IN/app.php
index 01f38350b..76488212e 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/hi_IN/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/hi_IN/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'बुकिंग जानकारी',
             'location'                  => 'स्थान',
             'contact'                   => 'संपर्क करें',
             'email'                     => 'ईमेल',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/it/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/it/app.php
index 4be549c8d..bf5472e75 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/it/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/it/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'Informazioni sulla prenotazione',
             'location' => 'Location',
             'contact' => 'Contatto',
             'email' => 'Email',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/nl/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/nl/app.php
index 030934add..ed6333ede 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/nl/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'Boekingsinformatie',
             'location' => 'Plaats',
             'contact' => 'Contact',
             'email' => 'Email',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/tr/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/tr/app.php
index 435392b2f..f9a2a8873 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/tr/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => 'Rezervasyon bilgileri',
             'location' => 'Konum',
             'contact' => 'İletişim',
             'email' => 'Email',
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/zh_CN/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/zh_CN/app.php
index d8d855904..be13af119 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/zh_CN/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/zh_CN/app.php
@@ -82,7 +82,7 @@ return [
 
     'shop' => [
         'products' => [
-            'booking-information' => 'Booking Information',
+            'booking-information' => '预订信息',
             'location' => '位置',
             'contact' => '联系',
             'email' => '电子邮件',
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/slots.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/slots.blade.php
index 5a4fcc245..e3a2735d7 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/slots.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/slots.blade.php
@@ -4,7 +4,7 @@
     <script type="text/x-template" id="book-slots-template">
 
         <div class="book-slots">
-            <label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }} :</label>
+            <label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }}</label>
 
             <div class="control-group-container">
                 <div class="control-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php
index 9b53fd416..7b3233eb6 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php
@@ -7,7 +7,7 @@
 
             <div v-if="renting_type == 'daily_hourly'">
                 <div class="form-group">
-                    <label class="label-style">{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
+                    <label class="label-style required">{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
 
                     <span class="radio">
                         <input type="radio" id="daily-renting-type" name="booking[renting_type]" value="daily" v-model="sub_renting_type">
@@ -27,7 +27,7 @@
             <div v-if="renting_type != 'daily' && sub_renting_type == 'hourly'">
                 
                 <div>
-                    <label class="label-style">{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
+                    <label class="label-style required">{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
 
                     <div class="control-group-container">
                         <div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
@@ -50,7 +50,7 @@
                 </div>
 
                 <div v-if="slots[selected_slot] && slots[selected_slot]['slots'].length">
-                    <label class="label-style">{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
+                    <label class="label-style required">{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
 
                     <div class="control-group-container">
                         <div class="form-group slots" :class="[errors.has('booking[slot][from]') ? 'has-error' : '']">
@@ -81,7 +81,7 @@
             </div>
 
             <div v-else>
-                <label class="label-style">{{ __('bookingproduct::app.shop.products.select-date') }}</label>
+                <label class="label-style required">{{ __('bookingproduct::app.shop.products.select-date') }}</label>
 
                 <div class="control-group-container">
                     <div class="form-group date" :class="[errors.has('booking[date_from]') ? 'has-error' : '']">
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php
index 1710b54ce..724d9b979 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php
@@ -4,7 +4,7 @@
     <script type="text/x-template" id="book-slots-template">
 
         <div class="book-slots">
-            <label class="label-style">{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }} :</label>
+            <label class="label-style required">{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }}</label>
 
             <div class="control-group-container">
                 <div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
index 7bf4c0e9d..7291e5550 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
@@ -58,6 +58,6 @@
     ])
 
 <div class="form-group">
-    <label class="label-style">{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
+    <label class="label-style required">{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
     <textarea name="booking[note]" class="form-style" style="width: 100%"/>
 </div>
\ No newline at end of file

From 36c92cf3d7a41c718d4716d15676de4516bc955a Mon Sep 17 00:00:00 2001
From: Sanjay <sanjay.bhatt371@webkul.com>
Date: Mon, 4 Apr 2022 13:22:45 +0530
Subject: [PATCH 2/4] Issue #206 fixed

---
 .../BookingProduct/publishable/assets/css/admin-booking.css     | 2 +-
 .../Webkul/BookingProduct/publishable/assets/mix-manifest.json  | 2 +-
 .../Webkul/BookingProduct/src/Resources/assets/sass/admin.scss  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/BookingProduct/publishable/assets/css/admin-booking.css b/packages/Webkul/BookingProduct/publishable/assets/css/admin-booking.css
index 35c154ec3..5b306b0b6 100644
--- a/packages/Webkul/BookingProduct/publishable/assets/css/admin-booking.css
+++ b/packages/Webkul/BookingProduct/publishable/assets/css/admin-booking.css
@@ -1 +1 @@
-.switch-view-container{margin-left:-5px;margin-right:6px;vertical-align:top;display:inline-block}.switch-view-container .icon-container{height:36px;cursor:pointer;display:inline-block;padding:6px 10px 10px;border:1px solid #c7c7c7}.switch-view-container .icon-container:first-child{left:5px;position:relative;border-radius:3px 0 0 3px}.switch-view-container .icon-container:last-child{border-radius:0 3px 3px 0}.switch-view-container .icon-container.active{cursor:not-allowed;border-color:#0041ff;background-color:#0041ff}.switch-view-container .icon-container .icon{vertical-align:middle;width:22px;height:22px}.vuecal__event{background:#0041ff!important;color:#fff!important;cursor:pointer}.vuecal__event:hover{height:-webkit-max-content!important;height:-moz-max-content!important;height:max-content!important}.rtl .switch-view-container{margin-left:unset}.rtl .switch-view-container .icon-container.active{margin-left:-9px}.calendar-icon{background-image:url(../images/calendar-icon.svg)}.calendar-white-icon{background-image:url(../images/calendar-white-icon.svg)}.table-icon{background-image:url(../images/table-icon.svg)}.table-white-icon{background-image:url(../images/table-white-icon.svg)}
\ No newline at end of file
+.switch-view-container{margin-left:-5px;margin-right:6px;vertical-align:top;display:inline-block}.switch-view-container .icon-container{height:36px;cursor:pointer;display:inline-block;padding:6px 10px 10px;border:1px solid #c7c7c7}.switch-view-container .icon-container:first-child{left:5px;position:relative;border-radius:3px 0 0 3px}.switch-view-container .icon-container:last-child{border-radius:0 3px 3px 0}.switch-view-container .icon-container.active{cursor:not-allowed;background-color:#0041ff;border:1px solid}.switch-view-container .icon-container .icon{vertical-align:middle;width:22px;height:22px}.vuecal__event{background:#0041ff!important;color:#fff!important;cursor:pointer}.vuecal__event:hover{height:-webkit-max-content!important;height:-moz-max-content!important;height:max-content!important}.rtl .switch-view-container{margin-left:unset}.rtl .switch-view-container .icon-container.active{margin-left:-9px}.calendar-icon{background-image:url(../images/calendar-icon.svg)}.calendar-white-icon{background-image:url(../images/calendar-white-icon.svg)}.table-icon{background-image:url(../images/table-icon.svg)}.table-white-icon{background-image:url(../images/table-white-icon.svg)}
\ No newline at end of file
diff --git a/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json b/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
index cfcd9305e..2c85b584d 100644
--- a/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
@@ -2,5 +2,5 @@
     "/css/default-booking.css": "/css/default-booking.css?id=76de1f2b8e064c1e9043",
     "/css/velocity-booking.css": "/css/velocity-booking.css?id=481d94b621e06671752a",
     "/js/admin-booking.js": "/js/admin-booking.js?id=5cc56229ce47cbecd1be",
-    "/css/admin-booking.css": "/css/admin-booking.css?id=97f40d778fa7f81d69ff"
+    "/css/admin-booking.css": "/css/admin-booking.css?id=02be5e2fa5a499045cbe"
 }
diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss b/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss
index c7b4dd531..6ce14cfa9 100644
--- a/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss
+++ b/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss
@@ -25,6 +25,7 @@
             cursor: not-allowed;
             border-color: #0041ff;
             background-color: #0041ff;
+            border:1px solid;
         }
 
         .icon {

From 6386b1c1ad6bf32c7d1a3df489e68507381c23c2 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Mon, 4 Apr 2022 14:02:47 +0530
Subject: [PATCH 3/4] Issue #6040 fixed

---
 .../src/Resources/views/shop/layouts/header/mobile.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/mobile.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/mobile.blade.php
index b9c6d68f5..d647a2883 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/mobile.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/mobile.blade.php
@@ -11,7 +11,7 @@
     cart-items-count="{{ $cartItemsCount }}"
     cart-route="{{ route('shop.checkout.cart.index') }}"
     :locale="{{ json_encode(core()->getCurrentLocale()) }}"
-    :all-locales="{{ json_encode(core()->getCurrentChannel()->locales) }}"
+    :all-locales="{{ json_encode(core()->getCurrentChannel()->locales()->orderBy('name')->get()) }}"
     :currency="{{ json_encode(core()->getCurrentCurrency()) }}"
     :all-currencies="{{ json_encode(core()->getCurrentChannel()->currencies) }}"
 >

From 990bd80026cc0bf9ac1c7b45837573a8f4951894 Mon Sep 17 00:00:00 2001
From: Sanjay <sanjay.bhatt371@webkul.com>
Date: Mon, 4 Apr 2022 14:26:12 +0530
Subject: [PATCH 4/4]  Changes-complete

---
 .../Webkul/BookingProduct/src/Resources/assets/sass/admin.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss b/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss
index 6ce14cfa9..72cca29a2 100644
--- a/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss
+++ b/packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss
@@ -25,7 +25,7 @@
             cursor: not-allowed;
             border-color: #0041ff;
             background-color: #0041ff;
-            border:1px solid;
+            border: 1px solid;
         }
 
         .icon {