From 0359315c792c1762ee7c05259abe4bef121a14aa Mon Sep 17 00:00:00 2001
From: ellynoize <111681973+ellynoize@users.noreply.github.com>
Date: Wed, 26 Mar 2025 15:45:25 +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=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D0=BF=D0=BB=D0=B0=D1=82=D1=8B=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2=20(#387)?=
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 fc48e922..dff8b19f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2025-03-25 v6.6.10
+- Исправлено некорректное изменение статуса оплаты отмененных заказов
+
 ## 2025-03-04 v6.6.9
 - Исправлено обновление модуля
 
diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
index 3b28f8d0..54d546a9 100644
--- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
+++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -2062,7 +2062,7 @@ class RetailCrmHistory
             $payment->delete();
         }
 
-        if ($paymentsCrm['totalSumm'] == $paySumm) {
+        if ($paymentsCrm['totalSumm'] == $paySumm && $order->getField('CANCELED') !== 'Y') {
             $order->setFieldNoDemand('PAYED', 'Y');
         } else {
             $order->setFieldNoDemand('PAYED', 'N');
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index a85d28d4..e6357763 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Исправлено обновление модуля
+- Исправлено некорректное изменение статуса оплаты отмененных заказов
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 0a299036..2d90c753 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.6.9',
-    'VERSION_DATE' => '2025-03-04 16:00:00'
+    'VERSION'      => '6.6.10',
+    'VERSION_DATE' => '2025-03-25 16:00:00'
 ];
diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php
index 27d49a6a..c5a21cea 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.9';
+    public const MODULE_VERSION = '6.6.10';
     public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
     public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
     public const CRM_USERS_MAP = 'crm_users_map';