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

Added Increment ID On All View Portion

This commit is contained in:
devansh bawari 2021-06-22 16:59:38 +05:30
parent fca590e28c
commit 58aa486c22
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -157,7 +157,7 @@
<div class="invoice-summary">
<div class="row">
<span class="label">{{ __('admin::app.sales.invoices.invoice-id') }} -</span>
<span class="value">#{{ $invoice->id }}</span>
<span class="value">#{{ $invoice->increment_id ?? $invoice->id }}</span>
</div>
<div class="row">

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

@ -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 @@
<i class="icon angle-left-icon back-link" onclick="window.location = '{{ route('admin.sales.invoices.index') }}'"></i>
{{ __('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]) !!}
</h1>

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -490,7 +490,7 @@
<tbody>
@foreach ($order->invoices as $invoice)
<tr>
<td>#{{ $invoice->id }}</td>
<td>#{{ $invoice->increment_id ?? $invoice->id }}</td>
<td>{{ $invoice->created_at }}</td>
<td>#{{ $invoice->order->increment_id }}</td>
<td>{{ $invoice->address->name }}</td>

2
packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
View File

@ -160,7 +160,7 @@
<div class="row">
<span class="label">{{ __('shop::app.customer.account.order.view.invoice-id') }} -</span>
<span class="value">#{{ $invoice->id }}</span>
<span class="value">#{{ $invoice->increment_id ?? $invoice->id }}</span>
</div>
<div class="row">

4
packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
View File

@ -194,7 +194,7 @@
<tr class="bold">
<td>{{ __('shop::app.customer.account.order.view.total-due') }}</td>
<td>-</td>
@if($order->status !== 'canceled')
@ -217,7 +217,7 @@
<div class="sale-section">
<div class="secton-title">
<span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }}</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="pull-right">
{{ __('shop::app.customer.account.order.view.print') }}

14
packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
View File

@ -10,7 +10,7 @@
<div style="padding: 30px;">
<div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
<span style="font-weight: bold;">
{{ __('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]) }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@ -49,15 +49,15 @@
<div>
{{ $order->shipping_address->address1 }}
</div>
<div>
{{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
</div>
<div>
{{ $order->shipping_address->state }}
</div>
<div>
{{ core()->country_name($order->shipping_address->country) }}
</div>
@ -94,15 +94,15 @@
<div>
{{ $order->billing_address->address1 }}
</div>
<div>
{{ $order->billing_address->postcode . " " . $order->billing_address->city }}
</div>
<div>
{{ $order->billing_address->state }}
</div>
<div>
{{ core()->country_name($order->billing_address->country) }}
</div>

2
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
View File

@ -229,7 +229,7 @@
<div class="sale-section">
<div class="section-title">
<span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }}</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') }}