CORE-978 Customer address country options got reduced to match store …

…configuration
spryker · Jul 10, 2017 · d262765 · d262765
1 parent bcf1b1b
commit d262765
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 26 deletions.
diff --git a/src/Spryker/Zed/Customer/Communication/CustomerCommunicationFactory.php b/src/Spryker/Zed/Customer/Communication/CustomerCommunicationFactory.php
@@ -108,8 +108,17 @@ public function createAddressFormDataProvider()
     {
         return new AddressFormDataProvider(
             $this->getProvidedDependency(CustomerDependencyProvider::FACADE_COUNTRY),
-            $this->getQueryContainer()
+            $this->getQueryContainer(),
+            $this->getStore()
         );
     }
 
+    /**
+     * @return \Spryker\Shared\Kernel\Store
+     */
+    protected function getStore()
+    {
+        return $this->getProvidedDependency(CustomerDependencyProvider::STORE);
+    }
+
 }
diff --git a/src/Spryker/Zed/Customer/Communication/Form/AddressForm.php b/src/Spryker/Zed/Customer/Communication/Form/AddressForm.php
@@ -46,10 +46,11 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired(static::OPTION_SALUTATION_CHOICES);
         $resolver->setRequired(static::OPTION_COUNTRY_CHOICES);
-        $resolver->setRequired(static::OPTION_PREFERRED_COUNTRY_CHOICES);
+        $resolver->setDefined(static::OPTION_PREFERRED_COUNTRY_CHOICES);
 
         $resolver->setDefaults([
             'required' => false,
+            static::OPTION_PREFERRED_COUNTRY_CHOICES => [],
         ]);
     }
 

diff --git a/src/Spryker/Zed/Customer/Communication/Form/DataProvider/AddressFormDataProvider.php b/src/Spryker/Zed/Customer/Communication/Form/DataProvider/AddressFormDataProvider.php
@@ -7,15 +7,14 @@
 
 namespace Spryker\Zed\Customer\Communication\Form\DataProvider;
 
+use Spryker\Shared\Kernel\Store;
 use Spryker\Zed\Customer\Communication\Form\AddressForm;
 use Spryker\Zed\Customer\Dependency\Facade\CustomerToCountryInterface;
 use Spryker\Zed\Customer\Persistence\CustomerQueryContainerInterface;
 
 class AddressFormDataProvider extends AbstractCustomerDataProvider
 {
 
-    const PREFERRED_COUNTRY_NAME = 'Germany';
-
     /**
      * @var \Spryker\Zed\Customer\Dependency\Facade\CustomerToCountryInterface
      */
@@ -26,14 +25,21 @@ class AddressFormDataProvider extends AbstractCustomerDataProvider
      */
     protected $customerQueryContainer;
 
+    /**
+     * @var \Spryker\Shared\Kernel\Store
+     */
+    protected $store;
+
     /**
      * @param \Spryker\Zed\Customer\Dependency\Facade\CustomerToCountryInterface $countryFacade
      * @param \Spryker\Zed\Customer\Persistence\CustomerQueryContainerInterface $customerQueryContainer
+     * @param \Spryker\Shared\Kernel\Store $store
      */
-    public function __construct(CustomerToCountryInterface $countryFacade, CustomerQueryContainerInterface $customerQueryContainer)
+    public function __construct(CustomerToCountryInterface $countryFacade, CustomerQueryContainerInterface $customerQueryContainer, Store $store)
     {
         $this->countryFacade = $countryFacade;
         $this->customerQueryContainer = $customerQueryContainer;
+        $this->store = $store;
     }
 
     /**
@@ -60,7 +66,6 @@ public function getOptions()
         return [
             AddressForm::OPTION_SALUTATION_CHOICES => $this->getSalutationChoices(),
             AddressForm::OPTION_COUNTRY_CHOICES => $this->getCountryChoices(),
-            AddressForm::OPTION_PREFERRED_COUNTRY_CHOICES => $this->getPreferredCountryChoices(),
         ];
     }
 
@@ -69,26 +74,13 @@ public function getOptions()
      */
     protected function getCountryChoices()
     {
-        $countryCollection = $this->countryFacade->getAvailableCountries();
-
         $result = [];
-        if (count($countryCollection->getCountries()) > 0) {
-            foreach ($countryCollection->getCountries() as $country) {
-                $result[$country->getIdCountry()] = $country->getName();
-            }
+        foreach ($this->store->getCountries() as $iso2Code) {
+            $countryTransfer = $this->countryFacade->getCountryByIso2Code($iso2Code);
+            $result[$countryTransfer->getIdCountry()] = $countryTransfer->getName();
         }
 
         return $result;
     }
 
-    /**
-     * @return array
-     */
-    protected function getPreferredCountryChoices()
-    {
-        return [
-            $this->countryFacade->getPreferredCountryByName(self::PREFERRED_COUNTRY_NAME)->getIdCountry(),
-        ];
-    }
-
 }
diff --git a/src/Spryker/Zed/Customer/CustomerDependencyProvider.php b/src/Spryker/Zed/Customer/CustomerDependencyProvider.php
@@ -55,10 +55,7 @@ public function provideBusinessLayerDependencies(Container $container)
             return $container->getLocator()->locale()->queryContainer();
         };
 
