Merge branch 'MAGETWO-94295' into 2.2-develop-pr4

Author: Mastiuhin Olexandr

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

@@ -217,6 +217,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');

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php

@@ -20,6 +20,8 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Address;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+use Magento\Sales\Model\AdminOrder\Create;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -51,6 +53,16 @@ class FormTest extends \PHPUnit\Framework\TestCase
      */
     private $countriesCollection;
 
+    /**
+     * @var Create|MockObject
+     */
+    private $orderCreate;
+
+    /**
+     * @var QuoteSession|MockObject
+     */
+    private $sessionQuote;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -61,6 +73,15 @@ protected function setUp()
         $this->countriesCollection = $this->createMock(
             Collection::class
         );
+        $this->sessionQuote = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStoreId', 'getStore'])
+            ->getMock();
+        $this->orderCreate = $this->getMockBuilder(Create::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderCreate->method('getSession')
+            ->willReturn($this->sessionQuote);
 
         $this->addressBlock = $objectManager->getObject(
             Form::class,
@@ -69,6 +90,8 @@ protected function setUp()
                 '_customerFormFactory' => $this->customerFormFactory,
                 '_coreRegistry' => $this->coreRegistry,
                 'countriesCollection' => $this->countriesCollection,
+                'sessionQuote' => $this->sessionQuote,
+                '_orderCreate' => $this->orderCreate
             ]
         );
     }
@@ -108,6 +131,8 @@ public function testGetForm()
             ->willReturn($order);
         $order->method('getStoreId')
             ->willReturn($storeId);
+        $this->sessionQuote->method('getStoreId')
+            ->willReturn($storeId);
         $this->countriesCollection->method('loadByStore')
             ->with($storeId)
             ->willReturn($this->countriesCollection);