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

hotfixes after production publish

Browse Source
This commit is contained in:
merelendor 2023-09-05 12:33:58 +03:00
parent 4e33c2e98d
commit 0d001284c2
16 changed files with 296 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bitrix/php_interface/init.php
View File

@ -505,6 +505,8 @@ function OnBeforeIBlockElementUpdateHandler(&$arFields)
else
{
$arFields['PROPERTY_VALUES'][$properties['ADVERTISING']] = '';
$arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_URL']] = '';
$arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_ID']] = '';
$arFields['ACTIVE'] = 'N';
}
}
@ -512,9 +514,19 @@ function OnBeforeIBlockElementUpdateHandler(&$arFields)
else
{
//очистка ЕРИР и образца
if(is_array($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_ERIR']]))
{
$arFields['PROPERTY_VALUES'][$properties['ADVERTISING_ERIR']] = [ "".array_keys($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_ERIR']])[0]."" => [ 'VALUE' => '' ] ];
}
if(is_array($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_URL']]))
{
$arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_URL']] = [ "".array_keys($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_URL']])[0]."" => [ 'VALUE' => '' ] ];
}
if(is_array($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_ID']]))
{
$arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_ID']] = [ "".array_keys($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_SAMPLE_ID']])[0]."" => [ 'VALUE' => '' ] ];
}
}
}
}

3
local/components/evolution/about.news.list/component.php
View File

