Merge pull request #3385 from magento-mpi/mpi-fix-1810

[MPI]-fix-1810

Author: Lysenko Olexandr

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,11 @@ 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,10 @@ 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

@@ -64,7 +64,7 @@ public function testValidateBeforeSubmitCountryIsNotAllowed()
         )->setValue(
             'general/country/allow',
             'US',
-            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $quote = $this->objectManager->create(Quote::class);
         $quote->load('quote123', 'reserved_order_id');

lib/web/magnifier/magnify.js

@@ -35,13 +35,6 @@ define([
             allowZoomOut = false,
             allowZoomIn = true;
 
-        if (isTouchEnabled) {
-            $(element).on('fotorama:showend fotorama:load', function () {
-                $(magnifierSelector).remove();
-                $(magnifierZoomSelector).remove();
-            });
-        }
-
         (function () {
             var style = document.documentElement.style,
                 transitionEnabled = style.transition !== undefined ||