From bc114f4eb1a7d5678f1c8ea21841262a68e9f160 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 8 Feb 2021 18:11:35 +0530
Subject: [PATCH 1/2] Config Check Added

---
 .../views/shop/customers/signup/index.blade.php        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php
index 82039e381..bc5dfbd1b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php
@@ -138,10 +138,12 @@
                             </span>
                         </div>
 
-                        <div class="control-group">
-                            <input type="checkbox" id="checkbox2" name="is_subscribed">
-                            <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-                        </div>
+                        @if (core()->getConfigData('customer.settings.newsletter.subscription'))
+                            <div class="control-group">
+                                <input type="checkbox" id="checkbox2" name="is_subscribed">
+                                <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+                            </div>
+                        @endif
 
                         {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
 

From 13ba8c934fdedeffea80e9989856a83414eef48e Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 8 Feb 2021 19:14:51 +0530
Subject: [PATCH 2/2] More Checks Added

---
 .../views/customers/account/profile/edit.blade.php     | 10 ++++++----
 .../Resources/views/customers/signup/index.blade.php   | 10 ++++++----
 .../shop/customers/account/profile/edit.blade.php      | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
index 2172eb72f..44e076f7a 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
@@ -108,10 +108,12 @@
                         <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
                     </div>
 
-                    <div class="control-group">
-                        <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif>
-                        <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-                    </div>
+                    @if (core()->getConfigData('customer.settings.newsletter.subscription'))
+                        <div class="control-group">
+                            <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif>
+                            <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+                        </div>
+                    @endif
 
                     {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
index 9f1598a08..72f74bd86 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
@@ -76,10 +76,12 @@
                 Checkbox Value 1
             </span> --}}
 
-            <div class="control-group">
-                <input type="checkbox" id="checkbox2" name="is_subscribed">
-                <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-            </div>
+            @if (core()->getConfigData('customer.settings.newsletter.subscription'))
+                <div class="control-group">
+                    <input type="checkbox" id="checkbox2" name="is_subscribed">
+                    <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+                </div>
+            @endif
 
             {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!}
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
index 1c7d17017..14c70dd45 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
@@ -191,10 +191,12 @@
                 </div>
             </div>
 
-            <div class="control-group">
-                <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter"@if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif  style="width: auto;">
-                <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
-            </div>
+            @if (core()->getConfigData('customer.settings.newsletter.subscription'))
+                <div class="control-group">
+                    <input type="checkbox" id="checkbox2" name="subscribed_to_news_letter" @if (isset($customer->subscription)) value="{{ $customer->subscription->is_subscribed }}" {{ $customer->subscription->is_subscribed ? 'checked' : ''}} @endif  style="width: auto;">
+                    <span>{{ __('shop::app.customer.signup-form.subscribe-to-newsletter') }}</span>
+                </div>
+            @endif
 
             {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}