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

updates & fixes after used published

Browse Source
This commit is contained in:
merelendor 2023-07-18 23:45:35 +03:00
parent 52d41265cc
commit 735d266a17
11 changed files with 31 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bitrix/php_interface/init.php
View File

@ -161,10 +161,6 @@ function zerof_request($path, $query)
$hash = hash_hmac("SHA1", $data, $key_sha1, false); $hash = hash_hmac("SHA1", $data, $key_sha1, false);
$hash_base64 = base64_encode(hex2bin($hash)); $hash_base64 = base64_encode(hex2bin($hash));
//print "HASH ".$hash_base64."\n";
//print "DATE ".$date."\n";
//print "\n";
$headers = [ $headers = [
"Authorization: ZWS ".ZEROF_USERNAME.":".$hash_base64, "Authorization: ZWS ".ZEROF_USERNAME.":".$hash_base64,
"Date: ".$date, "Date: ".$date,
@ -178,6 +174,7 @@ function zerof_request($path, $query)
} }
$request = curl_init(); $request = curl_init();
curl_setopt($request, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
curl_setopt($request, CURLOPT_URL, $url); curl_setopt($request, CURLOPT_URL, $url);
curl_setopt($request, CURLOPT_CONNECTTIMEOUT, 30); curl_setopt($request, CURLOPT_CONNECTTIMEOUT, 30);
curl_setopt($request, CURLOPT_TIMEOUT, 30); curl_setopt($request, CURLOPT_TIMEOUT, 30);
@ -209,8 +206,6 @@ function zerof_get_images($task_uid)
$tasks_trucks_in_pass_data = json_decode(html_entity_decode($tasks_trucks_in_pass), true); $tasks_trucks_in_pass_data = json_decode(html_entity_decode($tasks_trucks_in_pass), true);
$tasks_trucks_in_new_data = json_decode(html_entity_decode($tasks_trucks_in_new), true); $tasks_trucks_in_new_data = json_decode(html_entity_decode($tasks_trucks_in_new), true);
//var_dump($images_response_array);
$tasks = array_merge( $tasks = array_merge(
$tasks_car_in_process_data[array_keys($tasks_car_in_process_data)[0]], $tasks_car_in_process_data[array_keys($tasks_car_in_process_data)[0]],
$tasks_car_in_pass_data[array_keys($tasks_car_in_pass_data)[0]], $tasks_car_in_pass_data[array_keys($tasks_car_in_pass_data)[0]],

17
local/components/evolution/catalog.brands/component.php
View File

@ -15,8 +15,8 @@ use Bitrix\Main\Context,
Bitrix\Main\Loader, Bitrix\Main\Loader,
Bitrix\Iblock; Bitrix\Iblock;
//if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
//{ {
if(CModule::IncludeModule('iblock')) if(CModule::IncludeModule('iblock'))
{ {
$arResult = [ $arResult = [
@ -35,6 +35,11 @@ use Bitrix\Main\Context,
$brands_ar_res = $brands_ob_element->GetFields(); $brands_ar_res = $brands_ob_element->GetFields();
$brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties(); $brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties();
if(!empty($brands_ar_res['PREVIEW_PICTURE']))
{
$brands_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($brands_ar_res['PREVIEW_PICTURE']);
}
if(isset($arParams['PROPERTIES_FILTER_ARRAY'])) if(isset($arParams['PROPERTIES_FILTER_ARRAY']))
{ {
$brand_image_filter = array_merge( $brand_image_filter = array_merge(
@ -53,11 +58,7 @@ use Bitrix\Main\Context,
} }
else else
{ {
if(isset($brands_ar_res['PREVIEW_PICTURE'])) if(empty($brands_ar_res['PREVIEW_PICTURE']))
{
$brands_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($brands_ar_res['PREVIEW_PICTURE']);
}
else
{ {
$brand_image_filter = [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_BRAND" => $brands_ar_res['ID'] ]; $brand_image_filter = [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_BRAND" => $brands_ar_res['ID'] ];
@ -77,4 +78,4 @@ use Bitrix\Main\Context,
$this->IncludeComponentTemplate(); $this->IncludeComponentTemplate();
} }
//} }

8
local/components/evolution/catalog.landing.body/component.php
View File

@ -145,10 +145,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$arResult['CARS_CATALOG_TITLE'] = "Каталог ".$bodies_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"]; $arResult['CARS_CATALOG_TITLE'] = "Каталог ".$bodies_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"];
$catalog_bodies_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_BODY' => $bodies_ar_res['NAME'] ], false, [ 'ID' => [ IBLOCK_ID_CATALOG_CARS_NEW_BODY_PROPERTY_ID ] ]); $catalog_bodies_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_BODY' => $bodies_ar_res['NAME'] ], false, [ 'ID' => [ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ] ]);
while ($catalog_bodies_row = $catalog_bodies_res->Fetch()) while ($catalog_bodies_row = $catalog_bodies_res->Fetch())
{ {
array_push($arResult['BRANDS_IDS'], $catalog_bodies_row[ IBLOCK_ID_CATALOG_CARS_NEW_BODY_PROPERTY_ID ]); array_push($arResult['BRANDS_IDS'], $catalog_bodies_row[ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ]);
} }
$arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']); $arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']);
} }
@ -180,10 +180,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$arResult['CARS_CATALOG_TITLE'] = "Каталог ".$bodies_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"]; $arResult['CARS_CATALOG_TITLE'] = "Каталог ".$bodies_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"];
$catalog_bodies_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_BODY' => $bodies_ar_res['NAME'] ], false, [ 'ID' => [ IBLOCK_ID_CATALOG_CARS_NEW_BODY_PROPERTY_ID ] ]); $catalog_bodies_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_BODY' => $bodies_ar_res['NAME'] ], false, [ 'ID' => [ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ] ]);
while ($catalog_bodies_row = $catalog_bodies_res->Fetch()) while ($catalog_bodies_row = $catalog_bodies_res->Fetch())
{ {
array_push($arResult['BRANDS_IDS'], $catalog_bodies_row[ IBLOCK_ID_CATALOG_CARS_NEW_BODY_PROPERTY_ID ]); array_push($arResult['BRANDS_IDS'], $catalog_bodies_row[ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ]);
} }
$arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']); $arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']);
} }

