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

order number

This commit is contained in:
rahul shukla 2019-09-11 17:34:11 +05:30
parent ac48a20822
commit aab8bd1479
17 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
View File

@ -43,21 +43,14 @@ class OrderDataGrid extends DataGrid
public function addColumns()
{
$this->addColumn([
'index' => 'id',
'index' => 'increment_id',
'label' => trans('admin::app.datagrid.id'),
'type' => 'number',
'searchable' => false,
'sortable' => true,
'filterable' => true
]);
$this->addColumn([
'index' => 'increment_id',
'label' => trans('admin::app.datagrid.order_number'),
'type' => 'string',
'searchable' => true,
'sortable' => true,
'filterable' => true
]);
$this->addColumn([
'index' => 'base_sub_total',
'label' => trans('admin::app.datagrid.sub-total'),

2
packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
View File

@ -46,7 +46,7 @@ class NewInventorySourceNotification extends Mailable
$inventory = $this->shipment->inventory_source;
return $this->to($inventory->contact_email, $inventory->name)
->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id]))
->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
->view('shop::emails.sales.new-inventorysource-shipment');
}
}

2
packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
View File

@ -46,7 +46,7 @@ class NewInvoiceNotification extends Mailable
return $this->to($order->customer_email, $order->customer_full_name)
->from(env('SHOP_MAIL_FROM'))
->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->id]))
->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id]))
->view('shop::emails.sales.new-invoice');
}
}

2
packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
View File

@ -46,7 +46,7 @@ class NewShipmentNotification extends Mailable
return $this->to($order->customer_email, $order->customer_full_name)
->from(env('SHOP_MAIL_FROM'))
->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id]))
->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
->view('shop::emails.sales.new-shipment');
}
}

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

@ -43,7 +43,7 @@
</span>
<span class="value">
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
<a href="{{ route('admin.sales.orders.view', $order->increment_id) }}">#{{ $order->increment_id }}</a>
</span>
</div>

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

@ -43,7 +43,7 @@
</span>
<span class="value">
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
</span>
</div>

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

@ -1,7 +1,7 @@
@extends('admin::layouts.master')
@section('page_title')
{{ __('admin::app.sales.orders.view-title', ['order_id' => $order->id]) }}
{{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }}
@stop
@section('content-wrapper')
@ -375,7 +375,7 @@
<tr>
<td>#{{ $invoice->id }}</td>
<td>{{ $invoice->created_at }}</td>
<td>#{{ $invoice->order->id }}</td>
<td>#{{ $invoice->order->increment_id }}</td>
<td>{{ $invoice->address->name }}</td>
<td>{{ $invoice->status_label }}</td>
<td>{{ core()->formatBasePrice($invoice->base_grand_total) }}</td>
@ -419,7 +419,7 @@
<tr>
<td>#{{ $shipment->id }}</td>
<td>{{ $shipment->created_at }}</td>
<td>#{{ $shipment->order->id }}</td>
<td>#{{ $shipment->order->increment_id }}</td>
<td>{{ $shipment->order->created_at }}</td>
<td>{{ $shipment->address->name }}</td>
<td>{{ $shipment->total_qty }}</td>

2
packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
View File

@ -43,7 +43,7 @@
</span>
<span class="value">
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
</span>
</div>

54
packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
View File

@ -34,21 +34,21 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.shipments.order-id') }}
</span>
<span class="value">
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
<a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.order-date') }}
</span>
<span class="value">
<span class="value">
{{ $order->created_at }}
</span>
</div>
@ -57,7 +57,7 @@
<span class="title">
{{ __('admin::app.sales.orders.order-status') }}
</span>
<span class="value">
{{ $order->status_label }}
</span>
@ -67,7 +67,7 @@
<span class="title">
{{ __('admin::app.sales.orders.channel') }}
</span>
<span class="value">
{{ $order->channel_name }}
</span>
@ -82,21 +82,21 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.customer-name') }}
</span>
<span class="value">
<span class="value">
{{ $shipment->address->name }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.email') }}
</span>
<span class="value">
<span class="value">
{{ $shipment->address->email }}
</span>
</div>
@ -117,7 +117,7 @@
<div class="section-content">
@include ('admin::sales.address', ['address' => $order->billing_address])
</div>
</div>
@ -128,13 +128,13 @@
</div>
<div class="section-content">
@include ('admin::sales.address', ['address' => $order->shipping_address])
</div>
</div>
@endif
</div>
</accordian>
@ -148,21 +148,21 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.payment-method') }}
</span>
<span class="value">
<span class="value">
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.currency') }}
</span>
<span class="value">
<span class="value">
{{ $order->order_currency_code }}
</span>
</div>
@ -176,53 +176,53 @@
<div class="section-content">
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.shipping-method') }}
</span>
<span class="value">
<span class="value">
{{ $order->shipping_title }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.orders.shipping-price') }}
</span>
<span class="value">
<span class="value">
{{ core()->formatBasePrice($order->base_shipping_amount) }}
</span>
</div>
@if ($shipment->inventory_source)
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.shipments.inventory-source') }}
</span>
<span class="value">
<span class="value">
{{ $shipment->inventory_source->name }}
</span>
</div>
@endif
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.shipments.carrier-title') }}
</span>
<span class="value">
<span class="value">
{{ $shipment->carrier_title }}
</span>
</div>
<div class="row">
<span class="title">
<span class="title">
{{ __('admin::app.sales.shipments.tracking-number') }}
</span>
<span class="value">
<span class="value">
{{ $shipment->track_number }}
</span>
</div>

3
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -238,7 +238,8 @@ return [
'order_id' => 'Order ID',
'date' => 'Date',
'status' => 'Status',
'total' => 'Total'
'total' => 'Total',
'order_number' => 'Order Number'
],
'view' => [

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

@ -1,7 +1,7 @@
@extends('shop::layouts.master')
@section('page_title')
{{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }}
{{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
@endsection
@section('content-wrapper')
@ -14,7 +14,7 @@
<div class="account-head">
<span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
<span class="account-heading">
{{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }}
{{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
</span>
<span></span>
</div>

2
packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
View File

@ -17,7 +17,7 @@
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.order.greeting-admin', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
'created_at' => $order->created_at
])
!!}

4
packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
View File

@ -11,7 +11,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.shipment.inventory-heading', ['order_id' => $order->id, 'shipment_id' => $shipment->id]) }}
{{ __('shop::app.mail.shipment.inventory-heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@ -20,7 +20,7 @@
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.shipment.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
'created_at' => $order->created_at
])
!!}

4
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->id, 'invoice_id' => $invoice->id]) }}
{{ __('shop::app.mail.invoice.heading', ['order_id' => $order->increment_id, 'invoice_id' => $invoice->id]) }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@ -19,7 +19,7 @@
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.order.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
'created_at' => $order->created_at
])
!!}

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

@ -17,7 +17,7 @@
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.order.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
'created_at' => $order->created_at
])
!!}

4
packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.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.shipment.heading', ['order_id' => $order->id, 'shipment_id' => $shipment->id]) }}
{{ __('shop::app.mail.shipment.heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
</span> <br>
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@ -19,7 +19,7 @@
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.order.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
'created_at' => $order->created_at
])
!!}

2
packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
View File

@ -17,7 +17,7 @@
<p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
{!! __('shop::app.mail.order.cancel.greeting', [
'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
'order_id' => '<a href="' . route('customer.orders.view', $) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
'created_at' => $order->created_at
])
!!}