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

Author: Sergii Kovalenko

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

@@ -321,7 +321,7 @@ protected function getAttributesMeta(Type $entityType)
 
             if ($attribute->usesSource()) {
                 if ($code == AddressInterface::COUNTRY_ID) {
-                    $meta[$code]['arguments']['data']['config']['options'] = $this->getcountryWithWebsiteSource()
+                    $meta[$code]['arguments']['data']['config']['options'] = $this->getCountryWithWebsiteSource()
                         ->getAllOptions();
                 } else {
                     $meta[$code]['arguments']['data']['config']['options'] = $attribute->getSource()->getAllOptions();

app/code/Magento/Customer/Model/Plugin/AllowedCountries.php

@@ -47,8 +47,8 @@ public function __construct(
      */
     public function beforeGetAllowedCountries(
         \Magento\Directory\Model\AllowedCountries $subject,
-        $scopeCode = null,
-        $scope = ScopeInterface::SCOPE_WEBSITE
+        $scope = ScopeInterface::SCOPE_WEBSITE,
+        $scopeCode = null
     ) {
         if ($this->shareConfig->isGlobalScope()) {
             //Check if we have shared accounts - than merge all website allowed countries
@@ -58,6 +58,6 @@ public function beforeGetAllowedCountries(
             $scope = ScopeInterface::SCOPE_WEBSITES;
         }
 
-        return [$scopeCode, $scope];
+        return [$scope, $scopeCode];
     }
 }

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

@@ -78,7 +78,7 @@ public function getAllOptions()
             if (!$this->shareConfig->isGlobalScope()) {
                 foreach ($this->storeManager->getWebsites() as $website) {
                     $countries = $this->allowedCountriesReader
-                        ->getAllowedCountries($website->getId(), ScopeInterface::SCOPE_WEBSITE);
+                        ->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $website->getId());
                     $allowedCountries = array_merge($allowedCountries, $countries);
 
                     foreach ($countries as $countryCode) {

app/code/Magento/Customer/Setup/UpgradeData.php

@@ -203,7 +203,7 @@ private function migrateStoresAllowedCountriesToWebsite(SetupInterface $setup)
             $allowedCountries = $this->mergeAllowedCountries(
                 $allowedCountries,
                 $this->getAllowedCountriesReader()
-                    ->getAllowedCountries($store->getId(), ScopeInterface::SCOPE_STORE),
+                    ->getAllowedCountries(ScopeInterface::SCOPE_STORE, $store->getId()),
                 $store->getWebsiteId()
             );
         }
@@ -212,7 +212,7 @@ private function migrateStoresAllowedCountriesToWebsite(SetupInterface $setup)
             $allowedCountries = $this->mergeAllowedCountries(
                 $allowedCountries,
                 $this->getAllowedCountriesReader()
-                    ->getAllowedCountries($website->getId(), ScopeInterface::SCOPE_WEBSITE),
+                    ->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $website->getId()),
                 $website->getId()
             );
         }

app/code/Magento/Directory/Model/AllowedCountries.php

@@ -49,8 +49,8 @@ public function __construct(
      * @return array
      */
     public function getAllowedCountries(
-        $scopeCode = null,
-        $scope = ScopeInterface::SCOPE_WEBSITE
+        $scope = ScopeInterface::SCOPE_WEBSITE,
+        $scopeCode = null
     ) {
         if (empty($scopeCode)) {
             $scopeCode = $this->getDefaultScopeCode($scope);

app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php

@@ -150,7 +150,7 @@ private function getAllowedCountriesReader()
     public function loadByStore($store = null)
     {
         $allowedCountries = $this->getAllowedCountriesReader()
-            ->getAllowedCountries($store, ScopeInterface::SCOPE_STORE);
+            ->getAllowedCountries(ScopeInterface::SCOPE_STORE, $store);
 
         if (!empty($allowedCountries)) {
             $this->addFieldToFilter("country_id", ['in' => $allowedCountries]);

app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php

@@ -67,27 +67,7 @@ public function testGetAllowedCountries()
 
         $this->assertEquals(
             ['AM' => 'AM'],
-            $this->allowedCountriesReader->getAllowedCountries(1, ScopeInterface::SCOPE_WEBSITE, true)
+            $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, true)
         );
     }
-
-//    public function testLoadByScope()
-//    {
-//        $this->scopeConfigMock->expects($this->once())
-//            ->method('getValue')
-//            ->with(CountryHandlerInterface::ALLOWED_COUNTRIES_PATH, 'website', 1)
-//            ->willReturn('AM');
-//
-//        $collectionMock = $this->getMockBuilder(AbstractDb::class)
-//            ->disableOriginalConstructor()
-//            ->getMock();
-//        $collectionMock->expects($this->once())
-//            ->method('addFieldToFilter')
-//            ->with('country_id', ['in' => ['AM' => 'AM']]);
-//
-//        $this->assertEquals(
-//            $collectionMock,
-//            $this->countryHandler->loadByScope($collectionMock, 1, ScopeInterface::SCOPE_WEBSITE)
-//        );
-//    }
 }