From 0d001284c23a58839154675c262cab870589871d Mon Sep 17 00:00:00 2001 From: merelendor Date: Tue, 5 Sep 2023 12:33:58 +0300 Subject: [PATCH] hotfixes after production publish --- bitrix/php_interface/init.php | 16 ++- .../evolution/about.news.list/component.php | 3 +- .../templates/.default/template.php | 78 +++++------ .../templates/.default/template.php | 78 +++++------ .../templates/.default/template.php | 78 +++++------ .../templates/.default/template.php | 2 +- .../templates/.default/template.php | 9 +- .../templates/.default/template.php | 7 + .../templates/.default/template.php | 16 ++- .../templates/.default/template.php | 7 + .../templates/.default/template.php | 128 +++++++++--------- local/include/footer.php | 2 +- local/templates/evolution/css/forms/style.css | 16 ++- .../templates/evolution/css/forms/style.less | 17 ++- local/templates/evolution/css/var.less | 1 + local/templates/evolution/js/main.js | 34 +++++ 16 files changed, 296 insertions(+), 196 deletions(-) diff --git a/bitrix/php_interface/init.php b/bitrix/php_interface/init.php index 8229b40..575eff8 100644 --- a/bitrix/php_interface/init.php +++ b/bitrix/php_interface/init.php @@ -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,8 +514,18 @@ function OnBeforeIBlockElementUpdateHandler(&$arFields) else { //очистка ЕРИР и образца - $arFields['PROPERTY_VALUES'][$properties['ADVERTISING_ERIR']] = [ "".array_keys($arFields['PROPERTY_VALUES'][$properties['ADVERTISING_ERIR']])[0]."" => [ 'VALUE' => '' ] ]; - $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_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' => '' ] ]; + } } } } diff --git a/local/components/evolution/about.news.list/component.php b/local/components/evolution/about.news.list/component.php index 58a2b73..653af9f 100644 --- a/local/components/evolution/about.news.list/component.php +++ b/local/components/evolution/about.news.list/component.php @@ -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); diff --git a/local/components/evolution/catalog.landing.promo.model/templates/.default/template.php b/local/components/evolution/catalog.landing.promo.model/templates/.default/template.php index d8b4f3e..1ab51d7 100644 --- a/local/components/evolution/catalog.landing.promo.model/templates/.default/template.php +++ b/local/components/evolution/catalog.landing.promo.model/templates/.default/template.php @@ -14,44 +14,46 @@ $this->setFrameMode(true); ?> 0): ?> -

-
- -
- - <?= $arItem['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['MODEL']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['BODY']['VALUE']; ?> -

-

- - , , л.с. -

-
    -
  • -

    Ежемесячный платёж (от)

    -

    р.

    -
  • -
  • -

    Стоимость автомобиля (от)

    -

    р.

    -
  • -
  • -

    Экономия по налогу на прибыль (до)

    -

    р.

    -
  • -
  • -

    НДС к возмещению из бюджета (до)

    -

    р.

    -
  • -
- - //" style="cursor:pointer;"> - Показать еще - + +
+ //" style="cursor:pointer;"> + Показать еще + + \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.brand/templates/.default/template.php b/local/components/evolution/catalog.promo.brand/templates/.default/template.php index ef38e5b..94b1278 100644 --- a/local/components/evolution/catalog.promo.brand/templates/.default/template.php +++ b/local/components/evolution/catalog.promo.brand/templates/.default/template.php @@ -14,44 +14,46 @@ $this->setFrameMode(true); ?> 0): ?> -

-
- -
- - <?= $arItem['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['MODEL']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['BODY']['VALUE']; ?> -

-

- - , , л.с. -

-
    -
  • -

    Ежемесячный платёж (от)

    -

    р.

    -
  • -
  • -

    Стоимость автомобиля (от)

    -

    р.

    -
  • -
  • -

    Экономия по налогу на прибыль (до)

    -

    р.

    -
  • -
  • -

    НДС к возмещению из бюджета (до)

    -

    р.

    -
  • -
- - - Показать еще - + +
+ + Показать еще + + \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.model/templates/.default/template.php b/local/components/evolution/catalog.promo.model/templates/.default/template.php index 8257520..fd7baef 100644 --- a/local/components/evolution/catalog.promo.model/templates/.default/template.php +++ b/local/components/evolution/catalog.promo.model/templates/.default/template.php @@ -14,44 +14,46 @@ $this->setFrameMode(true); ?> 0): ?> -

-
- -
- - <?= $arItem['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['MODEL']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['BODY']['VALUE']; ?> -

-

- - , , л.с. -

-
    -
  • -

    Ежемесячный платёж (от)

    -

    р.

    -
  • -
  • -

    Стоимость автомобиля (от)

    -

    р.

    -
  • -
  • -

    Экономия по налогу на прибыль (до)

    -

    р.

    -
  • -
  • -

    НДС к возмещению из бюджета (до)

    -

    р.

    -
  • -
- - //" style="cursor:pointer;"> - Показать еще - + +
+ //" style="cursor:pointer;"> + Показать еще + + \ No newline at end of file diff --git a/local/components/evolution/preapproval/templates/.default/template.php b/local/components/evolution/preapproval/templates/.default/template.php index bc8f904..fe965ca 100644 --- a/local/components/evolution/preapproval/templates/.default/template.php +++ b/local/components/evolution/preapproval/templates/.default/template.php @@ -13,7 +13,7 @@ $this->setFrameMode(true); ?> -
+
@@ -61,10 +68,17 @@ $this->setFrameMode(true); diff --git a/local/components/evolution/special.offers/templates/.default/template.php b/local/components/evolution/special.offers/templates/.default/template.php index 3aa57fd..9ed15be 100644 --- a/local/components/evolution/special.offers/templates/.default/template.php +++ b/local/components/evolution/special.offers/templates/.default/template.php @@ -36,6 +36,13 @@ $this->setFrameMode(true); <?= $offer['NAME']; ?> + +
Реклама +
ООО "ЛК Эволюция"
+
ИНН 9724016636
+
ЕРИР:
+
+ Подробнее
diff --git a/local/components/evolution/used.catalog.position/templates/.default/template.php b/local/components/evolution/used.catalog.position/templates/.default/template.php index a295be1..010e025 100644 --- a/local/components/evolution/used.catalog.position/templates/.default/template.php +++ b/local/components/evolution/used.catalog.position/templates/.default/template.php @@ -186,78 +186,80 @@ $this->setFrameMode(true);
- -
-
-

Калькулятор расчета лизинга

-
-
-

Стоимость авто

-

- - 0 ? $arResult['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] : $arResult['PROPERTIES']['PRICE']['VALUE'], 0, ".", " "); ?> ₽ - - -

-