-        $container[static::STORE] = function (Container $container) {
-            return Store::getInstance();
-        };
-
+        $container = $this->addStore($container);
         $container = $this->addCustomerAnonymizerPlugins($container);
 
         return $container;
@@ -78,6 +75,8 @@ public function provideCommunicationLayerDependencies(Container $container)
             return $container->getLocator()->utilDateTime()->service();
         };
 
+        $container = $this->addStore($container);
+
         return $container;
     }
 
@@ -103,4 +102,18 @@ protected function getCustomerAnonymizerPlugins()
         return [];
     }
 
+    /**
+     * @param \Spryker\Zed\Kernel\Container $container
+     *
+     * @return \Spryker\Zed\Kernel\Container
+     */
+    protected function addStore(Container $container)
+    {
+        $container[static::STORE] = function (Container $container) {
+            return Store::getInstance();
+        };
+
+        return $container;
+    }
+
 }
diff --git a/src/Spryker/Zed/Customer/Dependency/Facade/CustomerToCountryBridge.php b/src/Spryker/Zed/Customer/Dependency/Facade/CustomerToCountryBridge.php
@@ -42,6 +42,8 @@ public function getAvailableCountries()
     }
 
     /**
+     * @deprecated Use getCountryByIso2Code() instead.
+     *
      * @param string $iso2Code
      *
      * @return int
@@ -51,4 +53,14 @@ public function getIdCountryByIso2Code($iso2Code)
         return $this->countryFacade->getIdCountryByIso2Code($iso2Code);
     }
 
+    /**
+     * @param string $iso2Code
+     *
+     * @return \Generated\Shared\Transfer\CountryTransfer
+     */
+    public function getCountryByIso2Code($iso2Code)
+    {
+        return $this->countryFacade->getCountryByIso2Code($iso2Code);
+    }
+
 }
diff --git a/src/Spryker/Zed/Customer/Dependency/Facade/CustomerToCountryInterface.php b/src/Spryker/Zed/Customer/Dependency/Facade/CustomerToCountryInterface.php
@@ -11,6 +11,8 @@ interface CustomerToCountryInterface
 {
 
     /**
+     * @deprecated Use getCountryByIso2Code() instead.
+     *
      * @param string $iso2Code
      *
      * @return int
@@ -29,4 +31,11 @@ public function getPreferredCountryByName($countryName);
      */
     public function getAvailableCountries();
 
+    /**
+     * @param string $iso2Code
+     *
+     * @return \Generated\Shared\Transfer\CountryTransfer
+     */
+    public function getCountryByIso2Code($iso2Code);
+
 }