From ba4147647671f902061247dcc9bde72a23446c68 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Wed, 15 Jul 2020 14:00:25 +0530
Subject: [PATCH 1/2] Changes event name for path hint

---
 packages/Webkul/Core/src/Providers/CoreServiceProvider.php      | 2 +-
 .../Core/src/Resources/views/blade/tracer/style.blade.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
index 3b1c9fbf5..8b4ff525a 100755
--- a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
+++ b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
@@ -58,7 +58,7 @@ class CoreServiceProvider extends ServiceProvider
 
         $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'core');
 
-        Event::listen('bagisto.shop.layout.head', static function(ViewRenderEventManager $viewRenderEventManager) {
+        Event::listen('bagisto.shop.layout.body.after', static function(ViewRenderEventManager $viewRenderEventManager) {
             $viewRenderEventManager->addTemplate('core::blade.tracer.style');
         });
 
diff --git a/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php b/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php
index 6729a3934..cd461a36a 100644
--- a/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php
+++ b/packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php
@@ -54,7 +54,7 @@
             }
 
             $(this).remove();
-        })
+        });
 
         $('.path-hint').on('mouseover', function(e) {
             e.stopPropagation();

From ba8151c2236121af98727d0c06bc1b640c80c354 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Mon, 20 Jul 2020 23:03:16 +0530
Subject: [PATCH 2/2] Issue #3451 fixed

---
 .../Controllers/Sales/ShipmentController.php   |  2 --
 .../views/sales/shipments/create.blade.php     | 18 ++++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
index 42239458b..df7479293 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
@@ -108,8 +108,6 @@ class ShipmentController extends Controller
         }
 
         $this->validate(request(), [
-            'shipment.carrier_title' => 'required',
-            'shipment.track_number'  => 'required',
             'shipment.source'        => 'required',
             'shipment.items.*.*'     => 'required|numeric|min:0',
         ]);
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
index 157a9e33e..04fb6e457 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
@@ -199,20 +199,14 @@
                                         </span>
                                     </div>
 
-                                    <div class="control-group" :class="[errors.has('shipment[carrier_title]') ? 'has-error' : '']" style="margin-top: 40px">
-                                        <label for="shipment[carrier_title]" class="required">{{ __('admin::app.sales.shipments.carrier-title') }}</label>
-                                        <input type="text" v-validate="'required'" class="control" id="shipment[carrier_title]" name="shipment[carrier_title]" data-vv-as="&quot;{{ __('admin::app.sales.shipments.carrier-title') }}&quot;"/>
-                                        <span class="control-error" v-if="errors.has('shipment[carrier_title]')">
-                                            @{{ errors.first('shipment[carrier_title]') }}
-                                        </span>
+                                    <div class="control-group" style="margin-top: 40px">
+                                        <label for="shipment[carrier_title]">{{ __('admin::app.sales.shipments.carrier-title') }}</label>
+                                        <input type="text" class="control" id="shipment[carrier_title]" name="shipment[carrier_title]"/>
                                     </div>
 
-                                    <div class="control-group" :class="[errors.has('shipment[track_number]') ? 'has-error' : '']">
-                                        <label for="shipment[track_number]" class="required">{{ __('admin::app.sales.shipments.tracking-number') }}</label>
-                                        <input type="text" v-validate="'required'" class="control" id="shipment[track_number]" name="shipment[track_number]" data-vv-as="&quot;{{ __('admin::app.sales.shipments.tracking-number') }}&quot;"/>
-                                        <span class="control-error" v-if="errors.has('shipment[track_number]')">
-                                            @{{ errors.first('shipment[track_number]') }}
-                                        </span>
+                                    <div class="control-group">
+                                        <label for="shipment[track_number]">{{ __('admin::app.sales.shipments.tracking-number') }}</label>
+                                        <input type="text" class="control" id="shipment[track_number]" name="shipment[track_number]"/>
                                     </div>
                                 </div>
                             </div>