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

Исправлена ошибка с передачей данных заказа в retailCRM

Browse Source
This commit is contained in:
Pavel 2019-04-16 15:01:28 +03:00
parent 702c18d757
commit 66d3963dd5
4 changed files with 6 additions and 3 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.3.1
* Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM
## v.3.3.0 ## v.3.3.0
* Добавена настройка записи истории изменения заказов в Opencart * Добавена настройка записи истории изменения заказов в Opencart
* Устранен баг с вызовом события редактирования заказа при выгрузке истории изменений из retailCRM * Устранен баг с вызовом события редактирования заказа при выгрузке истории изменений из retailCRM

2
VERSION
View File

@ -1 +1 @@
3.3.0 3.3.1

2
src/upload/admin/model/extension/retailcrm/history/v4_5.php
View File

@ -472,9 +472,7 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
if (isset($this->settings[$this->moduleTitle . '_status_changes']) if (isset($this->settings[$this->moduleTitle . '_status_changes'])
&& $this->settings[$this->moduleTitle . '_status_changes'] && $this->settings[$this->moduleTitle . '_status_changes']
) { ) {
\retailcrm\Retailcrm::$history_run = true;
$this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']); $this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']);
\retailcrm\Retailcrm::$history_run = false;
} }
} }
} }

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

@ -45,7 +45,9 @@ class ControllerApiRetailcrm extends Controller
$response = array('error' => 'Not found data'); $response = array('error' => 'Not found data');
} else { } else {
$this->load->model('checkout/order'); $this->load->model('checkout/order');
\retailcrm\Retailcrm::$history_run = true;
$this->model_checkout_order->addOrderHistory($this->request->post['order_id'], $this->request->post['order_status_id']); $this->model_checkout_order->addOrderHistory($this->request->post['order_id'], $this->request->post['order_status_id']);
\retailcrm\Retailcrm::$history_run = false;
$response = array('success' => true); $response = array('success' => true);
} }