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

Sergii Kovalenko · Sergii Kovalenko · commit 6a3fbf0d9cda · 2016-09-11T22:16:25.000-07:00
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -146,7 +146,7 @@ private function getAllowedCountriesReader()
      * @param string $scope
      * @return self
      */
-    public function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE)
+    private function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE)
     {
         $allowedCountries = $this->getAllowedCountriesReader()->getAllowedCountries($filter, $scope);
 
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
@@ -302,7 +302,7 @@ private function processCountryOptions(\Magento\Framework\Data\Form\Element\Abst
     {
         $storeId = $this->getBackendQuoteSession()->getStoreId();
         $options = $this->getCountriesCollection()
-            ->loadByScope($storeId, ScopeInterface::SCOPE_STORE)
+            ->loadByStore($storeId)
             ->toOptionArray();
 
         $countryElement->setValues($options);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function getAllowedCountriesReader()`
`146`	`146`	`* @param string $scope`
`147`	`147`	`* @return self`
`148`	`148`	`*/`
`149`		`- public function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE)`
	`149`	`+ private function loadByScope($filter, $scope = ScopeInterface::SCOPE_STORE)`
`150`	`150`	`{`
`151`	`151`	`$allowedCountries = $this->getAllowedCountriesReader()->getAllowedCountries($filter, $scope);`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ private function processCountryOptions(\Magento\Framework\Data\Form\Element\Abst`
`302`	`302`	`{`
`303`	`303`	`$storeId = $this->getBackendQuoteSession()->getStoreId();`
`304`	`304`	`$options = $this->getCountriesCollection()`
`305`		`- ->loadByScope($storeId, ScopeInterface::SCOPE_STORE)`
	`305`	`+ ->loadByStore($storeId)`
`306`	`306`	`->toOptionArray();`
`307`	`307`
`308`	`308`	`$countryElement->setValues($options);`