diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 1ac4f3c3e..d927d59e6 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -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', diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index 6846f4c8e..8e97e58ac 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -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',