From 1852d5cb08afba7b1b5a01c1fd540d942f8e1239 Mon Sep 17 00:00:00 2001
From: Sergey <gluschenko@retailcrm.ru>
Date: Thu, 18 Apr 2019 17:43:54 +0300
Subject: [PATCH] =?UTF-8?q?Fixes:=20#147=20=D0=92=D0=BE=D0=B7=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0?=
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 | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f4c336..e49290c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v.3.3.2
+* Добавлен возврат остатка товара при отмене заказа
+
 ## v.3.3.1
 * Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM
 
diff --git a/VERSION b/VERSION
index bea438e..4772543 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.1
+3.3.2
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 910577b..a6580dd 100644
--- a/src/upload/admin/model/extension/retailcrm/history/v4_5.php
+++ b/src/upload/admin/model/extension/retailcrm/history/v4_5.php
@@ -467,13 +467,13 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
                 $data['order_status_id'] = $tmpOrder['order_status_id'];
             }
 
-            $this->editOrder($order['externalId'], $data);
-
             if (isset($this->settings[$this->moduleTitle . '_status_changes'])
                 && $this->settings[$this->moduleTitle . '_status_changes']
             ) {
                 $this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']);
             }
+
+            $this->editOrder($order['externalId'], $data);
         }
     }