From f44cf792b257f19cc7350afb69c9881db1b2e7c8 Mon Sep 17 00:00:00 2001
From: Kocmonavtik <61938582+Kocmonavtik@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:34:02 +0300
Subject: [PATCH] =?UTF-8?q?ref=20#89494=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BC=D0=BE=D0=B4=D1=83?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=20=D0=BD=D0=B0=20php=208=20=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D1=81=D0=B8=D0=B8=20(#298)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 3 +++
 intaro.retailcrm/description.ru      | 2 +-
 intaro.retailcrm/install/index.php   | 2 +-
 intaro.retailcrm/install/version.php | 4 ++--
 intaro.retailcrm/options.php         | 4 ----
 intaro.retailcrm/updater.php         | 4 ++++
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c771aaa6..06e65767 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2023-06-08 v.6.3.12
+- Исправление критических ошибок при обновлении модуля и php
+
 ## 2023-06-07 v.6.3.11
 - Исправление критической ошибки при изменении настроек модуля
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index a8940393..09524d5f 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Исправление критической ошибки при изменении настроек модуля
\ No newline at end of file
+- Исправление критических ошибок при обновлении модуля и php
\ No newline at end of file
diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php
index 539abd35..c2bfff77 100644
--- a/intaro.retailcrm/install/index.php
+++ b/intaro.retailcrm/install/index.php
@@ -1154,7 +1154,7 @@ class intaro_retailcrm extends CModule
                 $agentId = CAgent::AddAgent(
                     'CCatalogExport::PreGenerateExport(' . $profileId . ');',
                     'catalog',
-                    'N',
+                    'N'
                 );
 
                 CCatalogExport::Update($profileId, [
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 4895e48a..fb585b07 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.3.11',
-    'VERSION_DATE' => '2023-06-07 18:00:00'
+    'VERSION'      => '6.3.12',
+    'VERSION_DATE' => '2023-06-08 19:00:00'
 ];
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index c6a3c308..4d8b3ce1 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -529,10 +529,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     //discount_round
     if (htmlspecialchars(trim($_POST['discount_round'])) === 'Y') {
         $discount_round = 'Y';
-        RegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmDc", "add");
     } else {
         $discount_round = 'N';
-        UnRegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmDc", "add");
     }
 
     //shipment
@@ -560,10 +558,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     //purchasePrice_null
     if (htmlspecialchars(trim($_POST['purchasePrice_null'])) === 'Y') {
         $purchasePrice_null = 'Y';
-        RegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmPricePrchase", "add");
     } else {
         $purchasePrice_null = 'N';
-        UnRegisterModuleDependences("main", "OnBeforeProlog", $mid, "RetailCrmPricePrchase", "add");
     }
 
     //version
diff --git a/intaro.retailcrm/updater.php b/intaro.retailcrm/updater.php
index ede8cddc..c2783c69 100644
--- a/intaro.retailcrm/updater.php
+++ b/intaro.retailcrm/updater.php
@@ -1089,6 +1089,10 @@ function update()
         ->updateBonusInfoFieldForLp()
         ->updateBonusFieldsTypeInHl()
         ->updateDefDiscountFieldTypeInHl();
+
+    UnRegisterModuleDependences("main", "OnBeforeProlog", 'intaro.retailcrm', "RetailCrmPricePrchase", "add");
+    UnRegisterModuleDependences("main", "OnBeforeProlog", 'intaro.retailcrm', "RetailCrmDc", "add");
+    UnRegisterModuleDependences("main", "OnBeforeProlog", 'intaro.retailcrm', "RetailCrmCc", "add");
 }
 
 try {