diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php index 8e481faa9..efed8f233 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php @@ -74,7 +74,7 @@ color: #000; font-weight: 600; } - + @@ -115,7 +115,7 @@

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

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

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

- {{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->billing_address->phone }} + {{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->billing_address->phone }}

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

@@ -123,7 +123,7 @@

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

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

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

- {{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }} + {{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }} @@ -151,7 +151,7 @@ - +
@@ -210,6 +210,12 @@ + + + + + + @@ -222,4 +228,3 @@ - \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php index d596e5342..eb813b782 100755 --- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php +++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php @@ -64,7 +64,7 @@ class InvoiceRepository extends Repository parent::__construct($app); } - + /** * Specify Model class name * @@ -83,7 +83,7 @@ class InvoiceRepository extends Repository public function create(array $data) { DB::beginTransaction(); - + try { Event::fire('sales.invoice.save.before', $data); @@ -99,6 +99,8 @@ class InvoiceRepository extends Repository 'channel_currency_code' => $order->channel_currency_code, 'order_currency_code' => $order->order_currency_code, 'order_address_id' => $order->billing_address->id, + "discount_amount" => $order->discount_amount, + "base_discount_amount" => $order->base_discount_amount, ]); foreach ($data['invoice']['items'] as $itemId => $qty) { @@ -127,7 +129,7 @@ class InvoiceRepository extends Repository 'product_type' => $orderItem->product_type, 'additional' => $orderItem->additional, ]); - + if ($orderItem->type == 'configurable' && $orderItem->child) { $childOrderItem = $orderItem->child; @@ -167,7 +169,7 @@ class InvoiceRepository extends Repository throw $e; } - + DB::commit(); return $invoice; 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 3280ae310..a3871d349 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 @@ -206,6 +206,14 @@ + @if ($invoice->base_discount_amount > 0) + + + + + + @endif + 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 77e0c318e..8fd17453b 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 @@ -224,6 +224,14 @@ + @if ($order->base_discount_amount > 0) + + + + + + @endif +
{{ core()->formatBasePrice($invoice->base_tax_amount) }}
{{ __('admin::app.sales.orders.discount') }}-{{ core()->formatBasePrice($invoice->base_discount_amount) }}
{{ __('admin::app.sales.orders.grand-total') }} - {{ core()->formatPrice($invoice->shipping_amount, $invoice->order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.discount') }}-{{ core()->formatPrice($invoice->discount_amount, $invoice->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.tax') }} -{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.discount') }}-{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.tax') }} -