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

2023-09-21 17:24:33 +03:00 · 2023-09-21 17:24:33 +03:00 · 7d80243c65
commit 7d80243c65
parent bcbecf68da e8363e716f
15 changed files with 100 additions and 17 deletions
--- a/catalog/position.php
+++ b/catalog/position.php
@ -21,7 +21,7 @@ $APPLICATION->AddChainItem("Каталог", "/catalog/");
 			"lease_period" => 15, 
 			"redemption_payment" => 5, 
 			"CAR_PRICE_MIN" => 500000,
-			"CAR_PRICE_MAX" => 20000000,
+			"CAR_PRICE_MAX" => 30000000,
 			"INITIAL_PAYMENT_MIN" => 5, 
 			"INITIAL_PAYMENT_MAX" => 50, 
 			"LEASE_PERIOD_MIN" => 7, 
--- a/element_add.txt
+++ b/element_add.txt
@ -0,0 +1,83 @@
+array (
+  'ACTIVE' => 'Y',
+  'MODIFIED_BY' => '1',
+  'IBLOCK_ID' => 13,
+  'ACTIVE_FROM' => '',
+  'ACTIVE_TO' => '',
+  'SORT' => '493',
+  'NAME' => 'Корпоративная программа Changan',
+  'CODE' => '',
+  'TAGS' => '',
+  'PREVIEW_PICTURE' => 
+  array (
+    'name' => 'changan525.jpg',
+    'type' => 'image/jpeg',
+    'tmp_name' => '/home/bitrix/.bx_temp/sitemanager/BXTEMP-2023-09-13/03/bxu/main/f4856fb539b43ff1b62d689208f692d3/file1694527882980/default',
+    'size' => '72032',
+    'error' => 0,
+    'description' => '',
+    'COPY_FILE' => 'Y',
+    'MODULE_ID' => 'iblock',
+  ),
+  'PREVIEW_TEXT' => '<ul class="special_desc list-column">
+	<li>Выгода до 560&nbsp;000&nbsp;₽</li>
+</ul>',
+  'PREVIEW_TEXT_TYPE' => 'html',
+  'DETAIL_TEXT' => '',
+  'DETAIL_TEXT_TYPE' => 'text',
+  'TMP_ID' => 0,
+  'PROPERTY_VALUES' => 
+  array (
+    25 => 
+    array (
+      'n0' => 
+      array (
+        'VALUE' => '103703',
+      ),
+    ),
+    174 => 
+    array (
+      0 => 
+      array (
+        'VALUE' => '33',
+      ),
+    ),
+    175 => 
+    array (
+      'n0' => 
+      array (
+        'VALUE' => 'Y1jgkD79VtBHEZmvSe2y8jBjy9if',
+      ),
+    ),
+    176 => 
+    array (
+      'n0' => 
+      array (
+        'VALUE' => 'https://www.evoleasing.ru/advertising/samples/program_special_offers_banner_103660.png',
+      ),
+    ),
+    195 => 
+    array (
+      'n0' => 
+      array (
+        'VALUE' => 'sob_103660',
+      ),
+    ),
+  ),
+  'IPROPERTY_TEMPLATES' => 
+  array (
+    'ELEMENT_META_TITLE' => '',
+    'ELEMENT_META_KEYWORDS' => '',
+    'ELEMENT_META_DESCRIPTION' => '',
+    'ELEMENT_PAGE_TITLE' => '',
+    'ELEMENT_PREVIEW_PICTURE_FILE_ALT' => '',
+    'ELEMENT_PREVIEW_PICTURE_FILE_TITLE' => '',
+    'ELEMENT_PREVIEW_PICTURE_FILE_NAME' => '',
+    'ELEMENT_DETAIL_PICTURE_FILE_ALT' => '',
+    'ELEMENT_DETAIL_PICTURE_FILE_TITLE' => '',
+    'ELEMENT_DETAIL_PICTURE_FILE_NAME' => '',
+  ),
+  'SEARCHABLE_CONTENT' => 'КОРПОРАТИВНАЯ ПРОГРАММА CHANGAN
+- ВЫГОДА ДО 560&NBSP;000&NBSP;₽
+',
+)
--- a/index.php
+++ b/index.php
@ -33,7 +33,7 @@ $APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_N
 		"lease_period" => 15, 
 		"redemption_payment" => 5, 
 		"CAR_PRICE_MIN" => 500000,
-		"CAR_PRICE_MAX" => 20000000,
+		"CAR_PRICE_MAX" => 30000000,
 		"INITIAL_PAYMENT_MIN" => 5, 
 		"INITIAL_PAYMENT_MAX" => 50, 
 		"LEASE_PERIOD_MIN" => 7, 
