Merge branch 'MAGETWO-91626' into mpi-forwardport-0309

Author: iivashchenko

app/code/Magento/Customer/Model/Address/Validator/Country.php

@@ -7,7 +7,8 @@
 
 use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Customer\Model\Address\ValidatorInterface;
-use Magento\Framework\App\ObjectManager;
+use Magento\Directory\Helper\Data;
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Store\Model\ScopeInterface;
 
 /**
@@ -16,35 +17,25 @@
 class Country implements ValidatorInterface
 {
     /**
-     * @var \Magento\Directory\Helper\Data
+     * @var Data
      */
     private $directoryData;
 
     /**
-     * @var \Magento\Directory\Model\AllowedCountries
+     * @var AllowedCountries
      */
     private $allowedCountriesReader;
 
     /**
-     * @var \Magento\Customer\Model\Config\Share
-     */
-    private $shareConfig;
-
-    /**
-     * @param \Magento\Directory\Helper\Data $directoryData
-     * @param \Magento\Directory\Model\AllowedCountries|null $allowedCountriesReader
-     * @param \Magento\Customer\Model\Config\Share|null $shareConfig
+     * @param Data $directoryData
+     * @param AllowedCountries $allowedCountriesReader
      */
     public function __construct(
-        \Magento\Directory\Helper\Data $directoryData,
-        \Magento\Directory\Model\AllowedCountries $allowedCountriesReader = null,
-        \Magento\Customer\Model\Config\Share $shareConfig = null
+        Data $directoryData,
+        AllowedCountries $allowedCountriesReader
     ) {
         $this->directoryData = $directoryData;
-        $this->allowedCountriesReader = $allowedCountriesReader
-            ?: ObjectManager::getInstance()->get(\Magento\Directory\Model\AllowedCountries::class);
-        $this->shareConfig = $shareConfig
-            ?: ObjectManager::getInstance()->get(\Magento\Customer\Model\Config\Share::class);
+        $this->allowedCountriesReader = $allowedCountriesReader;
     }
 
     /**
@@ -128,12 +119,7 @@ private function validateRegion(AbstractAddress $address)
      */
     private function getWebsiteAllowedCountries(AbstractAddress $address): array
     {
-        $websiteId = null;
-
-        if (!$this->shareConfig->isGlobalScope()) {
-            $websiteId = $address->getCustomer() ? $address->getCustomer()->getWebsiteId() : null;
-        }
-
-        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $websiteId);
+        $storeId = $address->getData('store_id');
+        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
     }
 }

app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php

@@ -7,6 +7,7 @@
  */
 namespace Magento\Customer\Model\ResourceModel;
 
+use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Model\Address as CustomerAddressModel;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\ResourceModel\Address\Collection;
@@ -123,6 +124,7 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address)
         } else {
             $addressModel->updateData($address);
         }
+        $addressModel->setStoreId($customerModel->getStoreId());
 
         $errors = $addressModel->validate();
         if ($errors !== true) {

app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php

@@ -27,11 +27,6 @@ class CountryTest extends \PHPUnit\Framework\TestCase
      */
     private $allowedCountriesReaderMock;
 
-    /**
-     * @var \Magento\Customer\Model\Config\Share|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $shareConfigMock;
-
     protected function setUp()
     {
         $this->directoryDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
@@ -40,16 +35,11 @@ protected function setUp()
             \Magento\Directory\Model\AllowedCountries::class,
             ['getAllowedCountries']
         );
-        $this->shareConfigMock = $this->createPartialMock(
-            \Magento\Customer\Model\Config\Share::class,
-            ['isGlobalScope']
-        );
         $this->model = $this->objectManager->getObject(
             \Magento\Customer\Model\Address\Validator\Country::class,
             [
                 'directoryData' => $this->directoryDataMock,
                 'allowedCountriesReader' => $this->allowedCountriesReaderMock,
-                'shareConfig' => $this->shareConfigMock,
             ]
         );
     }
@@ -81,10 +71,9 @@ public function testValidate(array $data, array $countryIds, array $allowedRegio
             ->method('isRegionRequired')
             ->willReturn($data['regionRequired']);
 
-        $this->shareConfigMock->method('isGlobalScope')->willReturn(false);
         $this->allowedCountriesReaderMock
             ->method('getAllowedCountries')
-            ->with(ScopeInterface::SCOPE_WEBSITE, null)
+            ->with(ScopeInterface::SCOPE_STORE, null)
             ->willReturn($countryIds);
 
         $addressMock->method('getCountryId')->willReturn($data['country_id']);

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)];

app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php

@@ -113,6 +113,7 @@ protected function _prepareForm()
             $this->getUrl('sales/*/addressSave', ['address_id' => $this->_getAddress()->getId()])
         );
         $this->_form->setUseContainer(true);
+
         return $this;
     }
 

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php

@@ -164,6 +164,7 @@ public function getDataSelectorDisplay()
     public function getOrderDataJson()
     {
         $data = [];
+        $this->_storeManager->setCurrentStore($this->getStoreId());
         if ($this->getCustomerId()) {
             $data['customer_id'] = $this->getCustomerId();
             $data['addresses'] = [];

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php

@@ -136,6 +136,7 @@ public function __construct(
         $this->searchCriteriaBuilder = $criteriaBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->addressMapper = $addressMapper;
+        $this->backendQuoteSession = $sessionQuote;
         parent::__construct(
             $context,
             $sessionQuote,
@@ -217,6 +218,11 @@ public function getAddressCollectionJson()
      */
     protected function _prepareForm()
     {
+        $storeId = $this->getCreateOrderModel()
+            ->getSession()
+            ->getStoreId();
+        $this->_storeManager->setCurrentStore($storeId);
+
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
 
         $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');