diff --git a/packages/Sarga/Admin/src/Listeners/Notification.php b/packages/Sarga/Admin/src/Listeners/Notification.php index 2f000154a..b5d2a6bb1 100644 --- a/packages/Sarga/Admin/src/Listeners/Notification.php +++ b/packages/Sarga/Admin/src/Listeners/Notification.php @@ -4,9 +4,18 @@ namespace Sarga\Admin\Listeners; use Illuminate\Contracts\Queue\ShouldQueue; use Sarga\Admin\Events\OrderChangedEvent; +use Webkul\Notification\Repositories\NotificationRepository; -class Notification +class Notification implements ShouldQueue { + /** + * Create a new listener instance. + * + * @return void + */ + public function __construct(protected NotificationRepository $notificationRepository) + { + } public function orderItem(\Webkul\Sales\Models\Order $order){ // $this->notificationRepository->create(['type' => 'order', 'order_id' => $order->id]); @@ -14,6 +23,6 @@ class Notification 'id' => $order->id, 'status' => 'item_cancelled', ]; - event(new OrderChangedEvent($orderArray)); + event(new OrderChangedEvent); } } \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php index 8b728e026..36256f21b 100644 --- a/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php @@ -12,18 +12,15 @@

- {!! view_render_event('sales.order.title.before', ['order' => $order]) !!} {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }} - {!! view_render_event('sales.order.title.after', ['order' => $order]) !!}

- {!! view_render_event('sales.order.page_action.before', ['order' => $order]) !!} @if ($order->canCancel() && bouncer()->hasPermission('sales.orders.cancel')) @@ -49,14 +46,12 @@ @endif - {!! view_render_event('sales.order.page_action.after', ['order' => $order]) !!}
- {!! view_render_event('sales.order.tabs.before', ['order' => $order]) !!}
@@ -81,7 +76,6 @@
- {!! view_render_event('sales.order.created_at.after', ['order' => $order]) !!}
@@ -93,7 +87,6 @@
- {!! view_render_event('sales.order.status_label.after', ['order' => $order]) !!}
@@ -105,7 +98,6 @@
- {!! view_render_event('sales.order.channel_name.after', ['order' => $order]) !!}
@@ -133,12 +125,10 @@ - {{ $order->customer->phone }} + {{ $order->customer->phone ?? '#'}} - {!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!} - @if (! is_null($order->customer) && ! is_null($order->customer->group))
@@ -185,8 +175,6 @@
@include ('admin::sales.address', ['address' => $order->shipping_address]) - - {!! view_render_event('sales.order.shipping_address.after', ['order' => $order]) !!}
@endif @@ -239,7 +227,6 @@ @endif - {!! view_render_event('sales.order.payment-method.after', ['order' => $order]) !!} @@ -269,8 +256,6 @@ {{ core()->formatPrice($order->shipping_amount,$order->order_currency_code) }} - - {!! view_render_event('sales.order.shipping-method.after', ['order' => $order]) !!} @endif @@ -301,17 +286,17 @@ @foreach ($order->items as $item) - + @php $product = $item->child->product ?? $item->product; @endphp - suraty - {{ $item->name }} + {{ $item->name }} @if (isset($item->additional['attributes']))
@@ -644,7 +629,6 @@ - {!! view_render_event('sales.order.tabs.after', ['order' => $order]) !!}