11
local/components/evolution/catalog.landing.engine_fuel/component.php
View File

@ -145,10 +145,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$arResult['CARS_CATALOG_TITLE'] = "Каталог ".$engines_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"]; $arResult['CARS_CATALOG_TITLE'] = "Каталог ".$engines_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"];
$catalog_engines_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_ENGINE_FUEL' => $engines_ar_res['NAME'] ], false, [ 'ID' => [ IBLOCK_ID_CATALOG_CARS_NEW_ENGINE_FUEL_PROPERTY_ID ] ]); $catalog_engines_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_ENGINE_FUEL' => $engines_ar_res['NAME'] ], false, [ 'ID' => [ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ] ]);
while ($catalog_engines_row = $catalog_engines_res->Fetch()) while ($catalog_engines_row = $catalog_engines_res->Fetch())
{ {
array_push($arResult['BRANDS_IDS'], $catalog_engines_row[ IBLOCK_ID_CATALOG_CARS_NEW_ENGINE_FUEL_PROPERTY_ID ]); array_push($arResult['BRANDS_IDS'], $catalog_engines_row[ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ]);
} }
$arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']); $arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']);
} }
@ -180,14 +180,11 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$arResult['CARS_CATALOG_TITLE'] = "Каталог ".$engines_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"]; $arResult['CARS_CATALOG_TITLE'] = "Каталог ".$engines_ar_res["PROPERTIES"]["GENITIVE_NAME"]["VALUE"];
$catalog_engines_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_ENGINE_FUEL' => $engines_ar_res['NAME'] ], false, [ 'ID' => [ IBLOCK_ID_CATALOG_CARS_NEW_ENGINE_FUEL_PROPERTY_ID ] ]); $catalog_engines_res = CIBlockElement::GetPropertyValues(IBLOCK_ID_CATALOG_CARS_NEW, [ 'ACTIVE' => 'Y', '=PROPERTY_ENGINE_FUEL' => $engines_ar_res['NAME'] ], false, [ 'ID' => [ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ] ]);
while ($catalog_engines_row = $catalog_engines_res->Fetch()) while ($catalog_engines_row = $catalog_engines_res->Fetch())
{ {
//print_r($catalog_engines_row); array_push($arResult['BRANDS_IDS'], $catalog_engines_row[ PROPERTY_ID_CATALOG_CARS_NEW_BRAND ]);
array_push($arResult['BRANDS_IDS'], $catalog_engines_row[ IBLOCK_ID_CATALOG_CARS_NEW_ENGINE_FUEL_PROPERTY_ID ]);
} }
//die();
$arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']); $arResult['BRANDS_IDS'] = array_unique($arResult['BRANDS_IDS']);
} }

