MAGETWO-98832: Multistore Allowed Countries List Problem

Author: ysapiga

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

@@ -905,7 +905,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         }
         try {
             foreach ($customerAddresses as $address) {
-                if (!$this->isAddressAllowedForWebsite($address, (int)$customer->getStoreId())) {
+                if (!$this->isAddressAllowedForWebsite($address, (string)$customer->getStoreId())) {
                     continue;
                 }
                 if ($address->getId()) {
@@ -1619,10 +1619,10 @@ private function setIgnoreValidationFlag($customer)
      * Check is address allowed for store
      *
      * @param AddressInterface $address
-     * @param int $storeId
+     * @param string $storeId
      * @return bool
      */
-    private function isAddressAllowedForWebsite(AddressInterface $address, int $storeId): bool
+    private function isAddressAllowedForWebsite(AddressInterface $address, string $storeId): bool
     {
         $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
 

app/code/Magento/Quote/Model/Quote.php

@@ -410,7 +410,6 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Sales\Model\OrderIncrementIdChecker|null $orderIncrementIdChecker
      * @param AllowedCountries|null $allowedCountriesReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -931,7 +930,6 @@ public function assignCustomer(\Magento\Customer\Api\Data\CustomerInterface $cus
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @param Address $billingAddress Quote billing address
      * @param Address $shippingAddress Quote shipping address
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return $this
      */
     public function assignCustomerWithAddressChange(
@@ -954,10 +952,7 @@ public function assignCustomerWithAddressChange(
                     /** @var \Magento\Quote\Model\Quote\Address $billingAddress */
                     $billingAddress = $this->_quoteAddressFactory->create();
                     $billingAddress->importCustomerAddressData($defaultBillingAddress);
-
-                    if ($this->isAddressAllowedForWebsite($billingAddress, (int)$this->getStoreId())) {
-                        $this->setBillingAddress($billingAddress);
-                    }
+                    $this->assignAddress($billingAddress);
                 }
             }
 
@@ -975,9 +970,8 @@ public function assignCustomerWithAddressChange(
                     $shippingAddress = $this->_quoteAddressFactory->create();
                 }
             }
-            if ($this->isAddressAllowedForWebsite($shippingAddress, (int)$this->getStoreId())) {
-                $this->setShippingAddress($shippingAddress);
-            }
+
+            $this->assignAddress($shippingAddress, false);
         }
 
         return $this;
@@ -2619,13 +2613,29 @@ public function setExtensionAttributes(\Magento\Quote\Api\Data\CartExtensionInte
      * Check is address allowed for store
      *
      * @param Address $address
-     * @param int $storeId
+     * @param  string $storeId
      * @return bool
      */
-    private function isAddressAllowedForWebsite(Address $address, int $storeId): bool
+    private function isAddressAllowedForWebsite(Address $address, string $storeId): bool
     {
         $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
 
         return in_array($address->getCountryId(), $allowedCountries);
     }
+
+    /**
+     * Assign address to quote
+     *
+     * @param Address $address
+     * @param bool $billingAddress
+     * @return void
+     */
+    private function assignAddress(Address $address, bool $billingAddress = true): void
+    {
+        if ($this->isAddressAllowedForWebsite($address, (string) $this->getStoreId())) {
+            $billingAddress
+                ? $this->setBillingAddress($address)
+                : $this->setShippingAddress($address);
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php

@@ -862,18 +862,11 @@ public function testCreateNewCustomerWithPasswordHash()
      */
     public function testCreateNewCustomerWithPasswordHashWithNotAllowedCountry()
     {
-        /** Preconditions:
-         * Customer with two addresses created
-         * Two websites with different allowed country configured
-         */
-        $customerRepository = $this->objectManager->create(
-            CustomerRepositoryInterface::class
-        );
         $fixtureCustomerId = 1;
         $allowedCountryIdForSecondWebsite = 'UA';
         /** @var \Magento\Customer\Model\Customer $customer */
-        $store =$this->storeManager->getStore('fixture_second_store');
-        $customerData = $customerRepository->getById($fixtureCustomerId);
+        $store = $this->storeManager->getStore('fixture_second_store');
+        $customerData = $this->customerRepository->getById($fixtureCustomerId);
         $customerData->getAddresses()[1]->setRegion(null)->setCountryId($allowedCountryIdForSecondWebsite)
             ->setRegionId(null);
         $customerData->setStoreId($store->getId())->setWebsiteId($store->getWebsiteId())->setId(null);

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -353,16 +353,11 @@ public function testAssignCustomerWithAddressChange(): void
      */
     public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
     {
-        /** Preconditions:
-         * Customer with  address is created
-         */
         $this->config->saveConfig(
             $this->allowedCountriesConfigPath,
             'FR'
         );
         Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class)->reinit();
-        Bootstrap::getObjectManager()->create(StoreManagerInterface::class)->reinitStores();
-
         /** @var Quote $quote */
         $quote = $this->objectManager->create(Quote::class);
         $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);