From 37b94086fed9bb0b8d84dc8880f7eadbf671c759 Mon Sep 17 00:00:00 2001
From: KMityai <dkruglovn@gmail.com>
Date: Fri, 30 Sep 2022 13:05:58 +0300
Subject: [PATCH 1/3] fix order canceling

---
 .../classes/general/history/RetailCrmHistory_v5.php           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index 037d0dfc..9fa768a7 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -1995,11 +1995,11 @@ class RetailCrmHistory
     }
 
     /**
-     * @param int $externalId
+     * @param mixed $externalId
      *
      * @return void
      */
-    public static function cancelOrder(int $externalId)
+    public static function cancelOrder($externalId)
     {
         try {
             $newOrder = Order::load($externalId);

From 26639fd5d6dfd358475bc5b458828cdb1a8c9e77 Mon Sep 17 00:00:00 2001
From: KMityai <dkruglovn@gmail.com>
Date: Tue, 22 Nov 2022 10:41:35 +0300
Subject: [PATCH 2/3] bump to 6.1.8

---
 CHANGELOG.md                         | 3 +++
 intaro.retailcrm/install/version.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90192d23..b3ec79b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2022-09-30 v.6.1.8
+- Исправление ошибки в работе модуля при отмене заказа в Bitrix
+
 ## 2022-09-09 v.6.1.7
 - Корректировка получения истории удалённых товаров
 
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index dd30929e..15b9596a 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.1.7',
-    'VERSION_DATE' => '2022-09-09 15:00:00'
+    'VERSION'      => '6.1.8',
+    'VERSION_DATE' => '2022-09-30 14:00:00'
 ];

From f7a5a39e1b26911f8a56c3c2cbd1608117818781 Mon Sep 17 00:00:00 2001
From: KMityai <dkruglovn@gmail.com>
Date: Fri, 2 Dec 2022 13:34:09 +0300
Subject: [PATCH 3/3] updated description.ru

---
 intaro.retailcrm/description.ru | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 50b98d46..ab7cb3c1 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Корректировка получения истории удалённых товаров
\ No newline at end of file
+- Исправлена работа агента получения истории при отмене заказа в Bitrix
\ No newline at end of file