diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index c2254f226..d62eacc05 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -84,30 +84,17 @@ class CustomerGroupDataGrid 'sortable' => true, ], [ - 'name' => 'cg.group_name', + 'name' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name', 'sortable' => true, ], - [ - 'name' => 'cg.is_user_defined', - 'alias' => 'User Defined', - 'type' => 'boolean', - 'label' => 'User Defined', - 'sortable' => true, - 'wrapper' => function ($value) { - if($value == 1) - return "False"; - else - return "True"; - }, - ], ], //don't use aliasing in case of filters 'filterable' => [ [ - 'column' => 'cg.group_name', + 'column' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name' @@ -118,12 +105,6 @@ class CustomerGroupDataGrid 'type' => 'number', 'label' => 'ID' ], - [ - 'column' => 'cg.is_user_defined', - 'alias' => 'User Defined', - 'type' => 'boolean', - 'label' => 'User Defined' - ] ], //don't use aliasing in case of searchables 'searchable' => [ @@ -158,6 +139,5 @@ class CustomerGroupDataGrid public function render() { return $this->createCustomerGroupDataGrid()->render(); - } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 3d3759235..68c9ac975 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -70,7 +70,7 @@ class CustomerGroupController extends Controller public function store() { $this->validate(request(), [ - 'group_name' => 'string|required', + 'name' => 'string|required', ]); $this->customerGroup->create(request()->all()); @@ -103,7 +103,7 @@ class CustomerGroupController extends Controller public function update(Request $request, $id) { $this->validate(request(), [ - 'group_name' => 'string|required', + 'name' => 'string|required', ]); $this->customerGroup->update(request()->all(),$id); diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php index d4bcddbf1..a7089e869 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -71,7 +71,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php index e9aa664b2..0e4c97079 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -82,7 +82,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php index 79fca7fa3..c200c2c83 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php @@ -27,23 +27,12 @@