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

Fixes #129 Fix catalog order controller

Browse Source
This commit is contained in:
Akolzin Dmitry 2019-01-25 09:52:12 +03:00
parent db80810584
commit 615d9c7c17
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -39,4 +39,4 @@ deploy:
on: on:
php: 7.1 php: 7.1
branch: master branch: master
condition: "$DEPLOY = true" condition: "$DEPLOY = true"

8
src/upload/catalog/controller/extension/module/retailcrm.php
View File

@ -58,11 +58,11 @@ class ControllerExtensionModuleRetailcrm extends Controller {
if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) { if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
$this->load->model('extension/retailcrm/custom/order'); $this->load->model('extension/retailcrm/custom/order');
$order = $this->model_extension_retailcrm_custom_order->processOrder($data); $order = $this->model_extension_retailcrm_custom_order->processOrder($data);
$this->model_extension_retailcrm_custom_order->sendToCrm($order, $data, $this->retailcrmApiClient); $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $data);
} else { } else {
$this->load->model('extension/retailcrm/order'); $this->load->model('extension/retailcrm/order');
$order = $this->model_extension_retailcrm_order->processOrder($data); $order = $this->model_extension_retailcrm_order->processOrder($data);
$this->model_extension_retailcrm_order->sendToCrm($order, $data, $this->retailcrmApiClient); $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, $data);
} }
} }
@ -110,11 +110,11 @@ class ControllerExtensionModuleRetailcrm extends Controller {
if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) { if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
$this->load->model('extension/retailcrm/custom/order'); $this->load->model('extension/retailcrm/custom/order');
$order = $this->model_extension_retailcrm_custom_order->processOrder($data, false); $order = $this->model_extension_retailcrm_custom_order->processOrder($data, false);
$this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, false); $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $data, false);
} else { } else {
$this->load->model('extension/retailcrm/order'); $this->load->model('extension/retailcrm/order');
$order = $this->model_extension_retailcrm_order->processOrder($data, false); $order = $this->model_extension_retailcrm_order->processOrder($data, false);
$this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, false); $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, $data, false);
} }
} }
} }