From 54692c50d4cbb1ec3f9a041d7593dfaba3851d9e Mon Sep 17 00:00:00 2001
From: ellynoize <111681973+ellynoize@users.noreply.github.com>
Date: Tue, 4 Feb 2025 09:07:06 +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=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20=D0=BD=D0=B0=20PHP=208.0?=
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/version.php          | 4 ++--
 intaro.retailcrm/lib/component/constants.php  | 2 +-
 intaro.retailcrm/lib/icml/settingsservice.php | 9 ++++-----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7edf1ece..a7cc4d1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2025-02-04 v6.6.7
+- Исправлена ошибка установки модуля на PHP 8.0
+
 ## 2025-01-29 v6.6.6
 - Поддержка нулевой закупочной стоимости при генерации каталога
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index db7b8c30..f6581a59 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Поддержка нулевой закупочной стоимости при генерации каталога
+- Исправлена ошибка установки модуля на PHP 8.0
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 191fd74c..87719b8f 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.6.6',
-    'VERSION_DATE' => '2025-01-29 18:00:00'
+    'VERSION'      => '6.6.7',
+    'VERSION_DATE' => '2025-02-04 18:00:00'
 ];
diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php
index a3008f95..d85c0a1d 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.6';
+    public const MODULE_VERSION = '6.6.7';
     public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
     public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
     public const CRM_USERS_MAP = 'crm_users_map';
diff --git a/intaro.retailcrm/lib/icml/settingsservice.php b/intaro.retailcrm/lib/icml/settingsservice.php
index 1f58643d..376cdf7f 100644
--- a/intaro.retailcrm/lib/icml/settingsservice.php
+++ b/intaro.retailcrm/lib/icml/settingsservice.php
@@ -178,13 +178,12 @@ class SettingsService
         $customProps = [];
 
         foreach ($this->customPropList as $propsByCatalog) {
-            $customProps = array_merge($customProps, $propsByCatalog);
+            foreach ($propsByCatalog as $code => $value) {
+                $customProps[$code] = $value;
+            }
         }
 
-        return [
-            ...$this->defaultPropList,
-            ...$customProps
-        ];
+        return array_merge($this->defaultPropList, $customProps);
     }
 
     private function getPriceTypes()