diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 06d9235ae..6b2a711d3 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -67,11 +67,11 @@ class CustomerDataGrid 'sortable' => true, ], [ - 'name' => 'first_name', - 'alias' => 'FirstName', + 'name' => 'CONCAT(first_name, " ", last_name)', + 'alias' => 'Name', 'type' => 'string', - 'label' => 'First Name', - 'sortable' => false, + 'label' => 'Name', + 'sortable' => true, ], [ 'name' => 'email', diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 0196a6bd3..722e2900e 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -456,16 +456,14 @@ class DataGrid { $select = []; foreach ($this->columns as $column) { - $select[] = $column->name.' as '.$column->alias; + $this->query->addselect(DB::raw($column->name.' as '.$column->alias)); } - $this->query->select(...$select); + // $this->query->select(...$select); if ($this->select) { $this->query->addselect($this->select); } - - // dd($this->query); } /**