From f6ce3643c05de361cb3e12d8fbed9c656044caa2 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Thu, 26 Sep 2019 16:45:44 +0530
Subject: [PATCH] Fixed issue #1524

---
 .../Customer/CustomerController.php           |  2 --
 .../views/customers/create.blade.php          | 11 ------
 .../Resources/views/customers/edit.blade.php  | 20 -----------
 ...remove_channel_id_from_customers_table.php | 34 +++++++++++++++++++
 4 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 packages/Webkul/Customer/src/Database/Migrations/2019_09_26_163950_remove_channel_id_from_customers_table.php

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
                         </select>
                     </div>
-
-                    <div class="control-group" :class="[errors.has('channel_id') ? 'has-error' : '']">
-                        <label for="channel" >{{ __('admin::app.customers.customers.channel_name') }}</label>
-                        <select  class="control" name="channel_id" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.channel_name') }}&quot;">
-                        @foreach ($channelName as $channel)
-                            <option value="{{ $channel->id }}"> {{ $channel->name}} </>
-                        @endforeach
-                        </select>
-                        <span class="control-error" v-if="errors.has('channel_id')">@{{ errors.first('channel_id') }}</span>
-                    </div>
-
                 </div>
             </div>
         </form>
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
                                 </select>
                             </div>
-
-                            <div class="control-group" :class="[errors.has('channel_id') ? 'has-error' : '']">
-                                <label for="channel" >{{ __('admin::app.customers.customers.channel_name') }}</label>
-
-                                @if (! is_null($customer->channel_id))
-                                    <?php $selectedChannelOption = $customer->channel_id ?>
-                                @else
-                                    <?php $selectedChannelOption = $customer->channel_id ?>
-                                @endif
-
-                                <select  class="control" name="channel_id" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.channel_name') }}&quot;">
-                                    @foreach ($channelName as $channel)
-                                    <option value="{{ $channel->id }}" {{ $selectedChannelOption == $channel->id ? 'selected' : '' }}>
-                                        {{ $channel->name}}
-                                    </option>
-                                    @endforeach
-                                </select>
-                                <span class="control-error" v-if="errors.has('channel_id')">@{{ errors.first('channel_id') }}</span>
-                            </div>
-
                         </div>
                     </accordian>
 
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 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveChannelIdFromCustomersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('customers', function (Blueprint $table) {
+            $table->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');
+        });
+    }
+}