MAGETWO-56941: CLONE - CLONE - [Github] Allowed countries for customer address in admin using storeview configuration #2946

Author: Sergey Kovalenko

app/code/Magento/Customer/Model/CountryHandler.php

@@ -117,7 +117,7 @@ private function getCountriesFromConfig($scope, $filter)
     /**
      * @param $filter
      * @param string $scope
-     * @return $this
+     * @return AbstractDb
      */
     public function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE, AbstractDb $collection)
     {

app/code/Magento/Customer/Model/Customer/DataProvider.php

@@ -12,7 +12,7 @@
 use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\FileProcessor;
 use Magento\Customer\Model\FileProcessorFactory;
-use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryByWebsite;
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -331,11 +331,11 @@ protected function getAttributesMeta(Type $entityType)
 
     /**
      * @deprecated
-     * @return CountryByWebsite
+     * @return CountryWithWebsites
      */
     private function getCountryByWebsiteSource()
     {
-        return ObjectManager::getInstance()->get(CountryByWebsite::class);
+        return ObjectManager::getInstance()->get(CountryWithWebsites::class);
     }
 
     /**

app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php

@@ -15,6 +15,10 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Class Country.
+ * @package Magento\Customer\Model\ResourceModel\Address\Attribute\Source
+ */
 class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
@@ -45,35 +49,12 @@ public function getAllOptions()
     {
         if (!$this->_options) {
             $this->_options = $this->_createCountriesCollection()->loadByStore(
-                $this->resolveStoreId()
+                $this->getStoreManager()->getStore()->getId()
             )->toOptionArray();
         }
         return $this->_options;
     }
 
-    /**
-     * @deprecated
-     * @return \Magento\Backend\Model\Session\Quote
-     */
-    private function getBackendSession()
-    {
-        return ObjectManager::getInstance()->get(\Magento\Backend\Model\Session\Quote::class);
-    }
-
-    /**
-     * Retrieve store id in view of backend quote.
-     * @return int
-     */
-    private function resolveStoreId()
-    {
-        $backendSession = $this->getBackendSession();
-        if ($backendSession->getQuoteId() && $backendSession->getQuote()->hasStoreId()) {
-            return $backendSession->getQuote()->getStoreId();
-        }
-
-        return $this->getStoreManager()->getStore()->getId();
-    }
-
     /**
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */

app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryByWebsite.php renamed to app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php

@@ -18,7 +18,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
-class CountryByWebsite extends \Magento\Eav\Model\Entity\Attribute\Source\Table
+class CountryWithWebsites extends \Magento\Eav\Model\Entity\Attribute\Source\Table
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory

app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php

@@ -7,7 +7,7 @@
 
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Model\Config\Share;
-use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryByWebsite;
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Type;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -401,7 +401,7 @@ function ($origName) {
 
     private function getCountryAttrMock()
     {
-        $countryByWebsiteMock = $this->getMockBuilder(CountryByWebsite::class)
+        $countryByWebsiteMock = $this->getMockBuilder(CountryWithWebsites::class)
             ->disableOriginalConstructor()
             ->getMock();
         $countryByWebsiteMock->expects($this->any())
@@ -414,7 +414,7 @@ private function getCountryAttrMock()
         $objectManagerMock->expects($this->any())
             ->method('get')
             ->willReturnMap([
-                [CountryByWebsite::class, $countryByWebsiteMock],
+                [CountryWithWebsites::class, $countryByWebsiteMock],
                 [Share::class, $shareMock],
             ]);
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/Attribute/Source/CountryByWebsiteTest.php renamed to app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsitesTest.php

@@ -6,13 +6,13 @@
 
 namespace Magento\Customer\Test\Unit\Model\ResourceModel\Address\Attribute\Source;
 
-use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryByWebsite;
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites;
 use Magento\Customer\Model\CountryHandler;
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
-class CountryByWebsiteTest extends \PHPUnit_Framework_TestCase
+class CountryWithWebsitesTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\CollectionFactory | \PHPUnit_Framework_MockObject_MockObject
@@ -30,7 +30,7 @@ class CountryByWebsiteTest extends \PHPUnit_Framework_TestCase
     private $storeManagerMock;
 
     /**
-     * @var CountryByWebsite
+     * @var CountryWithWebsites
      */
     private $countryByWebsite;
 
@@ -53,7 +53,7 @@ public function setUp()
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->storeManagerMock = $this->getMock(StoreManagerInterface::class);
-        $this->countryByWebsite = new CountryByWebsite(
+        $this->countryByWebsite = new CountryWithWebsites(
             $eavCollectionFactoryMock,
             $optionsFactoryMock,
             $this->countriesFactoryMock,

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

@@ -5,8 +5,12 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Backend\Model\Session\Quote;
+use Magento\Customer\Model\CountryHandler;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Order create address form
@@ -250,6 +254,7 @@ protected function _prepareForm()
         $this->_form->setValues($this->getFormValues());
 
         if ($this->_form->getElement('country_id')->getValue()) {
+            $this->processCountryOptions($this->_form->getElement('country_id'));
             $countryId = $this->_form->getElement('country_id')->getValue();
             $this->_form->getElement('country_id')->setValue(null);
             foreach ($this->_form->getElement('country_id')->getValues() as $country) {
@@ -279,6 +284,47 @@ protected function _prepareForm()
         return $this;
     }
 
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $countryElement
+     * @return void
+     */
+    private function processCountryOptions(\Magento\Framework\Data\Form\Element\AbstractElement $countryElement)
+    {
+        $storeId = $this->getBackendQuoteSession()->getStoreId();
+        $options = $this->getCountryHandler()
+            ->loadByScope($storeId, ScopeInterface::SCOPE_STORE, $this->getCountriesCollection())
+            ->toOptionArray();
+
+        $countryElement->setValues($options);
+    }
+
+    /**
+     * @deprecated
+     * @return \Magento\Directory\Model\ResourceModel\Country\Collection
+     */
+    private function getCountriesCollection()
+    {
+        return ObjectManager::getInstance()->get(\Magento\Directory\Model\ResourceModel\Country\Collection::class);
+    }
+
+    /**
+     * @deprecated
+     * @return CountryHandler
+     */
+    private function getCountryHandler()
+    {
+        return ObjectManager::getInstance()->get(CountryHandler::class);
+    }
+
+    /**
+     * @deprecated
+     * @return Quote
+     */
+    private function getBackendQuoteSession()
+    {
+        return ObjectManager::getInstance()->get(Quote::class);
+    }
+
     /**
      * Add additional data to form element
      *