merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Just Handled Some Exceptions

This commit is contained in:
Devansh 2020-08-11 20:31:38 +05:30
parent 8d93eb640f
commit ea6cdd99b5
2 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
View File

@ -107,14 +107,14 @@
<div class="section-content"> <div class="section-content">
<div class="row"> <div class="row">
<span class="title">{{ __('admin::app.sales.orders.customer-name') }}</span> <span class="title">{{ __('admin::app.sales.orders.customer-name') }}</span>
<span class="value">{{ $invoice->address->name }}</span> <span class="value">{{ $invoice->order->customer_full_name }}</span>
</div> </div>
{!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!} {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!}
<div class="row"> <div class="row">
<span class="title">{{ __('admin::app.sales.orders.email') }}</span> <span class="title">{{ __('admin::app.sales.orders.email') }}</span>
<span class="value">{{ $invoice->address->email }}</span> <span class="value">{{ $invoice->order->customer_email }}</span>
</div> </div>
{!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!} {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!}
@ -124,36 +124,40 @@
</div> </div>
</accordian> </accordian>
<accordian :title="'{{ __('admin::app.sales.orders.address') }}'" :active="true"> @if ($order->billing_address || $order->shipping_address)
<div slot="body" style="display: flex; overflow:auto;"> <accordian :title="'{{ __('admin::app.sales.orders.address') }}'" :active="true">
<div slot="body" style="display: flex; overflow:auto;">
<div class="sale-section"> @if ($order->billing_address)
<div class="secton-title" style="width: 380px;"> <div class="sale-section">
<span>{{ __('admin::app.sales.orders.billing-address') }}</span> <div class="secton-title" style="width: 380px;">
</div> <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
</div>
<div class="section-content" style="width: 380px;"> <div class="section-content" style="width: 380px;">
@include ('admin::sales.address', ['address' => $order->billing_address]) @include ('admin::sales.address', ['address' => $order->billing_address])
{!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!} {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!}
</div> </div>
</div>
@endif
@if ($order->shipping_address)
<div class="sale-section" style="margin: 0 0 0 300px;">
<div class="secton-title" style="width: 400px;">
<span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
</div>
<div class="section-content" style="width: 400px;">
@include ('admin::sales.address', ['address' => $order->shipping_address])
{!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!}
</div>
</div>
@endif
</div> </div>
</accordian>
@if ($order->shipping_address) @endif
<div class="sale-section" style="margin: 0 0 0 300px;">
<div class="secton-title" style="width: 400px;">
<span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
</div>
<div class="section-content" style="width: 400px;">
@include ('admin::sales.address', ['address' => $order->shipping_address])
{!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!}
</div>
</div>
@endif
</div>
</accordian>
<accordian :title="'{{ __('admin::app.sales.orders.products-ordered') }}'" :active="true"> <accordian :title="'{{ __('admin::app.sales.orders.products-ordered') }}'" :active="true">
<div slot="body"> <div slot="body">

60
packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
View File

@ -87,7 +87,7 @@
</span> </span>
<span class="value"> <span class="value">
{{ $shipment->address->name }} {{ $shipment->order->customer_full_name }}
</span> </span>
</div> </div>
@ -97,7 +97,7 @@
</span> </span>
<span class="value"> <span class="value">
{{ $shipment->address->email }} {{ $shipment->order->customer_email }}
</span> </span>
</div> </div>
</div> </div>
@ -106,37 +106,41 @@
</div> </div>
</accordian> </accordian>
<accordian :title="'{{ __('admin::app.sales.orders.address') }}'" :active="true"> @if ($order->billing_address || $order->shipping_address)
<div slot="body"> <accordian :title="'{{ __('admin::app.sales.orders.address') }}'" :active="true">
<div slot="body">
<div class="sale-section"> @if ($order->billing_address)
<div class="secton-title"> <div class="sale-section">
<span>{{ __('admin::app.sales.orders.billing-address') }}</span> <div class="secton-title">
</div> <span>{{ __('admin::app.sales.orders.billing-address') }}</span>
</div>
<div class="section-content"> <div class="section-content">
@include ('admin::sales.address', ['address' => $order->billing_address]) @include ('admin::sales.address', ['address' => $order->billing_address])
</div>
</div>
@endif
@if ($order->shipping_address)
<div class="sale-section">
<div class="secton-title">
<span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
</div>
<div class="section-content">
@include ('admin::sales.address', ['address' => $order->shipping_address])
</div>
</div>
@endif
</div>
</div> </div>
</accordian>
@if ($order->shipping_address) @endif
<div class="sale-section">
<div class="secton-title">
<span>{{ __('admin::app.sales.orders.shipping-address') }}</span>
</div>
<div class="section-content">
@include ('admin::sales.address', ['address' => $order->shipping_address])
</div>
</div>
@endif
</div>
</accordian>
<accordian :title="'{{ __('admin::app.sales.orders.payment-and-shipping') }}'" :active="true"> <accordian :title="'{{ __('admin::app.sales.orders.payment-and-shipping') }}'" :active="true">
<div slot="body"> <div slot="body">