Merge remote-tracking branch 'origin/MC-30650' into 2.4-develop-pr13

Author: serhii-balko

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

@@ -36,6 +36,7 @@
             <createData entity="Simple_US_Customer" stepKey="customer"/>
             <!--Login as admin-->
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <createData entity="CustomerAccountSharingGlobal" stepKey="setConfigCustomerAccountToGlobal"/>
         </before>
 
         <!--Create website, Sore adn Store View-->
@@ -328,6 +329,7 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
+            <createData entity="CustomerAccountSharingDefault" stepKey="setConfigCustomerAccountDefault"/>
             <actionGroup ref="logout" stepKey="logout"/>
 
             <!--Do reindex and flush cache-->

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -348,8 +348,14 @@ public function execute()
                     ['customer' => $customer, 'request' => $this->getRequest()]
                 );
 
-                if (isset($customerData['sendemail_store_id'])) {
+                if (isset($customerData['sendemail_store_id']) && $customerData['sendemail_store_id'] !== false) {
                     $customer->setStoreId($customerData['sendemail_store_id']);
+                    try {
+                        $this->customerAccountManagement->validateCustomerStoreIdByWebsiteId($customer);
+                    } catch (LocalizedException $exception) {
+                        throw new LocalizedException(__("The Store View selected for sending Welcome email from".
+                            " is not related to the customer's associated website."));
+                    }
                 }
 
                 // Save customer

app/code/Magento/Customer/Model/AccountManagement.php

@@ -872,7 +872,6 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         if ($customer->getId()) {
             $customer = $this->customerRepository->get($customer->getEmail());
             $websiteId = $customer->getWebsiteId();
-
             if ($this->isCustomerInStore($websiteId, $customer->getStoreId())) {
                 throw new InputException(__('This customer already exists in this store.'));
             }
@@ -896,13 +895,10 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             $customer->setWebsiteId($websiteId);
         }
 
+        $this->validateCustomerStoreIdByWebsiteId($customer);
+
         // Update 'created_in' value with actual store name
         if ($customer->getId() === null) {
-            $websiteId = $customer->getWebsiteId();
-            if ($websiteId && !$this->isCustomerInStore($websiteId, $customer->getStoreId())) {
-                throw new LocalizedException(__('The store view is not in the associated website.'));
-            }
-
             $storeName = $this->storeManager->getStore($customer->getStoreId())->getName();
             $customer->setCreatedIn($storeName);
         }
@@ -1144,6 +1140,22 @@ public function isCustomerInStore($customerWebsiteId, $storeId)
         return in_array($storeId, $ids);
     }
 
+    /**
+     * Validate customer store id by customer website id.
+     *
+     * @param CustomerInterface $customer
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function validateCustomerStoreIdByWebsiteId(CustomerInterface $customer)
+    {
+        if (!$this->isCustomerInStore($customer->getWebsiteId(), $customer->getStoreId())) {
+            throw new LocalizedException(__('The store view is not in the associated website.'));
+        }
+
+        return true;
+    }
+
     /**
      * Validate the Reset Password Token for a customer.
      *

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php

@@ -269,7 +269,7 @@ protected function setUp()
             ->getMock();
         $this->managementMock = $this->getMockBuilder(AccountManagement::class)
             ->disableOriginalConstructor()
-            ->setMethods(['createAccount'])
+            ->setMethods(['createAccount', 'validateCustomerStoreIdByWebsiteId'])
             ->getMock();
         $this->addressDataFactoryMock = $this->getMockBuilder(AddressInterfaceFactory::class)
             ->disableOriginalConstructor()
@@ -522,6 +522,9 @@ public function testExecuteWithExistentCustomer()
             ->with('customer/*/edit', ['id' => $customerId, '_current' => true])
             ->willReturn(true);
 
+        $this->managementMock->method('validateCustomerStoreIdByWebsiteId')
+            ->willReturn(true);
+
         $this->assertEquals($redirectMock, $this->model->execute());
     }