From 58aa486c22dcf03525425d8e0022e6247d7f0ccb Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 22 Jun 2021 16:59:38 +0530 Subject: [PATCH] Added Increment ID On All View Portion --- .../Resources/views/sales/invoices/pdf.blade.php | 2 +- .../Resources/views/sales/invoices/view.blade.php | 4 ++-- .../Resources/views/sales/orders/view.blade.php | 2 +- .../views/customers/account/orders/pdf.blade.php | 2 +- .../views/customers/account/orders/view.blade.php | 4 ++-- .../views/emails/sales/new-invoice.blade.php | 14 +++++++------- .../shop/customers/account/orders/view.blade.php | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) 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 b550b5bd3..75a1b8c01 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 @@ -157,7 +157,7 @@
{{ __('admin::app.sales.invoices.invoice-id') }} - - #{{ $invoice->id }} + #{{ $invoice->increment_id ?? $invoice->id }}
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 0d27ad1ae..277896667 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 @@ -1,7 +1,7 @@ @extends('admin::layouts.master') @section('page_title') - {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }} + {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }} @stop @section('content-wrapper') @@ -16,7 +16,7 @@ - {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }} + {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }} {!! view_render_event('sales.invoice.title.after', ['order' => $order]) !!} 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 a200fbbc6..d99288280 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 @@ -490,7 +490,7 @@ @foreach ($order->invoices as $invoice) - #{{ $invoice->id }} + #{{ $invoice->increment_id ?? $invoice->id }} {{ $invoice->created_at }} #{{ $invoice->order->increment_id }} {{ $invoice->address->name }} 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 0bfe5f09e..45d3a557e 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 @@ -160,7 +160,7 @@
{{ __('shop::app.customer.account.order.view.invoice-id') }} - - #{{ $invoice->id }} + #{{ $invoice->increment_id ?? $invoice->id }}
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 78d34d5d1..c848f65bc 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 @@ -194,7 +194,7 @@ {{ __('shop::app.customer.account.order.view.total-due') }} - + - @if($order->status !== 'canceled') @@ -217,7 +217,7 @@
- {{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }} + {{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }} {{ __('shop::app.customer.account.order.view.print') }} diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php index 8146c23af..f19247178 100755 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php @@ -10,7 +10,7 @@
- {{ __('shop::app.mail.invoice.heading', ['order_id' => $order->increment_id, 'invoice_id' => $invoice->id]) }} + {{ __('shop::app.mail.invoice.heading', ['order_id' => $order->increment_id, 'invoice_id' => $invoice->increment_id ?? $invoice->id]) }}

@@ -49,15 +49,15 @@

{{ $order->shipping_address->address1 }}
- +
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
- +
{{ $order->shipping_address->state }}
- +
{{ core()->country_name($order->shipping_address->country) }}
@@ -94,15 +94,15 @@
{{ $order->billing_address->address1 }}
- +
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
- +
{{ $order->billing_address->state }}
- +
{{ core()->country_name($order->billing_address->country) }}
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 fd64e3675..b90a46b23 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 @@ -229,7 +229,7 @@
- {{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }} + {{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->increment_id ?? $invoice->id]) }} {{ __('shop::app.customer.account.order.view.print') }}