diff --git a/catalog/index.php b/catalog/index.php index 8365485..d3bd5a9 100644 --- a/catalog/index.php +++ b/catalog/index.php @@ -48,6 +48,7 @@ if (isset($_GET['sorting'])) { ?>IncludeComponent( "bitrix:catalog", + // "eraseptic_catalog", "main", // отсюда перенести верстку в чистый шаблон на базе .default // ".default", array( diff --git a/local/templates/.default/components/bitrix/catalog/main/section_vertical.php b/local/templates/.default/components/bitrix/catalog/main/section_vertical.php index 02e42e7..577ac63 100644 --- a/local/templates/.default/components/bitrix/catalog/main/section_vertical.php +++ b/local/templates/.default/components/bitrix/catalog/main/section_vertical.php @@ -90,7 +90,8 @@ $APPLICATION->IncludeComponent( "SEF_RULE" => $arResult["URL_TEMPLATES"]["smart_filter"], "SMART_FILTER_PATH" => $arResult["VARIABLES"]["SMART_FILTER_PATH"], "PAGER_PARAMS_NAME" => $arParams["PAGER_PARAMS_NAME"], - "AJAX_MODE" => "Y", + // "AJAX_MODE" => "Y", + "AJAX_MODE" => "N", "INSTANT_RELOAD" => "Y", "AJAX_OPTION_JUMP" => "N", "AJAX_OPTION_HISTORY" => "Y", diff --git a/local/templates/.default/components/bitrix/catalog/main/section_vertical.php.FROM_ERA b/local/templates/.default/components/bitrix/catalog/main/section_vertical.php.FROM_ERA new file mode 100644 index 0000000..70409f7 --- /dev/null +++ b/local/templates/.default/components/bitrix/catalog/main/section_vertical.php.FROM_ERA @@ -0,0 +1,247 @@ +IncludeComponent( +// "bitrix:main.feedback", +// "order", +// Array( +// "EMAIL_TO" => "kepmaku@ya.ru", +// "EVENT_MESSAGE_ID" => array(), +// "OK_TEXT" => "Спасибо, ваше сообщение принято.", +// "REQUIRED_FIELDS" => array(), +// "USE_CAPTCHA" => "Y" +// ) +//); + +$APPLICATION->IncludeComponent( + "bitrix:catalog.smart.filter", + "cat_filter", + // "", + array( + "PREFILTER_NAME" => "presect", //добавляем префильтр + "IBLOCK_TYPE" => $arParams["IBLOCK_TYPE"], + "IBLOCK_ID" => $arParams["IBLOCK_ID"], + "SECTION_ID" => $arCurSection['ID'], + "FILTER_NAME" => $arParams["FILTER_NAME"], + "PRICE_CODE" => $arParams["~PRICE_CODE"], + "CACHE_TYPE" => $arParams["CACHE_TYPE"], + "CACHE_TIME" => $arParams["CACHE_TIME"], + "CACHE_GROUPS" => $arParams["CACHE_GROUPS"], + "SAVE_IN_SESSION" => "N", + "FILTER_VIEW_MODE" => $arParams["FILTER_VIEW_MODE"], + "XML_EXPORT" => "N", + "SECTION_TITLE" => "NAME", + "SECTION_DESCRIPTION" => "DESCRIPTION", + 'HIDE_NOT_AVAILABLE' => $arParams["HIDE_NOT_AVAILABLE"], + "TEMPLATE_THEME" => $arParams["TEMPLATE_THEME"], + 'CONVERT_CURRENCY' => $arParams['CONVERT_CURRENCY'], + 'CURRENCY_ID' => $arParams['CURRENCY_ID'], + "SEF_MODE" => $arParams["SEF_MODE"], + "SEF_RULE" => '/'. $arResult["URL_TEMPLATES"]["smart_filter"], + "SMART_FILTER_PATH" => $arResult["VARIABLES"]["SMART_FILTER_PATH"], + "PAGER_PARAMS_NAME" => $arParams["PAGER_PARAMS_NAME"], +// "INSTANT_RELOAD" => $arParams["INSTANT_RELOAD"], + // "AJAX_MODE" => "Y", + "AJAX_MODE" => "N", + "INSTANT_RELOAD" => "Y", + "AJAX_OPTION_JUMP" => "N", + "AJAX_OPTION_HISTORY" => "Y", + ), + $component, + array('HIDE_ICONS' => 'Y') +); + + + + +?> +
+ + IncludeComponent( + "sotbit:seo.meta", + ".default", + array( + "FILTER_NAME" => $arParams["FILTER_NAME"], + "SECTION_ID" => $arCurSection['ID'], + "CACHE_TYPE" => $arParams["CACHE_TYPE"], + "CACHE_TIME" => $arParams["CACHE_TIME"], + ) + ); + //sotbit seometa component end + $intSectionID = $APPLICATION->IncludeComponent( + "bitrix:catalog.section", + // "cat_section", + "", + array( + "IBLOCK_TYPE" => $arParams["IBLOCK_TYPE"], + "IBLOCK_ID" => $arParams["IBLOCK_ID"], + "ELEMENT_SORT_FIELD" => $arParams["ELEMENT_SORT_FIELD"], + "ELEMENT_SORT_ORDER" => $arParams["ELEMENT_SORT_ORDER"], + "ELEMENT_SORT_FIELD2" => $arParams["ELEMENT_SORT_FIELD2"], + "ELEMENT_SORT_ORDER2" => $arParams["ELEMENT_SORT_ORDER2"], + "PROPERTY_CODE" => (isset($arParams["LIST_PROPERTY_CODE"]) ? $arParams["LIST_PROPERTY_CODE"] : []), + "PROPERTY_CODE_MOBILE" => $arParams["LIST_PROPERTY_CODE_MOBILE"], + "META_KEYWORDS" => $arParams["LIST_META_KEYWORDS"], + "META_DESCRIPTION" => $arParams["LIST_META_DESCRIPTION"], + "BROWSER_TITLE" => $arParams["LIST_BROWSER_TITLE"], + "SET_LAST_MODIFIED" => $arParams["SET_LAST_MODIFIED"], + "INCLUDE_SUBSECTIONS" => $arParams["INCLUDE_SUBSECTIONS"], + "BASKET_URL" => $arParams["BASKET_URL"], + "ACTION_VARIABLE" => $arParams["ACTION_VARIABLE"], + "PRODUCT_ID_VARIABLE" => $arParams["PRODUCT_ID_VARIABLE"], + "SECTION_ID_VARIABLE" => $arParams["SECTION_ID_VARIABLE"], + "PRODUCT_QUANTITY_VARIABLE" => $arParams["PRODUCT_QUANTITY_VARIABLE"], + "PRODUCT_PROPS_VARIABLE" => $arParams["PRODUCT_PROPS_VARIABLE"], + "FILTER_NAME" => $arParams["FILTER_NAME"], + "CACHE_TYPE" => $arParams["CACHE_TYPE"], + "CACHE_TIME" => $arParams["CACHE_TIME"], + "CACHE_FILTER" => $arParams["CACHE_FILTER"], + "CACHE_GROUPS" => $arParams["CACHE_GROUPS"], + "SET_TITLE" => $arParams["SET_TITLE"], + "MESSAGE_404" => $arParams["~MESSAGE_404"], + "SET_STATUS_404" => $arParams["SET_STATUS_404"], + "SHOW_404" => $arParams["SHOW_404"], + "FILE_404" => $arParams["FILE_404"], + "DISPLAY_COMPARE" => $arParams["USE_COMPARE"], + "PAGE_ELEMENT_COUNT" => $arParams["PAGE_ELEMENT_COUNT"], + "LINE_ELEMENT_COUNT" => $arParams["LINE_ELEMENT_COUNT"], + "PRICE_CODE" => $arParams["~PRICE_CODE"], + "USE_PRICE_COUNT" => $arParams["USE_PRICE_COUNT"], + "SHOW_PRICE_COUNT" => $arParams["SHOW_PRICE_COUNT"], + + "PRICE_VAT_INCLUDE" => $arParams["PRICE_VAT_INCLUDE"], + "USE_PRODUCT_QUANTITY" => $arParams['USE_PRODUCT_QUANTITY'], + "ADD_PROPERTIES_TO_BASKET" => (isset($arParams["ADD_PROPERTIES_TO_BASKET"]) ? $arParams["ADD_PROPERTIES_TO_BASKET"] : ''), + "PARTIAL_PRODUCT_PROPERTIES" => (isset($arParams["PARTIAL_PRODUCT_PROPERTIES"]) ? $arParams["PARTIAL_PRODUCT_PROPERTIES"] : ''), + "PRODUCT_PROPERTIES" => (isset($arParams["PRODUCT_PROPERTIES"]) ? $arParams["PRODUCT_PROPERTIES"] : []), + + "DISPLAY_TOP_PAGER" => $arParams["DISPLAY_TOP_PAGER"], + "DISPLAY_BOTTOM_PAGER" => $arParams["DISPLAY_BOTTOM_PAGER"], + "PAGER_TITLE" => $arParams["PAGER_TITLE"], + "PAGER_SHOW_ALWAYS" => $arParams["PAGER_SHOW_ALWAYS"], + "PAGER_TEMPLATE" => $arParams["PAGER_TEMPLATE"], + "PAGER_DESC_NUMBERING" => $arParams["PAGER_DESC_NUMBERING"], + "PAGER_DESC_NUMBERING_CACHE_TIME" => $arParams["PAGER_DESC_NUMBERING_CACHE_TIME"], + "PAGER_SHOW_ALL" => $arParams["PAGER_SHOW_ALL"], + "PAGER_BASE_LINK_ENABLE" => $arParams["PAGER_BASE_LINK_ENABLE"], + "PAGER_BASE_LINK" => $arParams["PAGER_BASE_LINK"], + "PAGER_PARAMS_NAME" => $arParams["PAGER_PARAMS_NAME"], + "LAZY_LOAD" => $arParams["LAZY_LOAD"], + "MESS_BTN_LAZY_LOAD" => $arParams["~MESS_BTN_LAZY_LOAD"], + "LOAD_ON_SCROLL" => $arParams["LOAD_ON_SCROLL"], + + "OFFERS_CART_PROPERTIES" => (isset($arParams["OFFERS_CART_PROPERTIES"]) ? $arParams["OFFERS_CART_PROPERTIES"] : []), + "OFFERS_FIELD_CODE" => $arParams["LIST_OFFERS_FIELD_CODE"], + "OFFERS_PROPERTY_CODE" => (isset($arParams["LIST_OFFERS_PROPERTY_CODE"]) ? $arParams["LIST_OFFERS_PROPERTY_CODE"] : []), + "OFFERS_SORT_FIELD" => $arParams["OFFERS_SORT_FIELD"], + "OFFERS_SORT_ORDER" => $arParams["OFFERS_SORT_ORDER"], + "OFFERS_SORT_FIELD2" => $arParams["OFFERS_SORT_FIELD2"], + "OFFERS_SORT_ORDER2" => $arParams["OFFERS_SORT_ORDER2"], + "OFFERS_LIMIT" => (isset($arParams["LIST_OFFERS_LIMIT"]) ? $arParams["LIST_OFFERS_LIMIT"] : 0), + + "SECTION_ID" => $arResult["VARIABLES"]["SECTION_ID"], + "SECTION_CODE" => $arResult["VARIABLES"]["SECTION_CODE"], + "SECTION_URL" => '/' . $arResult["URL_TEMPLATES"]["section"], + "DETAIL_URL" => '/' . $arResult["URL_TEMPLATES"]["element"], + "USE_MAIN_ELEMENT_SECTION" => $arParams["USE_MAIN_ELEMENT_SECTION"], + 'CONVERT_CURRENCY' => $arParams['CONVERT_CURRENCY'], + 'CURRENCY_ID' => $arParams['CURRENCY_ID'], + 'HIDE_NOT_AVAILABLE' => $arParams["HIDE_NOT_AVAILABLE"], + 'HIDE_NOT_AVAILABLE_OFFERS' => $arParams["HIDE_NOT_AVAILABLE_OFFERS"], + + 'LABEL_PROP' => $arParams['LABEL_PROP'], + 'LABEL_PROP_MOBILE' => $arParams['LABEL_PROP_MOBILE'], + 'LABEL_PROP_POSITION' => $arParams['LABEL_PROP_POSITION'] ?? '', + 'ADD_PICT_PROP' => $arParams['ADD_PICT_PROP'], + 'PRODUCT_DISPLAY_MODE' => $arParams['PRODUCT_DISPLAY_MODE'], + 'PRODUCT_BLOCKS_ORDER' => $arParams['LIST_PRODUCT_BLOCKS_ORDER'], + 'PRODUCT_ROW_VARIANTS' => $arParams['LIST_PRODUCT_ROW_VARIANTS'], + 'ENLARGE_PRODUCT' => $arParams['LIST_ENLARGE_PRODUCT'], + 'ENLARGE_PROP' => isset($arParams['LIST_ENLARGE_PROP']) ? $arParams['LIST_ENLARGE_PROP'] : '', + 'SHOW_SLIDER' => $arParams['LIST_SHOW_SLIDER'], + 'SLIDER_INTERVAL' => isset($arParams['LIST_SLIDER_INTERVAL']) ? $arParams['LIST_SLIDER_INTERVAL'] : '', + 'SLIDER_PROGRESS' => isset($arParams['LIST_SLIDER_PROGRESS']) ? $arParams['LIST_SLIDER_PROGRESS'] : '', + + 'OFFER_ADD_PICT_PROP' => $arParams['OFFER_ADD_PICT_PROP'], + 'OFFER_TREE_PROPS' => (isset($arParams['OFFER_TREE_PROPS']) ? $arParams['OFFER_TREE_PROPS'] : []), + 'PRODUCT_SUBSCRIPTION' => $arParams['PRODUCT_SUBSCRIPTION'], + 'SHOW_DISCOUNT_PERCENT' => $arParams['SHOW_DISCOUNT_PERCENT'], + 'DISCOUNT_PERCENT_POSITION' => $arParams['DISCOUNT_PERCENT_POSITION'], + 'SHOW_OLD_PRICE' => $arParams['SHOW_OLD_PRICE'], + 'SHOW_MAX_QUANTITY' => $arParams['SHOW_MAX_QUANTITY'], + 'MESS_SHOW_MAX_QUANTITY' => (isset($arParams['~MESS_SHOW_MAX_QUANTITY']) ? $arParams['~MESS_SHOW_MAX_QUANTITY'] : ''), + 'RELATIVE_QUANTITY_FACTOR' => (isset($arParams['RELATIVE_QUANTITY_FACTOR']) ? $arParams['RELATIVE_QUANTITY_FACTOR'] : ''), + 'MESS_RELATIVE_QUANTITY_MANY' => (isset($arParams['~MESS_RELATIVE_QUANTITY_MANY']) ? $arParams['~MESS_RELATIVE_QUANTITY_MANY'] : ''), + 'MESS_RELATIVE_QUANTITY_FEW' => (isset($arParams['~MESS_RELATIVE_QUANTITY_FEW']) ? $arParams['~MESS_RELATIVE_QUANTITY_FEW'] : ''), + 'MESS_BTN_BUY' => (isset($arParams['~MESS_BTN_BUY']) ? $arParams['~MESS_BTN_BUY'] : ''), + 'MESS_BTN_ADD_TO_BASKET' => (isset($arParams['~MESS_BTN_ADD_TO_BASKET']) ? $arParams['~MESS_BTN_ADD_TO_BASKET'] : ''), + 'MESS_BTN_SUBSCRIBE' => (isset($arParams['~MESS_BTN_SUBSCRIBE']) ? $arParams['~MESS_BTN_SUBSCRIBE'] : ''), + 'MESS_BTN_DETAIL' => (isset($arParams['~MESS_BTN_DETAIL']) ? $arParams['~MESS_BTN_DETAIL'] : ''), + 'MESS_NOT_AVAILABLE' => $arParams['~MESS_NOT_AVAILABLE'] ?? '', + 'MESS_NOT_AVAILABLE_SERVICE' => $arParams['~MESS_NOT_AVAILABLE_SERVICE'] ?? '', + 'MESS_BTN_COMPARE' => (isset($arParams['~MESS_BTN_COMPARE']) ? $arParams['~MESS_BTN_COMPARE'] : ''), + + 'USE_ENHANCED_ECOMMERCE' => (isset($arParams['USE_ENHANCED_ECOMMERCE']) ? $arParams['USE_ENHANCED_ECOMMERCE'] : ''), + 'DATA_LAYER_NAME' => (isset($arParams['DATA_LAYER_NAME']) ? $arParams['DATA_LAYER_NAME'] : ''), + 'BRAND_PROPERTY' => (isset($arParams['BRAND_PROPERTY']) ? $arParams['BRAND_PROPERTY'] : ''), + + 'TEMPLATE_THEME' => (isset($arParams['TEMPLATE_THEME']) ? $arParams['TEMPLATE_THEME'] : ''), + "ADD_SECTIONS_CHAIN" => "Y", + 'ADD_TO_BASKET_ACTION' => $basketAction, + 'SHOW_CLOSE_POPUP' => isset($arParams['COMMON_SHOW_CLOSE_POPUP']) ? $arParams['COMMON_SHOW_CLOSE_POPUP'] : '', + 'COMPARE_PATH' => $arResult['FOLDER'] . $arResult['URL_TEMPLATES']['compare'], + 'COMPARE_NAME' => $arParams['COMPARE_NAME'], + 'USE_COMPARE_LIST' => 'Y', + 'BACKGROUND_IMAGE' => (isset($arParams['SECTION_BACKGROUND_IMAGE']) ? $arParams['SECTION_BACKGROUND_IMAGE'] : ''), + 'COMPATIBLE_MODE' => (isset($arParams['COMPATIBLE_MODE']) ? $arParams['COMPATIBLE_MODE'] : ''), + 'DISABLE_INIT_JS_IN_COMPONENT' => (isset($arParams['DISABLE_INIT_JS_IN_COMPONENT']) ? $arParams['DISABLE_INIT_JS_IN_COMPONENT'] : '') + ), + $component + ); + $GLOBALS['CATALOG_CURRENT_SECTION_ID'] = $intSectionID; + ?> + + + + + + SetTitle($sotbitSeoMetaH1); + } + if(!empty($sotbitSeoMetaTitle)) + { + $APPLICATION->SetPageProperty("title", $sotbitSeoMetaTitle); + } + if(!empty($sotbitSeoMetaKeywords)) + { + $APPLICATION->SetPageProperty("keywords", $sotbitSeoMetaKeywords); + } + if(!empty($sotbitSeoMetaDescription)) + { + $APPLICATION->SetPageProperty("description", $sotbitSeoMetaDescription); + } + if(!empty($sotbitSeoMetaBreadcrumbTitle) ) + { + $APPLICATION->AddChainItem($sotbitSeoMetaBreadcrumbTitle ); + } + //sotbit seometa meta end ?> + +
diff --git a/local/templates/.default/components/bitrix/catalog/main/sections.php b/local/templates/.default/components/bitrix/catalog/main/sections.php index 87d706b..5f7472d 100644 --- a/local/templates/.default/components/bitrix/catalog/main/sections.php +++ b/local/templates/.default/components/bitrix/catalog/main/sections.php @@ -1,5 +1,6 @@