MAGETWO-91626: Countries from default website set when edit order address

- Set store id to address

Author: viktym

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

@@ -10,6 +10,7 @@
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Validation\ValidationResultFactory;
 use Magento\Quote\Model\Quote;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @inheritdoc
@@ -54,10 +55,15 @@ public function validate(Quote $quote): array
         $validationErrors = [];
 
         if (!$quote->isVirtual()) {
+            $shippingAddress = $quote->getShippingAddress();
+            $shippingAddress->setStoreId($quote->getStoreId());
             $validationResult =
                 in_array(
-                    $quote->getShippingAddress()->getCountryId(),
-                    $this->allowedCountryReader->getAllowedCountries()
+                    $shippingAddress->getCountryId(),
+                    $this->allowedCountryReader->getAllowedCountries(
+                        ScopeInterface::SCOPE_STORE,
+                        $quote->getStoreId()
+                    )
                 );
             if (!$validationResult) {
                 $validationErrors = [__($this->generalMessage)];

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

@@ -43,7 +43,9 @@ public function __construct(
     public function validate(Quote $quote): array
     {
         $validationErrors = [];
-        $validationResult = $quote->getBillingAddress()->validate();
+        $billingAddress = $quote->getBillingAddress();
+        $billingAddress->setStoreId($quote->getStoreId());
+        $validationResult = $billingAddress->validate();
         if ($validationResult !== true) {
             $validationErrors = [__($this->generalMessage)];
         }

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

@@ -45,7 +45,9 @@ public function validate(Quote $quote): array
         $validationErrors = [];
 
         if (!$quote->isVirtual()) {
-            $validationResult = $quote->getShippingAddress()->validate();
+            $shippingAddress = $quote->getShippingAddress();
+            $shippingAddress->setStoreId($quote->getStoreId());
+            $validationResult = $shippingAddress->validate();
             if ($validationResult !== true) {
                 $validationErrors = [__($this->generalMessage)];
             }

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

@@ -45,8 +45,10 @@ public function validate(Quote $quote): array
         $validationErrors = [];
 
         if (!$quote->isVirtual()) {
-            $shippingMethod = $quote->getShippingAddress()->getShippingMethod();
-            $shippingRate = $quote->getShippingAddress()->getShippingRateByCode($shippingMethod);
+            $shippingAddress = $quote->getShippingAddress();
+            $shippingAddress->setStoreId($quote->getStoreId());
+            $shippingMethod = $shippingAddress->getShippingMethod();
+            $shippingRate = $shippingAddress->getShippingRateByCode($shippingMethod);
             $validationResult = $shippingMethod && $shippingRate;
             if (!$validationResult) {
                 $validationErrors = [__($this->generalMessage)];

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

@@ -57,7 +57,7 @@ public function testValidateBeforeSubmitCountryIsNotAllowed()
         )->setValue(
             'general/country/allow',
             'US',
-            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $quote = $this->getQuote();
         $quote->getShippingAddress()->setCountryId('AF');
@@ -139,6 +139,7 @@ public function testValidateBeforeSubmitWithMinimumOrderAmount()
      * for the another website with different country restrictions.
      *
      * @magentoDataFixture Magento/Quote/Fixtures/quote_sec_website.php
+     * @magentoDbIsolation disabled
      */
     public function testValidateBeforeSubmit()
     {

dev/tests/integration/testsuite/Magento/Store/_files/websites_different_countries_rollback.php

@@ -13,17 +13,18 @@
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
 //Deleting second website's store.
 $store = $objectManager->create(Store::class);
 if ($store->load('fixture_second_store', 'code')->getId()) {
     $store->delete();
 }
 
 //Deleting the second website.
-/** @var Registry $registry */
-$registry = $objectManager->get(Registry::class);
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', true);
 
 $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
 //Restoring allowed countries.