Skip to content

Changed Newsletter Enabled/Disable config settings by priority, store scope then default scope #31208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 24, 2021
Merged

Changed Newsletter Enabled/Disable config settings by priority, store scope then default scope #31208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
18aab3c
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
Dec 8, 2020
1de30e3
Changed config to store before default
Dec 8, 2020
cb4988a
Merge branch '2.4-develop' into fixed-issue-31188
Dec 16, 2020
7889a6f
Fix has been updated
engcom-Hotel Dec 23, 2020
21c0bff
Test has been added
engcom-Hotel Dec 23, 2020
3e1d239
Merge branch '2.4-develop' into fixed-issue-31188
engcom-Hotel Dec 23, 2020
5dab4fa
Merge branch '2.4-develop' into fixed-issue-31188
engcom-Hotel Dec 24, 2020
d099df9
30667 - in progress
engcom-Hotel Jan 12, 2021
1c056ea
Merge remote-tracking branch 'saphaljha/fixed-issue-31188' into fixed…
engcom-Hotel Jan 12, 2021
f3b63dc
Merge branch '2.4-develop' into fixed-issue-31188
engcom-Hotel Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/Customer/Block/Form/Register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Magento\Customer\Model\AccountManagement;
use Magento\Framework\App\ObjectManager;
use Magento\Newsletter\Model\Config;
use Magento\Store\Model\ScopeInterface;

/**
* Customer register form block
Expand Down Expand Up @@ -184,7 +185,7 @@ public function getRegion()
public function isNewsletterEnabled()
{
return $this->_moduleManager->isOutputEnabled('Magento_Newsletter')
&& $this->newsLetterConfig->isActive();
&& $this->newsLetterConfig->isActive(ScopeInterface::SCOPE_STORE);
}

/**
Expand Down
32 changes: 32 additions & 0 deletions ...Test/Mftf/Test/StorefrontNewsletterSubscriptionDisabledForStoreViewAtRegistrationTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="StorefrontNewsletterSubscriptionDisabledForStoreViewAtRegistrationTest">
<annotations>
<features value="Newsletter"/>
<stories value="Disabled Newsletter Subscription for store View"/>
<title value="Disabled Newsletter Subscription for store View"/>
<description value="Option to subscribe should not be displayed at registration form if it is switched off for current store"/>
<severity value="AVERAGE"/>
<group value="newsletter"/>
<group value="configuration"/>
<testCaseId value="MC-*"/>
</annotations>
<before>
<magentoCLI command="config:set --scope=stores --scope-code=default newsletter/general/active 0" stepKey="disableSubscriptionForStore"/>
</before>
<after>
<magentoCLI command="config:set --scope=stores --scope-code=default newsletter/general/active 1" stepKey="enableSubscriptionForStore"/>
</after>
<actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
<dontSeeElement selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="checkNoSubscriptionOption"/>
</test>
</tests>