diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php index f7b78f3e2..c98454d0c 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php @@ -116,9 +116,13 @@

{{ $invoice->order->billing_address->address1 }}

{{ $invoice->order->billing_address->city }}

{{ $invoice->order->billing_address->state }}

-

{{ core()->country_name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}

+

+ {{ core()->country_name($invoice->order->billing_address->country) }} + {{ $invoice->order->billing_address->postcode }} +

{{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }} +

{{ $invoice->order->shipping_address->name }}

{{ $invoice->order->shipping_address->address1 }}

@@ -173,6 +177,7 @@ @foreach ($invoice->items as $item) {{ $item->child ? $item->child->sku : $item->sku }} + {{ $item->name }} @@ -186,10 +191,15 @@ @endif + {{ core()->formatPrice($item->price, $invoice->order->order_currency_code) }} + {{ $item->qty }} + {{ core()->formatPrice($item->total, $invoice->order->order_currency_code) }} + {{ core()->formatPrice($item->tax_amount, $invoice->order->order_currency_code) }} + {{ core()->formatPrice(($item->total + $item->tax_amount), $invoice->order->order_currency_code) }} @endforeach diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php index 5cf178ab6..217232c6f 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php @@ -68,6 +68,7 @@ {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} + {{ $item->name }} @@ -81,7 +82,11 @@ @endif - {{ core()->formatPrice($item->price, $order->order_currency_code) }} + + + {{ core()->formatPrice($item->price, $order->order_currency_code) }} + + {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }} @@ -99,10 +104,22 @@ {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} - {{ core()->formatPrice($item->total, $order->order_currency_code) }} - {{ number_format($item->tax_percent, 2) }}% - {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} - {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} + + + {{ core()->formatPrice($item->total, $order->order_currency_code) }} + + + + {{ number_format($item->tax_percent, 2) }}% + + + + {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} + + + + {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} + @endforeach @@ -204,13 +221,33 @@ @foreach ($invoice->items as $item) - {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} - {{ $item->name }} - {{ core()->formatPrice($item->price, $order->order_currency_code) }} - {{ $item->qty }} - {{ core()->formatPrice($item->total, $order->order_currency_code) }} - {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} - {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} + + {{ $item->getTypeInstance()->getOrderedItem($item)->sku }} + + + + {{ $item->name }} + + + + {{ core()->formatPrice($item->price, $order->order_currency_code) }} + + + + {{ $item->qty }} + + + + {{ core()->formatPrice($item->total, $order->order_currency_code) }} + + + + {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} + + + + {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} + @endforeach