RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-03-09 18:46:07 +03:00
Code Issues Projects Releases Wiki Activity

Исправлена ошибка установки модуля на PHP 8.0

Browse Source
This commit is contained in:
ellynoize 2025-02-04 09:07:06 +03:00 committed by GitHub
parent 61044988d5
commit 54692c50d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2025-02-04 v6.6.7
- Исправлена ошибка установки модуля на PHP 8.0
## 2025-01-29 v6.6.6 ## 2025-01-29 v6.6.6
- Поддержка нулевой закупочной стоимости при генерации каталога - Поддержка нулевой закупочной стоимости при генерации каталога

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- Поддержка нулевой закупочной стоимости при генерации каталога - Исправлена ошибка установки модуля на PHP 8.0

4
intaro.retailcrm/install/version.php
View File

@ -1,6 +1,6 @@
<?php <?php
$arModuleVersion = [ $arModuleVersion = [
'VERSION' => '6.6.6', 'VERSION' => '6.6.7',
'VERSION_DATE' => '2025-01-29 18:00:00' 'VERSION_DATE' => '2025-02-04 18:00:00'
]; ];

2
intaro.retailcrm/lib/component/constants.php
View File

@ -18,7 +18,7 @@ namespace Intaro\RetailCrm\Component;
*/ */
class Constants 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 CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-'; public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
public const CRM_USERS_MAP = 'crm_users_map'; public const CRM_USERS_MAP = 'crm_users_map';

9
intaro.retailcrm/lib/icml/settingsservice.php
View File

@ -178,13 +178,12 @@ class SettingsService
$customProps = []; $customProps = [];
foreach ($this->customPropList as $propsByCatalog) { foreach ($this->customPropList as $propsByCatalog) {
$customProps = array_merge($customProps, $propsByCatalog); foreach ($propsByCatalog as $code => $value) {
$customProps[$code] = $value;
}
} }
return [ return array_merge($this->defaultPropList, $customProps);
...$this->defaultPropList,
...$customProps
];
} }
private function getPriceTypes() private function getPriceTypes()