@ -21,7 +21,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
{
$arResult = [];
$sort = Array("ACTIVE_FROM" => "DESC", "NAME" => "ASC");
$filter = Array("ACTIVE" => "Y", "IBLOCK_ID" => 6);
$filter = Array("IBLOCK_ID" => 6);
if(!isset($_GET['advertise'])) { $filter["ACTIVE"] = "Y"; }
$options = Array("nPageSize" => isset($_GET['advertise']) ? 10000 : 4);
$res = CIBlockElement::GetList($sort, $filter, false, $options);

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

@ -14,6 +14,7 @@ $this->setFrameMode(true);
?>
<? if(count($arResult['MODELS']) > 0): ?>
<? foreach($arResult['MODELS'] AS $model): ?>
<? if(count($model['ITEMS']) > 0): ?>
<h2 class="catalog_h2_title"><?= $model['BRAND_NAME']; ?> <?= $model['NAME']; ?></h2>
<div id="list" class="catalog_list">
<? foreach($model['ITEMS'] AS $arItem): ?>
@ -53,5 +54,6 @@ $this->setFrameMode(true);
<a class="catalog_show_more_button" href="<?= $model['PROPERTIES']['REGIONS']['VALUE'] !== "Да" ? "/catalog/" : $arParams['PATH']; ?><?= $model['BRAND_CODE']; ?>/<?= $model['CODE']; ?>/" style="cursor:pointer;">
<span>Показать еще</span>
</a>
<? endif; ?>
<? endforeach; ?>
<? endif; ?>

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

@ -14,6 +14,7 @@ $this->setFrameMode(true);
?>
<? if(count($arResult['BRANDS']) > 0): ?>
<? foreach($arResult['BRANDS'] AS $brand): ?>
<? if(count($brand['ITEMS']) > 0): ?>
<h2 class="catalog_h2_title"><?= $brand['NAME']; ?></h2>
<div id="list" class="catalog_list">
<? foreach($brand['ITEMS'] AS $arItem): ?>
@ -53,5 +54,6 @@ $this->setFrameMode(true);
<a class="catalog_show_more_button" href="<?= $arParams['PATH']; ?><?= $brand['CODE']; ?>/<?= $arParams['QUERY_STRING']; ?>" style="cursor:pointer;">
<span>Показать еще</span>
</a>
<? endif; ?>
<? endforeach; ?>
<? endif; ?>

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

@ -14,6 +14,7 @@ $this->setFrameMode(true);
?>
<? if(count($arResult['MODELS']) > 0): ?>
<? foreach($arResult['MODELS'] AS $model): ?>
<? if(count($model['ITEMS']) > 0): ?>
<h2 class="catalog_h2_title"><?= $arParams['BRAND_NAME']; ?> <?= $model['NAME']; ?></h2>
<div id="list" class="catalog_list">
<? foreach($model['ITEMS'] AS $arItem): ?>
@ -53,5 +54,6 @@ $this->setFrameMode(true);
<a class="catalog_show_more_button" href="<?= $model['PROPERTIES']['REGIONS']['VALUE'] !== "Да" ? "/catalog/" : $arParams['PATH']; ?><?= $arParams['BRAND_CODE']; ?>/<?= $model['CODE']; ?>/" style="cursor:pointer;">
<span>Показать еще</span>
</a>
<? endif; ?>
<? endforeach; ?>
<? endif; ?>

2
local/components/evolution/preapproval/templates/.default/template.php
View File

@ -13,7 +13,7 @@
$this->setFrameMode(true);
?>
<!-- Предварительное одобрение --->
<div id="preapproval_block">
<div id="preapproval_block" class="preapproval_block_content">
<button class="block_open block_toggle">
<i>
<img src="/images/icons/preapproval_icon.svg" loading="lazy" alt="Одобрение" width="34" height="40" />

9
local/components/evolution/programs.offers.banners/templates/.default/template.php
View File

@ -12,7 +12,7 @@
/** @var CBitrixComponent $component */
$this->setFrameMode(true);
?>
<div id="special_slider">
<div id="special_slider" style="overflow-x: clip;">
<div class="special_list swiped">
<? foreach($arResult['BANNERS'] AS $banner): ?>
<div class="special_item" id="program_special_offers_banner_<?= $banner['ID']; ?>">
@ -22,6 +22,13 @@ $this->setFrameMode(true);
<span class="special_link">Подробнее</span>
</a>
<img src="<?= $banner['PREVIEW_PICTURE']; ?>" alt="<?= $banner['NAME']; ?>"/>
<? if($banner['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
<div class="advblock adv_button_news">Реклама
<div class="adv_content">ООО "ЛК Эволюция"</div>
<div class="adv_content">ИНН 9724016636</div>
<div class="adv_content">ЕРИР: <?= $banner['PROPERTIES']['ADVERTISING_ERIR']['VALUE']; ?></div>
</div>
<? endif; ?>
</div>
<? endforeach; ?>
</div>

7
local/components/evolution/special.offers.cars/templates/.default/template.php
View File

@ -27,6 +27,13 @@ $this->setFrameMode(true);
<img src="<?= $car['PREVIEW_PICTURE']; ?>" alt="<?= $car['NAME']; ?>" />
<span class="leasing_model"><?= $car['NAME']; ?></span>
<span class="leasing_desc"><?= $car['PROPERTIES']['TAGLINE']['VALUE']; ?></span>
<? if($car['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
<div class="advblock adv_button_news">Реклама
<div class="adv_content">ООО "ЛК Эволюция"</div>
<div class="adv_content">ИНН 9724016636</div>
<div class="adv_content">ЕРИР: <?= $car['PROPERTIES']['ADVERTISING_ERIR']['VALUE']; ?></div>
</div>
<? endif; ?>
</a>
</div>
<? endfor; ?>

16
local/components/evolution/special.offers.offer/templates/.default/template.php
View File

@ -31,6 +31,13 @@ $this->setFrameMode(true);
<?= isset($arResult['PROPERTIES']['CONTENT_HEADER']['~VALUE']['TEXT']) ? $arResult['PROPERTIES']['CONTENT_HEADER']['~VALUE']['TEXT'] : ""; ?>
<a href="#order" class="button button-blue special_offer_button">Отправить заявку</a>
<img src="<?= $arResult['DETAIL_PICTURE']; ?>" alt="<?= $arResult['NAME']; ?>" />
<? if($arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
<div class="advblock adv_button_news">Реклама
<div class="adv_content">ООО "ЛК Эволюция"</div>
<div class="adv_content">ИНН 9724016636</div>
<div class="adv_content">ЕРИР: <?= $arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']; ?></div>
</div>
<? endif; ?>
</div>
</div>
<div class="special_offer-text">
@ -61,10 +68,17 @@ $this->setFrameMode(true);
<? for($i = 0; $i < count($arResult['PROPERTIES']['CARS']['RELATED']); $i++): ?>
<? $car = $arResult['PROPERTIES']['CARS']['RELATED'][$i]; ?>
<div class="leasing_item">
<a class="item_wrapper car_top_card" data-id="<?= $i; ?>" style="cursor: pointer;">
<a class="item_wrapper car_top_card" data-id="<?= $i; ?>" style="cursor: pointer; position: relative;">
<img src="<?= $car['PREVIEW_PICTURE']; ?>" alt="<?= $car['NAME']; ?>" />
<span class="leasing_model"><?= $car['NAME']; ?></span>
<span class="leasing_desc"><?= $car['PROPERTIES']['TAGLINE']['VALUE']; ?></span>
<? if($car['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
<div class="advblock adv_button_news">Реклама
<div class="adv_content">ООО "ЛК Эволюция"</div>
<div class="adv_content">ИНН 9724016636</div>
<div class="adv_content">ЕРИР: <?= $car['PROPERTIES']['ADVERTISING_ERIR']['VALUE']; ?></div>
</div>
<? endif; ?>
</a>
</div>
<? endfor; ?>

7
local/components/evolution/special.offers/templates/.default/template.php
View File

@ -36,6 +36,13 @@ $this->setFrameMode(true);
<a href="<?= $offer['DETAIL_PAGE_URL']; ?>">
<span class="special_name"><?= $offer['NAME']; ?></span>
<img src="<?= $offer['PREVIEW_PICTURE']; ?>" alt="<?= $offer['NAME']; ?>"/>
<? if($offer['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
<div class="advblock adv_button_news">Реклама
<div class="adv_content">ООО "ЛК Эволюция"</div>
<div class="adv_content">ИНН 9724016636</div>
<div class="adv_content">ЕРИР: <?= $offer['PROPERTIES']['ADVERTISING_ERIR']['VALUE']; ?></div>
</div>
<? endif; ?>
<span class="speacial_text"><?= $offer['PREVIEW_TEXT']; ?></span>
<span class="special_link">Подробнее</span>
</a>

4
local/components/evolution/used.catalog.position/templates/.default/template.php
View File

@ -186,8 +186,9 @@ $this->setFrameMode(true);
</article>
</div>
<div class="izt_calculator">
<? if($arResult['ACTIVE'] == "Y" && $arResult['PROPERTIES']['LEASING_AVAILABLE']['VALUE_XML_ID'] === 'YES'): ?>
<div id="calc" class="izt_calculator">
<div id="calc">
<div class="calc_body">
<h2 class="section_title">Калькулятор расчета лизинга</h2>
<div class="calc_settings">
@ -258,6 +259,7 @@ $this->setFrameMode(true);
</div>
</div>
<? endif; ?>
</div>
<? $APPLICATION->IncludeComponent(
"evolution:catalog.other.positions",
"",

2
local/include/footer.php
View File

@ -75,7 +75,7 @@
</div>
</footer>
<div id="cookie">
<div id="cookie" class="cookies-info">
<button class="close" area-label="Закрыть"></button>
<p>Мы <a href="/cookies/">используем cookies</a> для улучшения использования сайта.</p>
</div>

16
local/templates/evolution/css/forms/style.css
View File

@ -612,17 +612,17 @@
#preapproval_block {
position: fixed;
z-index: 1000;
left: 20px;
left: 12px;
bottom: 25px;
}
@media all and (max-width: 1280px) {
@media all and (max-width: 1279px) {
#preapproval_block {
bottom: 95px;
}
}
@media all and (max-width: 768px) {
#preapproval_block {
left: 0px;
left: 14px;
}
}
@media all and (max-width: 540px) {
@ -635,8 +635,8 @@
}
#preapproval_block #preapproval_block_span_wrapper {
overflow: hidden;
margin-left: -40px;
padding-left: 40px;
margin-left: -20px;
padding-left: 20px;
}
#preapproval_block .span_hidden {
z-index: 1;
@ -716,6 +716,7 @@
align-items: center;
justify-content: flex-start;
gap: 0 13px;
padding: 0px 0px !important;
}
#preapproval_block .block_open span {
display: inline-block;
@ -723,7 +724,7 @@
color: #fff;
font-weight: 6000;
line-height: 20px;
padding: 11px 16px;
padding: 11px 15px;
border-radius: 8px;
background: var(--blue);
}
@ -810,3 +811,6 @@
#preapproval_block .block_form form .step .error:after {
color: #A8026B;
}
.carrotquest-messenger-button-position {
bottom: 60px!important;
}

17
local/templates/evolution/css/forms/style.less
View File

@ -729,16 +729,16 @@
#preapproval_block {
position: fixed;
z-index: 1000;
left: 20px;
left: 12px;
bottom: 25px;
@media all and (max-width: 1280px) {
@media all and (max-width: 1279px) {
//display: none;
bottom: 95px;
}
@media all and (max-width: 768px) {
left: 0px;
left: 14px;
}
@media all and (max-width: 540px) {
@ -752,8 +752,8 @@
#preapproval_block_span_wrapper {
overflow: hidden;
margin-left: -40px;
padding-left: 40px;
margin-left: -20px;
padding-left: 20px;
}
.span_hidden {
@ -853,6 +853,7 @@
align-items: center;
justify-content: flex-start;
gap: 0 13px;
padding: 0px 0px !important;
span {
display: inline-block;
@ -860,7 +861,7 @@
color: #fff;
font-weight: 6000;
line-height: 20px;
padding: 11px 16px;
padding: 11px 15px;
border-radius: 8px;
background: var(--blue);
}
@ -965,3 +966,7 @@
}
}
}
.carrotquest-messenger-button-position {
bottom: 60px!important;
}

1
local/templates/evolution/css/var.less
View File

@ -27,6 +27,7 @@ html {
zoom: 1.4;
}
.container, .bx-breadcrumb {
margin-left: auto;
margin-right: auto;

34
local/templates/evolution/js/main.js
View File

@ -288,4 +288,38 @@ function init()
});
}
}
$(document).on('DOMNodeInserted', function(e)
{
if ( $(e.target).hasClass('carrotquest-messenger-right_bottom') )
{
comagic_position(true);
}
});
$(window).on("resize", function()
{
comagic_position(false);
});
}
function comagic_position(init)
{
var style = "";
if(window.innerWidth >= 1280)
{
style = "margin-bottom: 3px !important; right: -14px!important; z-index: 999!important;";
// style = 'bottom: -10px!important; right: -14px!important; z-index: 999!important;';
}
// else if(window.innerWidth >= 480)
// {
// style = "bottom: " + (init ? "60" : "0") + "px!important; right: -14px!important; z-index: 999!important;";
// }
else
{
style = "margin-bottom: 73px !important; right: -14px!important; z-index: 999!important;";
// style = 'bottom: -15px!important; right: -14px!important; z-index: 999!important;';
}
$('.carrotquest-messenger-right_bottom').attr('style', style);
}