From 18389e5d3c5d9c76cb7b622c92874ff20a08cdcd Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Thu, 1 Aug 2024 05:38:10 +0300
Subject: [PATCH] leasing program (taxi) update to SEO requirements

---
 local/components/evolution/catalog.program/component.php  | 5 +----
 .../catalog.program/templates/.default/template.php       | 1 +
 .../form.catalog.filter/templates/.default/script.js      | 7 ++++---
 .../form.catalog.filter/templates/.default/template.php   | 2 +-
 .../evolution/leasing.programs.taxi/component.php         | 8 +++++---
 .../leasing.programs.taxi/templates/.default/template.php | 1 +
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/local/components/evolution/catalog.program/component.php b/local/components/evolution/catalog.program/component.php
index 682db6d..9fa06a9 100644
--- a/local/components/evolution/catalog.program/component.php
+++ b/local/components/evolution/catalog.program/component.php
@@ -508,10 +508,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
 					$APPLICATION->SetPageProperty("keywords", strtr($arParams['KEYWORDS'], [ "%BRAND" => $arResult['TITLES']['BRAND'], ]));
 				}
 
-				if(!isset($arParams['PROGRAM']))
-				{
-					$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/catalog/'.implode("/", $canonical).(count($canonical) > 0 ? "/" : "").'"/>');
-				}
+				$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/programs/'.$_REQUEST['PROGRAM'].'/'.implode("/", $canonical).(count($canonical) > 0 ? "/" : "").'"/>');
 			}
 		}
 
diff --git a/local/components/evolution/catalog.program/templates/.default/template.php b/local/components/evolution/catalog.program/templates/.default/template.php
index e9f9bb3..97ee0bf 100644
--- a/local/components/evolution/catalog.program/templates/.default/template.php
+++ b/local/components/evolution/catalog.program/templates/.default/template.php
@@ -164,6 +164,7 @@ $subtitle = " в лизинг для юридических лиц и ИП";
 									"SORTING" => true, 
 									"PROGRAM" => $arParams['PROGRAM'], 
 									"SCROLL" => $arResult['SCROLL'], 
+									"ALLOW_SEF_LINKS" => false, 
 								)
 							); ?>
 						</div>
diff --git a/local/components/evolution/form.catalog.filter/templates/.default/script.js b/local/components/evolution/form.catalog.filter/templates/.default/script.js
index fc4404b..cf35120 100644
--- a/local/components/evolution/form.catalog.filter/templates/.default/script.js
+++ b/local/components/evolution/form.catalog.filter/templates/.default/script.js
@@ -12,7 +12,7 @@ var bodies_slugs = [];
 var engine_fuels_slugs = [];
 var used = false;
 
-function formCatalogFilter(p, pr, props, u)
+function formCatalogFilter(p, pr, props, u, asl = true)
 {
 //	console.log("FILTER", "program", pr);
 	path = p;
@@ -20,6 +20,7 @@ function formCatalogFilter(p, pr, props, u)
 	current_params = props;
 	program = pr;
 	used = u;
+	allow_sef_links = asl;
 
 	$(".filter_header .tabs .tab").on("click", function()
 	{
@@ -1225,7 +1226,7 @@ function filter_texts_resize()
 			"filter_keys": "Количество ключей", 
 			"filter_pts": "Бумажный ПТС", 
 		};
-	}	
+	}
 	else if(window.innerWidth >= 768 && window.innerWidth < 960)
 	{
 		return {
@@ -1453,7 +1454,7 @@ function init_filter()
 				}
 			}
 
-			if(s_count === 1)
+			if(allow_sef_links && s_count === 1)
 			{
 				if(selected['BODY'] !== undefined && selected['BODY'] !== null)
 				{
diff --git a/local/components/evolution/form.catalog.filter/templates/.default/template.php b/local/components/evolution/form.catalog.filter/templates/.default/template.php
index d9e20da..81a351a 100644
--- a/local/components/evolution/form.catalog.filter/templates/.default/template.php
+++ b/local/components/evolution/form.catalog.filter/templates/.default/template.php
@@ -129,7 +129,7 @@ HTML;
 <script>
 	$(function()
 	{
-		formCatalogFilter("<?= $arParams['PATH']; ?>", "<?= $arParams['PROGRAM']; ?>", <?= CUtil::PhpToJSObject($arResult['SELECTED']); ?>, <?= $arParams['USED'] ? "true" : "false"; ?>);
+		formCatalogFilter("<?= $arParams['PATH']; ?>", "<?= $arParams['PROGRAM']; ?>", <?= CUtil::PhpToJSObject($arResult['SELECTED']); ?>, <?= $arParams['USED'] ? "true" : "false"; ?>, <?= $arParams['ALLOW_SEF_LINKS'] ? "true" : "false"; ?>);
 		<? if($arResult['SCROLL']): ?>
 			$('html, body').animate({
 				scrollTop: $("#catalog").offset().top - 100
diff --git a/local/components/evolution/leasing.programs.taxi/component.php b/local/components/evolution/leasing.programs.taxi/component.php
index 387a1ce..b7e2c02 100644
--- a/local/components/evolution/leasing.programs.taxi/component.php
+++ b/local/components/evolution/leasing.programs.taxi/component.php
@@ -59,14 +59,16 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
 		if(empty($ar_res['NAME'])) { define('ERROR_404', 'Y'); }
 		else
 		{
-			$APPLICATION->AddChainItem($ar_res["NAME"], "/programs/lizing-taksi/");
+			$ipropValues = new \Bitrix\Iblock\InheritedProperty\ElementValues($ar_res['IBLOCK_ID'], $ar_res["ID"]);
+			$meta = $ipropValues->getValues();
+
+			$APPLICATION->AddChainItem($meta['ELEMENT_PAGE_TITLE'], "/programs/lizing-taksi/");
 
 			$APPLICATION->SetPageProperty("title", $arParams['TITLE']);
 			$APPLICATION->SetPageProperty("description", $arParams['DESCRIPTION']);
 			$APPLICATION->SetPageProperty("keywords", $arParams['KEYWORDS']);
 
-			$arResult['NAME'] = "Такси в лизинг";
-			$APPLICATION->AddHeadString('<link rel="canonical" href="'.$ar_res['CANONICAL_PAGE_URL'].'"/>');
+			$arResult['NAME'] = $meta['ELEMENT_META_TITLE'];
 		}
 
 		$this->IncludeComponentTemplate();
diff --git a/local/components/evolution/leasing.programs.taxi/templates/.default/template.php b/local/components/evolution/leasing.programs.taxi/templates/.default/template.php
index 34cf841..f0cff4e 100644
--- a/local/components/evolution/leasing.programs.taxi/templates/.default/template.php
+++ b/local/components/evolution/leasing.programs.taxi/templates/.default/template.php
@@ -28,6 +28,7 @@ $this->setFrameMode(true);
 				"MODIFICATION" => $_REQUEST['MODIFICATION'], 
 				"DRIVE" => $_REQUEST['DRIVE'], 
 				"BODY" => $_REQUEST['BODY'], 
+				"BODY_SLUG" => $_REQUEST['BODY_SLUG'], 
 				"GEAR" => $_REQUEST['GEAR'], 
 				"ENGINE_FUEL" => $_REQUEST['ENGINE_FUEL'], 
 				"ENGINE_POWER_FROM" => $_REQUEST['ENGINE_POWER_FROM'],