diff --git a/intaro.intarocrm/description.ru b/intaro.intarocrm/description.ru new file mode 100644 index 00000000..de30c791 --- /dev/null +++ b/intaro.intarocrm/description.ru @@ -0,0 +1,2 @@ +* При настройке выгрузки каталога сделано необязательным указание артикула товара +* Доработан скрипт генерации ICML-файла в части работы со спецсимволами \ No newline at end of file diff --git a/intaro.intarocrm/export/export_setup.php b/intaro.intarocrm/export/export_setup.php index 84c56fe0..d0c92f81 100644 --- a/intaro.intarocrm/export/export_setup.php +++ b/intaro.intarocrm/export/export_setup.php @@ -1,4 +1,4 @@ -1) { - - - if (count($IBLOCK_EXPORT) < count($IBLOCK_PROPERTY_ARTICLE)) + + + if (count($IBLOCK_EXPORT) < count($IBLOCK_PROPERTY_ARTICLE)) $arSetupErrors[] = GetMessage("ERROR_ARTICLE_NOT_SET"); if (strlen($SETUP_FILE_NAME)<=0) @@ -51,7 +51,7 @@ if (!empty($arSetupErrors)) if ($STEP==1) { - + ?>
@@ -66,8 +66,8 @@ if ($STEP==1) { $IBLOCK_EXPORT = array(); } - - + + $boolAll = false; $intCountChecked = 0; $intCountAvailIBlock = 0; @@ -88,14 +88,14 @@ if ($STEP==1) $db_properties = CIBlock::GetProperties($res['ID'], Array()); $properties = Array(); - while($prop = $db_properties->Fetch()) + while($prop = $db_properties->Fetch()) $properties[] = $prop; - - if (count($IBLOCK_EXPORT) != 0) + + if (count($IBLOCK_EXPORT) != 0) $boolExport = (in_array($res['ID'], $IBLOCK_EXPORT)); else $boolExport = true; - + $arIBlockList[] = array( 'ID' => $res['ID'], 'NAME' => $res['NAME'], @@ -105,7 +105,7 @@ if ($STEP==1) 'OLD_PROPERTY_SELECT' => $IBLOCK_PROPERTY_ARTICLE[$res['ID']] != "" ? $IBLOCK_PROPERTY_ARTICLE[$res['ID']] : null, 'SITE_LIST' => '('.implode(' ',$arSiteList).')', ); - + if ($boolExport) $intCountChecked++; $intCountAvailIBlock++; @@ -119,11 +119,12 @@ if ($STEP==1) $intCountChecked = $intCountAvailIBlock; $boolAll = true; } - + + ?> - - - + + + @@ -174,10 +175,10 @@ if ($STEP==1)
-


- - + + - - + + - + "> @@ -279,7 +282,7 @@ if ($STEP==1) "> - + '0.3.8', - 'VERSION_DATE' => '2013-08-14 19:32:00', + "VERSION" => "0.3.9", + "VERSION_DATE" => "2013-08-21 18:32:00", ); \ No newline at end of file diff --git a/intaro.intarocrm/updater.php b/intaro.intarocrm/updater.php new file mode 100644 index 00000000..e80c9e65 --- /dev/null +++ b/intaro.intarocrm/updater.php @@ -0,0 +1,10 @@ +CopyFiles("install/export/intarocrm_run.php", "php_interface/include/catalog_export/intarocrm_run.php"); + +if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php')) { + unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php'); +} +$updater->CopyFiles("install/export/intarocrm_setup.php", "php_interface/include/catalog_export/intarocrm_setup.php");