diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be21d4c7..df4f4016 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: run: composer validate - name: Cache Composer packages id: composer-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: vendor key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index a7cc4d1b..0481189d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2025-03-03 v6.6.8 +- Исправлена ошибка экспорта дополнительных свойств товаров + ## 2025-02-04 v6.6.7 - Исправлена ошибка установки модуля на PHP 8.0 diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index f6581a59..502750d4 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправлена ошибка установки модуля на PHP 8.0 +- Исправлена ошибка экспорта дополнительных свойств товаров diff --git a/intaro.retailcrm/export/export_run.php b/intaro.retailcrm/export/export_run.php index dee1703d..844328c9 100644 --- a/intaro.retailcrm/export/export_run.php +++ b/intaro.retailcrm/export/export_run.php @@ -39,7 +39,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/retailcrm/exp } global $PROFILE_ID; - $settingService = SettingsService::getInstance([], '', $PROFILE_ID); + $settingService = SettingsService::getInstance([], '', $PROFILE_ID ?? $profile_id); $iblockPropertySku = []; $iblockPropertySkuHl = []; $iblockPropertyUnitSku = []; diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 87719b8f..f9ae6abd 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.6.7', - 'VERSION_DATE' => '2025-02-04 18:00:00' + 'VERSION' => '6.6.8', + 'VERSION_DATE' => '2025-03-03 18:00:00' ]; diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php index d85c0a1d..0a03a73d 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.7'; + public const MODULE_VERSION = '6.6.8'; public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null'; public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-'; public const CRM_USERS_MAP = 'crm_users_map';