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 @@ -
- - - - @{{ errors.first('shipment[carrier_title]') }} - +
+ +
-
- - - - @{{ errors.first('shipment[track_number]') }} - +
+ +
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();