Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop

ShopBundle/Controller/CitiesController.php

@@ -39,8 +39,11 @@ class CitiesController extends AbstractController
 
                 $return = [] ;
                 foreach($result as $city) {
+
+                        $codesPostaux = $city->codesPostaux ;
+
                         $return[] = [
-                                'label' => $city->nom,
+                                'label' => '<span class="city">'.$city->nom.'</span> <span class="zip">'.$codesPostaux[0].'</span>',
                                 'value' => $city->code
                         ] ;
                 }

ShopBundle/Services/Utils.php

@@ -252,10 +252,20 @@ class Utils
                 return $result;
         }
 
-        public function getZipByCity($city)
+        public function getZipByCity($city, $code = null)
         {
                 $zip = null ;
-                $returnCitiesSearchZip = json_decode($this->callCitiesApi('get', 'communes', ['nom' => $city, 'fields' => 'nom,codesPostaux'])) ;
+
+                $paramsSearch = [
+                        'nom' => $city,
+                        'fields' => 'nom,codesPostaux'
+                ] ;
+
+                if($code != null && $code != 0) {
+                        $paramsSearch['code'] = $code ;
+                }
+
+                $returnCitiesSearchZip = json_decode($this->callCitiesApi('get', 'communes', $paramsSearch)) ;
 
                 if($returnCitiesSearchZip) {
                         foreach($returnCitiesSearchZip as $citySearchZip) {