From 7e260a2d22ef66c348cec46f2e50540bb8e0b9a4 Mon Sep 17 00:00:00 2001
From: ellynoize <111681973+ellynoize@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:42:58 +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?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=B0=20=D0=B2=D1=8B=D0=B3=D1=80?=
 =?UTF-8?q?=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=B8=20=D1=83=20=D0=B7=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20=D0=BC=D0=B0=D0=B3=D0=B0=D0=B7=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B0=20(#367)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                              | 3 +++
 .../classes/general/history/RetailCrmHistory_v5.php       | 8 ++++++++
 intaro.retailcrm/description.ru                           | 2 +-
 intaro.retailcrm/install/version.php                      | 4 ++--
 intaro.retailcrm/lib/component/constants.php              | 2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2335577..95d89858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2024-10-21 v6.5.34
+- Исправлена ошибка агента выгрузки изменений при наличии у заказа клиента без магазина
+
 ## 2024-10-14 v6.5.33
 - Добавлена передача дополнительных параметров в GET запросах
 
diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index b2cdc67a..78ae0d41 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -1015,6 +1015,14 @@ public static function orderHistory(): bool
                                 $order['site']
                             );
 
+                            if (!$response) {
+                                Logger::getInstance()->write(
+                                    sprintf('Заказ %s не выгружен. Не удалось получить клиента', $order['id']),
+                                    'orderAgent'
+                                );
+                                continue;
+                            }
+
                             $newUser = new CUser();
                             $customerBuilder = new CustomerBuilder();
                             $customerBuilder->setDataCrm($response['customer'])->build();
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index c5b7ed75..7f8c92f2 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Добавлена передача дополнительных параметров в GET запросах
+- Исправлена ошибка агента выгрузки изменений при наличии у заказа клиента без магазина
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index bb690a8c..9df2c561 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.5.33',
-    'VERSION_DATE' => '2024-10-14 17:00:00'
+    'VERSION'      => '6.5.34',
+    'VERSION_DATE' => '2024-10-21 17:00:00'
 ];
diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php
index 34ec5925..6011b85c 100644
--- a/intaro.retailcrm/lib/component/constants.php
+++ b/intaro.retailcrm/lib/component/constants.php
@@ -18,7 +18,7 @@
  */
 class Constants
 {
-    public const MODULE_VERSION = '6.5.33';
+    public const MODULE_VERSION = '6.5.34';
     public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
     public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
     public const CRM_USERS_MAP = 'crm_users_map';