From 21ddf2921b4eab6aa5fcb968635fa84b191cd060 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 27 Dec 2021 15:06:19 +0530
Subject: [PATCH] Order UI Issue Fixed

---
 .../customers/account/orders/view.blade.php   | 936 +++++++++---------
 1 file changed, 466 insertions(+), 470 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
index c474b64fd..106688978 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
@@ -17,49 +17,223 @@
 @endpush
 
 @section('page-detail-wrapper')
-    <div class="account-content">
-        <div class="account-layout">
-            <div class="account-head">
-                <span class="account-heading">
-                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
-                </span>
+    <div class="account-head">
+        <span class="account-heading">
+            {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
+        </span>
 
-                @if ($order->canCancel())
-                    <span class="account-action">
-                        <form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
-                            @csrf
-                        </form>
+        @if ($order->canCancel())
+            <span class="account-action">
+                <form id="cancelOrderForm" action="{{ route('customer.orders.cancel', $order->id) }}" method="post">
+                    @csrf
+                </form>
 
-                        <a href="javascript:void(0);" class="theme-btn light unset float-right" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right">
-                            {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
-                        </a>
-                    </span>
-                @endif
-            </div>
+                <a href="javascript:void(0);" class="theme-btn light unset float-right" onclick="cancelOrder('{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}')" style="float: right">
+                    {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
+                </a>
+            </span>
+        @endif
+    </div>
 
-            {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
+    {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
 
-            <div class="sale-container">
-                <tabs>
-                    <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
+    <div class="sale-container mt10">
+        <tabs>
+            <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
 
-                        <div class="sale-section">
-                            <div class="section-content">
-                                <div class="row col-12">
-                                    <label class="mr20">
-                                        {{ __('shop::app.customer.account.order.view.placed-on') }}
-                                    </label>
+                <div class="sale-section">
+                    <div class="section-content">
+                        <div class="row col-12">
+                            <label class="mr20">
+                                {{ __('shop::app.customer.account.order.view.placed-on') }}
+                            </label>
 
-                                    <span class="value">
-                                        {{ core()->formatDate($order->created_at, 'd M Y') }}
-                                    </span>
-                                </div>
-                            </div>
+                            <span class="value">
+                                {{ core()->formatDate($order->created_at, 'd M Y') }}
+                            </span>
                         </div>
+                    </div>
+                </div>
+
+                <div class="sale-section">
+                    <div class="section-title">
+                        <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
+                    </div>
+
+                    <div class="section-content">
+                        <div class="table">
+                            <table>
+                                <thead>
+                                    <tr>
+                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                    </tr>
+                                </thead>
+
+                                <tbody>
+                                    @foreach ($order->items as $item)
+                                        <tr>
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                                {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                                {{ $item->name }}
+
+                                                @if (isset($item->additional['attributes']))
+                                                    <div class="item-options">
+
+                                                        @foreach ($item->additional['attributes'] as $attribute)
+                                                            <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
+                                                        @endforeach
+
+                                                    </div>
+                                                @endif
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
+                                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
+                                                <span class="qty-row">
+                                                    {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
+                                                </span>
+
+                                                <span class="qty-row">
+                                                    {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
+                                                </span>
+
+                                                <span class="qty-row">
+                                                    {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
+                                                </span>
+
+                                                <span class="qty-row">
+                                                    {{ $item->qty_refunded ? __('shop::app.customer.account.order.view.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }}
+                                                </span>
+
+                                                <span class="qty-row">
+                                                    {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
+                                                </span>
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
+                                                {{ core()->formatPrice($item->total, $order->order_currency_code) }}
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">
+                                                {{ number_format($item->tax_percent, 2) }}%
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
+                                                {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
+                                            </td>
+
+                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
+                                                {{ core()->formatPrice($item->total + $item->tax_amount - $item->discount_amount, $order->order_currency_code) }}
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+
+                            </table>
+                        </div>
+
+                        <div class="totals">
+                            <table class="sale-summary">
+                                <tbody>
+                                    <tr>
+                                        <td>{{ __('shop::app.customer.account.order.view.subtotal') }}
+                                            <span class="dash-icon">-</span>
+                                        </td>
+                                        <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
+                                    </tr>
+
+                                    @if ($order->haveStockableItems())
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
+                                        </tr>
+                                    @endif
+
+                                    @if ($order->base_discount_amount > 0)
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.discount') }}
+                                                @if ($order->coupon_code)
+                                                    ({{ $order->coupon_code }})
+                                                @endif
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                        </tr>
+                                    @endif
+
+                                    <tr class="border-bottom">
+                                        <td>{{ __('shop::app.customer.account.order.view.tax') }}
+                                            <span class="dash-icon">-</span>
+                                        </td>
+                                        <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
+                                    </tr>
+
+                                    <tr class="fw6">
+                                        <td>{{ __('shop::app.customer.account.order.view.grand-total') }}
+                                            <span class="dash-icon">-</span>
+                                        </td>
+                                        <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
+                                    </tr>
+
+                                    <tr class="fw6">
+                                        <td>{{ __('shop::app.customer.account.order.view.total-paid') }}
+                                            <span class="dash-icon">-</span>
+                                        </td>
+                                        <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
+                                    </tr>
+
+                                    <tr class="fw6">
+                                        <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}
+                                            <span class="dash-icon">-</span>
+                                        </td>
+                                        <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
+                                    </tr>
+
+                                    <tr class="fw6">
+                                        <td>{{ __('shop::app.customer.account.order.view.total-due') }}
+                                            <span class="dash-icon">-</span>
+                                        </td>
+
+                                        @if($order->status !== 'canceled')
+                                            <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
+                                        @else
+                                            <td>{{ core()->formatPrice(0.00, $order->order_currency_code) }}</td>
+                                        @endif
+                                    </tr>
+                                <tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </tab>
+
+            @if ($order->invoices->count())
+                <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
+
+                    @foreach ($order->invoices as $invoice)
 
                         <div class="sale-section">
                             <div class="section-title">
-                                <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
+                                <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }}</span>
+
+                                <a href="{{ route('customer.orders.print', $invoice->id) }}" class="float-right">
+                                    {{ __('shop::app.customer.account.order.view.print') }}
+                                </a>
                             </div>
 
                             <div class="section-content">
@@ -70,16 +244,16 @@
                                                 <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
                                                 <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
                                                 <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
                                                 <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
                                                 <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
                                                 <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
                                             </tr>
                                         </thead>
 
                                         <tbody>
-                                            @foreach ($order->items as $item)
+
+                                            @foreach ($invoice->items as $item)
                                                 <tr>
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
                                                         {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
@@ -87,500 +261,322 @@
 
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
                                                         {{ $item->name }}
-
-                                                        @if (isset($item->additional['attributes']))
-                                                            <div class="item-options">
-
-                                                                @foreach ($item->additional['attributes'] as $attribute)
-                                                                    <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
-                                                                @endforeach
-
-                                                            </div>
-                                                        @endif
                                                     </td>
 
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
                                                         {{ core()->formatPrice($item->price, $order->order_currency_code) }}
                                                     </td>
 
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
-                                                        <span class="qty-row">
-                                                            {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_refunded ? __('shop::app.customer.account.order.view.item-refunded', ['qty_refunded' => $item->qty_refunded]) : '' }}
-                                                        </span>
-
-                                                        <span class="qty-row">
-                                                            {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
-                                                        </span>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">
+                                                        {{ $item->qty }}
                                                     </td>
 
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
                                                         {{ core()->formatPrice($item->total, $order->order_currency_code) }}
                                                     </td>
 
-                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">
-                                                        {{ number_format($item->tax_percent, 2) }}%
-                                                    </td>
-
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
                                                         {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
                                                     </td>
 
                                                     <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
-                                                        {{ core()->formatPrice($item->total + $item->tax_amount - $item->discount_amount, $order->order_currency_code) }}
+                                                        {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
                                                     </td>
                                                 </tr>
                                             @endforeach
                                         </tbody>
-
                                     </table>
                                 </div>
 
                                 <div class="totals">
                                     <table class="sale-summary">
-                                        <tbody>
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.subtotal') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
+                                        </tr>
+
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
+                                        </tr>
+
+                                        @if ($invoice->base_discount_amount > 0)
                                             <tr>
-                                                <td>{{ __('shop::app.customer.account.order.view.subtotal') }}
+                                                <td>{{ __('shop::app.customer.account.order.view.discount') }}
                                                     <span class="dash-icon">-</span>
                                                 </td>
-                                                <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
+                                                <td>{{ core()->formatPrice($invoice->discount_amount, $order->order_currency_code) }}</td>
                                             </tr>
+                                        @endif
 
-                                            @if ($order->haveStockableItems())
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            @endif
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.tax') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
+                                        </tr>
 
-                                            @if ($order->base_discount_amount > 0)
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}
-                                                        @if ($order->coupon_code)
-                                                            ({{ $order->coupon_code }})
-                                                        @endif
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            @endif
-
-                                            <tr class="border-bottom">
-                                                <td>{{ __('shop::app.customer.account.order.view.tax') }}
-                                                    <span class="dash-icon">-</span>
-                                                </td>
-                                                <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="fw6">
-                                                <td>{{ __('shop::app.customer.account.order.view.grand-total') }}
-                                                    <span class="dash-icon">-</span>
-                                                </td>
-                                                <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="fw6">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-paid') }}
-                                                    <span class="dash-icon">-</span>
-                                                </td>
-                                                <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="fw6">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}
-                                                    <span class="dash-icon">-</span>
-                                                </td>
-                                                <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
-                                            </tr>
-
-                                            <tr class="fw6">
-                                                <td>{{ __('shop::app.customer.account.order.view.total-due') }}
-                                                    <span class="dash-icon">-</span>
-                                                </td>
-
-                                                @if($order->status !== 'canceled')
-                                                    <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
-                                                @else
-                                                    <td>{{ core()->formatPrice(0.00, $order->order_currency_code) }}</td>
-                                                @endif
-                                            </tr>
-                                        <tbody>
+                                        <tr class="fw6">
+                                            <td>{{ __('shop::app.customer.account.order.view.grand-total') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
+                                        </tr>
                                     </table>
                                 </div>
                             </div>
                         </div>
-                    </tab>
 
-                    @if ($order->invoices->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
+                    @endforeach
 
-                            @foreach ($order->invoices as $invoice)
+                </tab>
+            @endif
 
-                                <div class="sale-section">
-                                    <div class="section-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }}</span>
+            @if ($order->shipments->count())
+                <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
 
-                                        <a href="{{ route('customer.orders.print', $invoice->id) }}" class="float-right">
-                                            {{ __('shop::app.customer.account.order.view.print') }}
-                                        </a>
-                                    </div>
+                    @foreach ($order->shipments as $shipment)
 
-                                    <div class="section-content">
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                                    </tr>
-                                                </thead>
+                        <div class="sale-section">
+                            <div class="section-content">
+                                <div class="row col-12">
+                                    <label class="mr20">
+                                    {{ __('shop::app.customer.account.order.view.tracking-number') }}
+                                    </label>
 
-                                                <tbody>
-
-                                                    @foreach ($invoice->items as $item)
-                                                        <tr>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
-                                                                {{ $item->getTypeInstance()->getOrderedItem($item)->sku }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
-                                                                {{ $item->name }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">
-                                                                {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">
-                                                                {{ $item->qty }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">
-                                                                {{ core()->formatPrice($item->total, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">
-                                                                {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
-                                                            </td>
-
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
-                                                                {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
-                                                            </td>
-                                                        </tr>
-                                                    @endforeach
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                        <div class="totals">
-                                            <table class="sale-summary">
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                @if ($invoice->base_discount_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}
-                                                            <span class="dash-icon">-</span>
-                                                        </td>
-                                                        <td>{{ core()->formatPrice($invoice->discount_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.tax') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr class="fw6">
-                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-
-                    @if ($order->shipments->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
-
-                            @foreach ($order->shipments as $shipment)
-
-                                <div class="sale-section">
-                                    <div class="section-content">
-                                        <div class="row col-12">
-                                            <label class="mr20">
-                                            {{ __('shop::app.customer.account.order.view.tracking-number') }}
-                                            </label>
-
-                                            <span class="value">
-                                                {{  $shipment->track_number }}
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="sale-section">
-                                    <div class="section-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($shipment->items as $item)
-
-                                                        <tr>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
-                                                            <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
-                                                        </tr>
-
-                                                    @endforeach
-
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-
-                    @if ($order->refunds->count())
-                        <tab name="{{ __('shop::app.customer.account.order.view.refunds') }}">
-
-                            @foreach ($order->refunds as $refund)
-
-                                <div class="sale-section">
-                                    <div class="section-title">
-                                        <span>{{ __('shop::app.customer.account.order.view.individual-refund', ['refund_id' => $refund->id]) }}</span>
-                                    </div>
-
-                                    <div class="section-content">
-                                        <div class="table">
-                                            <table>
-                                                <thead>
-                                                    <tr>
-                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
-                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
-                                                    </tr>
-                                                </thead>
-
-                                                <tbody>
-
-                                                    @foreach ($refund->items as $item)
-                                                        <tr>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
-                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
-                                                        </tr>
-                                                    @endforeach
-
-                                                    @if (! $refund->items->count())
-                                                        <tr>
-                                                            <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
-                                                        <tr>
-                                                    @endif
-                                                </tbody>
-                                            </table>
-                                        </div>
-
-                                        <div class="totals">
-                                            <table class="sale-summary">
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($refund->sub_total, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                @if ($refund->shipping_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}
-                                                            <span class="dash-icon">-</span>
-                                                        </td>
-                                                        <td>{{ core()->formatPrice($refund->shipping_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                @if ($refund->discount_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.discount') }}
-                                                            <span class="dash-icon">-</span>
-                                                        </td>
-                                                        <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                @if ($refund->tax_amount > 0)
-                                                    <tr>
-                                                        <td>{{ __('shop::app.customer.account.order.view.tax') }}
-                                                            <span class="dash-icon">-</span>
-                                                        </td>
-                                                        <td>{{ core()->formatPrice($refund->tax_amount, $order->order_currency_code) }}</td>
-                                                    </tr>
-                                                @endif
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-refund') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($refund->adjustment_refund, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr>
-                                                    <td>{{ __('shop::app.customer.account.order.view.adjustment-fee') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($refund->adjustment_fee, $order->order_currency_code) }}</td>
-                                                </tr>
-
-                                                <tr class="fw6">
-                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}
-                                                        <span class="dash-icon">-</span>
-                                                    </td>
-                                                    <td>{{ core()->formatPrice($refund->grand_total, $order->order_currency_code) }}</td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            @endforeach
-
-                        </tab>
-                    @endif
-                </tabs>
-
-                <div class="sale-section">
-                    <div class="section-content" style="border-bottom: 0">
-                        <div class="order-box-container">
-                            <div class="box">
-                                <div class="box-title">
-                                    {{ __('shop::app.customer.account.order.view.billing-address') }}
-                                </div>
-
-                                <div class="box-content">
-                                    @include ('admin::sales.address', ['address' => $order->billing_address])
-
-                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                                    <span class="value">
+                                        {{  $shipment->track_number }}
+                                    </span>
                                 </div>
                             </div>
+                        </div>
 
-                            @if ($order->shipping_address)
-                                <div class="box">
-                                    <div class="box-title">
-                                        {{ __('shop::app.customer.account.order.view.shipping-address') }}
-                                    </div>
+                        <div class="sale-section">
+                            <div class="section-title">
+                                <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
+                            </div>
 
-                                    <div class="box-content">
-                                        @include ('admin::sales.address', ['address' => $order->shipping_address])
+                            <div class="section-content">
 
-                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
-                                    </div>
+                                <div class="table">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                            </tr>
+                                        </thead>
+
+                                        <tbody>
+
+                                            @foreach ($shipment->items as $item)
+
+                                                <tr>
+                                                    <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
+                                                    <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                    <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                </tr>
+
+                                            @endforeach
+
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+
+                    @endforeach
+
+                </tab>
+            @endif
+
+            @if ($order->refunds->count())
+                <tab name="{{ __('shop::app.customer.account.order.view.refunds') }}">
+
+                    @foreach ($order->refunds as $refund)
+
+                        <div class="sale-section">
+                            <div class="section-title">
+                                <span>{{ __('shop::app.customer.account.order.view.individual-refund', ['refund_id' => $refund->id]) }}</span>
+                            </div>
+
+                            <div class="section-content">
+                                <div class="table">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                            </tr>
+                                        </thead>
+
+                                        <tbody>
+
+                                            @foreach ($refund->items as $item)
+                                                <tr>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            @endforeach
+
+                                            @if (! $refund->items->count())
+                                                <tr>
+                                                    <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
+                                                <tr>
+                                            @endif
+                                        </tbody>
+                                    </table>
                                 </div>
 
-                                <div class="box">
-                                    <div class="box-title">
-                                        {{ __('shop::app.customer.account.order.view.shipping-method') }}
-                                    </div>
+                                <div class="totals">
+                                    <table class="sale-summary">
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.subtotal') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($refund->sub_total, $order->order_currency_code) }}</td>
+                                        </tr>
 
-                                    <div class="box-content">
-                                        {{ $order->shipping_title }}
+                                        @if ($refund->shipping_amount > 0)
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}
+                                                    <span class="dash-icon">-</span>
+                                                </td>
+                                                <td>{{ core()->formatPrice($refund->shipping_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+                                        @endif
 
-                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
-                                    </div>
+                                        @if ($refund->discount_amount > 0)
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.discount') }}
+                                                    <span class="dash-icon">-</span>
+                                                </td>
+                                                <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+                                        @endif
+
+                                        @if ($refund->tax_amount > 0)
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.tax') }}
+                                                    <span class="dash-icon">-</span>
+                                                </td>
+                                                <td>{{ core()->formatPrice($refund->tax_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+                                        @endif
+
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.adjustment-refund') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($refund->adjustment_refund, $order->order_currency_code) }}</td>
+                                        </tr>
+
+                                        <tr>
+                                            <td>{{ __('shop::app.customer.account.order.view.adjustment-fee') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($refund->adjustment_fee, $order->order_currency_code) }}</td>
+                                        </tr>
+
+                                        <tr class="fw6">
+                                            <td>{{ __('shop::app.customer.account.order.view.grand-total') }}
+                                                <span class="dash-icon">-</span>
+                                            </td>
+                                            <td>{{ core()->formatPrice($refund->grand_total, $order->order_currency_code) }}</td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+
+                    @endforeach
+
+                </tab>
+            @endif
+        </tabs>
+
+        <div class="sale-section">
+            <div class="section-content" style="border-bottom: 0">
+                <div class="order-box-container">
+                    <div class="box">
+                        <div class="box-title">
+                            {{ __('shop::app.customer.account.order.view.billing-address') }}
+                        </div>
+
+                        <div class="box-content">
+                            @include ('admin::sales.address', ['address' => $order->billing_address])
+
+                            {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
+                        </div>
+                    </div>
+
+                    @if ($order->shipping_address)
+                        <div class="box">
+                            <div class="box-title">
+                                {{ __('shop::app.customer.account.order.view.shipping-address') }}
+                            </div>
+
+                            <div class="box-content">
+                                @include ('admin::sales.address', ['address' => $order->shipping_address])
+
+                                {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
+                            </div>
+                        </div>
+
+                        <div class="box">
+                            <div class="box-title">
+                                {{ __('shop::app.customer.account.order.view.shipping-method') }}
+                            </div>
+
+                            <div class="box-content">
+                                {{ $order->shipping_title }}
+
+                                {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
+                            </div>
+                        </div>
+                    @endif
+
+                    <div class="box">
+                        <div class="box-title">
+                            {{ __('shop::app.customer.account.order.view.payment-method') }}
+                        </div>
+
+                        <div class="box-content">
+                            {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+
+                            @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
+
+                            @if (! empty($additionalDetails))
+                                <div class="instructions">
+                                    <label>{{ $additionalDetails['title'] }}</label>
+                                    <p>{{ $additionalDetails['value'] }}</p>
                                 </div>
                             @endif
 
-                            <div class="box">
-                                <div class="box-title">
-                                    {{ __('shop::app.customer.account.order.view.payment-method') }}
-                                </div>
-
-                                <div class="box-content">
-                                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
-
-                                    @php $additionalDetails = \Webkul\Payment\Payment::getAdditionalDetails($order->payment->method); @endphp
-
-                                    @if (! empty($additionalDetails))
-                                        <div class="instructions">
-                                            <label>{{ $additionalDetails['title'] }}</label>
-                                            <p>{{ $additionalDetails['value'] }}</p>
-                                        </div>
-                                    @endif
-
-                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
-                                </div>
-                            </div>
+                            {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
                         </div>
                     </div>
                 </div>
             </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
         </div>
     </div>
+
+    {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
 @endsection
 
 @push('scripts')