From 66d3963dd5cf2a606b547729ce769280057291c1 Mon Sep 17 00:00:00 2001
From: Pavel <pashok9825@gmail.com>
Date: Tue, 16 Apr 2019 15:01:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B5=D0=B9?=
 =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B7=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B0=20=D0=B2=20retailCRM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                                | 3 +++
 VERSION                                                     | 2 +-
 src/upload/admin/model/extension/retailcrm/history/v4_5.php | 2 --
 src/upload/catalog/controller/api/retailcrm.php             | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aba642..2f4c336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v.3.3.1
+* Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM
+
 ## v.3.3.0
 * Добавена настройка записи истории изменения заказов в Opencart
 * Устранен баг с вызовом события редактирования заказа при выгрузке истории изменений из retailCRM
diff --git a/VERSION b/VERSION
index 15a2799..bea438e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0
+3.3.1
diff --git a/src/upload/admin/model/extension/retailcrm/history/v4_5.php b/src/upload/admin/model/extension/retailcrm/history/v4_5.php
index 36ca4c2..910577b 100644
--- a/src/upload/admin/model/extension/retailcrm/history/v4_5.php
+++ b/src/upload/admin/model/extension/retailcrm/history/v4_5.php
@@ -472,9 +472,7 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
             if (isset($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']);
-                \retailcrm\Retailcrm::$history_run = false;
             }
         }
     }
diff --git a/src/upload/catalog/controller/api/retailcrm.php b/src/upload/catalog/controller/api/retailcrm.php
index 4dfa9a2..35fb491 100644
--- a/src/upload/catalog/controller/api/retailcrm.php
+++ b/src/upload/catalog/controller/api/retailcrm.php
@@ -45,7 +45,9 @@ class ControllerApiRetailcrm extends Controller
             $response = array('error' => 'Not found data');
         } else {
             $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']);
+            \retailcrm\Retailcrm::$history_run = false;
             $response = array('success' => true);
         }