diff --git a/local/components/evolution/catalog.brands/component.php b/local/components/evolution/catalog.brands/component.php index 30eccb6..17f95f7 100644 --- a/local/components/evolution/catalog.brands/component.php +++ b/local/components/evolution/catalog.brands/component.php @@ -29,6 +29,11 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $brands_filter[ "ID" ] = $arParams['BRANDS_IDS']; } + if($arParams['BRANDS_FILTER'] !== null) + { + $brands_filter = array_merge($brands_filter, $arParams['BRANDS_FILTER']); + } + $brands_res = CIBlockElement::GetList([ "NAME" => "ASC" ], $brands_filter, false, []); while ($brands_ob_element = $brands_res->GetNextElement()) { diff --git a/local/components/evolution/catalog.landing.body/templates/.default/template.php b/local/components/evolution/catalog.landing.body/templates/.default/template.php index 0a1cd51..e1315c8 100644 --- a/local/components/evolution/catalog.landing.body/templates/.default/template.php +++ b/local/components/evolution/catalog.landing.body/templates/.default/template.php @@ -143,7 +143,7 @@ if(!empty($arResult['SUBTITLE'])) "COUNT" => 3, "PATH" => $arParams['PATH'], "QUERY_STRING" => "?BODY=".$arResult['BODY'], - "FILTER_ARRAY" => [ "ID" => $arResult['BRANDS_IDS'], ], + "FILTER_ARRAY" => [ "ID" => $arResult['BRANDS_IDS'], "PROPERTY_PROMO_VALUE" => "Да", ], "PROPERTIES_FILTER_ARRAY" => [ "PROPERTY_BODY" => $arResult['BODY'], ], ) ); ?> diff --git a/local/components/evolution/catalog.landing.engine_fuel/templates/.default/template.php b/local/components/evolution/catalog.landing.engine_fuel/templates/.default/template.php index 4d2b4e3..4a0089d 100644 --- a/local/components/evolution/catalog.landing.engine_fuel/templates/.default/template.php +++ b/local/components/evolution/catalog.landing.engine_fuel/templates/.default/template.php @@ -143,7 +143,7 @@ if(!empty($arResult['SUBTITLE'])) "COUNT" => 3, "PATH" => $arParams['PATH'], "QUERY_STRING" => "?ENGINE_FUEL=".$arResult['ENGINE_FUEL'], - "FILTER_ARRAY" => [ "ID" => $arResult['BRANDS_IDS'], ], + "FILTER_ARRAY" => [ "ID" => $arResult['BRANDS_IDS'], "PROPERTY_PROMO_VALUE" => "Да", ], "PROPERTIES_FILTER_ARRAY" => [ "PROPERTY_ENGINE_FUEL" => $arResult['ENGINE_FUEL'], ], ) ); ?> diff --git a/local/components/evolution/catalog.promo.brand/component.php b/local/components/evolution/catalog.promo.brand/component.php index faa4ade..bf52df2 100644 --- a/local/components/evolution/catalog.promo.brand/component.php +++ b/local/components/evolution/catalog.promo.brand/component.php @@ -26,7 +26,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) 'BRANDS' => [], ]; - $brands_filter_array = [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_BRANDS, "PROPERTY_PROMO_VALUE" => "Да" ]; + $brands_filter_array = [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_BRANDS, ]; if(isset($arParams['FILTER_ARRAY'])) { $brands_filter_array = array_merge($brands_filter_array, $arParams['FILTER_ARRAY']); @@ -38,7 +38,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $brands_ar_res = $brands_element->GetFields(); $brands_ar_res['ITEMS'] = []; - $positions_filter_array = [ "ACTIVE" => "Y", "IBLOCK_ID" => 1, "PROPERTY_BRAND" => $brands_ar_res['ID'], ]; + $positions_filter_array = [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_BRAND" => $brands_ar_res['ID'], ]; if(isset($arParams['PROPERTIES_FILTER_ARRAY'])) { $positions_filter_array = array_merge($positions_filter_array, $arParams['PROPERTIES_FILTER_ARRAY']); diff --git a/local/components/evolution/catalog/templates/.default/template.php b/local/components/evolution/catalog/templates/.default/template.php index e520c11..7e72579 100644 --- a/local/components/evolution/catalog/templates/.default/template.php +++ b/local/components/evolution/catalog/templates/.default/template.php @@ -218,6 +218,7 @@ if(!empty($arResult['SUBTITLE'])) Array( "COUNT" => 3, "PATH" => $arParams['PATH'], + "FILTER_ARRAY" => [ "PROPERTY_PROMO_VALUE" => "Да", ], ) ); ?>