Merge pull request #151 from sergeygw1990/master

Fixes: #147 Возврат остатка товара при отмене заказа
retailcrm · Apr 19, 2019 · 39d596e · 39d596e
2 parents 4313505 + 1852d5c
commit 39d596e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -467,13 +467,13 @@ protected function updateOrders($orders)
                 $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);
         }
     }