2
local/components/evolution/catalog.promo.brand/component.php
View File

@ -55,7 +55,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']);
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " ");

2
local/components/evolution/catalog.promo.model/component.php
View File

@ -44,7 +44,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']);
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " ");

162
local/components/evolution/catalog/component.php
View File

@ -176,8 +176,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
} }
} }
//$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/catalog/'.$ar_res['PROPERTIES']['BRAND']['RELATED']['CODE'].'/'.$ar_res['PROPERTIES']['MODEL']['RELATED']['CODE'].'/"/>');
if(isset($arParams['MODIFICATION'])) if(isset($arParams['MODIFICATION']))
{ {
if(!empty($arParams['MODIFICATION'])) if(!empty($arParams['MODIFICATION']))
@ -295,53 +293,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$query_arr['BODY'] = $arParams['BODY']; $query_arr['BODY'] = $arParams['BODY'];
} }
//$pages_url = $pages_url."/";
if(count($query_arr) > 0) if(count($query_arr) > 0)
{ {
$query = http_build_query($query_arr); $query = http_build_query($query_arr);
} }
//if(!empty($_SERVER['REDIRECT_QUERY_STRING']))
//{
// $query = $_SERVER['REDIRECT_QUERY_STRING'];
//}
/*
if(isset($arParams["sort"]))
{
$sort = $arParams["sort"];
}
if(isset($arParams["options"]))
{
$options = $arParams["options"];
}
else
{
//$options = false;
}
if(isset($arParams["filter"]))
{
$filter = array_merge($filter, $arParams["filter"]);
}
if(!empty($_REQUEST['filter']['city_id']))
{
$filter['PROPERTY_CITY'] = $_REQUEST['filter']['city_id'];
}
//if(!empty($_REQUEST['filter']['subway_id']))
//{
//$filter['PROPERTY_SUBWAY'] = $_REQUEST['filter']['subway_id'];
//}
if(is_array($_REQUEST['subways']))
{
$subs = Array(); foreach($_REQUEST['subways'] AS $s) { array_push($subs, $s); }
$filter['PROPERTY_SUBWAY'] = $subs;
}
*/
if($arParams['leasing_program'] && $arParams['leasing_program'] !== "") if($arParams['leasing_program'] && $arParams['leasing_program'] !== "")
{ {
@ -409,37 +364,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']);
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " ");
//print "<!-- ".$ar_res['ID']."-->\n";
//print "<!-- ";
//print_r($ar_res['PROPERTIES']);
//print "-->\n\n\n";
/*
if(isset($ar_res['PREVIEW_PICTURE']))
{
$ar_res['PREVIEW_PICTURE_SRC'] = get_image_path($ar_res['PREVIEW_PICTURE']);
}
if(!empty($ar_res['PROPERTIES']['PHOTO_ICON']['VALUE']))
{
$ar_res['PROPERTIES']['PHOTO_ICON']['SRC'] = get_image_path($ar_res['PROPERTIES']['PHOTO_ICON']['VALUE']);
}
if(!empty($ar_res['PROPERTIES']['CITY']['VALUE']))
{
$ar_res['PROPERTIES']['CITY']['RELATED'] = get_related_array(10, $ar_res['PROPERTIES']['CITY']['VALUE']);
}
if(!empty($ar_res['PROPERTIES']['SUBWAY']['VALUE']))
{
$ar_res['PROPERTIES']['SUBWAY']['RELATED'] = get_related_array(12, $ar_res['PROPERTIES']['SUBWAY']['VALUE']);
}
*/
$arResult['ITEMS'][] = $ar_res; $arResult['ITEMS'][] = $ar_res;
} }
} }
@ -513,16 +441,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
if(isset($ar_city['PROPERTIES']['OFFICES']['RELATED'][0])) if(isset($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]))
{ {
$ar_city['LEADER_CRM_ID'] = $ar_city['PROPERTIES']['LEADER_CRM_ID']['VALUE']; $ar_city['LEADER_CRM_ID'] = $ar_city['PROPERTIES']['LEADER_CRM_ID']['VALUE'];
/*
$ar_city['LEADER_NAME'] = $ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_NAME']['VALUE'];
$ar_city['LEADER_POSITION'] = $ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_POSITION']['VALUE'];
if(!empty($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_POSITION']['VALUE']))
{
$ar_city['LEADER_PHOTO'] = CFile::GetPath($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_PHOTO']['VALUE']);
}
*/
} }
$arResult['CITY'] = $ar_city; $arResult['CITY'] = $ar_city;
@ -536,42 +454,21 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
if(!empty($arResult['SELECTED']['MODEL'])) if(!empty($arResult['SELECTED']['MODEL']))
{ {
//array_unshift($breadcrumbs, [
// "NAME" => $ar_city['NAME'],
// "URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/".$arResult['SELECTED']['BRAND']."/".$arResult['SELECTED']['MODEL']."/",
//]);
$APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП | Эволюция"); $APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП | Эволюция");
$APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный."); $APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный.");
$APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг"); $APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг");
//$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/regions/'.$ar_city['CODE'].'/'.$arResult['SELECTED']['BRAND'].'/'.$arResult['SELECTED']['MODEL'].'/"/>');
} }
elseif(!empty($arResult['SELECTED']['BRAND'])) elseif(!empty($arResult['SELECTED']['BRAND']))
{ {
//array_unshift($breadcrumbs, [
// "NAME" => $ar_city['NAME'],
// "URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/".$arResult['SELECTED']['BRAND']."/",
//]);
$APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП | Эволюция"); $APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП | Эволюция");
$APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный."); $APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный.");
$APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг"); $APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг");
//$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/regions/'.$ar_city['CODE'].'/'.$arResult['SELECTED']['BRAND'].'/"/>');
} }
else else
{ {
//array_unshift($breadcrumbs, [
// "NAME" => $ar_city['NAME'],
// "URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/",
//]);
$APPLICATION->SetPageProperty("title", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП | Эволюция"); $APPLICATION->SetPageProperty("title", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП | Эволюция");
$APPLICATION->SetPageProperty("description", "Лизинговая компания Эволюция предлагает быстрое оформление авто в лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП. Выгодные цены, спецпредложения, простое оформление, консультирование и сопровождение."); $APPLICATION->SetPageProperty("description", "Лизинговая компания Эволюция предлагает быстрое оформление авто в лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП. Выгодные цены, спецпредложения, простое оформление, консультирование и сопровождение.");
$APPLICATION->SetPageProperty("keywords", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE'].", лизинг авто ".$ar_city['NAME'].", купить машину в лизинг ".$ar_city['NAME'].""); $APPLICATION->SetPageProperty("keywords", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE'].", лизинг авто ".$ar_city['NAME'].", купить машину в лизинг ".$ar_city['NAME']."");
//$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/regions/'.$ar_city['CODE'].'/"/>');
} }
$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/regions/'.implode("/", $canonical).(count($canonical) > 0 ? "/" : "").'"/>'); $APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/regions/'.implode("/", $canonical).(count($canonical) > 0 ? "/" : "").'"/>');
@ -588,45 +485,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
if(!isset($arParams['PROGRAM'])) 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.'/catalog/'.implode("/", $canonical).(count($canonical) > 0 ? "/" : "").'"/>');
/*
if(isset($arResult['SELECTED']['BRAND']))
{
if(isset($arResult['SELECTED']['MODEL']))
{
$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/catalog/'.$arResult['SELECTED']['BRAND'].'/'.$arResult['SELECTED']['MODEL'].'/"/>');
}
else
{
$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/catalog/'.$arResult['SELECTED']['BRAND'].'/"/>');
}
}
else
{
$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/catalog/"/>');
}
*/
/*
if($parameters_filter_count === 0 && !empty($arParams['BODY']))
{
$bodies_element_res = CIBlockElement::GetList(["NAME" => "ASC"], ["IBLOCK_ID" => IBLOCK_ID_BODIES, "=NAME" => $arParams['BODY']], false, []);
while ($bodies_element_ob_element = $bodies_element_res->GetNextElement())
{
$bodies_ar_res = $bodies_element_ob_element->GetFields();
$bodies_ar_res['PROPERTIES'] = $bodies_element_ob_element->GetProperties();
$APPLICATION->SetPageProperty("title", mb_ucfirst($bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE'])." в лизинг для юридических лиц и ИП в Москве - купить новый ".$bodies_ar_res['PROPERTIES']['SINGULAR_NAME']['VALUE']." в лизинг | Эволюция");
$APPLICATION->SetPageProperty("description", "Новые автомобили ".$bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE']." в лизинг для юридических лиц и ИП в Москве и в других регионах России. Вы можете купить ".$bodies_ar_res['PROPERTIES']['SINGULAR_NAME']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии 8 (800) 333-75-75 - звонок по России бесплатный.");
$APPLICATION->SetPageProperty("keywords", mb_ucfirst($bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE'])." в лизинг, купить ".$bodies_ar_res['PROPERTIES']['SINGULAR_NAME']['VALUE']." в лизинг");
$arResult['TITLE'] = mb_ucfirst($bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE'])." в лизинг";
$arResult['SUBTITLE'] = " для юридических лиц и ИП";
}
//print "BODY MODE";
//die();
}
*/
} }
} }
@ -656,24 +514,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
if(isset($_REQUEST['ajax'])) if(isset($_REQUEST['ajax']))
{ {
$GLOBALS['APPLICATION']->RestartBuffer(); $GLOBALS['APPLICATION']->RestartBuffer();
/*header('Content-Type: application/json; charset=utf-8');
$response = [
'PAGE_CURRENT' => $arResult['PAGE_CURRENT'],
'PAGE_COUNT' => $arResult['PAGE_COUNT'],
'PAGINATION' => $arResult['NAV_STRING'],
'ITEMS' => [],
];
foreach($arResult['ITEMS'] AS $item)
{
$position = [
$item
];
array_push($response['ITEMS'], $position);
}
print json_encode($arResult);
*/
$this->IncludeComponentTemplate(); $this->IncludeComponentTemplate();
$items = ob_get_contents(); $items = ob_get_contents();

66
local/components/evolution/used.catalog/component.php
View File

@ -181,8 +181,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
} }
} }
//$APPLICATION->AddHeadString('<link rel="canonical" href="https://'.SITE_SERVER_NAME.'/catalog/'.$ar_res['PROPERTIES']['BRAND']['RELATED']['CODE'].'/'.$ar_res['PROPERTIES']['MODEL']['RELATED']['CODE'].'/"/>');
if(isset($arParams['MODIFICATION'])) if(isset($arParams['MODIFICATION']))
{ {
if(!empty($arParams['MODIFICATION'])) if(!empty($arParams['MODIFICATION']))
@ -380,53 +378,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$query_arr['PARKING_CITY'] = $arParams['PARKING_CITY']; $query_arr['PARKING_CITY'] = $arParams['PARKING_CITY'];
} }
//$pages_url = $pages_url."/";
if(count($query_arr) > 0) if(count($query_arr) > 0)
{ {
$query = http_build_query($query_arr); $query = http_build_query($query_arr);
} }
//if(!empty($_SERVER['REDIRECT_QUERY_STRING']))
//{
// $query = $_SERVER['REDIRECT_QUERY_STRING'];
//}
/*
if(isset($arParams["sort"]))
{
$sort = $arParams["sort"];
}
if(isset($arParams["options"]))
{
$options = $arParams["options"];
}
else
{
//$options = false;
}
if(isset($arParams["filter"]))
{
$filter = array_merge($filter, $arParams["filter"]);
}
if(!empty($_REQUEST['filter']['city_id']))
{
$filter['PROPERTY_CITY'] = $_REQUEST['filter']['city_id'];
}
//if(!empty($_REQUEST['filter']['subway_id']))
//{
//$filter['PROPERTY_SUBWAY'] = $_REQUEST['filter']['subway_id'];
//}
if(is_array($_REQUEST['subways']))
{
$subs = Array(); foreach($_REQUEST['subways'] AS $s) { array_push($subs, $s); }
$filter['PROPERTY_SUBWAY'] = $subs;
}
*/
$arResult['SHOW_SPECIAL_OFFERS'] = false; $arResult['SHOW_SPECIAL_OFFERS'] = false;
$arResult['SHOW_PROMO_BRANDS'] = false; $arResult['SHOW_PROMO_BRANDS'] = false;
@ -457,7 +412,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
$price = $ar_res['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0 ? $ar_res['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] : $ar_res['PROPERTIES']['PRICE']['VALUE']; $price = $ar_res['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0 ? $ar_res['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] : $ar_res['PROPERTIES']['PRICE']['VALUE'];
$ar_res['CALCULATION'] = []; $ar_res['CALCULATION'] = [];
$ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " "); $ar_res['CALCULATION']['MONTHLY'] = number_format(($price / CALCULATION_COEFFICIENT), 0, ".", " ");
//$ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " ");
$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " ");
@ -532,24 +488,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true))))
if(isset($_REQUEST['ajax'])) if(isset($_REQUEST['ajax']))
{ {
$GLOBALS['APPLICATION']->RestartBuffer(); $GLOBALS['APPLICATION']->RestartBuffer();
/*header('Content-Type: application/json; charset=utf-8');
$response = [
'PAGE_CURRENT' => $arResult['PAGE_CURRENT'],
'PAGE_COUNT' => $arResult['PAGE_COUNT'],
'PAGINATION' => $arResult['NAV_STRING'],
'ITEMS' => [],
];
foreach($arResult['ITEMS'] AS $item)
{
$position = [
$item
];
array_push($response['ITEMS'], $position);
}
print json_encode($arResult);
*/
$this->IncludeComponentTemplate(); $this->IncludeComponentTemplate();
$items = ob_get_contents(); $items = ob_get_contents();

74
local/used.php
View File

@ -1,5 +1,4 @@
<? <?
//$_SERVER["DOCUMENT_ROOT"] = __DIR__;
define('STOP_STATISTICS', true); define('STOP_STATISTICS', true);
define('NO_KEEP_STATISTIC', 'Y'); define('NO_KEEP_STATISTIC', 'Y');
define('NO_AGENT_STATISTIC', 'Y'); define('NO_AGENT_STATISTIC', 'Y');
@ -36,32 +35,8 @@ $content = file_get_contents($api_used_url, false, stream_context_create($arrCon
print $api_used_url."\n\n"; print $api_used_url."\n\n";
file_put_contents("get_catalog_izt.json", $content); file_put_contents("get_catalog_izt.json", $content);
$json = json_decode($content, true); $json = json_decode($content, true);
/*
$bitrix_brands = [];
$bitrix_models = [];
$brand_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => IBLOCK_ID_BRANDS, ], false, false, [] );
while($brand_search_ob = $brand_search_res->GetNextElement())
{
$brand_search = $brand_search_ob->GetFields();
$brand_search['PROPERTIES'] = $brand_search_ob->GetProperties();
$bitrix_brands[$brand_search['PROPERTIES']['UID']['VALUE']] = $brand_search['ID'];
}
$models_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => IBLOCK_ID_MODELS, ], false, false, [] );
while($models_search_ob = $models_search_res->GetNextElement())
{
$model_search = $models_search_ob->GetFields();
$model_search['PROPERTIES'] = $models_search_ob->GetProperties();
$bitrix_models[$model_search['PROPERTIES']['UID']['VALUE']] = $model_search['ID'];
}
*/
$flags = []; $flags = [];
$flag_names = [ "SPECIAL_OFFER", "LEASING_AVAILABLE", "AFTER_ACCIDENT" ]; $flag_names = [ "SPECIAL_OFFER", "LEASING_AVAILABLE", "AFTER_ACCIDENT" ];
@ -71,9 +46,6 @@ foreach($flag_names AS $f)
while ($prop_fields = $properties->GetNext()) while ($prop_fields = $properties->GetNext())
{ {
$flags[ $f ] = $prop_fields["ID"]; $flags[ $f ] = $prop_fields["ID"];
//print_r($prop_fields)."\n";
//print $prop_fields["ID"]." - ".$prop_fields["NAME"]."\n";
} }
} }
@ -146,20 +118,6 @@ foreach($json AS $entry)
"name" => $model_name, "name" => $model_name,
]; ];
} }
/*
if(!isset($api_data_titles[ $brand_name ]['models'][ $model_name ]))
{
$api_data_titles[ $brand_name ]['models'][ $model_name ] = [
"modifications" => []
];
}
if(!in_array($model_id, $api_models))
{
array_push($api_models, $model_id);
}
*/
} }
print_r($api_data); print_r($api_data);
@ -316,12 +274,6 @@ function resize_image($image, $filename, $width, $height, $quality)
$mime = mime_content_type($tempfile_metadata['uri']); $mime = mime_content_type($tempfile_metadata['uri']);
$ext = get_ext_from_mime($mime); $ext = get_ext_from_mime($mime);
//$source = imagecreatefromjpeg($file_full_path_original);
//$tempfile = tmpfile();
//fwrite($tempfile, $image);
//$tempfile_metadata = stream_get_meta_data($tempfile);
$resized = imagecreatetruecolor($width, $height); $resized = imagecreatetruecolor($width, $height);
$source = imagecreatefromstring($image); $source = imagecreatefromstring($image);
@ -336,9 +288,6 @@ function resize_image($image, $filename, $width, $height, $quality)
imagejpeg($resized, $tempfile_filename, $quality); imagejpeg($resized, $tempfile_filename, $quality);
//header("Content-type: image/jpeg");
//imagejpeg($resized, null, 100);
imagedestroy($source); imagedestroy($source);
imagedestroy($resized); imagedestroy($resized);
imagedestroy($panel); imagedestroy($panel);
@ -349,27 +298,6 @@ function resize_image($image, $filename, $width, $height, $quality)
fclose($tempfile); fclose($tempfile);
/*
$file_path = CFile::GetPath($saved_file_id);
print "file_path\n";
print_r($file_path);
print "\n\n";
//die();
$file_full_path_original = $_SERVER["DOCUMENT_ROOT"].$file_path;
$file_full_path_resized = $_SERVER["DOCUMENT_ROOT"].$file_path."_resized";
$new_main_photo_name = $main_photo_path."_resized";
$file['tmp_name'] = $main_photo_path_resized;
$file['old_file'] = $saved_file_id;
$file['del'] = true;
$saved_file_id = CFile::SaveFile($file, "used");
fclose($tempfile);
*/
return $saved_file_id; return $saved_file_id;
} }
@ -470,6 +398,8 @@ foreach($json as $car)
$el = new CIBlockElement; $el = new CIBlockElement;
$el->Update($car_existed['ID'], ["ACTIVE" => "Y", "NAME" => $name, "SORT" => 500]); $el->Update($car_existed['ID'], ["ACTIVE" => "Y", "NAME" => $name, "SORT" => 500]);
CIBlockElement::SetPropertyValuesEx($car_existed['ID'], IBLOCK_ID_CATALOG_CARS_USED, $PROPERTY_VALUES, []);
} }
} }

