From 0f6bcfde49ebcfbfe60a97f945fda528260e5850 Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 25 Oct 2018 11:01:47 +0530 Subject: [PATCH] Seeders added --- .../src/DataGrids/CustomerGroupDataGrid.php | 4 +-- .../src/Database/Seeders/DatabaseSeeder.php | 6 +++- .../Customer/CustomerGroupController.php | 4 +-- .../views/customers/create.blade.php | 2 +- .../Resources/views/customers/edit.blade.php | 2 +- .../views/customers/group/create.blade.php | 8 ++--- .../views/customers/group/edit.blade.php | 8 ++--- ...018_07_20_064849_create_channels_table.php | 1 + .../Database/Seeders/ChannelTableSeeder.php | 32 +++++++++++++++++++ .../Database/Seeders/CurrencyTableSeeder..php | 4 +-- .../src/Database/Seeders/DatabaseSeeder.php | 3 +- .../Database/Seeders/LocalesTableSeeder.php | 2 ++ .../Seeders/CustomerGroupTableSeeder.php | 24 ++++++++++++++ .../src/Database/Seeders/DatabaseSeeder.php | 18 +++++++++++ ...24_082635_create_customer_groups_table.php | 4 +-- .../Customer/src/Models/CustomerGroup.php | 2 +- ..._110040_create_inventory_sources_table.php | 4 +-- .../src/Database/Seeders/DatabaseSeeder.php | 18 +++++++++++ .../Database/Seeders/InventoryTableSeeder.php | 21 ++++++++++++ .../Database/Seeders/AdminsTableSeeder.php | 26 +++++---------- public/themes/default/assets/js/shop.js | 2 +- .../themes/default/assets/mix-manifest.json | 2 +- 22 files changed, 154 insertions(+), 43 deletions(-) create mode 100644 packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php create mode 100644 packages/Webkul/Customer/src/Database/Seeders/CustomerGroupTableSeeder.php create mode 100644 packages/Webkul/Customer/src/Database/Seeders/DatabaseSeeder.php create mode 100644 packages/Webkul/Inventory/src/Database/Seeders/DatabaseSeeder.php create mode 100644 packages/Webkul/Inventory/src/Database/Seeders/InventoryTableSeeder.php 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 @@ 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..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 @@
@csrf() -
-