From 1f30769a98607ef1596a1913de58a50b43e7dae8 Mon Sep 17 00:00:00 2001 From: Carlos Augusto Gartner Date: Sun, 12 Apr 2020 22:08:51 -0300 Subject: [PATCH] Created new view_render_events for admin order and invoice view --- .../views/sales/invoices/view.blade.php | 30 +++++++++++++++++-- .../views/sales/orders/view.blade.php | 24 +++++++++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php index d46a2a43e..95a0a1a15 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php @@ -12,16 +12,24 @@ @@ -47,6 +55,8 @@ + {!! view_render_event('sales.invoice.increment_id.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.order-date') }} @@ -57,6 +67,8 @@
+ {!! view_render_event('sales.invoice.created_at.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.order-status') }} @@ -67,6 +79,8 @@
+ {!! view_render_event('sales.invoice.status_label.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.channel') }} @@ -76,6 +90,8 @@ {{ $order->channel_name }}
+ + {!! view_render_event('sales.invoice.channel_name.after', ['order' => $order]) !!} @@ -95,6 +111,8 @@ + {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.email') }} @@ -104,6 +122,8 @@ {{ $invoice->address->email }}
+ + {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!} @@ -119,9 +139,9 @@
- @include ('admin::sales.address', ['address' => $order->billing_address]) + {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!}
@@ -132,9 +152,9 @@
- @include ('admin::sales.address', ['address' => $order->shipping_address]) + {!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!}
@endif @@ -170,6 +190,8 @@ {{ $order->order_currency_code }} + + {!! view_render_event('sales.invoice.payment-method.after', ['order' => $order]) !!} @@ -199,6 +221,8 @@ {{ core()->formatBasePrice($order->base_shipping_amount) }} + + {!! view_render_event('sales.invoice.shipping-method.after', ['order' => $order]) !!} @endif @@ -236,7 +260,7 @@ @if (isset($item->additional['attributes']))
- + @foreach ($item->additional['attributes'] as $attribute) {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
@endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php index 09755ea48..e0d986c37 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php @@ -12,13 +12,19 @@

+ {!! 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()) {{ __('admin::app.sales.orders.cancel-btn-title') }} @@ -42,6 +48,8 @@ {{ __('admin::app.sales.orders.shipment-btn-title') }} @endif + + {!! view_render_event('sales.order.page_action.after', ['order' => $order]) !!}
@@ -72,6 +80,8 @@ + {!! view_render_event('sales.order.created_at.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.order-status') }} @@ -82,6 +92,8 @@
+ {!! view_render_event('sales.order.status_label.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.channel') }} @@ -91,6 +103,8 @@ {{ $order->channel_name }}
+ + {!! view_render_event('sales.order.channel_name.after', ['order' => $order]) !!} @@ -110,6 +124,8 @@ + {!! view_render_event('sales.order.customer_full_name.after', ['order' => $order]) !!} +
{{ __('admin::app.sales.orders.email') }} @@ -120,6 +136,8 @@
+ {!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!} + @if (! is_null($order->customer))
@@ -131,6 +149,8 @@
@endif + + {!! view_render_event('sales.order.customer_group.after', ['order' => $order]) !!} @@ -148,7 +168,7 @@
@include ('admin::sales.address', ['address' => $order->billing_address]) - {!! view_render_event('sales.order.billing-address.after', ['order' => $order]) !!} + {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!}
@@ -161,7 +181,7 @@
@include ('admin::sales.address', ['address' => $order->shipping_address]) - {!! view_render_event('sales.order.shipping-address.after', ['order' => $order]) !!} + {!! view_render_event('sales.order.shipping_address.after', ['order' => $order]) !!}
@endif