--- a/local/components/evolution/about.news.article/templates/.default/template.php
+++ b/local/components/evolution/about.news.article/templates/.default/template.php
@ -38,7 +38,7 @@ $APPLICATION->AddHeadString('<script type="application/ld+json">'.json_encode($m
 			<div class="image">
 				<div class="advwrapper">
 					<img src="<?= $arResult['DETAIL_PICTURE']; ?>" alt="<?= $arResult['NAME']; ?>" />
-					<? if($arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+					<? if(!isset($_GET['advertise']) && $arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 						<div class="advblock adv_button_news adv_button_news_article">Реклама
 							<div class="adv_content">ООО "ЛК Эволюция"</div>
 							<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/about.news.list/templates/.default/template.php
+++ b/local/components/evolution/about.news.list/templates/.default/template.php
@ -45,7 +45,7 @@ $this->setFrameMode(true);
 								<p class="news_title"><?= $entry['NAME']; ?></p>
 								<div class="advwrapper">
 									<img src="<?= $entry['PREVIEW_PICTURE']; ?>" width="234px" height="234px" alt="">
-									<? if($entry['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+									<? if(!isset($_GET['advertise']) && $entry['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 										<div class="advblock adv_button_news">Реклама
 											<div class="adv_content">ООО "ЛК Эволюция"</div>
 											<div class="adv_content">ИНН 9724016636</div>
@ -66,7 +66,7 @@ $this->setFrameMode(true);
 								<p class="news_title"><?= $entry['NAME']; ?></p>
 								<div class="advwrapper">
 									<img src="<?= $entry['PREVIEW_PICTURE']; ?>" width="234px" height="234px" alt="">
-									<? if($entry['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+									<? if(!isset($_GET['advertise']) && $entry['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 										<div class="advblock adv_button_news">Реклама
 											<div class="adv_content">ООО "ЛК Эволюция"</div>
 											<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/banner.inner/templates/.default/template.php
+++ b/local/components/evolution/banner.inner/templates/.default/template.php
@ -14,7 +14,7 @@ $this->setFrameMode(true);
 ?>
 <? if(isset($arResult['BANNER'])): ?>
 	<div class="advwrapper">
-		<? if($arResult['BANNER']['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+		<? if(!isset($_GET['advertise']) && $arResult['BANNER']['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 			<div class="advblock adv_button_news">Реклама
 				<div class="adv_content">ООО "ЛК Эволюция"</div>
 				<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/calculator/templates/.default/template.php
+++ b/local/components/evolution/calculator/templates/.default/template.php
@ -32,7 +32,7 @@ $this->setFrameMode(true);
 					<?/*<output hidden></output>*/?>
 					<p id="calculator_car_price_text"><output></output> ₽</p>
 					<div class="price_custom" id="calculator_car_price_editor" style="display:none;">
-						<input id="calculator_car_price_input" type="number" value="500000" min="500000" max="20000000" />
+						<input id="calculator_car_price_input" type="number" value="<?= $arParams['car_price']; ?>" min="<?= $arParams['CAR_PRICE_MIN']; ?>" max="<?= $arParams['CAR_PRICE_MAX']; ?>" />
 						<button id="calculator_car_price_save">Сохранить</button>
 					</div>
 					<div class="line">
--- a/local/components/evolution/news.list.main/templates/.default/template.php
+++ b/local/components/evolution/news.list.main/templates/.default/template.php
@ -41,7 +41,7 @@ $this->setFrameMode(true);
 						<p class="news_title"><?= $entry['NAME']; ?></p>
 						<div class="advwrapper">
 							<img src="<?= $entry['PREVIEW_PICTURE']; ?>" width="234px" height="234px" alt="" />
-							<? if($entry['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+							<? if(!isset($_GET['advertise']) && $entry['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 								<div class="advblock adv_button_news">Реклама
 									<div class="adv_content">ООО "ЛК Эволюция"</div>
 									<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/programs.offers.banners/templates/.default/template.php
+++ b/local/components/evolution/programs.offers.banners/templates/.default/template.php
@ -13,7 +13,7 @@
 $this->setFrameMode(true);
 ?>
 <div id="special_slider" style="overflow-x: clip;">
-	<div class="special_list swiped">
+	<div class="special_list swiped" style="<?= isset($_GET['advertise']) ? "flex-wrap: wrap;" : "" ?>">
 		<? foreach($arResult['BANNERS'] AS $banner): ?>
 			<div class="special_item" id="program_special_offers_banner_<?= $banner['ID']; ?>">
 				<a href="<?= $banner['PROPERTIES']['OFFER']['RELATED']['DETAIL_PAGE_URL']; ?>">
@ -22,7 +22,7 @@ $this->setFrameMode(true);
 					<span class="special_link">Подробнее</span>
 				</a>
 				<img src="<?= $banner['PREVIEW_PICTURE']; ?>" alt="<?= $banner['NAME']; ?>"/>
-				<? if($banner['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+				<? if(!isset($_GET['advertise']) && $banner['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 					<div class="advblock adv_button_news">Реклама
 						<div class="adv_content">ООО "ЛК Эволюция"</div>
 						<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/slider.main/templates/.default/template.php
+++ b/local/components/evolution/slider.main/templates/.default/template.php
@ -30,7 +30,7 @@ $this->setFrameMode(true);
 					data-image="<?= $SLIDE['DETAIL_PICTURE']; ?>"
 					data-tb-image="<?= $SLIDE['DETAIL_PICTURE']; ?>"
 					data-sm-image="<?= $SLIDE['PREVIEW_PICTURE']; ?>"
-					data-erir="<?= $SLIDE['PROPERTIES']['ADVERTISING_ERIR']['VALUE']; ?>"
+					data-erir="<?= !isset($_GET['advertise']) ? $SLIDE['PROPERTIES']['ADVERTISING_ERIR']['VALUE'] : ""; ?>"
 				>
 					<p class="item_name"><?= $SLIDE['PROPERTIES']['TAGLINE']['VALUE']; ?></p>
 					<span href="<?= $SLIDE['PROPERTIES']['URL']['VALUE']; ?>" class="item_link">Подробнее</span>
--- a/local/components/evolution/special.offers.cars/templates/.default/template.php
+++ b/local/components/evolution/special.offers.cars/templates/.default/template.php
@ -27,7 +27,7 @@ $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']): ?>
+											<? if(!isset($_GET['advertise']) && $car['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 												<div class="advblock adv_button_news">Реклама
 													<div class="adv_content">ООО "ЛК Эволюция"</div>
 													<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/special.offers.offer/templates/.default/template.php
+++ b/local/components/evolution/special.offers.offer/templates/.default/template.php
@ -33,7 +33,7 @@ $this->setFrameMode(true);
 						<a href="#order" class="button button-blue special_offer_button">Отправить заявку</a>
 					<? endif; ?>
 					<img src="<?= $arResult['DETAIL_PICTURE']; ?>" alt="<?= $arResult['NAME']; ?>" />
-					<? if($arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+					<? if(!isset($_GET['advertise']) && $arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 						<div class="advblock adv_button_news">Реклама
 							<div class="adv_content">ООО "ЛК Эволюция"</div>
 							<div class="adv_content">ИНН 9724016636</div>
@ -76,7 +76,7 @@ $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']): ?>
+											<? if(!isset($_GET['advertise']) && $car['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 												<div class="advblock adv_button_news">Реклама
 													<div class="adv_content">ООО "ЛК Эволюция"</div>
 													<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/special.offers/templates/.default/template.php
+++ b/local/components/evolution/special.offers/templates/.default/template.php
@ -36,7 +36,7 @@ $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']): ?>
+						<? if(!isset($_GET['advertise']) && $offer['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 							<div class="advblock adv_button_news">Реклама
 								<div class="adv_content">ООО "ЛК Эволюция"</div>
 								<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/used.catalog.list.item/templates/.default/template.php
+++ b/local/components/evolution/used.catalog.list.item/templates/.default/template.php
@ -24,7 +24,7 @@ if(!empty($arParams['PROPERTIES']['PARKING_CITY']['VALUE'])) { array_push($descr
 	<a href="/izt/<?= $arParams['CODE']; ?>/" class="item_link" area-label="<?= $arParams['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arParams['PROPERTIES']['MODEL']['RELATED']['NAME']; ?>"></a>

 		<img class="used_item_img <?= $arParams['ACTIVE'] === "N" ? "car_used_sold" : ""; ?>" src="<?= !empty($arParams['PREVIEW_PICTURE']) ? $arParams['PREVIEW_PICTURE'] : "/images/no_image_500x300.png"; ?>" alt="<?= $arParams['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arParams['PROPERTIES']['MODEL']['RELATED']['NAME']; ?> <?= $arParams['PROPERTIES']['BODY']['VALUE']; ?>" />
-		<? if($arParams['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+		<? if(!isset($_GET['advertise']) && $arParams['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 			<div class="advblock adv_button_news" style="padding: 6px; padding-top: 0px; padding-bottom: 0px;">Реклама
 				<div class="adv_content">ООО "ЛК Эволюция"</div>
 				<div class="adv_content">ИНН 9724016636</div>
--- a/local/components/evolution/used.catalog.position/templates/.default/template.php
+++ b/local/components/evolution/used.catalog.position/templates/.default/template.php
@ -79,7 +79,7 @@ $this->setFrameMode(true);
 										style="<?= $k === 0 ? "opacity: 1.0;" : "opacity: 0.0;"; ?>
 									">
 								<? endforeach; ?>
-								<? if($arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
+								<? if(!isset($_GET['advertise']) && $arResult['PROPERTIES']['ADVERTISING_ERIR']['VALUE']): ?>
 									<div class="advwrapper" style="position: absolute; right: 0px; top: 0px;">
 										<div class="advblock adv_button_news">Реклама
 											<div class="adv_content">ООО "ЛК Эволюция"</div>