From f87c07e2e16312c52f0faae72d2d1d00684c5101 Mon Sep 17 00:00:00 2001
From: Vlad <48670792+Mozgito@users.noreply.github.com>
Date: Thu, 21 Jul 2022 14:11:52 +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=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=BE=D0=B2=20=D0=B2=20HL=20?=
 =?UTF-8?q?=D0=B1=D0=BB=D0=BE=D0=BA=20=D0=BB=D0=BE=D1=8F=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=20(#263)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd2ca7fc..dddaf254 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
+## 2022-07-21 v.6.1.4
+- Исправление ошибки при записи товаров в HL блок лояльности
+
 ## 2022-07-18 v.6.1.3
-- Исправление работы модуля при попытки регистрации в программе лояльности уже существующего в ней клиента
-- Исправлени тестов
+- Исправление работы модуля при попытке регистрации в программе лояльности уже существующего в ней клиента
+- Исправление тестов
 
 ## 2022-07-01 v.6.1.2
 - Исправление передачи корпоративных клиентов
diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index e7f3c92e..12c2cb46 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -932,6 +932,10 @@ class RetailCrmHistory
                         }
                     }
 
+                    $editBasketInfo = [];
+                    $deleteBasketInfo = [];
+                    $bonusesChargeTotal = null;
+
                     if (isset($order['items'])) {
                         $itemUpdate = true;
                         $response = RCrmActions::apiMethod($api, 'orderGet', __METHOD__, $order['id']);
@@ -994,10 +998,6 @@ class RetailCrmHistory
 
                         $optionDiscRound = COption::GetOptionString(self::$MODULE_ID, self::$CRM_DISCOUNT_ROUND, 0);
 
-                        $editBasketInfo = [];
-                        $deleteBasketInfo = [];
-                        $bonusesChargeTotal = null;
-
                         foreach ($order['items'] as $product) {
                             if ($collectItems[$product['offer']['externalId']]['quantity']) {
                                 $product['quantity'] = $collectItems[$product['offer']['externalId']]['quantity'];
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index f814c906..2e6ad6dc 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1,2 +1 @@
-- Исправление работы модуля при попытки регистрации в программе лояльности уже существующего в ней клиента
-- Исправлени тестов
\ No newline at end of file
+- Исправление ошибки при записи товаров в HL блок лояльности
\ No newline at end of file
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index facab21d..9e90a379 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.1.3',
-    'VERSION_DATE' => '2022-07-18 10:00:00'
+    'VERSION'      => '6.1.4',
+    'VERSION_DATE' => '2022-07-21 12:00:00'
 ];
diff --git a/intaro.retailcrm/lib/component/builder/bitrix/loyaltydatabuilder.php b/intaro.retailcrm/lib/component/builder/bitrix/loyaltydatabuilder.php
index 4f65aae6..a72c544a 100644
--- a/intaro.retailcrm/lib/component/builder/bitrix/loyaltydatabuilder.php
+++ b/intaro.retailcrm/lib/component/builder/bitrix/loyaltydatabuilder.php
@@ -46,7 +46,7 @@ class LoyaltyDataBuilder implements BuilderInterface
     private $logger;
 
     /** @var OrderLoyaltyData[] $data */
-    private $data;
+    private $data = [];
 
     /** @var float|null */
     private $bonusCountTotal;