diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index a4873017f..8f5e5d5ac 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -100,7 +100,6 @@ class CustomerController extends Controller public function store() { $this->validate(request(), [ - 'channel_id' => 'required', 'first_name' => 'string|required', 'last_name' => 'string|required', 'gender' => 'required', @@ -156,7 +155,6 @@ class CustomerController extends Controller public function update(Request $request, $id) { $this->validate(request(), [ - 'channel_id' => 'required', 'first_name' => 'string|required', 'last_name' => 'string|required', 'gender' => 'required', 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 f672d29bd..30f976987 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -78,17 +78,6 @@ @endforeach - -
- - - @{{ errors.first('channel_id') }} -
- 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 ebc3aabee..5d396d1d0 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -102,26 +102,6 @@ @endforeach - -
- - - @if (! is_null($customer->channel_id)) - channel_id ?> - @else - channel_id ?> - @endif - - - @{{ errors.first('channel_id') }} -
- diff --git a/packages/Webkul/Customer/src/Database/Migrations/2019_09_26_163950_remove_channel_id_from_customers_table.php b/packages/Webkul/Customer/src/Database/Migrations/2019_09_26_163950_remove_channel_id_from_customers_table.php new file mode 100644 index 000000000..f9a8205ad --- /dev/null +++ b/packages/Webkul/Customer/src/Database/Migrations/2019_09_26_163950_remove_channel_id_from_customers_table.php @@ -0,0 +1,34 @@ +dropForeign('customers_channel_id_foreign'); + $table->dropColumn('channel_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('customers', function (Blueprint $table) { + $table->integer('channel_id')->unsigned(); + $table->foreign('channel_id')->references('id')->on('channels')->onDelete('restrict'); + }); + } +} diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index d0a0e195b..75399852d 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -68,8 +68,6 @@ class RegistrationController extends Controller $data['password'] = bcrypt($data['password']); - $data['channel_id'] = core()->getCurrentChannel()->id; - if (core()->getConfigData('customer.settings.email.verification')) { $data['is_verified'] = 0; } else {