Merge pull request #130 from iyzoer/master

Fixes #129 Fix catalog order controller
This commit is contained in:
Alex Lushpai 2019-01-25 15:36:20 +03:00 committed by GitHub
commit f79ed21018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -58,11 +58,11 @@ class ControllerExtensionModuleRetailcrm extends Controller {
if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
$this->load->model('extension/retailcrm/custom/order');
$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 {
$this->load->model('extension/retailcrm/order');
$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')) {
$this->load->model('extension/retailcrm/custom/order');
$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 {
$this->load->model('extension/retailcrm/order');
$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);
}
}
}