RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-22 21:26:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120 from iyzoer/master

Browse Source 
v3.1.5
This commit is contained in:
Alex Lushpai 2018-11-02 20:18:39 +03:00 committed by GitHub
commit 3e55de0e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v.3.1.5
* Исправление ошибок
## v.3.1.4 ## v.3.1.4
* Исправлена некорректная склейка типов доставки * Исправлена некорректная склейка типов доставки

2
VERSION
View File

@ -1 +1 @@
3.1.4 3.1.5

7
src/upload/catalog/controller/api/retailcrm.php
View File

@ -15,9 +15,11 @@ class ControllerApiRetailcrm extends Controller
$moduleTitle = $this->retailcrm->getModuleTitle(); $moduleTitle = $this->retailcrm->getModuleTitle();
$setting = $this->model_setting_setting->getSetting($moduleTitle); $setting = $this->model_setting_setting->getSetting($moduleTitle);
$response = array();
if (isset($setting[$moduleTitle . '_country']) && $setting[$moduleTitle . '_country']) { if (isset($setting[$moduleTitle . '_country']) && $setting[$moduleTitle . '_country']) {
foreach ($setting[$moduleTitle . '_country'] as $country) { foreach ($setting[$moduleTitle . '_country'] as $country) {
$response = $this->mergeDeliveryTypes($country); $response = $this->mergeDeliveryTypes($country, $response);
} }
} }
} }
@ -130,8 +132,7 @@ class ControllerApiRetailcrm extends Controller
return $deliveryTypes; return $deliveryTypes;
} }
private function mergeDeliveryTypes($country) { private function mergeDeliveryTypes($country, $result) {
$result = array();
$delivery_types = $this->getDeliveryTypesByZones($country); $delivery_types = $this->getDeliveryTypesByZones($country);
foreach ($delivery_types as $shipping_module => $shipping_type) { foreach ($delivery_types as $shipping_module => $shipping_type) {