diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index c2254f226..d0c877f5d 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -84,7 +84,7 @@ class CustomerGroupDataGrid 'sortable' => true, ], [ - 'name' => 'cg.group_name', + 'name' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name', @@ -107,7 +107,7 @@ class CustomerGroupDataGrid //don't use aliasing in case of filters 'filterable' => [ [ - 'column' => 'cg.group_name', + 'column' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name' diff --git a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php index d865fcf1e..a0015124a 100644 --- a/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php +++ b/packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php @@ -6,6 +6,8 @@ use Illuminate\Database\Seeder; use Webkul\Attribute\Database\Seeders\DatabaseSeeder as AttributeSeeder; use Webkul\Core\Database\Seeders\DatabaseSeeder as CoreSeeder; use Webkul\User\Database\Seeders\DatabaseSeeder as UserSeeder; +use Webkul\Customer\Database\Seeders\DatabaseSeeder as CustomerSeeder; +use Webkul\Inventory\Database\Seeders\DatabaseSeeder as InventorySeeder; class DatabaseSeeder extends Seeder { @@ -16,8 +18,10 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call(AttributeSeeder::class); $this->call(CoreSeeder::class); + $this->call(InventorySeeder::class); + $this->call(AttributeSeeder::class); $this->call(UserSeeder::class); + $this->call(CustomerSeeder::class); } } 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 @@ {{ __('admin::app.customers.customers.customer_group') }} @foreach ($customerGroup as $group) - {{ $group->group_name}} > + {{ $group->name}} > @endforeach 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 @@ @foreach($customerGroup as $group) id ? 'selected' : '' }}> - {{ $group->group_name}} + {{ $group->name}} @endforeach 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..13765f46a 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,12 +27,12 @@