8
urlrewrite.php
View File

@ -82,7 +82,7 @@ $arUrlRewrite=array (
), ),
array ( array (
'CONDITION' => '#^/catalog/kuzov-([a-zA-Z0-9_-]+)/\\??.*$#', 'CONDITION' => '#^/catalog/kuzov-([a-zA-Z0-9_-]+)/#',
'RULE' => 'TYPE=body&BODY_SLUG=$1', 'RULE' => 'TYPE=body&BODY_SLUG=$1',
'ID' => '', 'ID' => '',
'PATH' => '/catalog/landing.php', 'PATH' => '/catalog/landing.php',
@ -90,7 +90,7 @@ $arUrlRewrite=array (
), ),
array ( array (
'CONDITION' => '#^/catalog/dvigatel-([a-zA-Z0-9_-]+)/\\??.*$#', 'CONDITION' => '#^/catalog/dvigatel-([a-zA-Z0-9_-]+)/#',
'RULE' => 'TYPE=engine_fuel&ENGINE_FUEL_SLUG=$1', 'RULE' => 'TYPE=engine_fuel&ENGINE_FUEL_SLUG=$1',
'ID' => '', 'ID' => '',
'PATH' => '/catalog/landing.php', 'PATH' => '/catalog/landing.php',
@ -328,7 +328,7 @@ $arUrlRewrite=array (
), ),
array ( array (
'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/kuzov-([a-zA-Z0-9_-]+)/(\\?(.*))?$#', 'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/kuzov-([a-zA-Z0-9_-]+)/#',
'RULE' => 'TYPE=body&REGION=$1&BODY_SLUG=$2', 'RULE' => 'TYPE=body&REGION=$1&BODY_SLUG=$2',
'ID' => '', 'ID' => '',
'PATH' => '/regions/landing.php', 'PATH' => '/regions/landing.php',
@ -336,7 +336,7 @@ $arUrlRewrite=array (
), ),
array ( array (
'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/dvigatel-([a-zA-Z0-9_-]+)/(\\?(.*))?$#', 'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/dvigatel-([a-zA-Z0-9_-]+)/#',
'RULE' => 'TYPE=engine_fuel&REGION=$1&ENGINE_FUEL_SLUG=$2', 'RULE' => 'TYPE=engine_fuel&REGION=$1&ENGINE_FUEL_SLUG=$2',
'ID' => '', 'ID' => '',
'PATH' => '/regions/landing.php', 'PATH' => '/regions/landing.php',

4
used/position.php
View File

@ -1,6 +1,6 @@
<? <?
require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php"); require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php");
$APPLICATION->AddChainItem("Подержанные автомобили", "/used/"); $APPLICATION->AddChainItem("С пробегом", "/used/");
?> ?>
<? <?
$APPLICATION->IncludeComponent("bitrix:breadcrumb", "evolution", Array( $APPLICATION->IncludeComponent("bitrix:breadcrumb", "evolution", Array(
@ -18,7 +18,7 @@ $APPLICATION->AddChainItem("Подержанные автомобили", "/used
[ [
"OFFER" => $OFFER, "OFFER" => $OFFER,
"initial_payment" => 20, "initial_payment" => 20,
"lease_period" => 15, "lease_period" => 36,
"redemption_payment" => 5, "redemption_payment" => 5,
"CAR_PRICE_MIN" => 100000, "CAR_PRICE_MIN" => 100000,
"CAR_PRICE_MAX" => 20000000, "CAR_PRICE_MAX" => 20000000,