evo/evoleasing-public
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/merelendor/evoleasing-site

Browse Source
This commit is contained in:
merelendor 2024-09-23 19:20:50 +00:00
commit b8fc863119
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cron/yasprav.php
View File

@ -26,7 +26,7 @@ while($ob = $res->GetNextElement())
<company-id>'.$arFields["PROPERTY_YAID_VALUE"].'</company-id> <company-id>'.$arFields["PROPERTY_YAID_VALUE"].'</company-id>
<actualization-date>'.$today.'</actualization-date> <actualization-date>'.$today.'</actualization-date>
<name lang="ru">Эволюция Автолизинга</name> <name lang="ru">Эволюция Автолизинга</name>
<shortname lang="ru">ЛК Эволюция</shortname> <shortname lang="ru">Эволюция</shortname>
<name lang="en">Evoleasing</name> <name lang="en">Evoleasing</name>
<country lang="ru">Россия</country> <country lang="ru">Россия</country>
<address lang="ru">'.$arFields["PROPERTY_YAADRESS1_VALUE"].'</address> <address lang="ru">'.$arFields["PROPERTY_YAADRESS1_VALUE"].'</address>

19
local/components/evolution/programs.aggregations.brands.list/component.php
View File

@ -33,7 +33,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
{ {
$res_filter = CIBlockElement::GetList( $res_filter = CIBlockElement::GetList(
[ "SORT" => "ASC" ], [ "SORT" => "ASC" ],
[ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_PROGRAMS_AGGREGATION_RULES_SPECIAL, "PROPERTY_VEHICLE_TYPE" => $arParams['TYPE'], "!PROPERTY_VEHICLE_BRAND" => false, ], [ "ACTIVE" => "Y", "IBLOCK_ID" => $arParams['RULES_IBLOCK_ID'], "PROPERTY_VEHICLE_TYPE" => $arParams['TYPE'], "!PROPERTY_VEHICLE_BRAND" => false, ],
false, false, ['ID', 'NAME', 'PROPERTY_VEHICLE_BRAND'] false, false, ['ID', 'NAME', 'PROPERTY_VEHICLE_BRAND']
); );
while ($element_filter = $res_filter->GetNextElement()) while ($element_filter = $res_filter->GetNextElement())
@ -48,17 +48,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$filter['ID'] = $brands_ids; $filter['ID'] = $brands_ids;
} }
/* $sec_res = CIBlockSection::GetList($sort, $filter, false, [], false);
while ($section = $sec_res->GetNext())
{
if(!empty($section['PICTURE']))
{
}
$section['ITEMS'] = [];
$filter = array_merge($filter, [ "SECTION_ID" => $section['ID'] ]);
*/
$res = CIBlockElement::GetList($sort, $filter, false, $options); $res = CIBlockElement::GetList($sort, $filter, false, $options);
while ($element = $res->GetNextElement()) while ($element = $res->GetNextElement())
{ {
@ -67,12 +56,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$arResult['ITEMS'][] = $ar_res; $arResult['ITEMS'][] = $ar_res;
} }
//if(count($section['ITEMS']) > 0)
//{
// $arResult['SECTIONS'][] = $section;
//}
// }
$this->IncludeComponentTemplate(); $this->IncludeComponentTemplate();
} }
} }

6
local/components/evolution/programs.aggregations/templates/.default/template.php
View File

@ -133,10 +133,6 @@ $this->setFrameMode(true);
/* /*
<section data-page="aggregation"> <section data-page="aggregation">
<? <?
// print "<pre>"; print_r($arResult); print "</pre>";
// die();
$APPLICATION->IncludeComponent( $APPLICATION->IncludeComponent(
"evolution:programs.aggregations.offers.list", "evolution:programs.aggregations.offers.list",
"", "",
@ -360,6 +356,7 @@ elseif(isset($arResult['GROUP']))
"", "",
[ [
"IBLOCK_ID" => $arParams['IBLOCK_ID_PROGRAMS_AGGREGATION_BRANDS'], "IBLOCK_ID" => $arParams['IBLOCK_ID_PROGRAMS_AGGREGATION_BRANDS'],
"RULES_IBLOCK_ID" => $arParams['IBLOCK_ID_RULES'],
"TYPE" => $arResult['TYPE'], "TYPE" => $arResult['TYPE'],
"TYPE_SLUG" => $arResult['TYPE_SLUG'], "TYPE_SLUG" => $arResult['TYPE_SLUG'],
"TYPE_GENITIVE" => $arResult['TYPE_GENITIVE'], "TYPE_GENITIVE" => $arResult['TYPE_GENITIVE'],
@ -378,6 +375,7 @@ elseif(isset($arResult['GROUP']))
"", "",
[ [
"IBLOCK_ID" => $arParams['IBLOCK_ID_PROGRAMS_AGGREGATION_BRANDS'], "IBLOCK_ID" => $arParams['IBLOCK_ID_PROGRAMS_AGGREGATION_BRANDS'],
"RULES_IBLOCK_ID" => $arParams['IBLOCK_ID_RULES'],
"TYPE" => $arResult['TYPE'], "TYPE" => $arResult['TYPE'],
"TYPE_SLUG" => $arResult['TYPE_SLUG'], "TYPE_SLUG" => $arResult['TYPE_SLUG'],
"TYPE_GENITIVE" => $arResult['TYPE_GENITIVE'], "TYPE_GENITIVE" => $arResult['TYPE_GENITIVE'],