From 8cf4420592561ab89ca896476af2244ef752ea0d Mon Sep 17 00:00:00 2001
From: ellynoize <111681973+ellynoize@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:45:49 +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=BE=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=B7=D0=BD=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=BE=D0=BC=D0=BE=D0=BA=D0=BE=D0=B4=D0=B0?=
 =?UTF-8?q?=20(#380)?=
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 ++--
 intaro.retailcrm/lib/component/constants.php                  | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 569690fd..e7d0d36c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2025-01-27 v6.6.4
+- Исправлено некорректное удаление признака применения промокода при изменении состава заказа в CRM
+
 ## 2025-01-14 v6.6.3
 - Исправлены ошибки при обновлении модуля
 
diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index 78ae0d41..3b28f8d0 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -1226,7 +1226,6 @@ class RetailCrmHistory
                             }
 
                             if (array_key_exists('discountTotal_sum', $collectItems[$product['offer']['externalId']])) {
-                                $item->setField('CUSTOM_PRICE', 'Y');
                                 $item->setField('DISCOUNT_NAME', '');
                                 $item->setField('DISCOUNT_VALUE', '');
 
@@ -1240,6 +1239,7 @@ class RetailCrmHistory
                                     $price = self::truncate($price, 2);
                                 }
 
+                                $item->markFieldCustom('PRICE');
                                 $item->setField('PRICE', $price);
                             }
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 57c6b407..2667f99f 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Исправлены ошибки при обновлении модуля
+- Исправлено некорректное удаление признака применения промокода при изменении состава заказа в CRM
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index af685007..06b5c060 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.6.3',
-    'VERSION_DATE' => '2025-01-14 18:00:00'
+    'VERSION'      => '6.6.4',
+    'VERSION_DATE' => '2025-01-27 18:00:00'
 ];
diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php
index bb0a99b4..3d67d1a7 100644
--- a/intaro.retailcrm/lib/component/constants.php
+++ b/intaro.retailcrm/lib/component/constants.php
@@ -18,7 +18,7 @@ namespace Intaro\RetailCrm\Component;
  */
 class Constants
 {
-    public const MODULE_VERSION = '6.6.3';
+    public const MODULE_VERSION = '6.6.4';
     public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
     public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
     public const CRM_USERS_MAP = 'crm_users_map';