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

Merge pull request #231 from bagisto/prashant 

Order, order shipments full name fixes in datagrid
This commit is contained in:
JItendra Singh 2018-11-28 17:16:55 +05:30 committed by GitHub
parent 39c844e17c daf2bde541
commit e56c47697e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ class OrderDataGrid
'label' => 'ID',
'sortable' => true,
], [
'name' => 'or.customer_first_name',
'name' => 'CONCAT(or.customer_first_name, " ", or.customer_last_name)',
'alias' => 'oafirstname',
'type' => 'string',
'label' => 'Billed To',

5
packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
View File

@ -79,14 +79,11 @@ class OrderShipmentsDataGrid
'label' => 'Total Quantity',
'sortable' => true
], [
'name' => 'ors.customer_first_name',
'name' => 'CONCAT(ors.customer_first_name, " ", ors.customer_last_name)',
'alias' => 'order_customer_first_name',
'type' => 'string',
'label' => 'Customer Name',
'sortable' => false,
// 'wrapper' => function($value) {
// return $value.$last_name;
// }
], [
'name' => 'ors.created_at',
'alias' => 'orscreated',