Merge pull request #120 from iyzoer/master

v3.1.5
retailcrm · Nov 2, 2018 · 3e55de0 · 3e55de0
2 parents 5b70033 + bceb206
commit 3e55de0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v.3.1.5
+* Исправление ошибок
+
 ## v.3.1.4
 * Исправлена некорректная склейка типов доставки
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.4
+3.1.5
diff --git a/src/upload/catalog/controller/api/retailcrm.php b/src/upload/catalog/controller/api/retailcrm.php
@@ -15,9 +15,11 @@ public function getDeliveryTypes()
             $moduleTitle = $this->retailcrm->getModuleTitle();
             $setting = $this->model_setting_setting->getSetting($moduleTitle);
 
+            $response = array();
+
             if (isset($setting[$moduleTitle . '_country']) && $setting[$moduleTitle . '_country']) {
                 foreach ($setting[$moduleTitle . '_country'] as $country) {
-                    $response = $this->mergeDeliveryTypes($country);
+                    $response = $this->mergeDeliveryTypes($country, $response);
                 }
             }
         }
@@ -130,8 +132,7 @@ protected function getDeliveryTypesByZones($country_id)
         return $deliveryTypes;
     }
 
-    private function mergeDeliveryTypes($country) {
-        $result = array();
+    private function mergeDeliveryTypes($country, $result) {
         $delivery_types = $this->getDeliveryTypesByZones($country);
 
         foreach ($delivery_types as $shipping_module => $shipping_type) {