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

Merge pull request #121 from iyzoer/v2.2

Browse Source 
Fixes #21. Исправлена склейка типов доставки
This commit is contained in:
Alex Lushpai 2018-12-05 11:20:32 +03:00 committed by GitHub
commit d2d5bef98d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
catalog/controller/api/retailcrm.php
View File

@ -1,7 +1,7 @@
<?php
class ControllerApiRetailcrm extends Controller
{
class ControllerApiRetailcrm extends Controller
{
public function getDeliveryTypes()
{
$api = $this->auth();
@ -11,11 +11,13 @@ class ControllerApiRetailcrm extends Controller
} else {
$this->load->model('localisation/country');
$this->load->model('setting/setting');
$countries = $this->model_setting_setting->getSetting('retailcrm')['retailcrm_country'];
$setting = $this->model_setting_setting->getSetting('retailcrm');
$response = array();
foreach ($countries as $country) {
$response = array_merge($response, $this->getDeliveryTypesByZones($country));
if (isset($setting['retailcrm_country']) && $setting['retailcrm_country']) {
foreach ($setting['retailcrm_country'] as $country) {
$response = $this->mergeDeliveryTypes($country, $response);
}
}
}
@ -56,7 +58,7 @@ class ControllerApiRetailcrm extends Controller
}
protected function getDeliveryTypesByZones($country_id)
{
{
$this->load->model('extension/extension');
$this->load->model('localisation/zone');
$this->load->model('localisation/country');
@ -76,7 +78,7 @@ class ControllerApiRetailcrm extends Controller
'postcode' => '',
'city' => ''
);
foreach ($shippingModules as $shippingModule) {
$this->load->model('shipping/' . $shippingModule['code']);
@ -88,7 +90,7 @@ class ControllerApiRetailcrm extends Controller
$this->config->set('free_total', 0);
}
}
if($this->{'model_shipping_' . $shippingModule['code']}->getQuote($address)) {
$quote_data[] = $this->{'model_shipping_' . $shippingModule['code']}->getQuote($address);
} else {
@ -121,6 +123,18 @@ class ControllerApiRetailcrm extends Controller
return $deliveryTypes;
}
private function mergeDeliveryTypes($country, $result) {
$delivery_types = $this->getDeliveryTypesByZones($country);
foreach ($delivery_types as $shipping_module => $shipping_type) {
if (isset($result[$shipping_module])) {
$result[$shipping_module] = array_merge($result[$shipping_module], $shipping_type);
} else {
$result[$shipping_module] = $shipping_type;
}
}
return $result;
}
private function auth()
{
if (version_compare(VERSION, '2.1.0', '>=')) {