Merge branch 'master' of https://github.com/bagisto/bagisto into development

packages/Webkul/Admin/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/admin.js": "/js/admin.js?id=c7c2ef0a298910b82304",
-    "/css/admin.css": "/css/admin.css?id=f2c6fe51889bca1fb79d"
+    "/js/admin.js": "/js/admin.js?id=2701b1627d73faa941d6",
+    "/css/admin.css": "/css/admin.css?id=bbb1e500385b8d7ade13"
 }

packages/Webkul/Admin/src/Resources/assets/sass/partials/_dashboard.scss

@@ -3,6 +3,17 @@
         margin-bottom: 0 !important;
         padding-bottom: 15px;
         border-bottom: 1px solid $border-color;
+
+        .control-group {
+            span {
+                width: 100%;
+            }
+
+            &.date::after {
+                margin-top: -13px;
+                left: 100%;
+            }
+        }
     }
 
     .page-content {

packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/default-booking.css": "/css/default-booking.css?id=3607d6ec4cb93857b42c",
+    "/css/default-booking.css": "/css/default-booking.css?id=ab5abfabd8e0f6df6466",
     "/css/velocity-booking.css": "/css/velocity-booking.css?id=fb0d5b9e37ed77d662d1"
 }

packages/Webkul/BookingProduct/src/Helpers/EventTicket.php

@@ -4,6 +4,7 @@ namespace Webkul\BookingProduct\Helpers;
 
 use Illuminate\Support\Facades\DB;
 use Carbon\Carbon;
+use Webkul\Checkout\Facades\Cart;
 
 class EventTicket extends Booking
 {
@@ -124,6 +125,12 @@ class EventTicket extends Booking
 
         $ticket = $bookingProduct->event_tickets()->find($item->additional['booking']['ticket_id']);
 
+        if (! $ticket) {
+            Cart::removeItem($item->id);
+
+            return true;
+        }
+
         $price += $ticket->price;
 
         if ($price == $item->base_price) {

packages/Webkul/BookingProduct/src/Resources/assets/sass/default.scss

@@ -130,9 +130,8 @@
                     padding-right: 5px;
 
                     &::after {
-                        position: absolute;
-                        top: 14px;
-                        right: 10px;
+                        top: 16px;
+                        left: 100%; 
                     }
                 }
 

packages/Webkul/Ui/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
     "/js/ui.js": "/js/ui.js?id=5c5ae91d95c2c0668124",
-    "/css/ui.css": "/css/ui.css?id=8c35163268c09336c2bc"
+    "/css/ui.css": "/css/ui.css?id=b87eb840235219138c2c"
 }

packages/Webkul/Ui/src/Resources/assets/sass/app.scss

@@ -646,9 +646,9 @@ h5 {
             vertical-align: middle;
             margin-left: -34px;
             pointer-events: none;
-            left: 70%;
             position: absolute;
-            top: 35px;
+            left: 70%;
+            top: 50%;
         }
     }
 

packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php

@@ -3,6 +3,17 @@
     $comparableAttributes = $attributeRepository->findByField('is_comparable', 1);
 @endphp
 
+@push('css')
+    <style>
+        .btn-add-to-cart {
+            max-width: 130px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    </style>
+@endpush
+
 @push('scripts')
     <script type="text/x-template" id="compare-product-template">
         <section class="cart-details row no-margin col-12">

resources/views/vendor/notifications/email.blade.php

@@ -52,10 +52,11 @@
 @slot('subcopy')
 @lang(
     "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
-    'into your web browser: [:actionURL](:actionURL)',
+    'into your web browser: [:displayableActionUrl](:actionURL)',
     [
         'actionText' => $actionText,
         'actionURL' => $actionUrl,
+        'displayableActionUrl' => $displayableActionUrl,
     ]
 )
 @endslot