diff --git a/intaro.intarocrm/classes/general/ICMLLoader.php b/intaro.intarocrm/classes/general/ICMLLoader.php index c2ee5c29..fa9a725a 100644 --- a/intaro.intarocrm/classes/general/ICMLLoader.php +++ b/intaro.intarocrm/classes/general/ICMLLoader.php @@ -9,321 +9,297 @@ class ICMLLoader { public $encoding = 'utf-8'; protected $fp; - public static function AgentLoad3( $filename) - { - echo $filename; - $arFilename = "'" . $filename . "'"; - return "ICMLLoader::AgentLoad( " . $arFilename . ");"; + protected $mainSection = 1000000; - } - public static function AgentLoad($iblocks, $filename) - { - - if (!CModule::IncludeModule("iblock")) { - //handle err - self::eventLog('ICMLLoader::AgentLoad', 'iblock', 'module not found'); - return true; - } - - if (!CModule::IncludeModule("catalog")) { - //handle err - self::eventLog('ICMLLoader::AgentLoad', 'catalog', 'module not found'); - return true; - } - - global $APPLICATION, $USER; - if(!isset($USER)) { - $USER = new CUser; - } - $loader = new ICMLLoader(); - $loader->iblocks = json_decode($iblocks, true); - $loader->filename = $filename; - $loader->application = $APPLICATION; - $loader->Load(); - $arIblocks = "'" . $iblocks . "'"; - $arFilename = "'" . $filename . "'"; - return "ICMLLoader::AgentLoad(" . $arIblocks . ", " . $arFilename . ");"; - } public function Load() { - $categories = $this->GetCategories(); - - $offers = $this->GetOffers(); - - /*foreach ($offers as $obj) - if (is_array($obj)) - foreach ($obj as $obj2) - print(htmlspecialcharsbx($obj2) . "
"); - else - print(htmlspecialcharsbx($obj) . "
"); - */ - - - $this->PrepareFile(); - - $this->PreWriteCatalog(); - - $this->WriteCategories($categories); - $this->WriteOffers($offers); - - $this->PostWriteCatalog(); - - $this->CloseFile(); + global $USER; + if(!isset($USER)) + $USER = new CUser; + + if (count($this->iblocks) < count($this->articleProperties)) + return false; + + $categories = $this->GetCategories(); + + $offers = $this->GetOffers(); + + $this->PrepareFile(); + + $this->PreWriteCatalog(); + + $this->WriteCategories($categories); + $this->WriteOffers($offers); + + $this->PostWriteCatalog(); + + $this->CloseFile(); + return true; } protected function PrepareValue($text) { - - //$text = htmlspecialcharsbx($text); - //$text = str_replace('"', '"', $text); - //$text = preg_replace("/[\x1-\x8\xB-\xC\xE-\x1F]/", "", $text); - //$text = str_replace("'", "'", $text); - $text = $this->application->ConvertCharset($text, LANG_CHARSET, $this->encoding); - return $text; + $newText = $this->application->ConvertCharset($text, LANG_CHARSET, $this->encoding); + $newText = strip_tags($newText); + $newText = str_replace("&", "&", $newText); + return $newText; } protected function PrepareFile() { - $fullFilename = $_SERVER["DOCUMENT_ROOT"] . $this->filename; - CheckDirPath($fullFilename); - - if (!$this->fp = @fopen($fullFilename, "w")) - return false; - else - return true; + $fullFilename = $_SERVER["DOCUMENT_ROOT"] . $this->filename; + CheckDirPath($fullFilename); + + if (!$this->fp = @fopen($fullFilename, "w")) + return false; + else + return true; } protected function PreWriteCatalog() { - @fwrite($this->fp, "\n"); - @fwrite($this->fp, "\n"); - - @fwrite($this->fp, "".$this->application->ConvertCharset(htmlspecialcharsbx(COption::GetOptionString("main", "site_name", "")), LANG_CHARSET, $encoding)."\n"); - - @fwrite($this->fp, "".$this->application->ConvertCharset(htmlspecialcharsbx(COption::GetOptionString("main", "site_name", "")), LANG_CHARSET, $encoding)."\n"); - + @fwrite($this->fp, "PrepareValue(Date("Y-m-d H:i:s")) . "\">\n"); + @fwrite($this->fp, "\n"); + + @fwrite($this->fp, "". $this->PrepareValue(COption::GetOptionString("main", "site_name", ""))."\n"); + + @fwrite($this->fp, "".$this->PrepareValue(COption::GetOptionString("main", "site_name", ""))."\n"); + } protected function WriteCategories($categories) { - @fwrite($this->fp, "\n"); - foreach ($categories as $category) { - @fwrite($this->fp, $category . "\n"); - } - @fwrite($this->fp, "\n"); + @fwrite($this->fp, "\n"); + foreach ($categories as $category) { + @fwrite($this->fp, $category . "\n"); + } + @fwrite($this->fp, "\n"); } protected function WriteOffers($offers) { - @fwrite($this->fp, "\n"); - foreach ($offers as $offer) { - @fwrite($this->fp, $offer . "\n"); - } - @fwrite($this->fp, "\n"); + @fwrite($this->fp, "\n"); + foreach ($offers as $offer) { + @fwrite($this->fp, $offer . "\n"); + } + @fwrite($this->fp, "\n"); } protected function PostWriteCatalog() { - @fwrite($this->fp, "\n"); - @fwrite($this->fp, "\n"); + @fwrite($this->fp, "\n"); + @fwrite($this->fp, "\n"); } protected function CloseFile() { - @fclose($this->fp); + @fclose($this->fp); } protected function GetCategories() { - $categories = array(); - foreach ($this->iblocks as $id) - { - $filter = Array( - "IBLOCK_ID" => $id, - "ACTIVE" => "Y", - "IBLOCK_ACTIVE" => "Y", - "GLOBAL_ACTIVE" => "Y" - ); - - - $dbRes = CIBlockSection::GetList(array("left_margin" => "asc"), $filter); - while ($arRes = $dbRes->Fetch()) - { - $categories[] = $this->BuildCategory($arRes); - } - } - return $categories; + $categories = array(); + foreach ($this->iblocks as $id) + { + $filter = Array( + "IBLOCK_ID" => $id, + "ACTIVE" => "Y", + "IBLOCK_ACTIVE" => "Y", + "GLOBAL_ACTIVE" => "Y" + ); + + + $dbRes = CIBlockSection::GetList(array("left_margin" => "asc"), $filter); + while ($arRes = $dbRes->Fetch()) + { + $categories[] = $this->BuildCategory($arRes); + } + if (count($categories) == 0) + { + $arRes = Array(); + $arRes['ID'] = $this->mainSection + $id; + $arRes['IBLOCK_SECTION_ID'] = 0; + $arRes['NAME'] = "Основной раздел каталога"; + $categories[] = $this->BuildCategory($arRes); + } + } + return $categories; } protected function BuildCategory($arCategory) { - return " - 0 ? - " parentId=\"" . $arCategory["IBLOCK_SECTION_ID"] . "\"" - :"") - . ">" - . $arCategory["NAME"] - . ""; + return " + PrepareValue($arCategory["ID"]) . "\"" + . ( intval($arCategory["IBLOCK_SECTION_ID"] ) > 0 ? + " parentId=\"" . $this->PrepareValue($arCategory["IBLOCK_SECTION_ID"]) . "\"" + :"") + . ">" + . $this->PrepareValue($arCategory["NAME"]) + . ""; } protected function GetOffers() { - $offers = Array(); - foreach ($this->iblocks as $key => $id) - { - - $iblock['IBLOCK_DB'] = CIBlock::GetByID($id)->Fetch(); - $iblockOffer = CCatalogSKU::GetInfoByProductIBlock($id); - - - $arSelect = Array ( - "ID", - "LID", - "IBLOCK_ID", - "IBLOCK_SECTION_ID", - "ACTIVE", - "ACTIVE_FROM", - "ACTIVE_TO", - "NAME", - "DETAIL_PICTURE", - "DETAIL_TEXT", - "DETAIL_PICTURE", - "LANG_DIR", - "DETAIL_PAGE_URL", - "PROPERTY_" . $this->articleProperties[$key] - ); + $offers = Array(); + foreach ($this->iblocks as $key => $id) + { - $filter = Array ( - "IBLOCK_ID" => $id, - "ACTIVE_DATE" => "Y", - "ACTIVE" => "Y", - "INCLUDE_SUBSECTIONS" => "Y" - ); - $counter = 0; - $dbResProducts = CIBlockElement::GetList(array(), $filter, false, false, $arSelect); - while ($product = $dbResProducts->GetNextElement()) { - - $product = $product->GetFields(); - - $categoriesString = ""; - - - $existOffer = false; - if (!empty($iblockOffer['IBLOCK_ID'])) { - $arFilterOffer = Array ( - 'IBLOCK_ID' => $iblockOffer['IBLOCK_ID'], - 'PROPERTY_'.$iblockOffer['SKU_PROPERTY_ID'] => $product["ID"] - ); - $arSelectOffer = Array ( - 'ID', - "NAME", - "DETAIL_TEXT", - "DETAIL_PAGE_URL", - "DETAIL_PICTURE", - "PROPERTY_" . $this->articleProperties[$key] - ); - - $rsOffers = CIBlockElement::GetList(array(), $arFilterOffer, false, false, $arSelectOffer); - while ($arOffer = $rsOffers->GetNext()) { - - $dbResCategories = CIBlockElement::GetElementGroups($arOffer['ID'], true); - while ($arResCategory = $dbResCategories->Fetch()) { - $categoriesString .= "" . $arResCategory["ID"] . "\n"; - } - $offer = CCatalogProduct::GetByID($arOffer['ID']); - $arOffer['QUANTITY'] = $offer["QUANTITY"]; - - $arOffer['PRODUCT_ID'] = $product["ID"]; - $arOffer['DETAIL_PAGE_URL'] = $product["DETAIL_PAGE_URL"]; - $arOffer['DETAIL_PICTURE'] = $product["DETAIL_PICTURE"]; - $arOffer['PREVIEW_PICTURE'] = $product["PREVIEW_PICTURE"]; - $arOffer['PRODUCT_NAME'] = $product["NAME"]; - $arOffer['ARTICLE'] = $arOffer["PROPERTY_" . $this->articleProperties[$key] . "_VALUE"]; - - $dbPrice = GetCatalogProductPrice($arOffer["ID"],1); - $arOffer['PRICE'] = $dbPrice['PRICE']; - - - - $offers[] = $this->BuildOffer($arOffer, $categoriesString, $iblock); - $existOffer = true; - } - } - if (!$existOffer) { - $dbResCategories = CIBlockElement::GetElementGroups($product["ID"], true); - while ($arResCategory = $dbResCategories->Fetch()) { - $categoriesString .= "" . $arResCategory["ID"] . "\n"; - } - - - $offer = CCatalogProduct::GetByID($product['ID']); - $product['QUANTITY'] = $offer["QUANTITY"]; - - $product['PRODUCT_ID'] = $product["ID"]; - $product['PRODUCT_NAME'] = $product["NAME"]; - $product['ARTICLE'] = $product["PROPERTY_" . $this->articleProperties[$key] . "_VALUE"]; - - $dbPrice = GetCatalogProductPrice($product["ID"],1); - $product['PRICE'] = $dbPrice['PRICE']; - - $offers[] = $this->BuildOffer($product, $categoriesString, $iblock); - } - } - } - return $offers; + $iblock['IBLOCK_DB'] = CIBlock::GetByID($id)->Fetch(); + $iblockOffer = CCatalogSKU::GetInfoByProductIBlock($id); + + + $arSelect = Array ( + "ID", + "LID", + "IBLOCK_ID", + "IBLOCK_SECTION_ID", + "ACTIVE", + "ACTIVE_FROM", + "ACTIVE_TO", + "NAME", + "DETAIL_PICTURE", + "DETAIL_TEXT", + "DETAIL_PICTURE", + "LANG_DIR", + "DETAIL_PAGE_URL" + ); + + if (isset($this->articleProperties[$id])) + $arSelect[] = "PROPERTY_" . $this->articleProperties[$id]; + + + $filter = Array ( + "IBLOCK_ID" => $id, + "ACTIVE_DATE" => "Y", + "ACTIVE" => "Y", + "INCLUDE_SUBSECTIONS" => "Y" + ); + + $dbResProducts = CIBlockElement::GetList(array(), $filter, false, false, $arSelect); + while ($product = $dbResProducts->GetNextElement()) { + + $product = $product->GetFields(); + + $categoriesString = ""; + + + $existOffer = false; + if (!empty($iblockOffer['IBLOCK_ID'])) { + $arFilterOffer = Array ( + 'IBLOCK_ID' => $iblockOffer['IBLOCK_ID'], + 'PROPERTY_'.$iblockOffer['SKU_PROPERTY_ID'] => $product["ID"] + ); + $arSelectOffer = Array ( + 'ID', + "NAME", + "DETAIL_TEXT", + "DETAIL_PAGE_URL", + "DETAIL_PICTURE" + ); + if (isset($this->articleProperties[$id])) + $arSelectOffer[] = "PROPERTY_" . $this->articleProperties[$id]; + + $rsOffers = CIBlockElement::GetList(array(), $arFilterOffer, false, false, $arSelectOffer); + while ($arOffer = $rsOffers->GetNext()) { + + $dbResCategories = CIBlockElement::GetElementGroups($arOffer['ID'], true); + while ($arResCategory = $dbResCategories->Fetch()) { + $categoriesString .= "" . $arResCategory["ID"] . "\n"; + } + if ($categoriesString == '') + $categoriesString .= "" . ($this->mainSection + $id) . "\n"; + $offer = CCatalogProduct::GetByID($arOffer['ID']); + $arOffer['QUANTITY'] = $offer["QUANTITY"]; + + $arOffer['PRODUCT_ID'] = $product["ID"]; + $arOffer['DETAIL_PAGE_URL'] = $product["DETAIL_PAGE_URL"]; + $arOffer['DETAIL_PICTURE'] = $product["DETAIL_PICTURE"]; + $arOffer['PREVIEW_PICTURE'] = $product["PREVIEW_PICTURE"]; + $arOffer['PRODUCT_NAME'] = $product["NAME"]; + if (isset($this->articleProperties[$id])) + $arOffer['ARTICLE'] = $arOffer["PROPERTY_" . $this->articleProperties[$id] . "_VALUE"]; + + $dbPrice = GetCatalogProductPrice($arOffer["ID"],1); + $arOffer['PRICE'] = $dbPrice['PRICE']; + + + + $offers[] = $this->BuildOffer($arOffer, $categoriesString, $iblock); + $existOffer = true; + } + } + if (!$existOffer) { + $dbResCategories = CIBlockElement::GetElementGroups($product["ID"], true); + while ($arResCategory = $dbResCategories->Fetch()) { + $categoriesString .= "" . $arResCategory["ID"] . "\n"; + } + if ($categoriesString == '') + $categoriesString .= "" . ($this->mainSection + $id) . "\n"; + + $offer = CCatalogProduct::GetByID($product['ID']); + $product['QUANTITY'] = $offer["QUANTITY"]; + + $product['PRODUCT_ID'] = $product["ID"]; + $product['PRODUCT_NAME'] = $product["NAME"]; + if (isset($this->articleProperties[$id])) + $product['ARTICLE'] = $product["PROPERTY_" . $this->articleProperties[$id] . "_VALUE"]; + + $dbPrice = GetCatalogProductPrice($product["ID"],1); + $product['PRICE'] = $dbPrice['PRICE']; + + $offers[] = $this->BuildOffer($product, $categoriesString, $iblock); + } + } + } + return $offers; } protected function BuildOffer($arOffer, $categoriesString, $iblock) { - $offer = ""; - $offer .= "\n"; - $offer .= "http://" . $iblock['IBLOCK_DB']['SERVER_NAME'] . $arOffer['DETAIL_PAGE_URL'] . "\n"; + $offer = ""; + $offer .= "PrepareValue($arOffer["ID"]) . "\" ". + "productId=\"" . $this->PrepareValue($arOffer["PRODUCT_ID"]) . "\" ". + "quantity=\"" . $this->PrepareValue(DoubleVal($arOffer['QUANTITY'])) . "\">\n"; + $offer .= "http://" . $this->PrepareValue($iblock['IBLOCK_DB']['SERVER_NAME']) . $this->PrepareValue($arOffer['DETAIL_PAGE_URL']) . "\n"; - $offer .= "" . $arOffer['PRICE'] . "\n"; - $offer .= $categoriesString; - - $detailPicture = intval($arOffer["DETAIL_PICTURE"]); - $previewPicture = intval($arOffer["PREVIEW_PICTURE"]); + $offer .= "" . $this->PrepareValue($arOffer['PRICE']) . "\n"; + $offer .= $categoriesString; - if ($detailPicture > 0 || $previewPicture > 0) - { - $picture = $detailPicture; - if ($picture <= 0) { - $picture = $previewPicture; - } + $detailPicture = intval($arOffer["DETAIL_PICTURE"]); + $previewPicture = intval($arOffer["PREVIEW_PICTURE"]); - if ($arFile = CFile::GetFileArray($picture)) - { - if(substr($arFile["SRC"], 0, 1) == "/") - $strFile = "http://" . $iblock['IBLOCK_DB']['SERVER_NAME'] . implode("/", array_map("rawurlencode", explode("/", $arFile["SRC"]))); - elseif(preg_match("/^(http|https):\\/\\/(.*?)\\/(.*)\$/", $arFile["SRC"], $match)) - $strFile = "http://" . $match[2] . '/' . implode("/", array_map("rawurlencode", explode("/", $match[3]))); - else - $strFile = $arFile["SRC"]; - $offer .= "" . $strFile . "\n"; - } - } - - $offer .= "" . $this->PrepareValue($arOffer["NAME"]) . "\n"; - $offer .= "" . (strip_tags( html_entity_decode(str_replace(" ", ' ', $this->PrepareValue($arOffer["DETAIL_TEXT"]))))) . - "\n"; - + if ($detailPicture > 0 || $previewPicture > 0) + { + $picture = $detailPicture; + if ($picture <= 0) { + $picture = $previewPicture; + } - $offer .= "" . $arOffer["EXTERNAL_ID"] . "\n"; - $offer .= "" . $arOffer["PRODUCT_NAME"] . "\n"; - $offer .= "
" . $arOffer["ARTICLE"] . "
\n"; - - $offer.= "\n"; - return $offer; + if ($arFile = CFile::GetFileArray($picture)) + { + if(substr($arFile["SRC"], 0, 1) == "/") + $strFile = "http://" . $this->PrepareValue($iblock['IBLOCK_DB']['SERVER_NAME']) . implode("/", array_map("rawurlencode", explode("/", $arFile["SRC"]))); + elseif(preg_match("/^(http|https):\\/\\/(.*?)\\/(.*)\$/", $arFile["SRC"], $match)) + $strFile = "http://" . $this->PrepareValue($match[2]) . '/' . implode("/", array_map("rawurlencode", explode("/", $this->PrepareValue($match[3])))); + else + $strFile = $arFile["SRC"]; + $offer .= "" . $this->PrepareValue($strFile) . "\n"; + } + } + + $offer .= "" . $this->PrepareValue($arOffer["NAME"]) . "\n"; + + $offer .= "" . $this->PrepareValue($arOffer["EXTERNAL_ID"]) . "\n"; + $offer .= "" . $this->PrepareValue($arOffer["PRODUCT_NAME"]) . "\n"; + if (isset($arOffer["ARTICLE"])) + $offer .= "
" . $this->PrepareValue($arOffer["ARTICLE"]) . "
\n"; + + $offer.= "\n"; + return $offer; } diff --git a/intaro.intarocrm/export/export_run.php b/intaro.intarocrm/export/export_run.php new file mode 100644 index 00000000..ea2d7464 --- /dev/null +++ b/intaro.intarocrm/export/export_run.php @@ -0,0 +1,19 @@ +iblocks = $IBLOCK_EXPORT; +$loader->articleProperties = $IBLOCK_PROPERTY_ARTICLE; +$loader->filename = $SETUP_FILE_NAME; +$loader->application = $APPLICATION; +$loader->Load(); \ No newline at end of file diff --git a/intaro.intarocrm/export/export_setup.php b/intaro.intarocrm/export/export_setup.php new file mode 100644 index 00000000..d0c92f81 --- /dev/null +++ b/intaro.intarocrm/export/export_setup.php @@ -0,0 +1,295 @@ + 1) +{ + + + if (count($IBLOCK_EXPORT) < count($IBLOCK_PROPERTY_ARTICLE)) + $arSetupErrors[] = GetMessage("ERROR_ARTICLE_NOT_SET"); + + if (strlen($SETUP_FILE_NAME)<=0) + { + $arSetupErrors[] = GetMessage("CET_ERROR_NO_FILENAME"); + } + elseif ($APPLICATION->GetFileAccessPermission($SETUP_FILE_NAME) < "W") + { + $arSetupErrors[] = str_replace("#FILE#", $SETUP_FILE_NAME, GetMessage('CET_YAND_RUN_ERR_SETUP_FILE_ACCESS_DENIED')); + } + + if (($ACTION=="EXPORT_SETUP" || $ACTION == 'EXPORT_EDIT' || $ACTION == 'EXPORT_COPY') && strlen($SETUP_PROFILE_NAME)<=0) + { + $arSetupErrors[] = GetMessage("CET_ERROR_NO_PROFILE_NAME"); + } + + if (!empty($arSetupErrors)) + { + $STEP = 1; + } +} + +if (!empty($arSetupErrors)) + echo ShowError(implode('
', $arSetupErrors)); + + +if ($STEP==1) +{ + + +?> +
+ +

+ "ASC", "NAME"=>"ASC"),array('CHECK_PERMISSIONS' => 'Y','MIN_PERMISSION' => 'W')); + while ($res = $db_res->Fetch()) + { + if ($arCatalog = CCatalog::GetByIDExt($res["ID"])) + { + if($arCatalog['CATALOG_TYPE'] == "D" || $arCatalog['CATALOG_TYPE'] == "X" || $arCatalog['CATALOG_TYPE'] == "P") + { + $arSiteList = array(); + $rsSites = CIBlock::GetSite($res["ID"]); + while ($arSite = $rsSites->Fetch()) + { + $arSiteList[] = $arSite["SITE_ID"]; + } + $db_properties = CIBlock::GetProperties($res['ID'], Array()); + + $properties = Array(); + while($prop = $db_properties->Fetch()) + $properties[] = $prop; + + if (count($IBLOCK_EXPORT) != 0) + $boolExport = (in_array($res['ID'], $IBLOCK_EXPORT)); + else + $boolExport = true; + + $arIBlockList[] = array( + 'ID' => $res['ID'], + 'NAME' => $res['NAME'], + 'IBLOCK_TYPE_ID' => $res['IBLOCK_TYPE_ID'], + 'IBLOCK_EXPORT' => $boolExport, + 'PROPERTIES' => $properties, + 'OLD_PROPERTY_SELECT' => $IBLOCK_PROPERTY_ARTICLE[$res['ID']] != "" ? $IBLOCK_PROPERTY_ARTICLE[$res['ID']] : null, + 'SITE_LIST' => '('.implode(' ',$arSiteList).')', + ); + + if ($boolExport) + $intCountChecked++; + $intCountAvailIBlock++; + } + } + } + if (count($IBLOCK_EXPORT) != 0) { + if ($intCountChecked == $intCountAvailIBlock) + $boolAll = true; + } else { + $intCountChecked = $intCountAvailIBlock; + $boolAll = true; + } + + + ?> + + + + + + + + + + + + + + + + + + $arIBlock) + { + ?> + + + + + + + +
+
+ 		+
+   +
+ 		+
+
+ + + > + + +   +
+ + + + ]" + id="IBLOCK_EXPORT" + value="" + + onclick="checkOne(this,);" + > + + + +
+ +
+
+
+ +

