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 2025-09-08 08:35:04 +00:00
commit a62b367eb1
11 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/index.php
View File

@ -1601,9 +1601,12 @@ switch($PARAM_1)
} }
$restrictions_values = array_unique($restrictions_values); $restrictions_values = array_unique($restrictions_values);
foreach($restrictions_values AS $rv) foreach($restrictions_values AS $rv)
{
if($flags['RESTRICTIONS'][ $rv ] !== null && $flags['RESTRICTIONS'][ $rv ] !== "")
{ {
array_push($restrictions, $flags['RESTRICTIONS'][ $rv ]); array_push($restrictions, $flags['RESTRICTIONS'][ $rv ]);
} }
}
//filter for pts //filter for pts
$filter_pts = $filter; $filter_pts = $filter;
@ -1617,9 +1620,12 @@ switch($PARAM_1)
} }
$pts_values = array_unique($pts_values); $pts_values = array_unique($pts_values);
foreach($pts_values AS $rp) foreach($pts_values AS $rp)
{
if($flags['PTS'][ $rp ] !== null && $flags['PTS'][ $rp ] !== "")
{ {
array_push($pts, $flags['PTS'][ $rp ]); array_push($pts, $flags['PTS'][ $rp ]);
} }
}
//filter for reserved //filter for reserved
$filter_reserved = $filter; $filter_reserved = $filter;

8
local/components/evolution/catalog.list.item/templates/.default/template.php
View File

@ -24,19 +24,19 @@ $this->setFrameMode(true);
<ul> <ul>
<li class="pay"> <li class="pay">
<p>Ежемесячный платёж (от)</p> <p>Ежемесячный платёж (от)</p>
<p><?= $arParams['CALCULATION']['MONTHLY']; ?> р.</p> <p><?= $arParams['CALCULATION']['MONTHLY']; ?> ₽</p>
</li> </li>
<li> <li>
<p>Стоимость автомобиля (от)</p> <p>Стоимость автомобиля (от)</p>
<p><?= number_format($arParams['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> р.</p> <p><?= number_format($arParams['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> ₽</p>
</li> </li>
<li> <li>
<p>Экономия по налогу на прибыль (до)</p> <p>Экономия по налогу на прибыль (до)</p>
<p><?= $arParams['CALCULATION']['SAVINGS_TAX']; ?> р.</p> <p><?= $arParams['CALCULATION']['SAVINGS_TAX']; ?> ₽</p>
</li> </li>
<li> <li>
<p>НДС к возмещению из бюджета (до)</p> <p>НДС к возмещению из бюджета (до)</p>
<p><?= $arParams['CALCULATION']['SAVINGS_VAT']; ?> р.</p> <p><?= $arParams['CALCULATION']['SAVINGS_VAT']; ?> ₽</p>
</li> </li>
</ul> </ul>
<div class="item_footer"> <div class="item_footer">

4
local/components/evolution/catalog.promo.brand/component.php
View File

@ -56,8 +56,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " ");
$brands_ar_res['ITEMS'][] = $ar_res; $brands_ar_res['ITEMS'][] = $ar_res;
} }

8
local/components/evolution/catalog.promo.brand/templates/.default/template.php
View File

@ -29,19 +29,19 @@ $this->setFrameMode(true);
<ul> <ul>
<li class="pay"> <li class="pay">
<p>Ежемесячный платёж (от)</p> <p>Ежемесячный платёж (от)</p>
<p><?= $arItem['CALCULATION']['MONTHLY']; ?> р.</p> <p><?= $arItem['CALCULATION']['MONTHLY']; ?> ₽</p>
</li> </li>
<li> <li>
<p>Стоимость автомобиля (от)</p> <p>Стоимость автомобиля (от)</p>
<p><?= number_format($arItem['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> р.</p> <p><?= number_format($arItem['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> ₽</p>
</li> </li>
<li> <li>
<p>Экономия по налогу на прибыль (до)</p> <p>Экономия по налогу на прибыль (до)</p>
<p><?= $arItem['CALCULATION']['SAVINGS_TAX']; ?> р.</p> <p><?= $arItem['CALCULATION']['SAVINGS_TAX']; ?> ₽</p>
</li> </li>
<li> <li>
<p>НДС к возмещению из бюджета (до)</p> <p>НДС к возмещению из бюджета (до)</p>
<p><?= $arItem['CALCULATION']['SAVINGS_VAT']; ?> р.</p> <p><?= $arItem['CALCULATION']['SAVINGS_VAT']; ?> ₽</p>
</li> </li>
</ul> </ul>
<div class="item_footer"> <div class="item_footer">

4
local/components/evolution/catalog.promo.model/component.php
View File

@ -51,8 +51,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " ");
$models_ar_res['ITEMS'][] = $ar_res; $models_ar_res['ITEMS'][] = $ar_res;
} }

