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

Merge pull request #107 from iyzoer/master

Browse Source 
Bug fixes
This commit is contained in:
Alex Lushpai 2018-08-01 09:37:44 +03:00 committed by GitHub
commit 86064c775f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/upload/admin/controller/extension/module/retailcrm.php
View File

@ -519,7 +519,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
$this->load->model('extension/retailcrm/order'); $this->load->model('extension/retailcrm/order');
$this->model_extension_retailcrm_order->uploadOrder($data, $this->retailcrm->getApiClient()); $this->model_extension_retailcrm_order->uploadOrder($data, $this->retailcrm->getApiClient());
$response = $this->model_extension_retailcrm_order->getLastResponse(); $response = ModelExtensionRetailcrmOrder::getLastResponse();
} }
if (!$response->isSuccessful()) { if (!$response->isSuccessful()) {

16
src/upload/admin/model/extension/retailcrm/order.php
View File

@ -5,6 +5,8 @@ class ModelExtensionRetailcrmOrder extends Model {
protected $moduleTitle; protected $moduleTitle;
protected $retailcrmApiClient; protected $retailcrmApiClient;
protected static $lastRepsonse = null;
public function __construct($registry) public function __construct($registry)
{ {
parent::__construct($registry); parent::__construct($registry);
@ -81,7 +83,7 @@ class ModelExtensionRetailcrmOrder extends Model {
unset($customers); unset($customers);
$retailcrmApiClient->ordersCreate($order); self::$lastRepsonse = $retailcrmApiClient->ordersCreate($order);
return $order; return $order;
} }
@ -116,6 +118,9 @@ class ModelExtensionRetailcrmOrder extends Model {
} }
if (!isset($delivery_code) && isset($shippingModule)) { if (!isset($delivery_code) && isset($shippingModule)) {
if (isset($this->settings[$this->moduleTitle . '_delivery'])
&& $this->settings[$this->moduleTitle . '_delivery']
) {
$deliveries = array_keys($this->settings[$this->moduleTitle . '_delivery']); $deliveries = array_keys($this->settings[$this->moduleTitle . '_delivery']);
$shipping_code = ''; $shipping_code = '';
@ -127,6 +132,7 @@ class ModelExtensionRetailcrmOrder extends Model {
$delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shipping_code]; $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shipping_code];
} }
}
if (!empty($order_data['payment_iso_code_2'])) { if (!empty($order_data['payment_iso_code_2'])) {
$order['countryIso'] = $order_data['payment_iso_code_2']; $order['countryIso'] = $order_data['payment_iso_code_2'];
@ -281,4 +287,12 @@ class ModelExtensionRetailcrmOrder extends Model {
return $order; return $order;
} }
/**
* @return mixed
*/
public static function getLastResponse()
{
return self::$lastRepsonse;
}
} }

6
src/upload/catalog/model/extension/retailcrm/order.php
View File

@ -82,10 +82,13 @@ class ModelExtensionRetailcrmOrder extends Model {
} }
if (!isset($delivery_code) && isset($shippingModule)) { if (!isset($delivery_code) && isset($shippingModule)) {
if (isset($this->settings[$this->moduleTitle . '_delivery'])
&& $this->settings[$this->moduleTitle . '_delivery']
) {
$deliveries = array_keys($this->settings[$this->moduleTitle . '_delivery']); $deliveries = array_keys($this->settings[$this->moduleTitle . '_delivery']);
$shipping_code = ''; $shipping_code = '';
array_walk($deliveries, function($item, $key) use ($shippingModule, &$shipping_code) { array_walk($deliveries, function ($item, $key) use ($shippingModule, &$shipping_code) {
if (strripos($item, $shippingModule) !== false) { if (strripos($item, $shippingModule) !== false) {
$shipping_code = $item; $shipping_code = $item;
} }
@ -93,6 +96,7 @@ class ModelExtensionRetailcrmOrder extends Model {
$delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shipping_code]; $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shipping_code];
} }
}
if (!empty($order_data['payment_iso_code_2'])) { if (!empty($order_data['payment_iso_code_2'])) {
$order['countryIso'] = $order_data['payment_iso_code_2']; $order['countryIso'] = $order_data['payment_iso_code_2'];