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

Author: Sergii Kovalenko

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

@@ -40,23 +40,24 @@ public function __construct(
 
     /**
      * Retrieve all allowed countries or specific by scope depends on customer share setting
+     *
      * @param \Magento\Directory\Model\AllowedCountries $subject
      * @param string | null $filter
      * @param string $scope
      */
     public function beforeGetAllowedCountries(
         \Magento\Directory\Model\AllowedCountries $subject,
-        $filter = null,
+        $scopeCode = null,
         $scope = ScopeInterface::SCOPE_WEBSITE
     ) {
         if ($this->shareConfig->isGlobalScope()) {
             //Check if we have shared accounts - than merge all website allowed countries
-            $filter = array_map(function (WebsiteInterface $website) {
+            $scopeCode = array_map(function (WebsiteInterface $website) {
                 return $website->getId();
             }, $this->storeManager->getWebsites());
             $scope = ScopeInterface::SCOPE_WEBSITES;
         }
 
-        return [$filter, $scope];
+        return [$scopeCode, $scope];
     }
 }

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

@@ -65,6 +65,7 @@ protected function _createCountriesCollection()
 
     /**
      * Retrieve Store Resolver
+     *
      * @deprecated
      * @return StoreResolverInterface
      */

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

@@ -106,6 +106,7 @@ public function getAllOptions()
 
     /**
      * Create Countries Collection with all countries
+     *
      * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */
     private function createCountriesCollection()

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

@@ -132,6 +132,8 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     }
 
     /**
+     * Retrieve Store Manager
+     *
      * @deprecated
      * @return StoreManagerInterface
      */
@@ -146,6 +148,7 @@ private function getStoreManager()
 
     /**
      * Retrieve Allowed Countries Reader
+     *
      * @deprecated
      * @return AllowedCountries
      */
@@ -159,6 +162,8 @@ private function getAllowedCountriesReader()
     }
 
     /**
+     * Merge allowed countries from different scopes
+     *
      * @param array $countries
      * @param array $newCountries
      * @param string $identifier
@@ -177,6 +182,8 @@ private function mergeAllowedCountries(array $countries, array $newCountries, $i
     }
 
     /**
+     * Migrate and merge allowed countries
+     *
      * @param SetupInterface $setup
      * @return void
      */

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

@@ -12,7 +12,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class AllowedCountries.
+ * Class CountryHandler
  */
 class AllowedCountries
 {
@@ -43,38 +43,65 @@ public function __construct(
 
     /**
      * Retrieve all allowed countries for scope or scopes
-     * @param string | null $filter
+     *
+     * @param string | null $scopeCode
      * @param string $scope
      * @return array
      */
     public function getAllowedCountries(
-        $filter = null,
+        $scopeCode = null,
         $scope = ScopeInterface::SCOPE_WEBSITE
     ) {
-        if (empty($filter)) {
-            $filter = $this->storeManager->getWebsite()->getId();
+        if (empty($scopeCode)) {
+            $scopeCode = $this->getDefaultScopeCode($scope);
         }
 
         switch ($scope) {
             case ScopeInterface::SCOPE_WEBSITES:
             case ScopeInterface::SCOPE_STORES:
                 $allowedCountries = [];
-                foreach ($filter as $singleFilter) {
+                foreach ($scopeCode as $singleFilter) {
                     $allowedCountries = array_merge(
                         $allowedCountries,
                         $this->getCountriesFromConfig($this->getSingleScope($scope), $singleFilter)
                     );
                 }
                 break;
             default:
-                $allowedCountries = $this->getCountriesFromConfig($scope, $filter);
+                $allowedCountries = $this->getCountriesFromConfig($scope, $scopeCode);
         }
 
         return $this->getUniqueCountries($allowedCountries);
     }
 
     /**
-     * Return Unique Countries by merging them by keys.
+     * Resolve scope code by scope
+     *
+     * @throws \InvalidArgumentException
+     * @param $scope
+     * @return array|int
+     */
+    private function getDefaultScopeCode($scope)
+    {
+        switch ($scope) {
+            case ScopeInterface::SCOPE_WEBSITE:
+                return $this->storeManager->getWebsite()->getId();
+            case ScopeInterface::SCOPE_STORE:
+                return $this->storeManager->getStore()->getId();
+            case ScopeInterface::SCOPE_GROUP:
+                return $this->storeManager->getGroup()->getId();
+            case ScopeInterface::SCOPE_WEBSITES:
+                return [$this->storeManager->getWebsite()->getId()];
+            case ScopeInterface::SCOPE_STORES:
+                return [$this->storeManager->getStore()->getId()];
+            default:
+                throw new \InvalidArgumentException("Invalid scope is specified");
+        }
+    }
+
+    /**
+     * Return Unique Countries by merging them by keys
+     *
      * @param array $allowedCountries
      * @return array
      */
@@ -85,24 +112,26 @@ private function getUniqueCountries(array $allowedCountries)
 
     /**
      * Takes countries from Countries Config data
+     *
      * @param string $scope
-     * @param int $filter
+     * @param int $scopeCode
      * @return array
      */
-    private function getCountriesFromConfig($scope, $filter)
+    private function getCountriesFromConfig($scope, $scopeCode)
     {
         return explode(
             ',',
             (string) $this->scopeConfig->getValue(
                 self::ALLOWED_COUNTRIES_PATH,
                 $scope,
-                $filter
+                $scopeCode
             )
         );
     }
 
     /**
      * Return Single Scope
+     *
      * @param string $scope
      * @return string
      */

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

@@ -59,7 +59,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
     /**
      * @var AllowedCountries
      */
-    private $allowedCountries;
+    private $allowedCountriesReader;
 
     /**
      * @var string[]
@@ -128,27 +128,29 @@ protected function _construct()
 
     /**
      * Return Allowed Countries reader
+     *
      * @deprecated
      * @return \Magento\Directory\Model\AllowedCountries
      */
     private function getAllowedCountriesReader()
     {
-        if (!$this->allowedCountries) {
-            $this->allowedCountries = ObjectManager::getInstance()->get(AllowedCountries::class);
+        if (!$this->allowedCountriesReader) {
+            $this->allowedCountriesReader = ObjectManager::getInstance()->get(AllowedCountries::class);
         }
 
-        return $this->allowedCountries;
+        return $this->allowedCountriesReader;
     }
 
     /**
-     * Apply allowed countries by specific scope: store, website, etc.
-     * @param string $filter
-     * @param string $scope
-     * @return self
+     * Load allowed countries for current store
+     *
+     * @param null|int|string|\Magento\Store\Model\Store $store
+     * @return \Magento\Directory\Model\ResourceModel\Country\Collection
      */
-    private function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE)
+    public function loadByStore($store = null)
     {
-        $allowedCountries = $this->getAllowedCountriesReader()->getAllowedCountries($filter, $scope);
+        $allowedCountries = $this->getAllowedCountriesReader()
+            ->getAllowedCountries($store, ScopeInterface::SCOPE_STORE);
 
         if (!empty($allowedCountries)) {
             $this->addFieldToFilter("country_id", ['in' => $allowedCountries]);
@@ -157,17 +159,6 @@ private function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE)
         return $this;
     }
 
-    /**
-     * Load allowed countries for current store
-     *
-     * @param null|int|string|\Magento\Store\Model\Store $store
-     * @return \Magento\Directory\Model\ResourceModel\Country\Collection
-     */
-    public function loadByStore($store = null)
-    {
-        return $this->loadByScope($store, ScopeInterface::SCOPE_STORE);
-    }
-
     /**
      * Loads Item By Id
      *