8
local/components/evolution/catalog.promo.model/templates/.default/template.php
View File

@ -29,19 +29,19 @@ $this->setFrameMode(true);
<ul> <ul>
<li class="pay"> <li class="pay">
<p>Ежемесячный платёж (от)</p> <p>Ежемесячный платёж (от)</p>
<p><?= $arItem['CALCULATION']['MONTHLY']; ?> р.</p> <p><?= $arItem['CALCULATION']['MONTHLY']; ?> ₽</p>
</li> </li>
<li> <li>
<p>Стоимость автомобиля (от)</p> <p>Стоимость автомобиля (от)</p>
<p><?= number_format($arItem['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> р.</p> <p><?= number_format($arItem['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> ₽</p>
</li> </li>
<li> <li>
<p>Экономия по налогу на прибыль (до)</p> <p>Экономия по налогу на прибыль (до)</p>
<p><?= $arItem['CALCULATION']['SAVINGS_TAX']; ?> р.</p> <p><?= $arItem['CALCULATION']['SAVINGS_TAX']; ?> ₽</p>
</li> </li>
<li> <li>
<p>НДС к возмещению из бюджета (до)</p> <p>НДС к возмещению из бюджета (до)</p>
<p><?= $arItem['CALCULATION']['SAVINGS_VAT']; ?> р.</p> <p><?= $arItem['CALCULATION']['SAVINGS_VAT']; ?> ₽</p>
</li> </li>
</ul> </ul>
<div class="item_footer"> <div class="item_footer">

4
local/components/evolution/catalog/component.php
View File

@ -365,8 +365,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " ");
$arResult['ITEMS'][] = $ar_res; $arResult['ITEMS'][] = $ar_res;
} }

8
local/components/evolution/used.catalog.list.item/templates/.default/template.php
View File

