RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-02-21 01:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Fix icml generator path (#223)

Browse Source
This commit is contained in:
Pavel 2021-11-12 13:53:40 +03:00 committed by GitHub
parent 2b20702e58
commit 64ac89d1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2021-10-09 v.5.8.3
* Исправлено определение пути к файлу ICML-каталога
## 2021-09-08 v.5.8.2
* Оптимизирована работа с памятью в генераторе каталога
* Исправлены ошибки в генераторе каталога

3
intaro.retailcrm/description.ru
View File

@ -1,2 +1 @@
- Оптимизирована работа с памятью в генераторе каталога
- Исправлены ошибки в генераторе каталога
- Исправлено определение пути к файлу ICML-каталога

12
intaro.retailcrm/export/export_run.php
View File

@ -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');

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

@ -1,6 +1,6 @@
<?php
$arModuleVersion = [
'VERSION' => '5.8.2',
'VERSION_DATE' => '2021-10-02 15:00:00',
'VERSION' => '5.8.3',
'VERSION_DATE' => '2021-10-09 13:00:00',
];

1
intaro.retailcrm/lang/en/export/export_run.php
View File

@ -1,3 +1,4 @@
<?php
$MESS['IBLOCK_NOT_SELECTED'] = 'No infoblock selected for export';
$MESS['TARGET_DIR_DOESNT_EXIST'] = 'Target directory does not exist';

1
intaro.retailcrm/lang/en/install/index.php
View File

@ -1,6 +1,7 @@
<?php
$MESS['IBLOCK_NOT_SELECTED'] = 'No infoblock selected for export';
$MESS['TARGET_DIR_DOESNT_EXIST'] = 'Target directory does not exist';
$MESS ['RETAIL_MODULE_NAME'] = 'RetailCRM';
$MESS ['MODULE_DESCRIPTION'] = 'Integration module with RetailCRM - specialized CRM for e-commerce';
$MESS ['MODULE_PARTNER_NAME'] = 'Intaro Software';

1
intaro.retailcrm/lang/ru/export/export_run.php
View File

@ -1,3 +1,4 @@
<?php
$MESS['IBLOCK_NOT_SELECTED'] = 'Не выбрано ни одного инфоблока для экспорта';
$MESS['TARGET_DIR_DOESNT_EXIST'] = 'Целевая директория не существует';

1
intaro.retailcrm/lang/ru/install/index.php
View File

@ -15,6 +15,7 @@ $MESS ['ERR_ARTICLE_IBLOCK'] = 'Не установлены артикулы';
$MESS ['DATE_TIMEZONE_ERR'] = 'Не указана временная зона в настройках php.';
$MESS ['SALE_VERSION_ERR'] = 'Версия модуля \'Интернет-магазин\' должна быть выше 16.';
$MESS['IBLOCK_NOT_SELECTED'] = 'Не выбрано ни одного инфоблока для экспорта';
$MESS['TARGET_DIR_DOESNT_EXIST'] = 'Целевая директория не существует';
/*
$MESS ['ORDER_PROPS'] = 'Настройки соответствия полей заказа RetailCRM свойствам заказа 1С-Битрикс';