From 10745c4c8d8b94d1abff8d49e2ce9d4dcbb48e84 Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Tue, 6 Aug 2024 11:17:14 +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?=D1=81=20=D0=BF=D1=80=D0=B8=D1=81=D0=B2=D0=BE=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=BC=20externalId=20=D0=BF=D1=80=D0=B8=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=80=D0=B0=20=D0=B2=20=D0=B7=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=20=D0=BA=D0=B0=D0=BA=20=D1=80=D0=B0=D0=B7=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B5=20=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=B8=20=D0=B8=D0=B7=20CRM?=
 =?UTF-8?q?=20(#355)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2860eb1..4bd76e84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2024-08-06 v.6.5.23
+- Исправлена ошибка с присвоением externalId при добавлении товара в заказ как разные товарные позиции из CRM
+
 ## 2024-07-18 v.6.5.22
 - Добавлена передача скидок на торговые позиции в брошенных корзинах
 
diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index e09574cb..69bbddb4 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -1091,7 +1091,7 @@ class RetailCrmHistory
                             $duplicateItems = [];
 
                             foreach ($orderTemp['items'] as $item) {
-                                $duplicateItems[$item['id']]['externalId'] += $item['offer']['externalId'];
+                                $duplicateItems[$item['id']]['externalId'] = $item['offer']['externalId'];
                                 $duplicateItems[$item['id']]['quantity'] += $item['quantity'];
                                 $duplicateItems[$item['id']]['discountTotal'] +=
                                     $item['quantity'] * $item['discountTotal'];
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index d227687c..d65af461 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Добавлена передача скидок на торговые позиции в брошенных корзинах
+- Исправлена ошибка с присвоением externalId при добавлении товара в заказ как разные товарные позиции из CRM
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 1d29c20b..2fa538db 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.5.22',
-    'VERSION_DATE' => '2024-07-18 12:00:00'
+    'VERSION'      => '6.5.23',
+    'VERSION_DATE' => '2024-08-06 11:00:00'
 ];