Skip to content

Commit 33d322b

Browse files
ENGCOM-8675: Changed Newsletter Enabled/Disable config settings by priority, store scope then default scope #31208
2 parents e5d0279 + a687390 commit 33d322b

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

app/code/Magento/Customer/Block/Form/Register.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Customer\Model\AccountManagement;
1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Newsletter\Model\Config;
12+
use Magento\Store\Model\ScopeInterface;
1213

1314
/**
1415
* Customer register form block
@@ -184,7 +185,7 @@ public function getRegion()
184185
public function isNewsletterEnabled()
185186
{
186187
return $this->_moduleManager->isOutputEnabled('Magento_Newsletter')
187-
&& $this->newsLetterConfig->isActive();
188+
&& $this->newsLetterConfig->isActive(ScopeInterface::SCOPE_STORE);
188189
}
189190

190191
/**
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontNewsletterSubscriptionDisabledForStoreViewAtRegistrationTest">
12+
<annotations>
13+
<features value="Newsletter"/>
14+
<stories value="Disabled Newsletter Subscription for store View"/>
15+
<title value="Disabled Newsletter Subscription for store View"/>
16+
<description value="Option to subscribe should not be displayed at registration form if it is switched off for current store"/>
17+
<severity value="AVERAGE"/>
18+
<group value="newsletter"/>
19+
<group value="configuration"/>
20+
<testCaseId value="MC-*"/>
21+
</annotations>
22+
<before>
23+
<magentoCLI command="config:set --scope=stores --scope-code=default newsletter/general/active 0" stepKey="disableSubscriptionForStore"/>
24+
</before>
25+
<after>
26+
<magentoCLI command="config:set --scope=stores --scope-code=default newsletter/general/active 1" stepKey="enableSubscriptionForStore"/>
27+
</after>
28+
<actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
29+
<waitForPageLoad stepKey="waitForPageLoad"/>
30+
<dontSeeElement selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="checkNoSubscriptionOption"/>
31+
</test>
32+
</tests>

0 commit comments

Comments
 (0)