From f566f215290f88f9a7664458bf36284dd7d5fd3e Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Sun, 4 Dec 2022 13:20:26 +0300
Subject: [PATCH] fix for catalog brand section, main office markup component

---
 .../templates/.default/template.php           | 65 ---------------
 .../evolution/catalog/component.php           |  2 -
 .../catalog/templates/.default/template.php   |  2 +-
 .../mainoffice.markup/.description.php        |  8 ++
 .../evolution/mainoffice.markup/component.php | 13 +++
 .../mainoffice.markup/ru/.description.php     |  4 +
 .../templates/.default/template.php           | 79 +++++++++++++++++++
 local/templates/404/footer.php                |  7 ++
 local/templates/evolution/footer.php          |  7 ++
 9 files changed, 119 insertions(+), 68 deletions(-)
 create mode 100644 local/components/evolution/mainoffice.markup/.description.php
 create mode 100644 local/components/evolution/mainoffice.markup/component.php
 create mode 100644 local/components/evolution/mainoffice.markup/ru/.description.php
 create mode 100644 local/components/evolution/mainoffice.markup/templates/.default/template.php

diff --git a/local/components/evolution/about.contacts.list/templates/.default/template.php b/local/components/evolution/about.contacts.list/templates/.default/template.php
index 257da59..a73838d 100644
--- a/local/components/evolution/about.contacts.list/templates/.default/template.php
+++ b/local/components/evolution/about.contacts.list/templates/.default/template.php
@@ -12,71 +12,6 @@
 /** @var CBitrixComponent $component */
 $this->setFrameMode(true);
 ?>
-<?
-$main_office_markup_content = [ 
-	"@context" => "https://schema.org", 
-	"@type" => "FinancialService", 
-	"image" => [ 
-		"https://avatars.mds.yandex.net/get-altay/2389272/2a000001749629d635959647ec27834f22be/XXXL", 
-	], 
-	"name" => "Эволюция Автолизинга", 
-	"address" => [ 
-		"@type" => "PostalAddress", 
-		"streetAddress" => "Котляковская ул., 8", 
-		"addressLocality" => "Москва", 
-		"addressRegion" => "Москва", 
-		"postalCode" => "115201", 
-		"addressCountry" => "Россия", 
-	], 
-	//"review" => [ 
-	//	"@type" => "Review", 
-	//	"reviewRating" => [ 
-	//		"@type" => "Rating", 
-	//		"ratingValue" => "4", 
-	//		"bestRating" => "5" 
-	//	], 
-	//	"author" => [ 
-	//		"@type" => "Person", 
-	//		"name" => "Lillian Ruiz", 
-	//	] 
-	//], 
-	"geo" => [
-		"@type" => "GeoCoordinates", 
-		"latitude" => 55.643978, 
-		"longitude" => 37.640452, 
-	], 
-	"url" => "https://".SITE_SERVER_NAME."/about/contacts/", 
-	"telephone" => "+74951466767", 
-	"openingHoursSpecification" => [ 
-		[ 
-			"@type" => "OpeningHoursSpecification", 
-			"dayOfWeek" => [ 
-				"Monday", 
-				"Tuesday", 
-				"Wednesday", 
-				"Thursday", 
-				"Friday", 
-			], 
-			"opens" => "09:00", 
-			"closes" => "18:00", 
-		], 
-		[ 
-			"@type" => "OpeningHoursSpecification", 
-			"dayOfWeek" => "Saturday", 
-			"opens" => "00:00", 
-			"closes" => "00:00", 
-		], 
-		[ 
-			"@type" => "OpeningHoursSpecification", 
-			"dayOfWeek" => "Sunday", 
-			"opens" => "00:00", 
-			"closes" => "00:00", 
-		], 
-	], 
-];
-
-$APPLICATION->AddHeadString('<script type="application/ld+json">'.json_encode($main_office_markup_content).'</script>', false, "AFTER_JS");
-?>
 <?
 	$placemarks = [];
 	foreach($arResult['AGENCIES'] AS $agency)
