From a1bce2bda0c81575ae760e7888cd4d14696a03c4 Mon Sep 17 00:00:00 2001
From: gorokh <gorokh@retailcrm.ru>
Date: Fri, 20 Dec 2019 14:22:53 +0300
Subject: [PATCH] fix conflicts

---
 .../classes/general/history/RetailCrmHistory_v5.php           | 4 ++++
 intaro.retailcrm/description.ru                               | 2 +-
 intaro.retailcrm/install/version.php                          | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index d356aaf5..8eef60b7 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -974,6 +974,10 @@ class RetailCrmHistory
                 $orders[$change['order']['id']] = $change['order'];
             }
 
+            if ($change['field'] == 'number') {
+                $orders[$change['order']['id']]['number'] = $change['newValue'];
+            }
+
             if ($change['item']) {
                 if ($orders[$change['order']['id']]['items'][$change['item']['id']]) {
                     $orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge($orders[$change['order']['id']]['items'][$change['item']['id']], $change['item']);
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 5f3b05c4..0f4f17aa 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- При обработке истории сбор по дублирующим товарам заменен на "externalId"
+- Добавлена обработка изменения номера заказа по истории
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index df44f11f..0ad6624e 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,5 +1,5 @@
 <?
 $arModuleVersion = array(
-    "VERSION" => "2.5.3",
-    "VERSION_DATE" => "2019-11-1  15:10:00"
+    "VERSION" => "5.2.4",
+    "VERSION_DATE" => "2019-12-10  15:03:00"
 );