@ -70,21 +70,21 @@ if(!empty($arParams['PROPERTIES']['PARKING_CITY']['VALUE'])) { array_push($descr
<? if($arParams['PROPERTIES']['LEASING_AVAILABLE']['VALUE_XML_ID'] === 'YES'): ?> <? if($arParams['PROPERTIES']['LEASING_AVAILABLE']['VALUE_XML_ID'] === 'YES'): ?>
<li class="pay"> <li class="pay">
<p>Ежемесячный платёж (от)</p> <p>Ежемесячный платёж (от)</p>
<p><?= $arParams['CALCULATION']['MONTHLY']; ?> р.</p> <p><?= $arParams['CALCULATION']['MONTHLY']; ?> ₽</p>
</li> </li>
<? endif; ?> <? endif; ?>
<li> <li>
<p>Стоимость автомобиля</p> <p>Стоимость автомобиля</p>
<? if($arParams['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0): ?> <? if($arParams['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0): ?>
<p style="text-decoration: line-through;"><?= number_format($arParams['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> р.</p> <p style="text-decoration: line-through;"><?= number_format($arParams['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> ₽</p>
<? else: ?> <? else: ?>
<p><?= number_format($arParams['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> р.</p> <p><?= number_format($arParams['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> ₽</p>
<? endif; ?> <? endif; ?>
</li> </li>
<? if($arParams['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0): ?> <? if($arParams['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0): ?>
<li> <li>
<p>Стоимость со скидкой</p> <p>Стоимость со скидкой</p>
<p><?= number_format($arParams['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'], 0, ".", " "); ?> р.</p> <p><?= number_format($arParams['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'], 0, ".", " "); ?> ₽</p>
</li> </li>
<? endif; ?> <? endif; ?>
</ul> </ul>

7
local/components/evolution/used.catalog/component.php
View File

@ -482,8 +482,11 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format(($price / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($price / CALCULATION_COEFFICIENT), 0, ".", " ");
//$ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " "); //$ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " "); //$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " "); //$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price*0.55 + $price / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price*0.55 + $price / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " ");
$ar_res['PREVIEW_PICTURE'] = CFile::GetPath($ar_res['PROPERTIES']['PHOTO']['VALUE']); $ar_res['PREVIEW_PICTURE'] = CFile::GetPath($ar_res['PROPERTIES']['PHOTO']['VALUE']);

5
local/ilsa_update.php
View File

@ -2632,7 +2632,7 @@ if(!in_array("simulate", $GLOBALS['argv']))
while($sitemap_program_aggregations_brand_ob = $sitemap_program_aggregations_brands->GetNextElement()) while($sitemap_program_aggregations_brand_ob = $sitemap_program_aggregations_brands->GetNextElement())
{ {
$sitemap_program_aggregations_brand = $sitemap_program_aggregations_brand_ob->GetFields(); $sitemap_program_aggregations_brand = $sitemap_program_aggregations_brand_ob->GetFields();
$sitemap_program_aggregations_string .= "<url><loc>".$url."/".$program['ROOT_CHUNK']."/".$sitemap_program_aggregations_brand['CODE']."/"."</loc><lastmod>".$lastmod."</lastmod></url>"."\n"; $sitemap_program_aggregations_string .= "<url><loc>".$url."/".$program['ROOT_CHUNK']."/brand-".$sitemap_program_aggregations_brand['CODE']."/"."</loc><lastmod>".$lastmod."</lastmod></url>"."\n";
$sitemap_program_aggregations_brand_types = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "IBLOCK_ID" => $program['RULES_ID'], "PROPERTY_VEHICLE_BRAND" => $sitemap_program_aggregations_brand['ID'], "ACTIVE" => "Y" ], false, [ "nTopCount" => 1000 ], [], ); $sitemap_program_aggregations_brand_types = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "IBLOCK_ID" => $program['RULES_ID'], "PROPERTY_VEHICLE_BRAND" => $sitemap_program_aggregations_brand['ID'], "ACTIVE" => "Y" ], false, [ "nTopCount" => 1000 ], [], );
while($sitemap_program_aggregations_type_ob = $sitemap_program_aggregations_brand_types->GetNextElement()) while($sitemap_program_aggregations_type_ob = $sitemap_program_aggregations_brand_types->GetNextElement())
@ -2643,11 +2643,12 @@ if(!in_array("simulate", $GLOBALS['argv']))
if(!empty($sitemap_program_aggregations_brand_type['PROPERTIES']['VEHICLE_TYPE']['VALUE'])) if(!empty($sitemap_program_aggregations_brand_type['PROPERTIES']['VEHICLE_TYPE']['VALUE']))
{ {
$sitemap_program_aggregations_brand_type_related = get_related($program['ROOT_ID'], $sitemap_program_aggregations_brand_type['PROPERTIES']['VEHICLE_TYPE']['VALUE']); $sitemap_program_aggregations_brand_type_related = get_related($program['ROOT_ID'], $sitemap_program_aggregations_brand_type['PROPERTIES']['VEHICLE_TYPE']['VALUE']);
$sitemap_program_aggregations_string .= "<url><loc>".$url."/".$program['ROOT_CHUNK']."/".$sitemap_program_aggregations_brand['CODE']."/".$sitemap_program_aggregations_brand_type_related['CODE']."/"."</loc><lastmod>".$lastmod."</lastmod></url>"."\n"; $sitemap_program_aggregations_string .= "<url><loc>".$url."/".$program['ROOT_CHUNK']."/brand-".$sitemap_program_aggregations_brand['CODE']."/".$sitemap_program_aggregations_brand_type_related['CODE']."/"."</loc><lastmod>".$lastmod."</lastmod></url>"."\n";
} }
} }
} }
} }
$sitemap_program_aggregations_string .= "</urlset>"."\n";
file_put_contents($_SERVER['DOCUMENT_ROOT']."/sitemap-programs.xml", $sitemap_program_aggregations_string); file_put_contents($_SERVER['DOCUMENT_ROOT']."/sitemap-programs.xml", $sitemap_program_aggregations_string);

6
local/templates/.default/components/bitrix/menu/evolution/template.php
View File

@ -48,11 +48,13 @@
</nav> </nav>
<div class="header_buttons_wrapper"> <div class="header_buttons_wrapper">
<a id="comagic1" href="tel:88003337575">8 800 333 75 75</a> <a id="comagic1" href="tel:88003337575">8 800 333 75 75</a>
<? $APPLICATION->IncludeComponent(
<? /*$APPLICATION->IncludeComponent(
"evolution:callback.button", "evolution:callback.button",
"", "",
Array() Array()
); ?> ); */?>
</div> </div>
</div> </div>
<a href="https://lk.evoleasing.ru/" class="lk" title="Личный кабинет" target="_blank"></a> <a href="https://lk.evoleasing.ru/" class="lk" title="Личный кабинет" target="_blank"></a>