diff --git a/local/components/evolution/catalog/component.php b/local/components/evolution/catalog/component.php
index d2996ba..c54d963 100644
--- a/local/components/evolution/catalog/component.php
+++ b/local/components/evolution/catalog/component.php
@@ -334,8 +334,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
 
 		if(!empty($arParams['BRAND']))
 		{
-			$arResult['SHOW_PROMO_BRANDS'] = true;
-
 			if($arResult['BRAND_DISABLED'])
 			{
 				$arResult['SHOW_PROMO_BRANDS'] = false;
diff --git a/local/components/evolution/catalog/templates/.default/template.php b/local/components/evolution/catalog/templates/.default/template.php
index a46bbf0..507162f 100644
--- a/local/components/evolution/catalog/templates/.default/template.php
+++ b/local/components/evolution/catalog/templates/.default/template.php
@@ -112,7 +112,7 @@ if(!empty($arResult['TITLES']['MODEL']))
 					<? else: ?>
 						<? if($arResult['MODEL_DISABLED']): ?>
 							<p style="font-size: 18px; line-height: 24px; padding: 10px 40px 40px 0px; border-left: solid 1px white;">Модель <b><?= $arResult['TITLES']['BRAND']; ?> <?= $arResult['TITLES']['MODEL']; ?></b> на данный момент отсутствует в каталоге, но это не означает, что мы не сможем её для Вас найти. Оставьте <a href="#order">заявку</a> или позвоните по номеру горячей линии <a href="tel:88003337575">8 800 333 75 75</a> и мы найдём Вам автомобиль!</p>
-							<p style="font-size: 18px; line-height: 24px; padding: 0px 40px 40px 0px; border-left: solid 1px white;">Посмотрите другие модели Bentley:</p>
+							<p style="font-size: 18px; line-height: 24px; padding: 0px 40px 40px 0px; border-left: solid 1px white;">Посмотрите другие модели <?= $arResult['TITLES']['BRAND']; ?>:</p>
 						<? endif; ?>
 					<? endif; ?>
 
diff --git a/local/components/evolution/mainoffice.markup/.description.php b/local/components/evolution/mainoffice.markup/.description.php
new file mode 100644
index 0000000..a20bdf3
--- /dev/null
+++ b/local/components/evolution/mainoffice.markup/.description.php
@@ -0,0 +1,8 @@
+<?
+if (!defined("B_PROLOG_INCLUDED") || B_PROLOG_INCLUDED!==true) die();
+
+$arTemplateDescription = array(
+	"NAME" => GetMessage("DEFAULT_NAME"),
+	"DESCRIPTION" => GetMessage("DEFAULT_DESC"),
+);
+?>
\ No newline at end of file
diff --git a/local/components/evolution/mainoffice.markup/component.php b/local/components/evolution/mainoffice.markup/component.php
new file mode 100644
index 0000000..81e8d0e
--- /dev/null
+++ b/local/components/evolution/mainoffice.markup/component.php
@@ -0,0 +1,13 @@
+<?
+if(!defined("B_PROLOG_INCLUDED") || B_PROLOG_INCLUDED!==true) die();
+/** @var CBitrixComponent $this */
+/** @var array $arParams */
+/** @var array $arResult */
+/** @var string $componentPath */
+/** @var string $componentName */
+/** @var string $componentTemplate */
+/** @global CDatabase $DB */
+/** @global CUser $USER */
+/** @global CMain $APPLICATION */
+
+$this->IncludeComponentTemplate();
\ No newline at end of file
diff --git a/local/components/evolution/mainoffice.markup/ru/.description.php b/local/components/evolution/mainoffice.markup/ru/.description.php
new file mode 100644
index 0000000..00b6583
--- /dev/null
+++ b/local/components/evolution/mainoffice.markup/ru/.description.php
@@ -0,0 +1,4 @@
+<?
+$MESS ['DEFAULT_NAME'] = "Микроразметка основного офиса";
+$MESS ['DEFAULT_DESC'] = "Микроразметка основного офиса";
+?>
\ No newline at end of file
diff --git a/local/components/evolution/mainoffice.markup/templates/.default/template.php b/local/components/evolution/mainoffice.markup/templates/.default/template.php
new file mode 100644
index 0000000..aaee20c
--- /dev/null
+++ b/local/components/evolution/mainoffice.markup/templates/.default/template.php
@@ -0,0 +1,79 @@
+<?if(!defined("B_PROLOG_INCLUDED") || B_PROLOG_INCLUDED!==true)die();
+/** @var array $arParams */
+/** @var array $arResult */
+/** @global CMain $APPLICATION */
+/** @global CUser $USER */
+/** @global CDatabase $DB */
+/** @var CBitrixComponentTemplate $this */
+/** @var string $templateName */
+/** @var string $templateFile */
+/** @var string $templateFolder */
+/** @var string $componentPath */
+/** @var CBitrixComponent $component */
+$this->setFrameMode(true);
+?>
+<?
+$main_office_markup_content = [ 
+	"@context" => "https://schema.org", 
+	"@type" => "FinancialService", 
+	"image" => [ 
+		"https://avatars.mds.yandex.net/get-altay/2389272/2a000001749629d635959647ec27834f22be/XXXL", 
+	], 
+	"name" => "Эволюция Автолизинга", 
+	"address" => [ 
+		"@type" => "PostalAddress", 
+		"streetAddress" => "Котляковская ул., 8", 
+		"addressLocality" => "Москва", 
+		"addressRegion" => "Москва", 
+		"postalCode" => "115201", 
+		"addressCountry" => "Россия", 
+	], 
+	//"review" => [ 
+	//	"@type" => "Review", 
+	//	"reviewRating" => [ 
+	//		"@type" => "Rating", 
+	//		"ratingValue" => "4", 
+	//		"bestRating" => "5" 
+	//	], 
+	//	"author" => [ 
+	//		"@type" => "Person", 
+	//		"name" => "Lillian Ruiz", 
+	//	] 
+	//], 
+	"geo" => [
+		"@type" => "GeoCoordinates", 
+		"latitude" => 55.643978, 
+		"longitude" => 37.640452, 
+	], 
+	"url" => "https://".SITE_SERVER_NAME."/about/contacts/", 
+	"telephone" => "+74951466767", 
+	"openingHoursSpecification" => [ 
+		[ 
+			"@type" => "OpeningHoursSpecification", 
+			"dayOfWeek" => [ 
+				"Monday", 
+				"Tuesday", 
+				"Wednesday", 
+				"Thursday", 
+				"Friday", 
+			], 
+			"opens" => "09:00", 
+			"closes" => "18:00", 
+		], 
+		[ 
+			"@type" => "OpeningHoursSpecification", 
+			"dayOfWeek" => "Saturday", 
+			"opens" => "00:00", 
+			"closes" => "00:00", 
+		], 
+		[ 
+			"@type" => "OpeningHoursSpecification", 
+			"dayOfWeek" => "Sunday", 
+			"opens" => "00:00", 
+			"closes" => "00:00", 
+		], 
+	], 
+];
+
+$APPLICATION->AddHeadString('<script type="application/ld+json">'.json_encode($main_office_markup_content).'</script>', false, "AFTER_JS");
+?>
\ No newline at end of file
diff --git a/local/templates/404/footer.php b/local/templates/404/footer.php
index a35ee7c..9342f9b 100644
--- a/local/templates/404/footer.php
+++ b/local/templates/404/footer.php
@@ -72,5 +72,12 @@
 	<script src="/local/templates/evolution/js/embla-carousel.umd.min.js"></script>
 	<script src="/local/templates/evolution/js/rangeslider.min.js"></script>
 	<script src="/local/templates/evolution/js/main.js"></script>
+	<?
+		$APPLICATION->IncludeComponent(
+			"evolution:mainoffice.markup",
+			"",
+			Array()
+		);
+	?>
 </body>
 </html>
\ No newline at end of file
diff --git a/local/templates/evolution/footer.php b/local/templates/evolution/footer.php
index 66bfeda..05b4751 100644
--- a/local/templates/evolution/footer.php
+++ b/local/templates/evolution/footer.php
@@ -86,5 +86,12 @@
 	<script src="/local/templates/evolution/js/embla-carousel.umd.min.js"></script>
 	<script src="/local/templates/evolution/js/rangeslider.min.js"></script>
 	<script src="/local/templates/evolution/js/main.js"></script>
+	<?
+		$APPLICATION->IncludeComponent(
+			"evolution:mainoffice.markup",
+			"",
+			Array()
+		);
+	?>
 </body>
 </html>
\ No newline at end of file