diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e79e73d..31245ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2021-10-09 v.5.8.3 +* Исправлено определение пути к файлу ICML-каталога + ## 2021-09-08 v.5.8.2 * Оптимизирована работа с памятью в генераторе каталога * Исправлены ошибки в генераторе каталога diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 71a71d7b..23bd9d66 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1,2 +1 @@ -- Оптимизирована работа с памятью в генераторе каталога -- Исправлены ошибки в генераторе каталога +- Исправлено определение пути к файлу ICML-каталога diff --git a/intaro.retailcrm/export/export_run.php b/intaro.retailcrm/export/export_run.php index 17384d20..903e42c9 100644 --- a/intaro.retailcrm/export/export_run.php +++ b/intaro.retailcrm/export/export_run.php @@ -142,6 +142,17 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/retailcrm/exp $xmlProps->highloadblockProduct = $iblockPropertyProductHl; } + $logger = Logger::getInstance('/bitrix/catalog_export/'); + + if (!file_exists(dirname($SETUP_FILE_NAME))) { + $SETUP_FILE_NAME = $_SERVER['DOCUMENT_ROOT'] . $SETUP_FILE_NAME; + + if (!file_exists(dirname($SETUP_FILE_NAME))) { + $logger->write(GetMessage('TARGET_DIR_DOESNT_EXIST'), 'i_crm_load_log'); + return; + } + } + $fileSetup = new XmlSetup($xmlProps); $fileSetup->profileId = $profile_id; $fileSetup->iblocksForExport = $iblockExport; @@ -149,7 +160,6 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/retailcrm/exp $fileSetup->filePath = $SETUP_FILE_NAME; $fileSetup->loadPurchasePrice = $loadPurchasePrice === 'Y'; $fileSetup->basePriceId = CatalogRepository::getBasePriceId($fileSetup->profileId); - $logger = Logger::getInstance('/bitrix/catalog_export/'); if (!is_array($fileSetup->iblocksForExport) || count($fileSetup->iblocksForExport) === 0) { $logger->write(GetMessage("IBLOCK_NOT_SELECTED"), 'i_crm_load_log'); diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index a1d987eb..131559a2 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '5.8.2', - 'VERSION_DATE' => '2021-10-02 15:00:00', + 'VERSION' => '5.8.3', + 'VERSION_DATE' => '2021-10-09 13:00:00', ]; diff --git a/intaro.retailcrm/lang/en/export/export_run.php b/intaro.retailcrm/lang/en/export/export_run.php index a1ace4af..593b663d 100644 --- a/intaro.retailcrm/lang/en/export/export_run.php +++ b/intaro.retailcrm/lang/en/export/export_run.php @@ -1,3 +1,4 @@