feature (services): Добавил нескрывемый блок и на детальную

bitrix/templates/aspro-scorp/components/bitrix/news/services-blocks/detail.php

 <?if(!defined('B_PROLOG_INCLUDED') || B_PROLOG_INCLUDED !== true) die();?>
 <?$this->setFrameMode(true);?>
 <?
+/**
+ * @var array $arParams
+ * @var array $arResult
+ * @var CBitrixComponent $component
+ */
 // get element
+$elementFields = array_filter($arParams['DETAIL_FIELD_CODE']);
+foreach ($arParams['DETAIL_PROPERTY_CODE'] as $code) {
+    if (empty($code)) continue;
+    $elementFields[] = "PROPERTY_{$code}";
+}
+
 $arItemFilter = CScorp::GetCurrentElementFilter($arResult['VARIABLES'], $arParams);
-$arElement = CCache::CIblockElement_GetList(array('CACHE' => array('TAG' => CCache::GetIBlockCacheTag($arParams['IBLOCK_ID']), 'MULTI' => 'N')), $arItemFilter, false, false, array('ID', 'NAME', 'PREVIEW_TEXT','DETAIL_PICTURE','DETAIL_PAGE_URL','DETAIL_TEXT', 'PREVIEW_PICTURE', 'PROPERTY_FIRST_SCREEN', 'PROPERTY_BLOCKS','PROPERTY_FAQ','PROPERTY_SCHEME', 'PROPERTY_TABLE_PRICE', 'PROPERTY_ADVANTAGES','PROPERTY_TITLE_ADVANTAGES', 'PROPERTY_ACTIONS','IBLOCK_SECTION_ID'));
-$arSection = CCache::CIblockSection_GetList(array("CACHE" => array("TAG" => CCache::GetIBlockCacheTag($arParams["IBLOCK_ID"]), "MULTI" => "N")), array('ID' => $arElement['IBLOCK_SECTION_ID']), false, array('ID','NAME'), true);
+
+// структура странная, потому что Aspro не хотели нарушать порядок аргументов, но хотели втиснуть параметр для кеша
+$sortParam = array('CACHE' => array('TAG' => CCache::GetIBlockCacheTag($arParams['IBLOCK_ID']), 'MULTI' => 'N'));
+
+$arElement = CCache::CIblockElement_GetList($sortParam, $arItemFilter, false, false, $elementFields);
+$arSection = CCache::CIblockSection_GetList($sortParam, array('ID' => $arElement['IBLOCK_SECTION_ID']), false, array('ID','NAME'), true);
 
 $isTitle = false;
 ?>
@@ -99,7 +114,6 @@ $isTitle = false;
                 $isTitle = true;?>
                 <article class="service-description">
                     <h1 class="title-block underline"><?php echo $arElement['NAME']?></h1>
-                    <div class="service-description__text"><?php echo $arElement['DETAIL_TEXT'] ?></div>
                 </article>
             <?}?>
         </div>
@@ -107,13 +121,22 @@ $isTitle = false;
     <div class="maxwidth-theme">
 
         <?php //Блоки
+        if ( empty($arElement['PROPERTY_VISIBLE_TEXT_VALUE']) || empty($arElement['PROPERTY_VISIBLE_TEXT_VALUE']['TEXT']) ) {
+            $visibleText = '';
+        } else {
+            if ( $arElement['PROPERTY_VISIBLE_TEXT_VALUE']['TYPE'] === 'HTML' ) {
+                $visibleText = $arElement['~PROPERTY_VISIBLE_TEXT_VALUE']['TEXT'];
+            } else {
+                $visibleText = nl2br($arElement['PROPERTY_VISIBLE_TEXT_VALUE']['TEXT']);
+            }
+        }
         $APPLICATION->IncludeFile(SITE_DIR . "include/blocks.php",
             array_merge($arParams,
                 array(
                     'arResult' => $arResult,
                     'ID' => $arElement["ID"],
                     'HIDE_BLOCKS' => $arElement["PROPERTY_BLOCKS_VALUE"],
-                    'CONTENT' => !$isTitle ? array('TITLE' => $arElement['NAME'], 'TEXT' => $arElement['DETAIL_TEXT']) : array(),
+                    'CONTENT' => array('HIDABLE_TEXT' => $arElement['DETAIL_TEXT'], 'VISIBLE_TEXT' => $visibleText),
                     'SCHEME' => $arElement["PROPERTY_SCHEME_VALUE"],
                     'FAQ' => $arElement["PROPERTY_FAQ_VALUE"],
                     'TABLE_PRICE' => $arElement["PROPERTY_TABLE_PRICE_VALUE"],

services/index.php

@@ -76,20 +76,35 @@ $APPLICATION->SetTitle("Услуги");
 		"BROWSER_TITLE" => "-",
 		"DETAIL_ACTIVE_DATE_FORMAT" => "d.m.Y",
 		"DETAIL_FIELD_CODE" => array(
-			0 => "DETAIL_TEXT",
-			1 => "DETAIL_PICTURE",
-			2 => "",
+            'DETAIL_TEXT',
+            'DETAIL_PICTURE',
+            'ID',
+            'NAME',
+            'PREVIEW_TEXT',
+            'PREVIEW_PICTURE',
+            'DETAIL_PAGE_URL',
+            'IBLOCK_SECTION_ID',
 		),
 		"DETAIL_PROPERTY_CODE" => array(
-			0 => "LINK_GOODS",
-			1 => "LINK_STAFF",
-			2 => "LINK_REVIEWS",
-			3 => "LINK_PROJECTS",
-			4 => "FORM_ORDER",
-			5 => "FORM_QUESTION",
-			6 => "DOCUMENTS",
-			7 => "PHOTOS",
-			8 => "",
+            'CODE',
+            'PHOTOPOS',
+            'TITLE_ADVANTAGES',
+            'ACTIONS',
+            'ADVANTAGES',
+            'BLOCKS',
+            'SCHEME',
+            'FAQ',
+            'TABLE_PRICE',
+            'FIRST_SCREEN',
+            'DOCUMENTS',
+            'PHOTOS',
+            'LINK_GOODS',
+            'LINK_STAFF',
+            'LINK_REVIEWS',
+            'LINK_PROJECTS',
+            'FORM_ORDER',
+            'FORM_QUESTION',
+            'VISIBLE_TEXT',
 		),
 		"DETAIL_DISPLAY_TOP_PAGER" => "N",
 		"DETAIL_DISPLAY_BOTTOM_PAGER" => "Y",