+ + +
+
+
+ + + +

+ +
+
+
+ + + + + + + + + + + + "> + + + + "> + + +
+ + \ No newline at end of file diff --git a/intaro.intarocrm/install/export/intarocrm_run.php b/intaro.intarocrm/install/export/intarocrm_run.php new file mode 100644 index 00000000..35313159 --- /dev/null +++ b/intaro.intarocrm/install/export/intarocrm_run.php @@ -0,0 +1,3 @@ +IntaroCRM +require($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro.intarocrm/export/export_run.php"); \ No newline at end of file diff --git a/intaro.intarocrm/install/export/intarocrm_setup.php b/intaro.intarocrm/install/export/intarocrm_setup.php new file mode 100644 index 00000000..b2297fb0 --- /dev/null +++ b/intaro.intarocrm/install/export/intarocrm_setup.php @@ -0,0 +1,3 @@ +IntaroCRM +require($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro.intarocrm/export/export_setup.php"); \ No newline at end of file diff --git a/intaro.intarocrm/install/index.php b/intaro.intarocrm/install/index.php index 50036c50..f55fc3b1 100755 --- a/intaro.intarocrm/install/index.php +++ b/intaro.intarocrm/install/index.php @@ -681,6 +681,15 @@ class intaro_intarocrm extends CModule ); } else if ($step == 5) { + + if(!CModule::IncludeModule("iblock")) { + $arResult['errCode'] = 'ERR_IBLOCK'; + } + + if(!CModule::IncludeModule("catalog")) { + $arResult['errCode'] = 'ERR_CATALOG'; + } + if(isset($arResult['errCode']) && $arResult['errCode']) { $APPLICATION->IncludeAdminFile( GetMessage('MODULE_INSTALL_TITLE'), @@ -695,153 +704,185 @@ class intaro_intarocrm extends CModule $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/step3.php' ); } - - RegisterModule($this->MODULE_ID); - RegisterModuleDependences("sale", "OnSaleCancelOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSaleCancelOrder"); - RegisterModuleDependences("sale", "OnSalePayOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSalePayOrder"); - - if(!CModule::IncludeModule("iblock")) { - $arResult['errCode'] = 'ERR_IBLOCK'; - } - - if (!CModule::IncludeModule("catalog")) { - $arResult['errCode'] = 'ERR_CATALOG'; - } - - if (!isset($_POST['IBLOCK_EXPORT'])) - $iblocks = 0; + if(!isset($_POST['IBLOCK_EXPORT'])) + $arResult['errCode'] = 'ERR_FIELDS_IBLOCK'; else $iblocks = $_POST['IBLOCK_EXPORT']; - - if (!isset($_POST['IBLOCK_PROPERTY_ARTICLE'])) - $articleProperties = 0; + + if(!isset($_POST['IBLOCK_PROPERTY_ARTICLE'])) + $arResult['errCode'] = 'ERR_FIELDS_ARTICLE'; else $articleProperties = $_POST['IBLOCK_PROPERTY_ARTICLE']; - - if (!isset($_POST['SETUP_PROFILE_NAME'])) - $profileName = 0; - else - $profileName = $_POST['SETUP_PROFILE_NAME']; - - if (!isset($_POST['SETUP_FILE_NAME'])) - $filename = 0; + + if(!isset($_POST['SETUP_FILE_NAME'])) + $arResult['errCode'] = 'ERR_FIELDS_FILE'; else $filename = $_POST['SETUP_FILE_NAME']; - - if (!isset($_POST['TYPE_LOADING'])) + + if (count($iblocks) < count($articleProperties)) + $arResult['errCode'] = 'ERR_ARTICLE_IBLOCK'; + + + if(!isset($_POST['TYPE_LOADING'])) $typeLoading = 0; else $typeLoading = $_POST['TYPE_LOADING']; - + + if(!isset($_POST['SETUP_PROFILE_NAME']) ) + $profileName = ""; + else + $profileName = $_POST['SETUP_PROFILE_NAME']; + + if ($typeLoading != 'none' && $profileName == "") + $arResult['errCode'] = 'ERR_FIELDS_PROFILE'; + + if($filename == "") + $arResult['errCode'] = 'ERR_FIELDS_FILE'; + + if(isset($arResult['errCode']) && $arResult['errCode']) { + + + $arOldValues = Array( + 'IBLOCK_EXPORT' => $iblocks, + 'IBLOCK_PROPERTY_ARTICLE' => $articleProperties, + 'SETUP_FILE_NAME' => $filename, + 'SETUP_PROFILE_NAME' => $profileName + ); + global $oldValues; + $oldValues = $arOldValues; + $APPLICATION->IncludeAdminFile( + GetMessage('MODULE_INSTALL_TITLE'), + $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/step4.php' + ); + return; + } + + RegisterModule($this->MODULE_ID); + RegisterModuleDependences("sale", "OnSaleCancelOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSaleCancelOrder"); + $this->CopyFiles(); if (isset($_POST['LOAD_NOW'])) { - + $loader = new ICMLLoader(); $loader->iblocks = $iblocks; $loader->articleProperties = $articleProperties; $loader->filename = $filename; $loader->application = $APPLICATION; $loader->Load(); - } - if (!isset($_POST['TYPE_LOADING'])) - $typeLoading = 0; - else - $typeLoading = $_POST['TYPE_LOADING']; - + + } + if ($typeLoading == 'agent' || $typeLoading == 'cron') { - $dbProfile = CCatalogExport::GetList(array(), array("FILE_NAME" => $this->INTARO_CRM_EXPORT)); + if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/' . $this->INTARO_CRM_EXPORT . '_run.php')) { + $dbProfile = CCatalogExport::GetList(array(), array("FILE_NAME" => $this->INTARO_CRM_EXPORT)); - while ($arProfile = $dbProfile->Fetch()) { - if ($arProfile["DEFAULT_PROFILE"] != "Y") - CAgent::RemoveAgent("CCatalogExport::PreGenerateExport(" . $arProfile['ID'] . ");", "catalog"); + while ($arProfile = $dbProfile->Fetch()) { + if ($arProfile["DEFAULT_PROFILE"]!="Y") { + CAgent::RemoveAgent("CCatalogExport::PreGenerateExport(".$arProfile['ID'].");", "catalog"); + CCatalogExport::Delete($arProfile['ID']); + } + } } $ar = $this->GetProfileSetupVars($iblocks, $articleProperties, $filename); $PROFILE_ID = CCatalogExport::Add(array( - "LAST_USE" => false, - "FILE_NAME" => $this->INTARO_CRM_EXPORT, - "NAME" => $profileName, - "DEFAULT_PROFILE" => "N", - "IN_MENU" => "N", - "IN_AGENT" => "N", - "IN_CRON" => "N", - "NEED_EDIT" => "N", - "SETUP_VARS" => $ar - )); + "LAST_USE" => false, + "FILE_NAME" => $this->INTARO_CRM_EXPORT, + "NAME" => $profileName, + "DEFAULT_PROFILE" => "N", + "IN_MENU" => "N", + "IN_AGENT" => "N", + "IN_CRON" => "N", + "NEED_EDIT" => "N", + "SETUP_VARS" => $ar + )); if (intval($PROFILE_ID) <= 0) { $arResult['errCode'] = 'ERR_IBLOCK'; return; } if ($typeLoading == 'agent') { - + $dateAgent = new DateTime(); $intAgent = new DateInterval('PT60S'); // PT60S - 60 sec; $dateAgent->add($intAgent); CAgent::AddAgent( - "CCatalogExport::PreGenerateExport(" . $PROFILE_ID . ");", "catalog", "N", 86400, $dateAgent->format('d.m.Y H:i:s'), // date of first check + "CCatalogExport::PreGenerateExport(" . $PROFILE_ID . ");", + "catalog", + "N", + 86400, + $dateAgent->format('d.m.Y H:i:s'), // date of first check "Y", // агент активен $dateAgent->format('d.m.Y H:i:s'), // date of first start 30 - ); - + ); + CCatalogExport::Update($PROFILE_ID, array( - "IN_CRON" => ($arProfile["IN_AGENT"] == "Y" ? "N" : "Y") - )); + "IN_AGENT" => "Y" + )); } else { $agent_period = 24; $agent_php_path = "/usr/local/php/bin/php"; - if (!file_exists($_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS . "cron_frame.php")) { - CheckDirPath($_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS); - $tmp_file_size = filesize($_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS_DEF . "cron_frame.php"); - $fp = fopen($_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS_DEF . "cron_frame.php", "rb"); + if (!file_exists($_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS."cron_frame.php")) + { + CheckDirPath($_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS); + $tmp_file_size = filesize($_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS_DEF."cron_frame.php"); + $fp = fopen($_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS_DEF."cron_frame.php", "rb"); $tmp_data = fread($fp, $tmp_file_size); fclose($fp); $tmp_data = str_replace("#DOCUMENT_ROOT#", $_SERVER["DOCUMENT_ROOT"], $tmp_data); $tmp_data = str_replace("#PHP_PATH#", $agent_php_path, $tmp_data); - $fp = fopen($_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS . "cron_frame.php", "ab"); + $fp = fopen($_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS."cron_frame.php", "ab"); fwrite($fp, $tmp_data); fclose($fp); } $cfg_data = ""; - if (file_exists($_SERVER["DOCUMENT_ROOT"] . "/bitrix/crontab/crontab.cfg")) { - $cfg_file_size = filesize($_SERVER["DOCUMENT_ROOT"] . "/bitrix/crontab/crontab.cfg"); - $fp = fopen($_SERVER["DOCUMENT_ROOT"] . "/bitrix/crontab/crontab.cfg", "rb"); - $cfg_data = fread($fp, $cfg_file_size); - fclose($fp); + if (file_exists($_SERVER["DOCUMENT_ROOT"]."/bitrix/crontab/crontab.cfg")) + { + $cfg_file_size = filesize($_SERVER["DOCUMENT_ROOT"]."/bitrix/crontab/crontab.cfg"); + $fp = fopen($_SERVER["DOCUMENT_ROOT"]."/bitrix/crontab/crontab.cfg", "rb"); + $cfg_data = fread($fp, $cfg_file_size); + fclose($fp); } - CheckDirPath($_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS . "logs/"); - - if ($arProfile["IN_CRON"] == "Y") { - // remove - $cfg_data = preg_replace("#^.*?" . preg_quote(CATALOG_PATH2EXPORTS) . "cron_frame.php +" . $PROFILE_ID . " *>.*?$#im", "", $cfg_data); - } else { - $strTime = "0 */" . $agent_period . " * * * "; - if (strlen($cfg_data) > 0) + CheckDirPath($_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS."logs/"); + + if ($arProfile["IN_CRON"]=="Y") + { + // remove + $cfg_data = preg_replace("#^.*?".preg_quote(CATALOG_PATH2EXPORTS)."cron_frame.php +".$PROFILE_ID." *>.*?$#im", "", $cfg_data); + } + else + { + $strTime = "0 */".$agent_period." * * * "; + if (strlen($cfg_data)>0) $cfg_data .= "\n"; - - $cfg_data .= $strTime . $agent_php_path . " -f " . $_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS . "cron_frame.php " . $PROFILE_ID . " >" . $_SERVER["DOCUMENT_ROOT"] . CATALOG_PATH2EXPORTS . "logs/" . $PROFILE_ID . ".txt\n"; + + $cfg_data .= $strTime.$agent_php_path." -f ".$_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS."cron_frame.php ".$PROFILE_ID." >".$_SERVER["DOCUMENT_ROOT"].CATALOG_PATH2EXPORTS."logs/".$PROFILE_ID.".txt\n"; } CCatalogExport::Update($PROFILE_ID, array( - "IN_CRON" => ($arProfile["IN_CRON"] == "Y" ? "N" : "Y") - )); - - CheckDirPath($_SERVER["DOCUMENT_ROOT"] . "/bitrix/crontab/"); + "IN_CRON" => "Y" + )); + + CheckDirPath($_SERVER["DOCUMENT_ROOT"]."/bitrix/crontab/"); $cfg_data = preg_replace("#[\r\n]{2,}#im", "\n", $cfg_data); - $fp = fopen($_SERVER["DOCUMENT_ROOT"] . "/bitrix/crontab/crontab.cfg", "wb"); + $fp = fopen($_SERVER["DOCUMENT_ROOT"]."/bitrix/crontab/crontab.cfg", "wb"); fwrite($fp, $cfg_data); fclose($fp); $arRetval = array(); - @exec("crontab " . $_SERVER["DOCUMENT_ROOT"] . "/bitrix/crontab/crontab.cfg", $arRetval, $return_var); - } + @exec("crontab ".$_SERVER["DOCUMENT_ROOT"]."/bitrix/crontab/crontab.cfg", $arRetval, $return_var); + + } } + + // //agent + $dateAgent = new DateTime(); $intAgent = new DateInterval('PT60S'); // PT60S - 60 sec; $dateAgent->add($intAgent); @@ -857,14 +898,11 @@ class intaro_intarocrm extends CModule 30 ); - $this->CopyFiles(); - - // statistic update $api_host = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_HOST_OPTION, 0); $api_key = COption::GetOptionString($this->MODULE_ID, $this->CRM_API_KEY_OPTION, 0); $this->INTARO_CRM_API = new \IntaroCrm\RestApi($api_host, $api_key); $this->INTARO_CRM_API->statisticUpdate(); - + $APPLICATION->IncludeAdminFile( GetMessage('MODULE_INSTALL_TITLE'), $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . $this->MODULE_ID . '/install/step5.php' @@ -887,6 +925,18 @@ class intaro_intarocrm extends CModule UnRegisterModuleDependences("sale", "OnSalePayOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSalePayOrder"); UnRegisterModuleDependences("sale", "OnSaleCancelOrder", $this->MODULE_ID, "ICrmOrderEvent", "onSaleCancelOrder"); + if(CModule::IncludeModule("catalog")) { + if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/' . $this->INTARO_CRM_EXPORT . '_run.php')) { + $dbProfile = CCatalogExport::GetList(array(), array("FILE_NAME" => $this->INTARO_CRM_EXPORT)); + + while ($arProfile = $dbProfile->Fetch()) { + if ($arProfile["DEFAULT_PROFILE"]!="Y") { + CAgent::RemoveAgent("CCatalogExport::PreGenerateExport(".$arProfile['ID'].");", "catalog"); + CCatalogExport::Delete($arProfile['ID']); + } + } + } + } $this->DeleteFiles(); @@ -911,4 +961,23 @@ class intaro_intarocrm extends CModule unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_run.php'); unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php'); } + + function GetProfileSetupVars($iblocks, $articleProperties, $filename) { + // Get string like IBLOCK_EXPORT[0]=3& + // IBLOCK_EXPORT[1]=6& + // IBLOCK_PROPERTY_ARTICLE[0]=ARTICLE& + // IBLOCK_PROPERTY_ARTICLE[1]=ARTNUMBER& + // SETUP_FILE_NAME=%2Fbitrix%2Fcatalog_export%2Ftestintarocrm.xml + + //$arProfileFields = explode(",", $SETUP_FIELDS_LIST); + $strVars = ""; + foreach ($iblocks as $key => $val) + $strVars .= 'IBLOCK_EXPORT[' . $key . ']=' . $val . '&'; + foreach ($articleProperties as $key => $val) + $strVars .= 'IBLOCK_PROPERTY_ARTICLE[' . $key . ']=' . $val . '&'; + + $strVars .= 'SETUP_FILE_NAME=' . urlencode($filename); + + return $strVars; + } } \ No newline at end of file diff --git a/intaro.intarocrm/install/step4.php b/intaro.intarocrm/install/step4.php index 81178e93..246c11dd 100644 --- a/intaro.intarocrm/install/step4.php +++ b/intaro.intarocrm/install/step4.php @@ -3,7 +3,18 @@ if(!check_bitrix_sessid()) return; IncludeModuleLangFile(__FILE__); __IncludeLang(GetLangFileName($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro.intarocrm/lang/", "/icml_export_setup.php")); - +?> +

+


@@ -12,7 +23,7 @@ __IncludeLang(GetLangFileName($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro. { $IBLOCK_EXPORT = array(); } - + $boolAll = false; $intCountChecked = 0; $intCountAvailIBlock = 0; @@ -33,33 +44,42 @@ __IncludeLang(GetLangFileName($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro. $db_properties = CIBlock::GetProperties($res['ID'], Array()); $properties = Array(); - while($prop = $db_properties->Fetch()) + while($prop = $db_properties->Fetch()) $properties[] = $prop; - - - $boolExport = (in_array($res['ID'],$IBLOCK_EXPORT)); + + if (count($IBLOCK_EXPORT) != 0) + $boolExport = (in_array($res['ID'], $IBLOCK_EXPORT)); + else + $boolExport = true; + $arIBlockList[] = array( 'ID' => $res['ID'], 'NAME' => $res['NAME'], 'IBLOCK_TYPE_ID' => $res['IBLOCK_TYPE_ID'], 'IBLOCK_EXPORT' => $boolExport, 'PROPERTIES' => $properties, + 'OLD_PROPERTY_SELECT' => $IBLOCK_PROPERTY_ARTICLE[$res['ID']] != "" ? $IBLOCK_PROPERTY_ARTICLE[$res['ID']] : null, 'SITE_LIST' => '('.implode(' ',$arSiteList).')', ); - + if ($boolExport) $intCountChecked++; $intCountAvailIBlock++; } } } - if ($intCountChecked == $intCountAvailIBlock) + if (count($IBLOCK_EXPORT) != 0) { + if ($intCountChecked == $intCountAvailIBlock) $boolAll = true; - + } else { + $intCountChecked = $intCountAvailIBlock; + $boolAll = true; + } + ?> - - - + + + @@ -101,8 +121,8 @@ __IncludeLang(GetLangFileName($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro. ]" + id="IBLOCK_EXPORT" value="" onclick="checkOne(this,);" @@ -110,16 +130,29 @@ __IncludeLang(GetLangFileName($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro.
- " + name="IBLOCK_PROPERTY_ARTICLE[]" + class="property-export"> + @@ -147,37 +180,37 @@ __IncludeLang(GetLangFileName($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/intaro. 'catalog', 'export_default_path', '/bitrix/catalog_export/')) - .'testintarocrm'/* .mt_rand(0, 999999) */.'.xml' + .'intarocrm'/* .mt_rand(0, 999999) */.'.xml' ); ?>" size="50"> - +


- +

-
+

-
+
+

-
  - +


- -