From ba4dc11687e172d293454e5e50de91823b239539 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Mon, 30 Sep 2019 10:56:38 +0530
Subject: [PATCH 1/2] Fixed issue #1532

---
 packages/Webkul/Customer/src/Models/Customer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php
index c44dc3fd6..6e653ca53 100755
--- a/packages/Webkul/Customer/src/Models/Customer.php
+++ b/packages/Webkul/Customer/src/Models/Customer.php
@@ -17,7 +17,7 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject
 
     protected $table = 'customers';
 
-    protected $fillable = ['first_name', 'channel_id', 'last_name', 'gender', 'date_of_birth', 'email', 'phone', 'password', 'customer_group_id', 'subscribed_to_news_letter', 'is_verified', 'token', 'notes', 'status'];
+    protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth', 'email', 'phone', 'password', 'customer_group_id', 'subscribed_to_news_letter', 'is_verified', 'token', 'notes', 'status'];
 
     protected $hidden = ['password', 'remember_token'];
 

From 109c99f3dab11e6d8300c9183f6c2b9cb2f0487a Mon Sep 17 00:00:00 2001
From: Webkul <prashant.singh852@webkul.com>
Date: Mon, 30 Sep 2019 15:57:35 +0530
Subject: [PATCH 2/2] Made footer text content optional from configuration
 apart from custom content also

---
 packages/Webkul/Admin/src/Config/system.php   | 17 ++++++++++++++-
 .../Admin/src/Resources/lang/en/app.php       |  1 +
 .../views/layouts/anonymous-master.blade.php  | 21 ++++++++++---------
 .../Resources/views/layouts/master.blade.php  | 21 ++++++++++---------
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index 5ab93dee3..881dc98f7 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -108,7 +108,7 @@ return [
                 'channel_based' => true,
             ]
         ]
-    ],[
+    ], [
         'key' => 'general.content',
         'name' => 'admin::app.admin.system.content',
         'sort' => 2,
@@ -123,6 +123,21 @@ return [
                 'type' => 'text',
                 'channel_based' => true,
                 'locale_based' => true
+            ], [
+                'name' => 'footer_toggle',
+                'title' => 'admin::app.admin.system.footer-toggle',
+                'type' => 'select',
+                'options' => [
+                    [
+                        'title' => 'True',
+                        'value' => 1
+                    ], [
+                        'title' => 'False',
+                        'value' => 0
+                    ]
+                ],
+                'locale_based' => true,
+                'channel_based' => true,
             ]
         ]
     ], [
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 3d47aed68..1d2af2325 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1155,6 +1155,7 @@ return [
             'footer' => 'Footer',
             'content' => 'Content',
             'footer-content' => 'Footer Text',
+            'footer-toggle' => 'Toggle footer',
             'locale-options' => 'Unit Options',
             'weight-unit' => 'Weight Unit',
             'design' => 'Design',
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
index 5597b4c40..6a94dab7d 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
@@ -90,16 +90,17 @@
 
                     {!! view_render_event('bagisto.admin.layout.content.after') !!}
 
-                    <div class="footer">
-                        <p>
-                            @if (core()->getConfigData('general.content.footer.footer_content'))
-                                {{ core()->getConfigData('general.content.footer.footer_content') }}
-                            @else
-                                {{ trans('admin::app.footer.copy-right') }}
-                            @endif
-                        </p>
-                    </div>
-
+                    @if (core()->getConfigData('general.content.footer.footer_toggle'))
+                        <div class="footer">
+                            <p style="text-align: center;">
+                                @if (core()->getConfigData('general.content.footer.footer_content'))
+                                    {{ core()->getConfigData('general.content.footer.footer_content') }}
+                                @else
+                                    {{ trans('admin::app.footer.copy-right') }}
+                                @endif
+                            </p>
+                        </div>
+                    @endif
                 </div>
 
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index e46f5369f..6880d5204 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -70,16 +70,17 @@
 
         {!! view_render_event('bagisto.shop.layout.footer.after') !!}
 
-        <div class="footer-bottom">
-            <p>
-                @if (core()->getConfigData('general.content.footer.footer_content'))
-                    {{ core()->getConfigData('general.content.footer.footer_content') }}
-                @else
-                    {{ trans('admin::app.footer.copy-right') }}
-                @endif
-            </p>
-        </div>
-
+        @if (core()->getConfigData('general.content.footer.footer_toggle'))
+            <div class="footer">
+                <p style="text-align: center;">
+                    @if (core()->getConfigData('general.content.footer.footer_content'))
+                        {{ core()->getConfigData('general.content.footer.footer_content') }}
+                    @else
+                        {{ trans('admin::app.footer.copy-right') }}
+                    @endif
+                </p>
+            </div>
+        @endif
     </div>
 
     <script type="text/javascript">