From d617c3ca6541d1528bf26c26738b909d55424def Mon Sep 17 00:00:00 2001
From: Oleksii Lisovyi <olexii.lisovyi@ven.com>
Date: Wed, 28 Aug 2019 18:51:39 +0300
Subject: [PATCH 1/2] Sales - fix displaying available allowed countries while
 editing order address in Admin panel

---
 .../Block/Adminhtml/Order/Address/Form.php    |  8 +++++
 .../Adminhtml/Order/Create/Form/Address.php   | 31 +++++++++++++------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index 12e59e63f6f7c..1efa149b390ef 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -136,4 +136,12 @@ public function getFormValues()
     {
         return $this->_getAddress()->getData();
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getAddressStoreId()
+    {
+        return $this->_getAddress()->getOrder()->getStoreId();
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index e4b9dd4c63b93..3fe943c1b194c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -271,21 +271,24 @@ protected function _prepareForm()
 
         $this->_form->setValues($this->getFormValues());
 
-        if ($this->_form->getElement('country_id')->getValue()) {
-            $countryId = $this->_form->getElement('country_id')->getValue();
-            $this->_form->getElement('country_id')->setValue(null);
-            foreach ($this->_form->getElement('country_id')->getValues() as $country) {
+        $countryElement = $this->_form->getElement('country_id');
+
+        $this->processCountryOptions($countryElement);
+
+        if ($countryElement->getValue()) {
+            $countryId = $countryElement->getValue();
+            $countryElement->setValue(null);
+            foreach ($countryElement->getValues() as $country) {
                 if ($country['value'] == $countryId) {
-                    $this->_form->getElement('country_id')->setValue($countryId);
+                    $countryElement->setValue($countryId);
                 }
             }
         }
-        if ($this->_form->getElement('country_id')->getValue() === null) {
-            $this->_form->getElement('country_id')->setValue(
+        if ($countryElement->getValue() === null) {
+            $countryElement->setValue(
                 $this->directoryHelper->getDefaultCountry($this->getStore())
             );
         }
-        $this->processCountryOptions($this->_form->getElement('country_id'));
         // Set custom renderer for VAT field if needed
         $vatIdElement = $this->_form->getElement('vat_id');
         if ($vatIdElement && $this->getDisplayVatValidationButton() !== false) {
@@ -309,7 +312,7 @@ protected function _prepareForm()
      */
     private function processCountryOptions(\Magento\Framework\Data\Form\Element\AbstractElement $countryElement)
     {
-        $storeId = $this->getBackendQuoteSession()->getStoreId();
+        $storeId = $this->getAddressStoreId();
         $options = $this->getCountriesCollection()
             ->loadByStore($storeId)
             ->toOptionArray();
@@ -388,4 +391,14 @@ public function getAddressAsString(\Magento\Customer\Api\Data\AddressInterface $
 
         return $this->escapeHtml($result);
     }
+
+    /**
+     * Return address store id.
+     *
+     * @return int
+     */
+    protected function getAddressStoreId()
+    {
+        return $this->getBackendQuoteSession()->getStoreId();
+    }
 }

From 883d9f52e1b360b5c3c3b9b9f0a7f512531dfe83 Mon Sep 17 00:00:00 2001
From: Oleksii Lisovyi <olexii.lisovyi@ven.com>
Date: Thu, 29 Aug 2019 15:25:58 +0300
Subject: [PATCH 2/2] Sales - fix displaying available allowed countries while
 editing order address in Admin panel

- fixed unit test
---
 .../Test/Unit/Block/Adminhtml/Order/Address/FormTest.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
index 94148cc515382..2b08daf02134e 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php
@@ -95,6 +95,11 @@ protected function setUp()
                 '_orderCreate' => $this->orderCreate
             ]
         );
+
+        // Do not display VAT validation button on edit order address form
+        // Emulate fix done in controller
+        /** @see \Magento\Sales\Controller\Adminhtml\Order\Address::execute */
+        $this->addressBlock->setDisplayVatValidationButton(false);
     }
 
     public function testGetForm()