diff --git a/.top.menu.php b/.top.menu.php index 5e1faab..9cdd0ae 100644 --- a/.top.menu.php +++ b/.top.menu.php @@ -1,39 +1,46 @@ \ No newline at end of file diff --git a/about/career/index.php b/about/career/index.php index d231a92..4e7878e 100644 --- a/about/career/index.php +++ b/about/career/index.php @@ -1,6 +1,16 @@ SetTitle("Эволюция автолизинга: Карьера"); +$APPLICATION->AddHeadString(''); +?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); ?> IncludeComponent( diff --git a/about/contacts/index.php b/about/contacts/index.php index 8bd8587..6a3eeba 100644 --- a/about/contacts/index.php +++ b/about/contacts/index.php @@ -2,6 +2,15 @@ require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php"); $APPLICATION->SetTitle("Эволюция автолизинга: Контакты"); ?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); +?> IncludeComponent( "evolution:about.contacts.list", diff --git a/about/index.php b/about/index.php index f2a5b3c..9c92da2 100644 --- a/about/index.php +++ b/about/index.php @@ -3,6 +3,16 @@ require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php"); $APPLICATION->SetPageProperty("keywords", "Эволюция Автолизинга, о компании Эволюция Автолизинга, история развития Эволюция Автолизинга, достижения компании Эволюция Автолизинга"); $APPLICATION->SetPageProperty("description", "Эволюция – самая динамично развивающаяся автолизинговая компания России. Благодаря огромному опыту в лизинге и лучшим практикам на рынке, за год работы вошли в Топ 10 лизинговых компаний."); $APPLICATION->SetTitle("Эволюция Автолизинга: история развития и достижения компании"); +$APPLICATION->AddHeadString(''); +?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); ?>
diff --git a/about/news/index.php b/about/news/index.php index 74c5b79..8cd3b5a 100644 --- a/about/news/index.php +++ b/about/news/index.php @@ -1,6 +1,16 @@ SetTitle("Эволюция автолизинга: Новости"); +$APPLICATION->AddHeadString(''); +?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); ?> IncludeComponent( diff --git a/about/requisites/index.php b/about/requisites/index.php index 631e4e2..f6eb6ea 100644 --- a/about/requisites/index.php +++ b/about/requisites/index.php @@ -1,7 +1,17 @@ SetTitle("Эволюция автолизинга: Реквизиты"); -?>
+?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); +?> +

Реквизиты

diff --git a/about/revocation/index.php b/about/revocation/index.php index 5b4388c..8942539 100644 --- a/about/revocation/index.php +++ b/about/revocation/index.php @@ -2,6 +2,15 @@ require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php"); $APPLICATION->SetTitle("Эволюция автолизинга: Отзыв доверенностей"); ?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); +?>

Отзыв доверенностей

diff --git a/about/rules/index.php b/about/rules/index.php index a949927..f91ff2d 100644 --- a/about/rules/index.php +++ b/about/rules/index.php @@ -2,6 +2,15 @@ require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php"); $APPLICATION->SetTitle("Эволюция автолизинга: Общие условия договора лизинга"); ?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "/about/rules/", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); +?> IncludeComponent( "evolution:about.rules", diff --git a/api/index.php b/api/index.php index a4e1158..aaea660 100644 --- a/api/index.php +++ b/api/index.php @@ -1,5 +1,4 @@ [ "verify_peer" => false, @@ -68,12 +59,7 @@ $arrContextOptions = [ $secret = "YnFN1EcbB4osQyKx53OoMs0seHcIcoUVv2mCQOleHdn9o07bIniM5TreQNvQtgsQo6zWxsxLNFbSBrywjmerU5VnKZVQD1EGVcO"; $secret_crm = "lk_evolution_the_best_leasing_company_of_the_world_sSOvumhogyAtZydpaITb"; -//$token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VybmFtZSI6ImNybSJ9.WxzNiB4W5kwqZoy6-kenc1X6Q7XDCVjGraux9rU9zro"; -//print \Bitrix\Main\Web\JWT::encode(["username" => "crm"], $secret, 'HS256', $keyId = null, $head = null); -//die(); - $auth = []; -//$token = ""; use Bitrix\Main\Context, Bitrix\Main\Type\DateTime, @@ -178,9 +164,6 @@ function getUsersForCompany($code) $company_record['PROPERTIES'] = $company_element->GetProperties(); $user = []; - //print_r($company_record); - //die(); - foreach($company_record['PROPERTIES']['USERS']['VALUE'] AS $user_id) { $user_res = \CUser::GetList(["ID" => "ASC"], false, [ "ID" => $user_id ], []); @@ -194,21 +177,6 @@ function getUsersForCompany($code) "companies" => $companies, "is_admin" => in_array($user_element['ID'], $company_record['PROPERTIES']['ADMINS']['VALUE']), ]; - ///print_r($user_element); - //$rs_user = \CUser::GetByLogin($user_element['LOGIN']); - //$ar_user = $rs_user->Fetch(); - - //array_push($existed_accounts, $existed_user['XML_ID']); - - /* - foreach($company_record['PROPERTIES']['ADMINS']['VALUE'] AS $k => $v) - { - if($v == $user_id) - { - $company['is_admin'] = true; - } - } - */ array_push($users, $user); } @@ -302,11 +270,6 @@ if($_SERVER['REMOTE_USER'] && strpos($_SERVER['REMOTE_USER'], "Bearer") > -1) try { $auth = (array) \Bitrix\Main\Web\JWT::decode($token, $secret, ["HS256"]); - //print json_encode([ - // "status" => "success", - // "token" => $auth['username'], - //]); - //die(); } catch(\Exception $e) { @@ -423,6 +386,55 @@ switch($PARAM_1) ) ]); + $user_properties = [ + 'COMPANY' => $REQ['org_title'], + 'INN' => (string)$REQ['inn'], + 'KPP' => (string)$REQ['kpp'], + 'OGRN' => (string)$REQ['ogrn'], + 'ADMINS' => [ $ID ], + 'USERS' => [ $ID ], + ]; + + $ar_new_client = [ + 'IBLOCK_ID' => IBLOCK_ID_CLIENTS, + 'NAME' => $REQ['org_title'], + 'CODE' => $REQ['crm_id'], + 'PROPERTY_VALUES' => $user_properties, + 'ACTIVE' => 'Y', // активен + ]; + + $new_client = new CIBlockElement; + if($new_client_id = $new_client->Add($ar_new_client)) + { + } + else + { + $existed_client_res = CIBlockElement::GetList([ 'id' => 'desc' ], [ 'IBLOCK_ID' => IBLOCK_ID_CLIENTS, 'CODE' => $REQ['crm_id'] ], false, []); + while ($existed_client_element = $existed_client_res->GetNextElement()) + { + $existed_client_record = $existed_client_element->GetFields(); + $existed_client_record['PROPERTIES'] = $existed_client_element->GetProperties(); + + $admins = $existed_client_record['PROPERTIES']['ADMINS']['VALUE']; + $users = $existed_client_record['PROPERTIES']['USERS']['VALUE']; + + array_push($admins, $ID); + array_push($users, $ID); + + $admins = array_unique($admins); + $users = array_unique($users); + + $updated_fields = [ + 'PROPERTY_VALUES' => [ + 'ADMINS' => $admins, + 'USERS' => $users, + ] + ]; + + CIBlockElement::SetPropertyValuesEx($existed_client_record['ID'], IBLOCK_ID_CLIENTS, [ 'ADMINS' => $admins, 'USERS' => $users, ]); + } + } + print json_encode([ "status" => "success" ]); @@ -563,15 +575,6 @@ switch($PARAM_1) ) ]); - //"PASSWORD" => $REQ['password'], - //"CONFIRM_PASSWORD" => $REQ['password'], - - //print json_encode([ - // "status" => "error", - // "error" => "company_already_registered", - // "message" => "Company already registered", - //]); - print json_encode([ "status" => "success" ]); @@ -581,7 +584,6 @@ switch($PARAM_1) else { //new company - //setCompanyForUser($user_registered_id, $REQ); print json_encode([ "status" => "error", @@ -599,7 +601,6 @@ switch($PARAM_1) if($company_registered_id !== null) { //existed company - //THIS! $profile["PASSWORD"] = $REQ['password']; $profile["CONFIRM_PASSWORD"] = $REQ['password']; @@ -653,37 +654,6 @@ switch($PARAM_1) die(); } } - -/* ******************************* - \Bitrix\Main\Mail\Event::send([ - "EVENT_NAME" => "USER_INFO", - "LID" => "s1", - "C_FIELDS" => Array( - "EMAIL" => $REQ['email'], - "ORG_NAME" => (string)$REQ['org_title'], - "LOGIN" => $REQ['email'], - "PASS" => $REQ['password'], - ) - ]); - - if($user->LAST_ERROR) - { - print json_encode([ - "status" => "error", - "error" => "wrong_payload", - "message" => $user->LAST_ERROR, - ]); - } - else - { - print json_encode([ - "status" => "success" - ]); - } - - die(); -******************************* */ - } break; @@ -792,6 +762,110 @@ switch($PARAM_1) } break; + case "check": + { + if(CModule::IncludeModule('iblock')) + { + if(checkRequestIsLocal()) + { + try + { + $user_registered = false; + $ar_user; + + $existed_accounts = []; + $auth = (array) \Bitrix\Main\Web\JWT::decode($REQ['token'], $secret_crm, ["HS256"]); + + $default_admin_id; + + $existed_client_as_admin_res = CIBlockElement::GetList([ 'ID' => 'ASC' ], [ 'IBLOCK_ID' => IBLOCK_ID_CLIENTS, 'CODE' => $auth['acc_number'] ], false, []); + while ($existed_client_as_admin_element = $existed_client_as_admin_res->GetNextElement()) + { + $existed_client_as_admin_record = $existed_client_as_admin_element->GetFields(); + $existed_client_as_admin_record['PROPERTIES'] = $existed_client_as_admin_element->GetProperties(); + $default_admin_id = $existed_client_as_admin_record['PROPERTIES']['ADMINS']['VALUE'][0]; + $user_registered = true; + } + + $existed_users_res = \CUser::GetList(["ID" => "ASC"], false, [ "ID" => $default_admin_id ], []); + while($existed_user = $existed_users_res->Fetch()) + { + $rs_user = \CUser::GetByLogin($existed_user['LOGIN']); + $ar_user = $rs_user->Fetch(); + + array_push($existed_accounts, $existed_user['XML_ID']); + } + + if(isset($REQ['filter'])) + { + if(!in_array($auth['acc_number'], $existed_accounts)) + { + print json_encode([ + "status" => "error", + "error" => "access_denied", + ]); + die(); + } + } + + if($user_registered) + { + $user_data = [ + "email" => $ar_user['LOGIN'], + "name" => $ar_user['NAME'], + "secondname" => $ar_user['SECOND_NAME'], + "lastname" => $ar_user['LAST_NAME'], + "phone" => $ar_user['UF_PHONE_NUMBER'], + "phone_verified" => $ar_user['UF_PHONE_VERIFIED'], + ]; + + $companies = getCompaniesForUser($ar_user['ID']); + $company_data = [ + "inn" => $companies[0]['inn'], + "kpp" => $companies[0]['kpp'], + "ogrn" => $companies[0]['ogrn'], + "title" => $companies[0]['title'], + ]; + + print json_encode([ + "status" => "success", + "user" => $user_data, + "company" => $company_data, + "companies" => $companies, + "token" => \Bitrix\Main\Web\JWT::encode([ "acc_number" => $auth['acc_number'], "is_admin" => $companies[0]['is_admin'], "login" => $ar_user['LOGIN'], "companies" => $companies ], $secret, 'HS256', null, null), + ]); + } + else + { + print json_encode([ + "status" => "error", + "error" => "unknown account", + ]); + } + die(); + } + catch(\Exception $e) + { + print json_encode([ + "status" => "error", + "error" => "wrong_jwt", + "message" => $e->getMessage(), + ]); + die(); + } + } + else + { + print json_encode([ + "status" => "error", + "error" => "wrong_source", + "error" => "Wrong source", + ]); + } + } + } + break; + default: { print json_encode([ @@ -1027,9 +1101,6 @@ switch($PARAM_1) if(count($user_companies) === 0) { \CUser::Delete($removed_user_id); - - //$user = new CUser; - //$user->Update($removed_user_id, [ "BLOCKED" => "Y" ]); } } @@ -1107,28 +1178,58 @@ switch($PARAM_1) $drive = []; $body = []; $fuel = []; + $volume = []; - $iterator = CIBlockElement::GetPropertyValues( 1, $filter, true, [ 'ID' => [ 7, 8, 9, 12 ] ] ); + $filter_props_ids = []; + + if(empty($REQ['GEAR'])) { array_push($filter_props_ids, 7); } + if(empty($REQ['DRIVE'])) { array_push($filter_props_ids, 8); } + if(empty($REQ['BODY'])) { array_push($filter_props_ids, 9); } + if(empty($REQ['ENGINE_FUEL'])) { array_push($filter_props_ids, 12); } + if(empty($REQ['ENGINE_VOLUME_FROM']) && empty($REQ['ENGINE_VOLUME_TO'])) { array_push($filter_props_ids, 11); } + + $iterator = CIBlockElement::GetPropertyValues( 1, $filter, true, [ 'ID' => [ 7, 8, 9, 11, 12 ] ] ); while ($row = $iterator->Fetch()) { - //print_r($row); - array_push($gear, $row[7]); - array_push($drive, $row[8]); - array_push($body, $row[9]); - array_push($fuel, $row[12]); + if(empty($REQ['GEAR'])) { array_push($gear, $row[7]); } + if(empty($REQ['DRIVE'])) { array_push($drive, $row[8]); } + if(empty($REQ['BODY'])) { array_push($body, $row[9]); } + if(empty($REQ['ENGINE_FUEL'])) { array_push($fuel, $row[12]); } + if(empty($REQ['ENGINE_VOLUME_FROM']) && empty($REQ['ENGINE_VOLUME_TO'])) { array_push($volume, $row[11]); } } - $gear = array_unique($gear); - $drive = array_unique($drive); - $body = array_unique($body); - $fuel = array_unique($fuel); - print json_encode([ + $gear = array_values(array_unique($gear)); + $drive = array_values(array_unique($drive)); + $body = array_values(array_unique($body)); + $fuel = array_values(array_unique($fuel)); + $volume = array_values(array_unique($volume)); + sort($volume); + + $volumes = []; + $min = floor($volume[0] / 100) * 100; + $max = (floor($volume[count($volume)-1] / 100) + 1) * 100; + + while($min <= $max) + { + if($min > 0) + { + array_push($volumes, $min); + } + + $min = $min + 100; + } + + $result = [ "total" => $total, - "gear" => $gear, - "drive" => $drive, - "body" => $body, - "fuel" => $fuel, - ]); + ]; + + if(empty($REQ['GEAR'])) { $result["gears"] = $gear; } + if(empty($REQ['DRIVE'])) { $result["drives"] = $drive; } + if(empty($REQ['BODY'])) { $result["bodies"] = $body; } + if(empty($REQ['ENGINE_FUEL'])) { $result["engine_fuels"] = $fuel; } + if(empty($REQ['ENGINE_VOLUME_FROM']) && empty($REQ['ENGINE_VOLUME_TO'])) { $result["engine_volumes"] = $volumes; } + + print json_encode($result); } } break; @@ -1210,6 +1311,261 @@ switch($PARAM_1) break; case "parameters": + { + if(CModule::IncludeModule('iblock')) + { + $filter = [ "ACTIVE" => "Y", ]; + + if(!empty($REQ['PROGRAM'])) { $filter['PROPERTY_LEASING_PROGRAMS'] = $REQ['PROGRAM']; } + + if(!empty($REQ['BRAND_ID'])) { $filter["PROPERTY_BRAND"] = $REQ['BRAND_ID']; } + if(!empty($REQ['MODEL_ID'])) { $filter["PROPERTY_MODEL"] = $REQ['MODEL_ID']; } + if(!empty($REQ['MODIFICATION'])) { $filter["PROPERTY_MODIFICATION"] = $REQ['MODIFICATION']; } + + if(!empty($REQ['GEAR'])) { $filter["PROPERTY_GEAR"] = $REQ['GEAR']; } + if(!empty($REQ['DRIVE'])) { $filter["PROPERTY_DRIVE"] = $REQ['DRIVE']; } + if(!empty($REQ['BODY'])) { $filter["PROPERTY_BODY"] = $REQ['BODY']; } + if(!empty($REQ['ENGINE_FUEL'])) { $filter["PROPERTY_ENGINE_FUEL"] = $REQ['ENGINE_FUEL']; } + + if(!empty($REQ['ENGINE_VOLUME_FROM']) || !empty($REQ['ENGINE_VOLUME_TO'])) + { + $filter['> "ASC", "NAME" => "ASC" ], array_merge([ "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW ], $filter), [], []); + $result = [ + "total" => $total, + "possible_volumes" => [], + ]; + + $brands = []; + $models = []; + $modifications = []; + + $gears = []; + $drives = []; + $bodies = []; + $engine_fuels = []; + $engine_volumes = []; + + $filter_props_ids = []; + + array_push($filter_props_ids, 3); + if(!empty($REQ['BRAND_ID'])) { array_push($filter_props_ids, 4); } + array_push($filter_props_ids, 7); + array_push($filter_props_ids, 8); + array_push($filter_props_ids, 9); + array_push($filter_props_ids, 12); + //if(empty($REQ['ENGINE_VOLUME_FROM']) || empty($REQ['ENGINE_VOLUME_TO'])) { array_push($filter_props_ids, 11); } + + $result['filter'] = $filter; + + //filter for brands + $filter_brands = $filter; + unset($filter_brands['PROPERTY_BRAND']); + + $brands_ids = []; + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_brands, true, [ 'ID' => [ 3 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($brands_ids, $row[ 3 ]); + } + + $brands_ids = array_values(array_unique($brands_ids)); + + $brands_res = CIBlockElement::GetList(["NAME" => "ASC"], array_merge([ "IBLOCK_ID" => IBLOCK_ID_BRANDS ], [ "ID" => $brands_ids ]), false, []); + while ($brands_ob_element = $brands_res->GetNextElement()) + { + $brands_ar_res = $brands_ob_element->GetFields(); + $brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties(); + + array_push($brands, [ + "id" => $brands_ar_res['ID'], + "value" => $brands_ar_res['CODE'], + "text" => $brands_ar_res['NAME'], + "uid" => $brands_ar_res['PROPERTIES']['UID']['VALUE'], + ]); + } + + //filter for models + if(!empty($REQ['BRAND_ID'])) + { + $filter_models = $filter; + unset($filter_models['PROPERTY_MODEL']); + + $models_ids = []; + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_models, true, [ 'ID' => [ 4 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($models_ids, $row[ 4 ]); + } + + $models_ids = array_values(array_unique($models_ids)); + + $models_res = CIBlockElement::GetList(["NAME" => "ASC"], array_merge([ "IBLOCK_ID" => IBLOCK_ID_MODELS ], [ "ID" => $models_ids ]), false, []); + while ($models_ob_element = $models_res->GetNextElement()) + { + $models_ar_res = $models_ob_element->GetFields(); + $models_ar_res['PROPERTIES'] = $models_ob_element->GetProperties(); + + array_push($models, [ + "id" => $models_ar_res['ID'], + "value" => $models_ar_res['CODE'], + "text" => $models_ar_res['NAME'], + "uid" => $models_ar_res['PROPERTIES']['UID']['VALUE'], + ]); + } + } + + //filter for modifications + if(!empty($REQ['MODEL_ID'])) + { + $filter_modifications = $filter; + unset($filter_modifications['PROPERTY_MODIFICATION']); + + $modifications_ids = []; + + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_modifications, true, [ 'ID' => [ 5 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($modifications_ids, $row[ 5 ]); + } + + $modifications_ids = array_values(array_unique($modifications_ids)); + + $modifications_res = CIBlockElement::GetList(["NAME" => "ASC"], array_merge([ "IBLOCK_ID" => IBLOCK_ID_MODIFICATIONS ], [ "ID" => $modifications_ids ]), false, []); + while ($modifications_ob_element = $modifications_res->GetNextElement()) + { + $modifications_ar_res = $modifications_ob_element->GetFields(); + + array_push($modifications, [ + "id" => $modifications_ar_res['ID'], + "text" => $modifications_ar_res['NAME'], + ]); + } + } + + //filter for bodies + $filter_bodies = $filter; + unset($filter_bodies['PROPERTY_BODY']); + + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_bodies, true, [ 'ID' => [ 9 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($bodies, $row[ 9 ]); + } + + //filter for gears + $filter_gears = $filter; + unset($filter_gears['PROPERTY_GEAR']); + + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_gears, true, [ 'ID' => [ 7 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($gears, $row[ 7 ]); + } + + //filter for drives + $filter_drives = $filter; + unset($filter_drives['PROPERTY_DRIVE']); + + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_drives, true, [ 'ID' => [ 8 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($drives, $row[ 8 ]); + } + + //filter for engine fuels + $filter_engine_fuels = $filter; + unset($filter_engine_fuels['PROPERTY_ENGINE_FUEL']); + + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter_engine_fuels, true, [ 'ID' => [ 12 ] ] ); + while ($row = $iterator->Fetch()) + { + array_push($engine_fuels, $row[ 12 ]); + } + + //filter for engine fuels + $filter_engine_volumes = $filter; + unset($filter_engine_volumes['> [ 11 ] ] ); + while ($row = $iterator->Fetch()) + { + if($row[ 11 ] != 0) + { + array_push($engine_volumes, $row[ 11 ]); + array_push($result["possible_volumes"], $row[ 11 ]); + } + } + /* + $iterator = CIBlockElement::GetPropertyValues( IBLOCK_ID_CATALOG_CARS_NEW, $filter, true, [ 'ID' => $filter_props_ids ] ); + while ($row = $iterator->Fetch()) + { + if(!empty($REQ['BRAND_ID'])) { array_push($models, $row[4]); } + + array_push($gear, $row[7]); + array_push($drive, $row[8]); + array_push($fuel, $row[12]); + } + */ + + /* + $result['filter2'] = array_merge($filter, [ "> [ 0, 10000 ]]); + + $iterator_volume = CIBlockElement::GetPropertyValues( 1, array_merge($filter, [ "> [ 0, 10000 ]]), true, [ 'ID' => [ 11 ] ] ); + while ($row = $iterator_volume->Fetch()) + { + if($row[11] != 0) + { + array_push($volume, $row[11]); + array_push($result["vvv"], $row[11]); + } + } + */ + + //$models = array_values(array_unique($models)); + + $gears = array_values(array_unique($gears)); + $drives = array_values(array_unique($drives)); + $bodies = array_values(array_unique($bodies)); + $engine_fuels = array_values(array_unique($engine_fuels)); + $engine_volumes = array_values(array_unique($engine_volumes)); + sort($engine_volumes); + + $volumes = []; + $min = floor($engine_volumes[0] / 100) * 100; + $max = (floor($engine_volumes[count($engine_volumes)-1] / 100) + 1) * 100; + + while($min <= $max) + { + if($min > 0) + { + array_push($volumes, $min); + } + + $min = $min + 100; + } + + $result["brands"] = $brands; + $result["models"] = $models; + $result["modifications"] = $modifications; + + $result["gears"] = $gears; + $result["drives"] = $drives; + $result["bodies"] = $bodies; + $result["engine_fuels"] = $engine_fuels; + //if(empty($REQ['ENGINE_VOLUME_FROM']) || empty($REQ['ENGINE_VOLUME_TO'])) { + $result["engine_volumes"] = $volumes; + //} + + print json_encode($result); + } + } + break; + + /* + case "-arameters": { if(CModule::IncludeModule('iblock')) { @@ -1220,7 +1576,7 @@ switch($PARAM_1) $ENGINE_VOLUME = []; $ENGINE_FUEL = []; - $iterator = CIBlockElement::GetPropertyValues(1, ['ACTIVE' => 'Y', ], false, ['ID' => [ 7, 8, 9, 10, 11, 12, ] ]); + $iterator = CIBlockElement::GetPropertyValues(1, ['ACTIVE' => 'Y', ], false, ['ID' => [ 7, 8, 9, 10, 11, 12, ] ]); while ($row = $iterator->Fetch()) { if(!in_array($row[7], $GEAR)) { array_push($GEAR, $row[7]); } @@ -1246,6 +1602,7 @@ switch($PARAM_1) } } break; + */ case "reset": { @@ -1661,19 +2018,6 @@ switch($PARAM_1) } else { - /* - \Bitrix\Main\Mail\Event::send([ - "EVENT_NAME" => "USER_INFO", - "LID" => "s1", - "C_FIELDS" => Array( - "EMAIL" => $REQ['email'], - "ORG_NAME" => $ar_user['UF_ORG_TITLE'], - "LOGIN" => $REQ['email'], - "PASS" => $REQ['password'], - ) - ]); - */ - print json_encode([ "status" => "success", ]); @@ -1988,12 +2332,6 @@ switch($PARAM_1) { $auth = (array) \Bitrix\Main\Web\JWT::decode($token, $secret, ["HS256"]); print_r($auth); - - //print json_encode([ - // "status" => "success", - // "token" => $auth['username'], - //]); - //die(); } catch(\Exception $e) { @@ -2090,15 +2428,6 @@ switch($PARAM_1) $filter = ["ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_ACCOUNT_SUPPORT]; $options = []; - /* - if(!empty($REQ['query'])) - { - $filter[' "ASC" ], [ 'IBLOCK_ID' => IBLOCK_ID_ACCOUNT_SUPPORT, 'GLOBAL_ACTIVE' => 'Y', ], false, ); while($theme_result = $themes_res->GetNext()) @@ -2211,10 +2540,7 @@ switch($PARAM_1) break; case "vizitka": - { - //define("LOG_FILENAME", $_SERVER["DOCUMENT_ROOT"]."/vizitka/tmp/log.txt"); - //AddMessage2Log("_REQUEST['guid'] => ".$_REQUEST['guid'], "my_module_id"); - + { $c = curl_init(); curl_setopt($c, CURLOPT_URL, API_HOST."/site/GetUserBusinessCard/?guid=".$_REQUEST['guid']); curl_setopt($c, CURLOPT_CONNECTTIMEOUT, 30); diff --git a/catalog/index.php b/catalog/index.php index f327968..1b127a5 100644 --- a/catalog/index.php +++ b/catalog/index.php @@ -1,13 +1,24 @@ SetTitle("Каталог"); +$APPLICATION->SetTitle("Новые автомобили в лизинг"); +//$APPLICATION->AddHeadString(''); +?> +IncludeComponent("bitrix:breadcrumb", "evolution", Array( + "PATH" => "", // Путь, для которого будет построена навигационная цепочка (по умолчанию, текущий путь) + "SITE_ID" => "s1", // Cайт (устанавливается в случае многосайтовой версии, когда DOCUMENT_ROOT у сайтов разный) + "START_FROM" => "0", // Номер пункта, начиная с которого будет построена навигационная цепочка + ), + false + ); ?> IncludeComponent( "evolution:catalog", - "", + isset($_REQUEST['ajax']) ? "ajax" : "", array( "PAGINATION" => "Y", + "COUNT_PER_PAGE" => 12, "BRAND" => $_REQUEST['BRAND'], "MODEL" => $_REQUEST['MODEL'], "MODIFICATION" => $_REQUEST['MODIFICATION'], @@ -25,6 +36,7 @@ $APPLICATION->SetTitle("Каталог"); ) ); ?> + IncludeComponent( "evolution:form.leasing", diff --git a/images/icons/icon-header-phone.svg b/images/icons/icon-header-phone.svg index 444cea6..c95733e 100644 --- a/images/icons/icon-header-phone.svg +++ b/images/icons/icon-header-phone.svg @@ -1,6 +1,13 @@ - + + + - + + + + + + diff --git a/images/icons/icon-header-recall.svg b/images/icons/icon-header-recall.svg new file mode 100644 index 0000000..e34954b --- /dev/null +++ b/images/icons/icon-header-recall.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/man.png b/images/man.png new file mode 100644 index 0000000..f6537cf Binary files /dev/null and b/images/man.png differ diff --git a/images/manager.png b/images/manager.png new file mode 100644 index 0000000..5137edd Binary files /dev/null and b/images/manager.png differ diff --git a/images/no_car_photo_380.png b/images/no_car_photo_380.png new file mode 100644 index 0000000..266444d Binary files /dev/null and b/images/no_car_photo_380.png differ diff --git a/images/no_image_380.png b/images/no_image_380.png new file mode 100644 index 0000000..2f00709 Binary files /dev/null and b/images/no_image_380.png differ diff --git a/images/no_image_650.png b/images/no_image_650.png new file mode 100644 index 0000000..ad39dd0 Binary files /dev/null and b/images/no_image_650.png differ diff --git a/images/programs_faq.png b/images/programs_faq.png new file mode 100644 index 0000000..d5ef4b2 Binary files /dev/null and b/images/programs_faq.png differ diff --git a/index.php b/index.php index 447f6c6..4970b37 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,14 @@ SetTitle("Эволюция автолизинга. Лизинг автомобилей"); +$APPLICATION->SetTitle("Лизинг для юридических лиц и ИП в Москве и других городах России | Лизинговая компания Эволюция"); +$APPLICATION->SetPageProperty("description", "Лизинговая компания Эволюция предлагает быстрое оформление авто в лизинг для юридических лиц и ИП в Москве и других городах России. Выгодные цены, спецпредложения, простое оформление, консультирование и сопровождение."); +$APPLICATION->AddHeadString(''); ?> IncludeComponent( "evolution:slider.main", "", Array() ); ?> -
IncludeComponent( @@ -22,7 +23,6 @@ $APPLICATION->SetTitle("Эволюция автолизинга. Лизинг а ); ?>
- IncludeComponent( "evolution:calculator", "", diff --git a/local/catalog_sitemap_generation.php b/local/catalog_sitemap_generation.php new file mode 100644 index 0000000..0b9c543 --- /dev/null +++ b/local/catalog_sitemap_generation.php @@ -0,0 +1,75 @@ + 8, "ACTIVE" => "Y" ], false, false, [ "CODE", "PROPERTY_UID" ] ); +while($all_brands_search_ob = $all_brands_search_res->GetNextElement()) +{ + $brand = $all_brands_search_ob->GetFields(); + $brand['MODELS'] = []; + + $catalog[$brand['PROPERTY_UID_VALUE']] = $brand; +} + +$all_models_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => 9, "ACTIVE" => "Y" ], false, false, [ "CODE", "PROPERTY_BRAND_UID"] ); +while($all_models_search_ob = $all_models_search_res->GetNextElement()) +{ + $model = $all_models_search_ob->GetFields(); + $model['PROPERTIES'] = $all_models_search_ob->GetProperties(); + + array_push($catalog[$model['PROPERTY_BRAND_UID_VALUE']]['MODELS'], $model); + + //print_r($model); + //array_push( $bitrix_existed_models, $model_search['PROPERTIES']['UID']['VALUE'] ); +} + +//print_r($catalog); + +//7f7534ad-5382-469c-8e40-f77267fb5644 + +$url = "https://".SITE_SERVER_NAME."/catalog"; +$lastmod = date(DATE_W3C); + +$strBegin = "\n\n"; + +foreach($catalog AS $brand) +{ + //print ; + //print "\n"; + //"\t". + $strBegin .= "".$url."/".$brand['CODE']."/"."".$lastmod.""."\n"; + + foreach($brand['MODELS'] AS $model) + { + //print "\t"; + //print $url."/".$brand['CODE']."/".$model['CODE']."/"; + //print "\n"; + //"\t"."\t". + $strBegin .= "".$url."/".$brand['CODE']."/".$model['CODE']."/"."".$lastmod.""."\n"; + } + + /* + + + https://evo.quickcode.ru/2022-03-29T15:01:44+03:00 + */ +} +$strBegin .= ""."\n"; + +file_put_contents("../sitemap-catalog.xml", $strBegin); +//print $strBegin; + +die(); + +?> \ No newline at end of file diff --git a/local/check_user.php b/local/check_user.php new file mode 100644 index 0000000..b3bf496 --- /dev/null +++ b/local/check_user.php @@ -0,0 +1,28 @@ + 'desc' ], [ 'IBLOCK_ID' => IBLOCK_ID_CLIENTS, 'PROPERTY_USERS' => $user_id ], false, []); +while ($existed_client_element = $existed_client_res->GetNextElement()) +{ + $existed_client_record = $existed_client_element->GetFields(); + $existed_client_record['PROPERTIES'] = $existed_client_element->GetProperties(); + + print_r("existed_client_record"); + print_r($existed_client_record); +} + +die(); + +?> \ No newline at end of file diff --git a/local/components/evolution/footer/component.php b/local/components/evolution/__footer/component.php similarity index 100% rename from local/components/evolution/footer/component.php rename to local/components/evolution/__footer/component.php diff --git a/local/components/evolution/footer/templates/.default/style.css b/local/components/evolution/__footer/templates/.default/style.css similarity index 100% rename from local/components/evolution/footer/templates/.default/style.css rename to local/components/evolution/__footer/templates/.default/style.css diff --git a/local/components/evolution/footer/templates/.default/template.php b/local/components/evolution/__footer/templates/.default/template.php similarity index 100% rename from local/components/evolution/footer/templates/.default/template.php rename to local/components/evolution/__footer/templates/.default/template.php diff --git a/local/components/evolution/top/component.php b/local/components/evolution/__top/component.php similarity index 100% rename from local/components/evolution/top/component.php rename to local/components/evolution/__top/component.php diff --git a/local/components/evolution/top/templates/.default/style.css b/local/components/evolution/__top/templates/.default/style.css similarity index 100% rename from local/components/evolution/top/templates/.default/style.css rename to local/components/evolution/__top/templates/.default/style.css diff --git a/local/components/evolution/top/templates/.default/template.php b/local/components/evolution/__top/templates/.default/template.php similarity index 100% rename from local/components/evolution/top/templates/.default/template.php rename to local/components/evolution/__top/templates/.default/template.php diff --git a/local/components/evolution/about.career.vacancy/component.php b/local/components/evolution/about.career.vacancy/component.php index 3f85473..18da80f 100644 --- a/local/components/evolution/about.career.vacancy/component.php +++ b/local/components/evolution/about.career.vacancy/component.php @@ -52,6 +52,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $APPLICATION->SetPageProperty("title", $meta['ELEMENT_META_TITLE']); $APPLICATION->SetPageProperty("keywords", $meta['ELEMENT_META_KEYWORDS']); $APPLICATION->SetPageProperty("description", $meta['ELEMENT_META_DESCRIPTION']); + + $APPLICATION->AddHeadString(''); } $this->IncludeComponentTemplate(); diff --git a/local/components/evolution/about.contacts.list/templates/.default/script.js b/local/components/evolution/about.contacts.list/templates/.default/script.js index cc28db8..9a5b1d8 100644 --- a/local/components/evolution/about.contacts.list/templates/.default/script.js +++ b/local/components/evolution/about.contacts.list/templates/.default/script.js @@ -1,5 +1,44 @@ $(function() { + var hash = document.location.hash.replace("#", ""); + + if(hash !== "") + { + var agency = null; + var region = null; + + $(".agency_item").each(function() + { + if($(this).data('agency') == hash) + { + agency = $(this).data('agency'); + region = $(this).data('region'); + + console.log("agency", $(this).data('agency'), "region", $(this).data('region')); + + /* + faq_section_index = $(this).data('section'); + faq_item_index = $(this).data('index'); + + $(".faq_section_button").removeClass("active"); + $(".faq_section_button_"+faq_section_index).addClass("active"); + $(".faq_items_list").css("display", "none"); + $(".faq_items_list_"+faq_section_index).css("display", "block"); + + $(".faq_item").removeClass("open"); + $(".faq_item_"+faq_item_index).addClass("open"); + */ + + + $(".tab").last().click(); + $(".regions_select").val(region); + onRegionChange(region); + + return false; + } + }); + } + $(".regions_select").on("change", function() { if($(this).val() === "") @@ -30,35 +69,7 @@ $(function() }, 200); } - $(".region_selected").remove(); - $(".region_block").css("display", "none"); - - var text_blocks = $(".column_desktop").find(".region_"+parseInt($(this).val(), 10)); - - text_blocks.map(function(index, item) - { - var n = $(item).clone(); - $(n).addClass("open").addClass("region_selected").css("display", "block"); - - if(index % 2 == 0) - { - $(".column_left").append(n); - } - else - { - $(".column_right").append(n); - } - }); - - var text_blocks = $(".column_mobile").find(".region_"+parseInt($(this).val(), 10)); - - text_blocks.map(function(index, item) - { - var n = $(item).clone(); - $(n).addClass("open").addClass("region_selected").css("display", "block"); - - $(".column_all").append(n); - }); + onRegionChange($(this).val()); } }); @@ -73,4 +84,39 @@ $(function() scrollTop: $("#contacts_top").offset().top - 100 }, 100); }); -}); \ No newline at end of file +}); + +function onRegionChange(region) +{ + console.log("region", region); + + $(".region_selected").remove(); + $(".region_block").css("display", "none"); + + var text_blocks = $(".column_desktop").find(".region_"+parseInt(region, 10)); + + text_blocks.map(function(index, item) + { + var n = $(item).clone(); + $(n).addClass("open").addClass("region_selected").css("display", "block"); + + if(index % 2 == 0) + { + $(".column_left").append(n); + } + else + { + $(".column_right").append(n); + } + }); + + var text_blocks = $(".column_mobile").find(".region_"+parseInt(region, 10)); + + text_blocks.map(function(index, item) + { + var n = $(item).clone(); + $(n).addClass("open").addClass("region_selected").css("display", "block"); + + $(".column_all").append(n); + }); +} \ No newline at end of file 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 4274671..257da59 100644 --- a/local/components/evolution/about.contacts.list/templates/.default/template.php +++ b/local/components/evolution/about.contacts.list/templates/.default/template.php @@ -12,6 +12,71 @@ /** @var CBitrixComponent $component */ $this->setFrameMode(true); ?> + "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('', false, "AFTER_JS"); +?> setFrameMode(true);
-
region_ "> +
region_ " data-region="" data-agency="">
-

+

[]

diff --git a/local/components/evolution/about.news.article/component.php b/local/components/evolution/about.news.article/component.php index a602c21..0d78dc1 100644 --- a/local/components/evolution/about.news.article/component.php +++ b/local/components/evolution/about.news.article/component.php @@ -46,6 +46,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $APPLICATION->SetPageProperty("title", $meta['ELEMENT_META_TITLE']); $APPLICATION->SetPageProperty("keywords", $meta['ELEMENT_META_KEYWORDS']); $APPLICATION->SetPageProperty("description", $meta['ELEMENT_META_DESCRIPTION']); + + $APPLICATION->AddHeadString(''); } $this->IncludeComponentTemplate(); diff --git a/local/components/evolution/about.news.article/templates/.default/template.php b/local/components/evolution/about.news.article/templates/.default/template.php index 214d9de..5c2879f 100644 --- a/local/components/evolution/about.news.article/templates/.default/template.php +++ b/local/components/evolution/about.news.article/templates/.default/template.php @@ -11,8 +11,26 @@ /** @var string $componentPath */ /** @var CBitrixComponent $component */ $this->setFrameMode(true); -?> +$markup_content = [ + "@context" => "https://schema.org", + "@type" => "NewsArticle", + "headline" => $arResult['NAME'], + "image" => [ + "https://".SITE_SERVER_NAME.$arResult['DETAIL_PICTURE'], + ], + "datePublished" => FormatDate(DATE_W3C, MakeTimeStamp($arResult['ACTIVE_FROM'])), + "dateModified" => FormatDate(DATE_W3C, MakeTimeStamp($arResult['ACTIVE_FROM'])), + "author" => [ + [ + "@type" => "Organization", + "name" => "Эволюция Автолизинга", + "url" => "https://".SITE_SERVER_NAME."/", + ], + ], +]; +$APPLICATION->AddHeadString('', false, "AFTER_JS"); +?>

Новость

diff --git a/local/components/evolution/banner.ask/.description.php b/local/components/evolution/banner.ask/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/banner.ask/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/banner.ask/component.php b/local/components/evolution/banner.ask/component.php new file mode 100644 index 0000000..81e8d0e --- /dev/null +++ b/local/components/evolution/banner.ask/component.php @@ -0,0 +1,13 @@ +IncludeComponentTemplate(); \ No newline at end of file diff --git a/local/components/evolution/banner.ask/lang/ru/.description.php b/local/components/evolution/banner.ask/lang/ru/.description.php new file mode 100644 index 0000000..d303aa0 --- /dev/null +++ b/local/components/evolution/banner.ask/lang/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/banner.ask/templates/.default/script.js b/local/components/evolution/banner.ask/templates/.default/script.js new file mode 100644 index 0000000..bb0d340 --- /dev/null +++ b/local/components/evolution/banner.ask/templates/.default/script.js @@ -0,0 +1,9 @@ +$(function() +{ + $("#to_form_button").on("click", function(event) + { + $('html, body').animate({ + scrollTop: $("#order").offset().top - 100 + }, 200); + }); +}); \ No newline at end of file diff --git a/local/components/evolution/banner.ask/templates/.default/style.css b/local/components/evolution/banner.ask/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/banner.ask/templates/.default/template.php b/local/components/evolution/banner.ask/templates/.default/template.php new file mode 100644 index 0000000..a93ab12 --- /dev/null +++ b/local/components/evolution/banner.ask/templates/.default/template.php @@ -0,0 +1,22 @@ +setFrameMode(true); +?> + \ No newline at end of file diff --git a/local/components/evolution/banner.inner/.description.php b/local/components/evolution/banner.inner/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/banner.inner/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/banner.inner/component.php b/local/components/evolution/banner.inner/component.php new file mode 100644 index 0000000..782af07 --- /dev/null +++ b/local/components/evolution/banner.inner/component.php @@ -0,0 +1,40 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +{ + if(CModule::IncludeModule('iblock')) + { + $filter = ["ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_BANNERS_INNER]; + $banner_res = CIBlockElement::GetList(["RAND" => "ASC", ], $filter, false, [ "nPageSize" => 1 ]); + + while ($banner_ob_element = $banner_res->GetNextElement()) + { + $banner_ar_res = $banner_ob_element->GetFields(); + $banner_ar_res['PROPERTIES'] = $banner_ob_element->GetProperties(); + + if(isset($banner_ar_res['PREVIEW_PICTURE'])) + { + $banner_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($banner_ar_res['PREVIEW_PICTURE']); + } + + $arResult['BANNER'] = $banner_ar_res; + } + + $this->IncludeComponentTemplate(); + } +} \ No newline at end of file diff --git a/local/components/evolution/banner.inner/ru/.description.php b/local/components/evolution/banner.inner/ru/.description.php new file mode 100644 index 0000000..1986cb3 --- /dev/null +++ b/local/components/evolution/banner.inner/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/banner.inner/templates/.default/script.js b/local/components/evolution/banner.inner/templates/.default/script.js new file mode 100644 index 0000000..bb0d340 --- /dev/null +++ b/local/components/evolution/banner.inner/templates/.default/script.js @@ -0,0 +1,9 @@ +$(function() +{ + $("#to_form_button").on("click", function(event) + { + $('html, body').animate({ + scrollTop: $("#order").offset().top - 100 + }, 200); + }); +}); \ No newline at end of file diff --git a/local/components/evolution/banner.inner/templates/.default/style.css b/local/components/evolution/banner.inner/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/banner.inner/templates/.default/template.php b/local/components/evolution/banner.inner/templates/.default/template.php new file mode 100644 index 0000000..5268f85 --- /dev/null +++ b/local/components/evolution/banner.inner/templates/.default/template.php @@ -0,0 +1,22 @@ +setFrameMode(true); +?> + + \ No newline at end of file diff --git a/local/components/evolution/callback.button/.description.php b/local/components/evolution/callback.button/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/callback.button/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/callback.button/component.php b/local/components/evolution/callback.button/component.php new file mode 100644 index 0000000..5dcd3ce --- /dev/null +++ b/local/components/evolution/callback.button/component.php @@ -0,0 +1,60 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +{ + if(CModule::IncludeModule('iblock')) + { + $arResult['ALLOW'] = false; + $arResult['SEARCH'] = $_REQUEST['search']; + + print "\n"; + + $sort = Array("ID" => "DESC"); + $filter = Array("ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CALLBACK_SCHEDULE); + $options = Array("nPageSize" => 1); + + $schedule_res = CIBlockElement::GetList($sort, $filter, false, $options); + while ($schedule_element = $schedule_res->GetNextElement()) + { + $schedule = $schedule_element->GetFields(); + $schedule['PROPERTIES'] = $schedule_element->GetProperties(); + + $day = date("w"); + $time = date("H:i"); + + if($schedule['PROPERTIES']['WEEKDAY_'.$day.'_ENABLED']['VALUE_XML_ID'] === "YES") + { + if(!empty($schedule['PROPERTIES']['WEEKDAY_'.$day.'_FROM']['VALUE']) && $schedule['PROPERTIES']['WEEKDAY_'.$day.'_TO']['VALUE']) + { + $from = mktime($schedule['PROPERTIES']['WEEKDAY_'.$day.'_FROM']['VALUE'].":00"); + $now = mktime( $time.":00" ); + $to = mktime($schedule['PROPERTIES']['WEEKDAY_'.$day.'_TO']['VALUE'].":00"); + + if($now >= $from && $now < $to) + { + $arResult['ALLOW'] = true; + print "\n"; + print "\n"; + } + } + } + } + + $this->IncludeComponentTemplate(); + } +} \ No newline at end of file diff --git a/local/components/evolution/callback.button/lang/ru/.description.php b/local/components/evolution/callback.button/lang/ru/.description.php new file mode 100644 index 0000000..f0bce42 --- /dev/null +++ b/local/components/evolution/callback.button/lang/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/callback.button/templates/.default/script.js b/local/components/evolution/callback.button/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/callback.button/templates/.default/style.css b/local/components/evolution/callback.button/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/callback.button/templates/.default/template.php b/local/components/evolution/callback.button/templates/.default/template.php new file mode 100644 index 0000000..22e6ec9 --- /dev/null +++ b/local/components/evolution/callback.button/templates/.default/template.php @@ -0,0 +1,17 @@ +setFrameMode(true); +?> + +

Обратный звонок

+ \ No newline at end of file diff --git a/local/components/evolution/catalog.brands/.description.php b/local/components/evolution/catalog.brands/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.brands/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.brands/component.php b/local/components/evolution/catalog.brands/component.php new file mode 100644 index 0000000..c49519c --- /dev/null +++ b/local/components/evolution/catalog.brands/component.php @@ -0,0 +1,54 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +//{ + if(CModule::IncludeModule('iblock')) + { + $arResult = [ + 'BRANDS' => [] + ]; + + $brands_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_BRANDS ], false, []); + while ($brands_ob_element = $brands_res->GetNextElement()) + { + $brands_ar_res = $brands_ob_element->GetFields(); + $brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties(); + + if(isset($brands_ar_res['PREVIEW_PICTURE'])) + { + $brands_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($brands_ar_res['PREVIEW_PICTURE']); + } + else + { + $cars_res = CIBlockElement::GetList([ "PROPERTY_PRICE" => "DESC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_BRAND" => $brands_ar_res['ID'] ], false, [ "nPageSize" => 1 ]); + while ($cars_ob_element = $cars_res->GetNextElement()) + { + $cars_ar_res = $cars_ob_element->GetFields(); + $cars_ar_res['PROPERTIES'] = $cars_ob_element->GetProperties(); + + $brands_ar_res['PREVIEW_PICTURE'] = $cars_ar_res['PROPERTIES']['IMAGE_URL']['VALUE']; + } + + } + + $arResult['BRANDS'][] = $brands_ar_res; + } + + $this->IncludeComponentTemplate(); + } +//} \ No newline at end of file diff --git a/local/components/evolution/catalog.brands/lang/ru/.description.php b/local/components/evolution/catalog.brands/lang/ru/.description.php new file mode 100644 index 0000000..be104ac --- /dev/null +++ b/local/components/evolution/catalog.brands/lang/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.brands/templates/.default/script.js b/local/components/evolution/catalog.brands/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.brands/templates/.default/style.css b/local/components/evolution/catalog.brands/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.brands/templates/.default/template.php b/local/components/evolution/catalog.brands/templates/.default/template.php new file mode 100644 index 0000000..fc9bda8 --- /dev/null +++ b/local/components/evolution/catalog.brands/templates/.default/template.php @@ -0,0 +1,25 @@ +setFrameMode(true); +?> +
+

+ +
+ + + " alt="" loading="lazy" /> + +
+ +
\ No newline at end of file diff --git a/local/components/evolution/catalog.list.item/.description.php b/local/components/evolution/catalog.list.item/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.list.item/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.list.item/component.php b/local/components/evolution/catalog.list.item/component.php new file mode 100644 index 0000000..81e8d0e --- /dev/null +++ b/local/components/evolution/catalog.list.item/component.php @@ -0,0 +1,13 @@ +IncludeComponentTemplate(); \ No newline at end of file diff --git a/local/components/evolution/catalog.list.item/ru/.description.php b/local/components/evolution/catalog.list.item/ru/.description.php new file mode 100644 index 0000000..32021ae --- /dev/null +++ b/local/components/evolution/catalog.list.item/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.list.item/templates/.default/template.php b/local/components/evolution/catalog.list.item/templates/.default/template.php new file mode 100644 index 0000000..43541f6 --- /dev/null +++ b/local/components/evolution/catalog.list.item/templates/.default/template.php @@ -0,0 +1,46 @@ +setFrameMode(true); +?> + +
+ + <?= $arParams['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arParams['PROPERTIES']['MODEL']['RELATED']['NAME']; ?> <?= $arParams['PROPERTIES']['BODY']['VALUE']; ?> +

+

+ + , , л.с. +

+
    +
  • +

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

    +

    р.

    +
    • +
  • +

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

    +

    р.

    +
    • +
  • +

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

    +

    р.

    +
    • +
  • +

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

    +

    р.

    +
    • +
+
+ Рассчитать график +
+

+
\ No newline at end of file diff --git a/local/components/evolution/catalog.models/.description.php b/local/components/evolution/catalog.models/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.models/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.models/component.php b/local/components/evolution/catalog.models/component.php new file mode 100644 index 0000000..98b08ad --- /dev/null +++ b/local/components/evolution/catalog.models/component.php @@ -0,0 +1,77 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +//{ + if(CModule::IncludeModule('iblock')) + { + $arResult = [ + 'BRAND_TITLE' => "", + 'MODELS' => [], + ]; + + $brands = []; + $brands_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_BRANDS, ], false, []); + while ($brands_ob_element = $brands_res->GetNextElement()) + { + $brands_ar_res = $brands_ob_element->GetFields(); + $brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties(); + $brands[$brands_ar_res['CODE']] = [ + "NAME" => $brands_ar_res['NAME'], + "CODE" => $brands_ar_res['CODE'], + "UID" => $brands_ar_res['PROPERTIES']['UID']['VALUE'], + ]; + } + + //print ""; + + $arResult['TITLE'] = $arParams['RECOMMENDED'] ? "Каталог автомобилей ".$brands[$arParams['BRAND']]['NAME'] : ""; + + $models_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_MODELS, "PROPERTY_BRAND_UID" => $brands[$arParams['BRAND']]['UID'] ], false, []); + while ($models_ob_element = $models_res->GetNextElement()) + { + $models_ar_res = $models_ob_element->GetFields(); + $models_ar_res['PROPERTIES'] = $models_ob_element->GetProperties(); + + if(!empty($models_ar_res['PREVIEW_PICTURE'])) + { + $models_ar_res['IMAGE_PREPARED'] = true; + $models_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($models_ar_res['PREVIEW_PICTURE']); + } + else + { + $cars_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_MODEL" => $models_ar_res['ID'] ], false, [ "nPageSize" => 1 ]); + while ($cars_ob_element = $cars_res->GetNextElement()) + { + $cars_ar_res = $cars_ob_element->GetFields(); + $cars_ar_res['PROPERTIES'] = $cars_ob_element->GetProperties(); + + $models_ar_res['IMAGE_PREPARED'] = false; + $models_ar_res['PREVIEW_PICTURE'] = $cars_ar_res['PROPERTIES']['IMAGE_URL']['VALUE']; + } + } + + $models_ar_res['URL'] = "/catalog/".$brands[$arParams['BRAND']]['CODE']."/".$models_ar_res['CODE']."/"; + + $arResult['MODELS'][] = $models_ar_res; + } + + $this->IncludeComponentTemplate(); + } +//} \ No newline at end of file diff --git a/local/components/evolution/catalog.models/lang/ru/.description.php b/local/components/evolution/catalog.models/lang/ru/.description.php new file mode 100644 index 0000000..be104ac --- /dev/null +++ b/local/components/evolution/catalog.models/lang/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.models/templates/.default/script.js b/local/components/evolution/catalog.models/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.models/templates/.default/style.css b/local/components/evolution/catalog.models/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.models/templates/.default/template.php b/local/components/evolution/catalog.models/templates/.default/template.php new file mode 100644 index 0000000..4439413 --- /dev/null +++ b/local/components/evolution/catalog.models/templates/.default/template.php @@ -0,0 +1,25 @@ +setFrameMode(true); +?> +
+

+ +
+ + + " alt="" loading="lazy" /> + +
+ +
\ No newline at end of file diff --git a/local/components/evolution/catalog.other.positions/.description.php b/local/components/evolution/catalog.other.positions/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.other.positions/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.other.positions/component.php b/local/components/evolution/catalog.other.positions/component.php new file mode 100644 index 0000000..8dd3af7 --- /dev/null +++ b/local/components/evolution/catalog.other.positions/component.php @@ -0,0 +1,61 @@ + [], + 'LINK' => "/catalog/", + ]; + + $query = null; + $query_arr = []; + + $sort = Array( "RAND" => "ASC" ); + $filter = Array( "ACTIVE" => "Y", "IBLOCK_ID" => 1, "!ID" => $arParams['EXCEPT'] ); + $options = Array( "nPageSize" => 6 ); + + if(!empty($arParams['BRAND_ID'])) + { + $filter['PROPERTY_BRAND'] = $arParams['BRAND_ID']; + $arResult['LINK'] .= $arParams['BRAND_CODE']."/"; + } + + if(!empty($arParams['MODEL_ID'])) + { + $filter['PROPERTY_MODEL'] = $arParams['MODEL_ID']; + $arResult['LINK'] .= $arParams['MODEL_CODE']."/"; + } + + $res = CIBlockElement::GetList($sort, $filter, false, $options); + + while ($obElement = $res->GetNextElement()) + { + $ar_res = $obElement->GetFields(); + $ar_res['PROPERTIES'] = $obElement->GetProperties(); + $ar_res['PROPERTIES']['BRAND']['RELATED'] = get_related(IBLOCK_ID_BRANDS, $ar_res['PROPERTIES']['BRAND']['VALUE']); + $ar_res['PROPERTIES']['MODEL']['RELATED'] = get_related(IBLOCK_ID_MODELS, $ar_res['PROPERTIES']['MODEL']['VALUE']); + $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(IBLOCK_ID_MODIFICATIONS, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); + + $arResult['ITEMS'][] = $ar_res; + } + + $this->IncludeComponentTemplate(); +} \ No newline at end of file diff --git a/local/components/evolution/catalog.other.positions/ru/.description.php b/local/components/evolution/catalog.other.positions/ru/.description.php new file mode 100644 index 0000000..48f4a9e --- /dev/null +++ b/local/components/evolution/catalog.other.positions/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.other.positions/templates/.default/script.js b/local/components/evolution/catalog.other.positions/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.other.positions/templates/.default/style.css b/local/components/evolution/catalog.other.positions/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.other.positions/templates/.default/template.php b/local/components/evolution/catalog.other.positions/templates/.default/template.php new file mode 100644 index 0000000..2bace59 --- /dev/null +++ b/local/components/evolution/catalog.other.positions/templates/.default/template.php @@ -0,0 +1,33 @@ +setFrameMode(true); +?> + 0): ?> +
+
+

Другие предложения

+ " class="button button-transparent">Показать все*/?> +
+ +
+ +
+ " alt="" loading="lazy" /> + +
+ + + Показать все + +
+ \ No newline at end of file diff --git a/local/components/evolution/catalog.position/component.php b/local/components/evolution/catalog.position/component.php index ffd4f80..b238cee 100644 --- a/local/components/evolution/catalog.position/component.php +++ b/local/components/evolution/catalog.position/component.php @@ -43,12 +43,18 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) ."&redemption_payment=".$arParams['redemption_payment']."")); $arResult = $ar_res; + + $APPLICATION->AddHeadString(''); + //$APPLICATION->AddHeadString(''); } if(empty($ar_res['NAME'])) { define('ERROR_404', 'Y'); } else { + $APPLICATION->AddChainItem($ar_res['PROPERTIES']['BRAND']['RELATED']['NAME'], "/catalog/".$ar_res['PROPERTIES']['BRAND']['RELATED']['CODE']."/"); + $APPLICATION->AddChainItem($ar_res['PROPERTIES']['MODEL']['RELATED']['NAME'], "/catalog/".$ar_res['PROPERTIES']['BRAND']['RELATED']['CODE']."/".$ar_res['PROPERTIES']['MODEL']['RELATED']['CODE']."/"); $APPLICATION->AddChainItem($ar_res["NAME"]); + $ipropValues = new \Bitrix\Iblock\InheritedProperty\ElementValues($ar_res['IBLOCK_ID'], $ar_res["ID"]); $meta = $ipropValues->getValues(); $APPLICATION->SetPageProperty("title", $meta['ELEMENT_META_TITLE']); diff --git a/local/components/evolution/catalog.position/templates/.default/script.js b/local/components/evolution/catalog.position/templates/.default/script.js index 7f573f8..bdc3da7 100644 --- a/local/components/evolution/catalog.position/templates/.default/script.js +++ b/local/components/evolution/catalog.position/templates/.default/script.js @@ -210,4 +210,18 @@ $(function() calculator_car_price_save(); } }); + + $("#to_calculator_button").on("click", function(event) + { + $('html, body').animate({ + scrollTop: $("#calc").offset().top - 100 + }, 200); + }); + + $("#to_form_button").on("click", function(event) + { + $('html, body').animate({ + scrollTop: $("#order").offset().top - 100 + }, 200); + }); }); \ No newline at end of file diff --git a/local/components/evolution/catalog.position/templates/.default/template.php b/local/components/evolution/catalog.position/templates/.default/template.php index acae19d..eab9120 100644 --- a/local/components/evolution/catalog.position/templates/.default/template.php +++ b/local/components/evolution/catalog.position/templates/.default/template.php @@ -18,6 +18,9 @@ $this->setFrameMode(true); calculator(); }); +
@@ -26,19 +29,19 @@ $this->setFrameMode(true); -
-

-

+


в лизинг

- <?= $arResult['NAME']; ?> + " alt="" width="650px" > +
+

Ключевые характеристики

-
    +
    • Год:
    • КПП:
    • Привод:
      • @@ -48,75 +51,15 @@ $this->setFrameMode(true);
    • Топливо:
-
-
-
-
-
-
-

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

-

- - ₽ - - -

- -
- -
-

млн

-

млн

-
-
-

Первоначальный взнос

-

%

-
- -
-

%

-

%

-
-
-

Срок договора

-

мес.

-
- -
-

мес.

-

мес.

-
-
-

Выкупной платеж

-

%

-
- -
-

%

-

%

-
-
-
-
-

Ежемесячный платеж

-

₽

-
-
-

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

-

₽

-
-
-

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

-

₽

-
-
- - Отправить заявку -
-
+
+
+

Оформите автомобиль в лизинг на выгодных условиях

+

+ Стоимость авто (от) + "> ₽ +

+ +
@@ -124,13 +67,13 @@ $this->setFrameMode(true); @@ -139,7 +82,7 @@ $this->setFrameMode(true);
-
Комплектация
+

Комплектация

Основная информация

    @@ -174,7 +117,7 @@ $this->setFrameMode(true);
-
Характеристики
+

Характеристики

Технические характеристики

    @@ -199,7 +142,7 @@ $this->setFrameMode(true);
-
Обслуживание
+

Обслуживание

IncludeComponent( "evolution:catalog.position.info", "", @@ -220,7 +163,6 @@ $this->setFrameMode(true);

Банкротство лизингодателя
Банкротство лизинговой компании не является поводом для изъятия у лизингополучателя объекта лизинга, при условии, что последний не нарушил условия договора лизинга.

-

Внутренний лизинг
Лизинг, при котором всё стороны договора лизинга являются резиденты Республики Беларусь.

@@ -274,6 +216,152 @@ $this->setFrameMode(true); ?>
+ +
+
+

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

+
+
+

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

+

+ + ₽ + + +

+ +
+ +
+

млн

+

млн

+
+
+

Первоначальный взнос

+

%

+
+ +
+

%

+

%

+
+
+

Срок договора

+

мес.

+
+ +
+

мес.

+

мес.

+
+
+

Выкупной платеж

+

%

+
+ +
+

%

+

%

+
+
+
+
+

Ежемесячный платеж

+

₽

+
+
+

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

+

₽

+
+
+

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

+

₽

+
+
+ Отправить заявку + +
+
+
+
+ IncludeComponent( + "evolution:catalog.other.positions", + "", + Array( + "EXCEPT" => $arResult['ID'], + "BRAND_ID" => $arResult['PROPERTIES']['BRAND']['RELATED']['ID'], + "BRAND_CODE" => $arResult['PROPERTIES']['BRAND']['RELATED']['CODE'], + "BRAND_NAME" => $arResult['PROPERTIES']['BRAND']['RELATED']['NAME'], + "MODEL_ID" => $arResult['PROPERTIES']['MODEL']['RELATED']['ID'], + "MODEL_CODE" => $arResult['PROPERTIES']['MODEL']['RELATED']['CODE'], + "MODEL_NAME" => $arResult['PROPERTIES']['MODEL']['RELATED']['NAME'], + ) + ); ?> + +
+

Другие модели Audi A3 Sedan

+ Показать все +
+
+ + Haval + + +
+
+ + Haval + + +
+
+ + Haval + + +
+
+ */?> + IncludeComponent( + "evolution:catalog.recommended.models", + "", + Array( + "EXCEPT" => $arResult['PROPERTIES']['MODEL']['RELATED']['ID'], + "BRAND_UID" => $arResult['PROPERTIES']['BRAND']['RELATED']['PROPERTIES']['UID']['VALUE'], + "BRAND_CODE" => $arResult['PROPERTIES']['BRAND']['RELATED']['CODE'], + "BRAND_NAME" => $arResult['PROPERTIES']['BRAND']['RELATED']['NAME'], + ) + ); ?> + +
+

Рекомендуемые модели Audi для вас

+ Показать все +
+
+ + Haval + + +
+
+ + Haval + + +
+
+ + Haval + + +
+
+ */?>
\ No newline at end of file diff --git a/local/components/evolution/catalog.promo.brand/.description.php b/local/components/evolution/catalog.promo.brand/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.promo.brand/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.brand/component.php b/local/components/evolution/catalog.promo.brand/component.php new file mode 100644 index 0000000..c882488 --- /dev/null +++ b/local/components/evolution/catalog.promo.brand/component.php @@ -0,0 +1,58 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +{ + if(CModule::IncludeModule('iblock')) + { + $arResult = [ + 'BRANDS' => [], + ]; + + $brands_res = CIBlockElement::GetList([ "SORT" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_BRANDS, "PROPERTY_PROMO_VALUE" => "Да" ], false, []); + while ($brands_element = $brands_res->GetNextElement()) + { + $brands_ar_res = $brands_element->GetFields(); + $brands_ar_res['ITEMS'] = []; + + $position_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => 1, "PROPERTY_BRAND" => $brands_ar_res['ID'], ], false, [ "nPageSize" => 3 ]); + + while ($position_element = $position_res->GetNextElement()) + { + $ar_res = $position_element->GetFields(); + $ar_res['PROPERTIES'] = $position_element->GetProperties(); + $ar_res['PROPERTIES']['BRAND']['RELATED'] = get_related(8, $ar_res['PROPERTIES']['BRAND']['VALUE']); + $ar_res['PROPERTIES']['MODEL']['RELATED'] = get_related(9, $ar_res['PROPERTIES']['MODEL']['VALUE']); + $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); + + $ar_res['CALCULATION'] = []; + $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 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, ".", " "); + + $brands_ar_res['ITEMS'][] = $ar_res; + } + + $arResult['BRANDS'][] = $brands_ar_res; + } + + $this->IncludeComponentTemplate(); + } +} \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.brand/ru/.description.php b/local/components/evolution/catalog.promo.brand/ru/.description.php new file mode 100644 index 0000000..3c24bdd --- /dev/null +++ b/local/components/evolution/catalog.promo.brand/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.brand/templates/.default/script.js b/local/components/evolution/catalog.promo.brand/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.promo.brand/templates/.default/style.css b/local/components/evolution/catalog.promo.brand/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.promo.brand/templates/.default/template.php b/local/components/evolution/catalog.promo.brand/templates/.default/template.php new file mode 100644 index 0000000..6175100 --- /dev/null +++ b/local/components/evolution/catalog.promo.brand/templates/.default/template.php @@ -0,0 +1,57 @@ +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/.description.php b/local/components/evolution/catalog.promo.model/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.promo.model/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.model/component.php b/local/components/evolution/catalog.promo.model/component.php new file mode 100644 index 0000000..6074ea6 --- /dev/null +++ b/local/components/evolution/catalog.promo.model/component.php @@ -0,0 +1,58 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +{ + if(CModule::IncludeModule('iblock')) + { + $arResult = [ + 'MODELS' => [], + ]; + + $models_res = CIBlockElement::GetList([ "SORT" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_MODELS, "PROPERTY_BRAND_UID" => $arParams['BRAND_UID'], "PROPERTY_PROMO_VALUE" => "Да" ], false, []); + while ($models_element = $models_res->GetNextElement()) + { + $models_ar_res = $models_element->GetFields(); + $models_ar_res['ITEMS'] = []; + + $position_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => 1, "PROPERTY_MODEL" => $models_ar_res['ID'], ], false, [ "nPageSize" => 3 ]); + + while ($position_element = $position_res->GetNextElement()) + { + $ar_res = $position_element->GetFields(); + $ar_res['PROPERTIES'] = $position_element->GetProperties(); + $ar_res['PROPERTIES']['BRAND']['RELATED'] = get_related(8, $ar_res['PROPERTIES']['BRAND']['VALUE']); + $ar_res['PROPERTIES']['MODEL']['RELATED'] = get_related(9, $ar_res['PROPERTIES']['MODEL']['VALUE']); + $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); + + $ar_res['CALCULATION'] = []; + $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 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, ".", " "); + + $models_ar_res['ITEMS'][] = $ar_res; + } + + $arResult['MODELS'][] = $models_ar_res; + } + + $this->IncludeComponentTemplate(); + } +} \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.model/ru/.description.php b/local/components/evolution/catalog.promo.model/ru/.description.php new file mode 100644 index 0000000..f07de75 --- /dev/null +++ b/local/components/evolution/catalog.promo.model/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.promo.model/templates/.default/script.js b/local/components/evolution/catalog.promo.model/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.promo.model/templates/.default/style.css b/local/components/evolution/catalog.promo.model/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.promo.model/templates/.default/template.php b/local/components/evolution/catalog.promo.model/templates/.default/template.php new file mode 100644 index 0000000..9e80cee --- /dev/null +++ b/local/components/evolution/catalog.promo.model/templates/.default/template.php @@ -0,0 +1,57 @@ +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.recommended.models/.description.php b/local/components/evolution/catalog.recommended.models/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.recommended.models/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.recommended.models/component.php b/local/components/evolution/catalog.recommended.models/component.php new file mode 100644 index 0000000..e74efb2 --- /dev/null +++ b/local/components/evolution/catalog.recommended.models/component.php @@ -0,0 +1,58 @@ + [], + ]; + $options = Array( "nPageSize" => 6 ); + + $models_res = CIBlockElement::GetList([ "RAND" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_MODELS, "PROPERTY_BRAND_UID" => $arParams['BRAND_UID'], "!ID" => $arParams['EXCEPT'] ], false, $options); + while ($models_ob_element = $models_res->GetNextElement()) + { + $models_ar_res = $models_ob_element->GetFields(); + $models_ar_res['PROPERTIES'] = $models_ob_element->GetProperties(); + + if(!empty($models_ar_res['PREVIEW_PICTURE'])) + { + $models_ar_res['IMAGE_PREPARED'] = true; + $models_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($models_ar_res['PREVIEW_PICTURE']); + } + else + { + $cars_res = CIBlockElement::GetList([ "NAME" => "ASC" ], [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_MODEL" => $models_ar_res['ID'] ], false, [ "nPageSize" => 1 ]); + while ($cars_ob_element = $cars_res->GetNextElement()) + { + $cars_ar_res = $cars_ob_element->GetFields(); + $cars_ar_res['PROPERTIES'] = $cars_ob_element->GetProperties(); + + $models_ar_res['IMAGE_PREPARED'] = false; + $models_ar_res['PREVIEW_PICTURE'] = $cars_ar_res['PROPERTIES']['IMAGE_URL']['VALUE']; + } + } + + $models_ar_res['URL'] = "/catalog/".$arParams['BRAND_CODE']."/".$models_ar_res['CODE']."/"; + + $arResult['MODELS'][] = $models_ar_res; + } + + $this->IncludeComponentTemplate(); +} \ No newline at end of file diff --git a/local/components/evolution/catalog.recommended.models/ru/.description.php b/local/components/evolution/catalog.recommended.models/ru/.description.php new file mode 100644 index 0000000..5248df0 --- /dev/null +++ b/local/components/evolution/catalog.recommended.models/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.recommended.models/templates/.default/script.js b/local/components/evolution/catalog.recommended.models/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.recommended.models/templates/.default/style.css b/local/components/evolution/catalog.recommended.models/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.recommended.models/templates/.default/template.php b/local/components/evolution/catalog.recommended.models/templates/.default/template.php new file mode 100644 index 0000000..1317dbe --- /dev/null +++ b/local/components/evolution/catalog.recommended.models/templates/.default/template.php @@ -0,0 +1,33 @@ +setFrameMode(true); +?> + 0): ?> +
+
+

Рекомендуемые модели для Вас

+ /" class="button button-transparent">Показать все*/?> +
+ +
+ + + " alt="" loading="lazy" /> + +
+ + + Показать все + +
+ \ No newline at end of file diff --git a/local/components/evolution/catalog.special.offers/.description.php b/local/components/evolution/catalog.special.offers/.description.php new file mode 100644 index 0000000..a20bdf3 --- /dev/null +++ b/local/components/evolution/catalog.special.offers/.description.php @@ -0,0 +1,8 @@ + GetMessage("DEFAULT_NAME"), + "DESCRIPTION" => GetMessage("DEFAULT_DESC"), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog.special.offers/component.php b/local/components/evolution/catalog.special.offers/component.php new file mode 100644 index 0000000..c0ac8e1 --- /dev/null +++ b/local/components/evolution/catalog.special.offers/component.php @@ -0,0 +1,63 @@ +StartResultCache(60*60*24, md5(var_export($_POST, true)))) +{ + if(CModule::IncludeModule('iblock')) + { + $arResult = [ + 'ITEMS' => [] + ]; + + $query = null; + $query_arr = []; + + $sort = [ "RAND" => "ASC" ]; + $filter = Array("ACTIVE" => "Y", "IBLOCK_ID" => 1); + $options = Array("nPageSize" => $arParams['COUNT']); + + $filter['PROPERTY_SPECIAL_OFFER_VALUE'] = "Да"; + + if(!empty($arParams['BRAND_ID'])) + { + $filter['PROPERTY_BRAND'] = $arParams['BRAND_ID']; + } + + $res = CIBlockElement::GetList($sort, $filter, false, $options); + + while ($obElement = $res->GetNextElement()) + { + $ar_res = $obElement->GetFields(); + $ar_res['PROPERTIES'] = $obElement->GetProperties(); + $ar_res['PROPERTIES']['BRAND']['RELATED'] = get_related(8, $ar_res['PROPERTIES']['BRAND']['VALUE']); + $ar_res['PROPERTIES']['MODEL']['RELATED'] = get_related(9, $ar_res['PROPERTIES']['MODEL']['VALUE']); + $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); + + $ar_res['CALCULATION'] = []; + $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 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, ".", " "); + + $arResult['ITEMS'][] = $ar_res; + } + + $this->IncludeComponentTemplate(); + } +} \ No newline at end of file diff --git a/local/components/evolution/catalog.special.offers/ru/.description.php b/local/components/evolution/catalog.special.offers/ru/.description.php new file mode 100644 index 0000000..bea98aa --- /dev/null +++ b/local/components/evolution/catalog.special.offers/ru/.description.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.special.offers/ru/.parameters.php b/local/components/evolution/catalog.special.offers/ru/.parameters.php new file mode 100644 index 0000000..e99d130 --- /dev/null +++ b/local/components/evolution/catalog.special.offers/ru/.parameters.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/local/components/evolution/catalog.special.offers/templates/.default/script.js b/local/components/evolution/catalog.special.offers/templates/.default/script.js new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.special.offers/templates/.default/style.css b/local/components/evolution/catalog.special.offers/templates/.default/style.css new file mode 100644 index 0000000..e69de29 diff --git a/local/components/evolution/catalog.special.offers/templates/.default/template.php b/local/components/evolution/catalog.special.offers/templates/.default/template.php new file mode 100644 index 0000000..fea5f53 --- /dev/null +++ b/local/components/evolution/catalog.special.offers/templates/.default/template.php @@ -0,0 +1,52 @@ +setFrameMode(true); +?> + 0): ?> +

" id="catalog_special_h2">Спецпредложения

+
+ +
+ + <?= $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/.parameters.php b/local/components/evolution/catalog/.parameters.php new file mode 100644 index 0000000..0597273 --- /dev/null +++ b/local/components/evolution/catalog/.parameters.php @@ -0,0 +1,14 @@ + array( + 'MAP_WIDTH' => array( + 'NAME' => GetMessage('COUNT_PER_PAGE'), + 'TYPE' => 'STRING', + 'DEFAULT' => '3', + 'PARENT' => 'BASE', + ), + ), +); +?> \ No newline at end of file diff --git a/local/components/evolution/catalog/component.php b/local/components/evolution/catalog/component.php index 8b3d623..5162b25 100644 --- a/local/components/evolution/catalog/component.php +++ b/local/components/evolution/catalog/component.php @@ -24,6 +24,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) { $arResult = [ 'SELECTED' => [], + 'TITLES' => [], 'ITEMS' => [] ]; @@ -54,11 +55,12 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $arResult['SELECTED']['SORT'] = $arParams['SORT']; } $filter = Array("ACTIVE" => "Y", "IBLOCK_ID" => 1); - $options = Array("nPageSize" => 6); + $options = Array("nPageSize" => !empty($arParams['COUNT_PER_PAGE']) ? $arParams['COUNT_PER_PAGE'] : 15); $pages_url = $arParams['PATH']; $arResult['EXTENDED'] = false; + $arResult['BY_OPTIONS'] = false; $arResult['FILTER_SMALL'] = $arParams['FILTER_SMALL'] ? true : false; if(!empty($arParams['BRAND'])) @@ -67,14 +69,27 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) while ($brands_ob_element = $brands_res->GetNextElement()) { $brands_ar_res = $brands_ob_element->GetFields(); + $brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties(); + $filter['PROPERTY_BRAND'] = $brands_ar_res['ID']; $pages_url = $pages_url.$brands_ar_res['CODE']."/"; $arResult['SELECTED']['BRAND'] = $brands_ar_res['CODE']; + $arResult['SELECTED']['BRAND_ID'] = $brands_ar_res['ID']; + $arResult['SELECTED']['BRAND_UID'] = $brands_ar_res['PROPERTIES']['UID']['VALUE']; + $arResult['TITLES']['BRAND'] = $brands_ar_res['NAME']; + $arResult['TITLES']['TRANSCRIPTION'] = $brands_ar_res['PROPERTIES']['TRANSCRIPTION']['VALUE']; + + $APPLICATION->AddChainItem($brands_ar_res['NAME'], "https://".SITE_SERVER_NAME."/catalog/".$arResult['SELECTED']['BRAND']."/"); } $arResult['EXTENDED'] = true; $arResult['FILTER_SMALL'] = false; $arResult['SCROLL'] = true; + + if(empty($arResult['SELECTED']['BRAND'])) + { + define('ERROR_404', 'Y'); + } } if(!empty($arParams['MODEL'])) @@ -86,66 +101,114 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $filter['PROPERTY_MODEL'] = $models_ar_res['ID']; $pages_url = $pages_url.$models_ar_res['CODE']."/"; $arResult['SELECTED']['MODEL'] = $models_ar_res['CODE']; + $arResult['TITLES']['MODEL'] = $models_ar_res['NAME']; + + $APPLICATION->AddChainItem($models_ar_res['NAME'], "https://".SITE_SERVER_NAME."/catalog/".$arResult['SELECTED']['BRAND']."/".$arResult['SELECTED']['MODEL']."/"); } $arResult['EXTENDED'] = true; $arResult['SCROLL'] = true; + + if(empty($arResult['SELECTED']['MODEL'])) + { + define('ERROR_404', 'Y'); + } } - if(!empty($arParams['MODIFICATION'])) + if(!isset($arParams['PROGRAM'])) { - $arResult['EXTENDED'] = true; - $arResult['SELECTED']['MODIFICATION'] = $arParams['MODIFICATION']; + if(isset($arResult['SELECTED']['BRAND'])) + { + if(isset($arResult['SELECTED']['MODEL'])) + { + $APPLICATION->AddHeadString(''); + } + else + { + $APPLICATION->AddHeadString(''); + } + } + else + { + $APPLICATION->AddHeadString(''); + } + } - $filter['PROPERTY_MODIFICATION'] = $arParams['MODIFICATION']; - $query_arr['MODIFICATION'] = $arParams['MODIFICATION']; - $arResult['SCROLL'] = true; + //$APPLICATION->AddHeadString(''); + + if(isset($arParams['MODIFICATION'])) + { + if(!empty($arParams['MODIFICATION'])) + { + $arResult['EXTENDED'] = true; + $arResult['SELECTED']['MODIFICATION'] = $arParams['MODIFICATION']; + $arResult['SCROLL'] = true; + + $filter['PROPERTY_MODIFICATION'] = $arParams['MODIFICATION']; + $query_arr['MODIFICATION'] = $arParams['MODIFICATION']; + } + else + { + LocalRedirect("https://".SITE_SERVER_NAME."/catalog/".$arResult['SELECTED']['BRAND']."/".$arResult['SELECTED']['MODEL']."/", true, "301 Moved permanently"); + } } if(!empty($arParams['DRIVE'])) { $arResult['EXTENDED'] = true; + $arResult['BY_OPTIONS'] = true; + $arResult['SCROLL'] = true; + $arResult['SELECTED']['DRIVE'] = $arParams['DRIVE']; $filter['=PROPERTY_DRIVE'] = $arParams['DRIVE']; $query_arr['DRIVE'] = $arParams['DRIVE']; - $arResult['SCROLL'] = true; } if(!empty($arParams['BODY'])) { $arResult['EXTENDED'] = true; + $arResult['BY_OPTIONS'] = true; + $arResult['SCROLL'] = true; + $arResult['SELECTED']['BODY'] = $arParams['BODY']; $filter['=PROPERTY_BODY'] = $arParams['BODY']; $query_arr['BODY'] = $arParams['BODY']; - $arResult['SCROLL'] = true; } if(!empty($arParams['GEAR'])) { $arResult['EXTENDED'] = true; + $arResult['BY_OPTIONS'] = true; + $arResult['SCROLL'] = true; + $arResult['SELECTED']['GEAR'] = $arParams['GEAR']; $filter['=PROPERTY_GEAR'] = $arParams['GEAR']; $query_arr['GEAR'] = $arParams['GEAR']; - $arResult['SCROLL'] = true; } if(!empty($arParams['ENGINE_FUEL'])) { - $filter['=PROPERTY_ENGINE_FUEL'] = $arParams['ENGINE_FUEL']; $arResult['EXTENDED'] = true; + $arResult['BY_OPTIONS'] = true; + $arResult['SCROLL'] = true; + $arResult['SELECTED']['ENGINE_FUEL'] = $arParams['ENGINE_FUEL']; + $filter['=PROPERTY_ENGINE_FUEL'] = $arParams['ENGINE_FUEL']; $query_arr['ENGINE_FUEL'] = $arParams['ENGINE_FUEL']; - $arResult['SCROLL'] = true; } if(!empty($arParams['ENGINE_POWER_FROM']) || !empty($arParams['ENGINE_POWER_TO'])) { - $filter['>StartResultCache(60*60*24, md5(var_export($_POST, true)))) $arResult['SELECTED']['ENGINE_POWER_TO'] = $arParams['ENGINE_POWER_TO']; $query_arr['ENGINE_POWER_TO'] = $arParams['ENGINE_POWER_TO']; } - $arResult['SCROLL'] = true; } if(!empty($arParams['ENGINE_VOLUME_FROM']) || !empty($arParams['ENGINE_VOLUME_TO'])) { - $filter['>StartResultCache(60*60*24, md5(var_export($_POST, true)))) $arResult['SELECTED']['ENGINE_VOLUME_TO'] = $arParams['ENGINE_VOLUME_TO']; $query_arr['ENGINE_VOLUME_TO'] = $arParams['ENGINE_VOLUME_TO']; } - $arResult['SCROLL'] = true; } //$pages_url = $pages_url."/"; @@ -229,49 +294,72 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $filter['PROPERTY_LEASING_PROGRAMS'] = $arParams["leasing_program"]; } - $res = CIBlockElement::GetList($sort, $filter, false, $options); - - while ($obElement = $res->GetNextElement()) + if(empty($arParams['PROGRAM'])) { - $ar_res = $obElement->GetFields(); - $ar_res['PROPERTIES'] = $obElement->GetProperties(); - $ar_res['PROPERTIES']['BRAND']['RELATED'] = get_related(8, $ar_res['PROPERTIES']['BRAND']['VALUE']); - $ar_res['PROPERTIES']['MODEL']['RELATED'] = get_related(9, $ar_res['PROPERTIES']['MODEL']['VALUE']); - $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); + $arResult['SHOW_SPECIAL_OFFERS'] = true; + $arResult['SHOW_PROMO_BRANDS'] = true; + } - $ar_res['CALCULATION'] = []; - $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 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, ".", " "); + if(!empty($arParams['BRAND'])) + { + $arResult['SHOW_PROMO_BRANDS'] = false; + } - //print "\n"; - //print "\n\n\n"; + if(!empty($arParams['BRAND']) && empty($arParams['MODEL'])) + { + $arResult['SHOW_PROMO_MODELS'] = true; + } - /* - if(isset($ar_res['PREVIEW_PICTURE'])) + if(!empty($arParams['MODEL']) || !empty($arParams['PROGRAM']) || $arResult['BY_OPTIONS']) + { + $arResult['SHOW_SPECIAL_OFFERS'] = false; + $arResult['SHOW_PROMO_BRANDS'] = false; + $arResult['SHOW_PROMO_MODELS'] = false; + + $res = CIBlockElement::GetList($sort, $filter, false, $options); + + while ($obElement = $res->GetNextElement()) { - $ar_res['PREVIEW_PICTURE_SRC'] = get_image_path($ar_res['PREVIEW_PICTURE']); - } + $ar_res = $obElement->GetFields(); + $ar_res['PROPERTIES'] = $obElement->GetProperties(); + $ar_res['PROPERTIES']['BRAND']['RELATED'] = get_related(8, $ar_res['PROPERTIES']['BRAND']['VALUE']); + $ar_res['PROPERTIES']['MODEL']['RELATED'] = get_related(9, $ar_res['PROPERTIES']['MODEL']['VALUE']); + $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); - if(!empty($ar_res['PROPERTIES']['PHOTO_ICON']['VALUE'])) - { - $ar_res['PROPERTIES']['PHOTO_ICON']['SRC'] = get_image_path($ar_res['PROPERTIES']['PHOTO_ICON']['VALUE']); - } + $ar_res['CALCULATION'] = []; + $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 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, ".", " "); - if(!empty($ar_res['PROPERTIES']['CITY']['VALUE'])) - { - $ar_res['PROPERTIES']['CITY']['RELATED'] = get_related_array(10, $ar_res['PROPERTIES']['CITY']['VALUE']); - } + //print "\n"; + //print "\n\n\n"; - if(!empty($ar_res['PROPERTIES']['SUBWAY']['VALUE'])) - { - $ar_res['PROPERTIES']['SUBWAY']['RELATED'] = get_related_array(12, $ar_res['PROPERTIES']['SUBWAY']['VALUE']); - } - */ + /* + if(isset($ar_res['PREVIEW_PICTURE'])) + { + $ar_res['PREVIEW_PICTURE_SRC'] = get_image_path($ar_res['PREVIEW_PICTURE']); + } - $arResult['ITEMS'][] = $ar_res; + 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; + } } if($_REQUEST['PAGEN_1'] > 1) @@ -279,7 +367,24 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $arResult['SCROLL'] = true; } - if($arParams["PAGINATION"] == "Y") + if(!empty($arResult['TITLES']['BRAND'])) + { + if(!empty($arResult['TITLES']['MODEL'])) + { + $APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в лизинг для юридических лиц и ИП в Москве - купить новый автомобиль ".$arResult['TITLES']['TRANSCRIPTION']." ".$arResult['TITLES']['MODEL']." в лизинг | Эволюция"); + $APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в лизинг для юридических лиц и ИП в Москве и в других регионах России. Вы можете купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный."); + } + else + { + $APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." в лизинг для юридических лиц и ИП в Москве - купить новый автомобиль ".$arResult['TITLES']['TRANSCRIPTION']." в лизинг | Эволюция"); + $APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." в лизинг для юридических лиц и ИП в Москве и в других регионах России. Вы можете купить ".$arResult['TITLES']['BRAND']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный."); + } + } + + $arResult['SECTION_CODE'] = !empty($arParams['section_code']) ? $arParams['section_code'] : $pages_url; + $arResult['QUERY'] = $query; + + if(count($arResult['ITEMS']) > 0 && $arParams["PAGINATION"] == "Y") { $arResult["NAV_STRING"] = $res->GetPageNavStringEx( $navComponentObject, @@ -288,12 +393,57 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) "N", null, [ - "section_code" => !empty($arParams['section_code']) ? $arParams['section_code'] : $pages_url, - "query" => $query, + "section_code" => $arResult['SECTION_CODE'], + "query" => $arResult['QUERY'], ] ); } - $this->IncludeComponentTemplate(); + $arResult['PAGE_CURRENT'] = $res->NavPageNomer; + $arResult['PAGE_COUNT'] = $res->NavPageCount; + + if(isset($_REQUEST['ajax'])) + { + $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(); + $items = ob_get_contents(); + ob_end_clean(); + + header('Content-Type: application/json; charset=utf-8'); + + $response = [ + 'ITEMS' => json_encode(str_replace(["\t","\r","\n"], ["","",""], $items), JSON_UNESCAPED_SLASHES), + 'PAGE_CURRENT' => $arResult['PAGE_CURRENT'], + 'PAGE_COUNT' => $arResult['PAGE_COUNT'], + 'PAGINATION' => json_encode(str_replace(["\t","\r","\n"], ["","",""], $arResult['NAV_STRING']), JSON_UNESCAPED_SLASHES), + ]; + + print json_encode($response, JSON_UNESCAPED_SLASHES); + + die(); + } + else + { + $this->IncludeComponentTemplate(); + } } } \ No newline at end of file diff --git a/local/components/evolution/catalog/lang/ru/.parameters.php b/local/components/evolution/catalog/lang/ru/.parameters.php new file mode 100644 index 0000000..f1b414e --- /dev/null +++ b/local/components/evolution/catalog/lang/ru/.parameters.php @@ -0,0 +1,2 @@ +Любая"); - $("#filter_models").append(""); - } - else - { - if(selected['MODEL'] !== undefined) + page++; + $(".pagination").replaceWith(JSON.parse(response['PAGINATION'])); + $("#catalog_positions_list").append(JSON.parse(response['ITEMS'])); + + if(parseInt(response['PAGE_COUNT'], 10) === parseInt(response['PAGE_CURRENT'], 10)) { - $("#small_filter_models").append(""); - $("#filter_models").append(""); + $("#catalog_get_more").empty(); } - else - { - $("#small_filter_models").append(""); - $("#filter_models").append(""); - } - } - $("#small_filter_models")[0].selectedIndex = 0; - $("#filter_models")[0].selectedIndex = 0; - - for(let i in response.models) - { - $("#small_filter_models").append(""); - $("#filter_models").append(""); - } - - if(selected['MODEL'] !== undefined) - { - $("#small_filter_models").val(selected['MODEL']); - $("#filter_models").val(selected['MODEL']); - - let id = $("#filter_models").find(':selected').data('id'); - selected['MODEL_ID'] = id; - - updateCounter(selected); - } - else - { - updateCounter(selected); - } - }, "json"); -} - -$(function() -{ - $.get("/api/catalog/brands/", - { - params: {}, - }, function(response) - { - console.log("selected", selected); - //$("#small_filter_brands").empty(); - //$("#small_filter_brands").find("option").first().text("Любая").attr("disabled", false); - //$("#filter_brands").find("option").first().text("Любая").attr("disabled", false); - - for(let i in response.brands) - { - $("#small_filter_brands").append(""); - $("#filter_brands").append(""); - } - - if(selected['BRAND'] !== undefined) - { - $("#small_filter_brands").find("option").first().text("Любая").attr("disabled", false).val(''); - $("#filter_brands").find("option").first().text("Любая").attr("disabled", false).val(''); - - $("#small_filter_brands").val(selected['BRAND']); - $("#filter_brands").val(selected['BRAND']); - - let uid = $("#filter_brands").find(':selected').data('uid'); - let id = $("#filter_brands").find(':selected').data('id'); - selected['BRAND_ID'] = id; - - loadModels(uid); - } - else - { - updateCounter(selected); - } - }, "json"); - - $("#small_filter_brands").on("change", function(event) - { - $("#filter_brands").val(event.target.value); - selected['MODEL'] = undefined; - selected['MODEL_ID'] = undefined; - - if($(this).val() === "") - { - $("#small_filter_brands").find("option").first().text("Марка").attr("disabled", "disabled"); - $("#small_filter_models").empty(); - $("#small_filter_models").append(""); - $("#filter_brands").find("option").first().text("Марка").attr("disabled", "disabled"); - $("#filter_models").empty(); - $("#filter_models").append(""); - } - else - { - let uid = $(this).find(':selected').data('uid'); - let id = $(this).find(':selected').data('id'); - selected['BRAND_ID'] = id; - - $("#small_filter_brands").find("option").first().text("Любая").attr("disabled", false); - $("#filter_brands").find("option").first().text("Любая").attr("disabled", false); - - loadModels(uid); - } + }); }); - - $("#small_filter_models").on("change", function(event) - { - if($(this).val() === "") - { - $("#filter_models").val(); - - selected['MODEL'] = undefined; - selected['MODEL_ID'] = undefined; - - $("#small_filter_models").find("option").first().text("Модель").attr("disabled", "disabled"); - $("#filter_models").find("option").first().text("Модель").attr("disabled", "disabled"); - } - else - { - let id = $(this).find(':selected').data('id'); - $("#filter_models").val(event.target.value); - - selected['MODEL'] = id; - selected['MODEL_ID'] = id; - - $("#small_filter_models").find("option").first().text("Любая").attr("disabled", false); - $("#filter_models").find("option").first().text("Любая").attr("disabled", false); - } - }); - - $("#filter_brands").on("change", function(event) - { - console.log("BBBBB", $(this).val()); - if($(this).val() === '') - { - selected['BRAND'] = undefined; - selected['BRAND_ID'] = undefined; - selected['MODEL'] = undefined; - selected['MODEL_ID'] = undefined; - - $("#small_filter_brands").find("option").first().text("Марка").attr("disabled", "disabled"); - $("#small_filter_models").empty(); - $("#small_filter_models").append(""); - $("#filter_brands").find("option").first().text("Марка").attr("disabled", "disabled"); - $("#filter_models").empty(); - $("#filter_models").append(""); - - updateCounter(selected); - } - else - { - let id = $(this).find(':selected').data('id'); - let uid = $(this).find(':selected').data('uid'); - selected['BRAND'] = $(this).val(); - selected['BRAND_ID'] = id; - selected['MODEL'] = undefined; - selected['MODEL_ID'] = undefined; - - $("#small_filter_brands").find("option").first().text("Любая").attr("disabled", false); - $("#filter_brands").find("option").first().text("Любая").attr("disabled", false); - - loadModels(uid); - } - }); - - $("#filter_models").on("change", function(event) - { - if($(this).val() === "") - { - selected['MODEL'] = undefined; - selected['MODEL_ID'] = undefined; - - $("#filter_models").find("option").first().text("Модель").attr("disabled", "disabled"); - } - else - { - let id = $(this).find(':selected').data('id'); - selected['MODEL_ID'] = id; - - $("#filter_models").find("option").first().text("Любая").attr("disabled", false); - } - - updateCounter(selected); - }); - - $("#catalog_small_form").on("submit", function(e) - { - e.preventDefault(); - }); - - $("#catalog_small_find").on("click", function() - { - var path = "/catalog"; - - if($("#small_filter_brands").val() !== "") - { - path = path+"/"+$("#small_filter_brands").val(); - } - if($("#small_filter_models").val() !== "") - { - path = path+"/"+$("#small_filter_models").val(); - } - - path = path+"/"; - - window.location.href = path; - //$("#catalog_small_form").submit(); - }); - - $("#rich_filter_toggle").on("click", function() - { - updateCounter(selected); - $("#filter").addClass("visible"); - $("#catalog_small_filter").addClass("hidden"); - }); - - $.get("/api/catalog/parameters/", - { - params: {}, - }, function(response) - { - for(let i in response.bodies) - { - $("#filter_bodies").append(""); - } - if(selected['BODY'] !== undefined && selected['BODY'] !== null && selected['BODY'] !== "") - { - $("#filter_bodies").val(selected['BODY']); - $("#filter_bodies").find("option").first().text("Любой").attr("disabled", false); - } - - for(let i in response.gears) - { - $("#filter_gears").append(""); - } - if(selected['GEAR'] !== undefined && selected['GEAR'] !== null && selected['GEAR'] !== "") - { - $("#filter_gears").val(selected['GEAR']); - $("#filter_gears").find("option").first().text("Любая").attr("disabled", false); - } - - for(let i in response.engine_fuels) - { - $("#filter_engine_fuels").append(""); - } - if(selected['ENGINE_FUEL'] !== undefined && selected['ENGINE_FUEL'] !== null && selected['ENGINE_FUEL'] !== "") - { - $("#filter_engine_fuels").val(selected['ENGINE_FUEL']); - $("#filter_engine_fuels").find("option").first().text("Любой").attr("disabled", false); - } - - for(let i in response.drives) - { - $("#filter_drives").append(""); - } - if(selected['DRIVE'] !== undefined && selected['DRIVE'] !== null && selected['DRIVE'] !== "") - { - $("#filter_drives").val(selected['DRIVE']); - $("#filter_drives").find("option").first().text("Любой").attr("disabled", false); - } - - if(selected['ENGINE_VOLUME_FROM'] !== undefined && selected['ENGINE_VOLUME_FROM'] !== null && selected['ENGINE_VOLUME_FROM'] !== "") - { - $("#filter_engine_volume_from").val(selected['ENGINE_VOLUME_FROM']); - $("#filter_engine_volume_from").find("option").first().text("Любой").attr("disabled", false); - } - - if(selected['ENGINE_VOLUME_TO'] !== undefined && selected['ENGINE_VOLUME_TO'] !== null && selected['ENGINE_VOLUME_TO'] !== "") - { - $("#filter_engine_volume_to").val(selected['ENGINE_VOLUME_TO']); - $("#filter_engine_volume_to").find("option").first().text("Любой").attr("disabled", false); - } - - console.log("response", response); - }, "json"); - - $("#filter_bodies").on("change", function() - { - if($(this).val() !== "") - { $(this).find("option").first().text("Любой").attr("disabled", false); } - else - { $(this).find("option").first().text("Кузов").attr("disabled", "disabled"); } - - selected['BODY'] = $(this).val();; - updateCounter(selected); - }); - - $("#filter_drives").on("change", function() - { - if($(this).val() !== "") - { $(this).find("option").first().text("Любой").attr("disabled", false); } - else - { $(this).find("option").first().text("Привод").attr("disabled", "disabled"); } - - selected['DRIVE'] = $(this).val();; - updateCounter(selected); - }); - - $("#filter_engine_fuels").on("change", function() - { - if($(this).val() !== "") - { $(this).find("option").first().text("Любой").attr("disabled", false); } - else - { $(this).find("option").first().text("Двигатель").attr("disabled", "disabled"); } - - selected['ENGINE_FUEL'] = $(this).val();; - updateCounter(selected); - }); - - $("#filter_gears").on("change", function() - { - if($(this).val() !== "") - { $(this).find("option").first().text("Любая").attr("disabled", false); } - else - { $(this).find("option").first().text("Коробка").attr("disabled", "disabled"); } - - selected['GEAR'] = $(this).val();; - updateCounter(selected); - }); - - $("#catalog_filter_search_button").on("click", function(e) - { - e.preventDefault(); - var path = "/catalog"; - - if($("#filter_brands").val() !== undefined && $("#filter_brands").val() !== null && $("#filter_brands").val() !== "") - { - path = path+"/"+$("#filter_brands").val(); - } - if($("#filter_models").val() !== undefined && $("#filter_models").val() !== null && $("#filter_models").val() !== "") - { - path = path+"/"+$("#filter_models").val(); - } - - var p = {}; - for(let i in selected) - { - if(i !== "BRAND" && i !== "BRAND_ID" && i !== "MODEL" && i !== "MODEL_ID") - { - p[i] = selected[i]; - } - } - - path = path+"/?"+$.param(p); - window.location.href = path; - }); - - $("#filter_engine_volume_from").on("change", function() - { - if($(this).val() !== "") - { $(this).find("option").first().text("Любой").attr("disabled", false); } - else - { $(this).find("option").first().text("Объем, от").attr("disabled", "disabled"); } - - selected['ENGINE_VOLUME_FROM'] = $(this).val();; - updateCounter(selected); - }); - - $("#filter_engine_volume_to").on("change", function() - { - if($(this).val() !== "") - { $(this).find("option").first().text("Любой").attr("disabled", false); } - else - { $(this).find("option").first().text("Объем, до").attr("disabled", "disabled"); } - - selected['ENGINE_VOLUME_TO'] = $(this).val();; - updateCounter(selected); - }); -}); -*/ \ No newline at end of file +}); \ No newline at end of file diff --git a/local/components/evolution/catalog/templates/.default/template.php b/local/components/evolution/catalog/templates/.default/template.php index be04a87..ba8ec6b 100644 --- a/local/components/evolution/catalog/templates/.default/template.php +++ b/local/components/evolution/catalog/templates/.default/template.php @@ -11,104 +11,324 @@ /** @var string $componentPath */ /** @var CBitrixComponent $component */ $this->setFrameMode(true); + +$title = ""; +if(!empty($arResult['TITLES']['BRAND'])) +{ + $title .= "Новые автомобили ".$arResult['TITLES']['BRAND']; +} + +if(!empty($arResult['TITLES']['MODEL'])) +{ + $title = $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']; +} ?> + +
-

Каталог автомобилей

-
- - -
-

СКИДКИ ДО 1,5% + СПЕЦТАРИФ НА КАСКО

-
    -
  • Скидки до 1,5% при покупке
    • -
  • Land Rover в лизинг
    • -
  • Специальный тариф на каско
    • -
- - -
- -
"> -
-
-
- -
-
- -
- - -
-
-
-
"> -
- IncludeComponent( - "evolution:form.catalog.filter", - "", - Array( - "SELECTED" => $arResult['SELECTED'], - "PATH" => $arParams['PATH'], - "SORTING" => true, - "PROGRAM" => $arParams['PROGRAM'], - "SCROLL" => $arResult['SCROLL'], - ) - ); ?> -
-
- IncludeComponent( - "evolution:catalog.sort", - "", - Array( - "SORT" => $arParams['SORT'], - "FILTER" => $arResult['FILTER_SMALL'], - ) - ); ?> - 0): ?> -
- -
- - <?= $arItem['PROPERTIES']['BRAND']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['MODEL']['RELATED']['NAME']; ?> <?= $arItem['PROPERTIES']['BODY']['VALUE']; ?> -

-

- - , , л.с. -

-
    -
  • -

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

    -

    р.

    -
    • -
  • -

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

    -

    р.

    -
    • -
  • -

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

    -

    р.

    -
    • -
  • -

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

    -

    р.

    -
    • +
    +
    +

    +
    + + +
    +

    СКИДКИ ДО 1,5% + СПЕЦТАРИФ НА КАСКО

    +
      +
    • Скидки до 1,5% при покупке
      • +
    • Land Rover в лизинг
      • +
    • Специальный тариф на каско
    -
    - Рассчитать график -
    -

    + +
    - + +
    "> +
    +
    +
    + +
    +
    + +
    + + +
    +
    +
    +
    "> +
    + IncludeComponent( + "evolution:form.catalog.filter", + "", + Array( + "SELECTED" => $arResult['SELECTED'], + "PATH" => $arParams['PATH'], + "SORTING" => true, + "PROGRAM" => $arParams['PROGRAM'], + "SCROLL" => $arResult['SCROLL'], + ) + ); ?> +
    +
    + 0): ?> + IncludeComponent( + "evolution:catalog.sort", + "", + Array( + "SORT" => $arParams['SORT'], + "FILTER" => $arResult['FILTER_SMALL'], + ) + ); ?> + +
    +
    +
    +
    + + + + IncludeComponent( + "evolution:catalog.special.offers", + "", + Array( + "COUNT" => 3, + "EXTENDED" => $arResult['EXTENDED'], + "BRAND_ID" => $arResult['SELECTED']['BRAND_ID'], + ) + ); ?> + + + + IncludeComponent( + "evolution:catalog.promo.brand", + "", + Array( + "COUNT" => 3, + ) + ); ?> + + + + IncludeComponent( + "evolution:catalog.promo.model", + "", + Array( + "COUNT" => 3, + "BRAND_NAME" => $arResult['TITLES']['BRAND'], + "BRAND_CODE" => $arResult['SELECTED']['BRAND'], + "BRAND_UID" => $arResult['SELECTED']['BRAND_UID'], + ) + ); ?> + + + 0): ?> +
    + + IncludeComponent( + "evolution:catalog.list.item", + "", + $arItem + ); ?> + +
    + 1 && $arResult['PAGE_CURRENT'] != $arResult['PAGE_COUNT']): ?> + + + Показать еще + + + + + +

    Рекомендуемые модели Audi для вас

    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + */ ?> + + IncludeComponent( + "evolution:catalog.brands", + "", + Array( + "TITLE" => "Каталог автомобилей", + "SORT" => $arParams['SORT'], + "FILTER" => $arResult['FILTER_SMALL'], + ) + ); ?> + + + IncludeComponent( + "evolution:catalog.models", + "", + Array( + "BRAND" => $_REQUEST['BRAND'], + "RECOMMENDED" => true, + ) + ); ?> + + + +

    Седаны в лизинг

    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + Haval + + +
    +
    + + */ ?>
    - - +
+
\ No newline at end of file diff --git a/local/components/evolution/catalog/templates/ajax/template.php b/local/components/evolution/catalog/templates/ajax/template.php new file mode 100644 index 0000000..d76618e --- /dev/null +++ b/local/components/evolution/catalog/templates/ajax/template.php @@ -0,0 +1,22 @@ +setFrameMode(true); + +?> + + IncludeComponent( + "evolution:catalog.list.item", + "", + $arItem + ); ?> + \ No newline at end of file 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 e02c286..be3c694 100644 --- a/local/components/evolution/form.catalog.filter/templates/.default/script.js +++ b/local/components/evolution/form.catalog.filter/templates/.default/script.js @@ -1,15 +1,19 @@ -var current = {}; +var current_params = {}; var selected = {}; var inputs = {}; var path = ""; var program = null; +var updating = false; +var counter_params = undefined; +var loaded = false; +var total = undefined; function formCatalogFilter(p, pr, props) { console.log("FILTER", "program", pr); path = p; selected = props; - current = props; + current_params = props; program = pr; $(".filter_header .tabs .tab").on("click", function() @@ -19,40 +23,377 @@ function formCatalogFilter(p, pr, props) }); } -function updateCounter(parameters) +function updateCounter(parameters, reset = false) { - console.log("updateCounter", parameters); + $(".catalog_filter_select").attr("disabled", true); - $("#catalog_filter_spinner").show(); - $("#catalog_filter_search_button_counter").hide(); + console.log("updateCounter", "parameters (selected)", parameters); - var params = {}; - if(program !== null) + if(!updating) { - params['PROGRAM'] = program; + updating = true; + + $("#catalog_filter_spinner").show(); + $("#catalog_filter_spinner").show(); + $("#catalog_filter_search_button_counter").hide(); + + var params = {}; + if(program !== null) + { + params['PROGRAM'] = program; + } + + for(let i in parameters) + { + if(parameters[i] !== undefined) { params[i] = parameters[i]; } + } + + counter_params = params; + + setTimeout(function() + { + $.get("/api/catalog/parameters/", counter_params, function(response) + { + $(".catalog_filter_select").attr("disabled", false); + + if(response.brands !== undefined) + { + if(response.brands.length > 0) + { + var current = $("#filter_brands").val(); + + $("#filter_brands").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_brands").append(''); + } + else + { + $("#filter_brands").append(''); + } + + for(let i in response.brands) + { + var brand = response.brands[i]; + $("#filter_brands").append(''); + } + + $("#filter_brands").val(reset ? "" : current); + } + } + + if(response.models !== undefined) + { + var current = $("#filter_models").val(); + + $("#filter_models").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_models").append(''); + } + else + { + $("#filter_models").append(''); + } + + for(let i in response.models) + { + var model = response.models[i]; + $("#filter_models").append(''); + } + + $("#filter_models").val(reset ? "" : current); + } + + if(response.modifications !== undefined) + { + var current = $("#filter_modifications").val(); + + $("#filter_modifications").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_modifications").append(''); + } + else + { + $("#filter_modifications").append(''); + } + + for(let i in response.modifications) + { + var modification = response.modifications[i]; + $("#filter_modifications").append(''); + } + + $("#filter_modifications").val(reset ? "" : current); + } + + if(response.bodies !== undefined) + { + console.log("BODY FROM RESPONSE"); + if(response.bodies.length > 0) + { + var current = $("#filter_bodies").val(); + console.log("BODY FROM RESPONSE", "current", current); + $("#filter_bodies").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_bodies").append(''); + } + else + { + $("#filter_bodies").append(''); + } + + for(let i in response.bodies) + { + $("#filter_bodies").append(''); + } + + if(!loaded) + { + if(selected['BODY'] !== undefined && selected['BODY'] !== null && selected['BODY'] !== "") + { + $("#filter_bodies").val(selected['BODY']); + $("#filter_bodies").find("option").first().text("Любой").attr("disabled", false); + } + } + else + { + $("#filter_bodies").val(reset ? "" : current); + } + } + } + + if(response.gears !== undefined) + { + if(response.gears.length > 0) + { + var current = $("#filter_gears").val(); + $("#filter_gears").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_gears").append(''); + } + else + { + $("#filter_gears").append(''); + } + + for(let i in response.gears) + { + $("#filter_gears").append(''); + } + + if(!loaded) + { + if(selected['GEAR'] !== undefined && selected['GEAR'] !== null && selected['GEAR'] !== "") + { + $("#filter_gears").val(selected['GEAR']); + $("#filter_gears").find("option").first().text("Любая").attr("disabled", false); + } + } + else + { + $("#filter_gears").val(reset ? "" : current); + } + } + } + + if(response.engine_fuels !== undefined) + { + if(response.engine_fuels.length > 0) + { + var current = $("#filter_engine_fuels").val(); + $("#filter_engine_fuels").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_engine_fuels").append(''); + } + else + { + $("#filter_engine_fuels").append(''); + } + + for(let i in response.engine_fuels) + { + $("#filter_engine_fuels").append(''); + } + + if(!loaded) + { + if(selected['ENGINE_FUEL'] !== undefined && selected['ENGINE_FUEL'] !== null && selected['ENGINE_FUEL'] !== "") + { + $("#filter_engine_fuels").val(selected['ENGINE_FUEL']); + $("#filter_engine_fuels").find("option").first().text("Любой").attr("disabled", false); + } + } + else + { + $("#filter_engine_fuels").val(reset ? "" : current); + } + } + } + + if(response.drives !== undefined) + { + if(response.drives.length > 0) + { + var current = $("#filter_drives").val(); + $("#filter_drives").empty(); + + if(!reset && current !== "" && current !== null) + { + $("#filter_drives").append(''); + } + else + { + $("#filter_drives").append(''); + } + + for(let i in response.drives) + { + $("#filter_drives").append(''); + } + + if(!loaded) + { + if(selected['DRIVE'] !== undefined && selected['DRIVE'] !== null && selected['DRIVE'] !== "") + { + $("#filter_drives").val(selected['DRIVE']); + $("#filter_drives").find("option").first().text("Любой").attr("disabled", false); + } + } + else + { + $("#filter_drives").val(reset ? "" : current); + } + } + } + + if(response.engine_volumes !== undefined) + { + if(response.engine_volumes.length > 0) + { + var current_from = parameters['ENGINE_VOLUME_FROM'] !== undefined ? parameters['ENGINE_VOLUME_FROM'] : ""; + var current_to = parameters['ENGINE_VOLUME_TO'] !== undefined ? parameters['ENGINE_VOLUME_TO'] : ""; + + $("#filter_engine_volume_from").empty(); + $("#filter_engine_volume_to").empty(); + + if(!reset && current_from !== "" && current_from !== null) + { + $("#filter_engine_volume_from").append(''); + } + else + { + $("#filter_engine_volume_from").append(''); + } + + if(!reset && current_to !== "" && current_to !== null) + { + $("#filter_engine_volume_to").append(''); + } + else + { + $("#filter_engine_volume_to").append(''); + } + + var c = 0; + for(let i in response.engine_volumes) + { + var v = (response.engine_volumes[i] / 1000); + if(v.toString().length === 1) + { + v = v+".0"; + } + + if(c < response.engine_volumes.length - 1) + { + $("#filter_engine_volume_from").append(''); + } + + if(c > 0) + { + $("#filter_engine_volume_to").append(''); + } + c++; + } + + if(!loaded) + { + if(selected['ENGINE_VOLUME_FROM'] !== undefined && selected['ENGINE_VOLUME_FROM'] !== null && selected['ENGINE_VOLUME_FROM'] !== "") + { + $("#filter_engine_volume_from").val(selected['ENGINE_VOLUME_FROM']); + $("#filter_engine_volume_from").find("option").first().text("Любой").attr("disabled", false); + } + + if(selected['ENGINE_VOLUME_TO'] !== undefined && selected['ENGINE_VOLUME_TO'] !== null && selected['ENGINE_VOLUME_TO'] !== "") + { + $("#filter_engine_volume_to").val(selected['ENGINE_VOLUME_TO']); + $("#filter_engine_volume_to").find("option").first().text("Любой").attr("disabled", false); + } + } + else + { + $("#filter_engine_volume_from").val(reset ? "" : current_from); + $("#filter_engine_volume_to").val(reset ? "" : current_to); + } + } + } + + $("#catalog_filter_spinner").hide(); + $("#catalog_filter_search_button_counter").text("Показать "+response.total+" вариантов").show(); + $("#catalog_small_find").text("Показать "+response.total+" вариантов"); + total = response.total; + + if(response.total == 0) + { + $("#catalog_filter_search_button").attr("disabled", true); + $("#catalog_small_find").attr("disabled", true); + } + else + { + $("#catalog_filter_search_button").attr("disabled", false); + $("#catalog_small_find").attr("disabled", false); + } + + updating = false; + loaded = true; + }, "json"); + }, 100); } - for(let i in parameters) + else { - if(parameters[i] !== undefined) { params[i] = parameters[i]; } + var params = {}; + if(program !== null) + { + params['PROGRAM'] = program; + } + for(let i in parameters) + { + if(parameters[i] !== undefined) { params[i] = parameters[i]; } + } + + counter_params = params; } - - $.get("/api/catalog/count/", params, function(response) - { - $("#catalog_filter_spinner").hide(); - $("#catalog_filter_search_button_counter").text("Показать "+response.total+" вариантов").show(); - $("#catalog_small_find").text("Показать "+response.total+" вариантов"); - }, "json"); } function loadModels(uid) { + console.log("loadModels()", "uid", uid); + $.post("/api/catalog/models/", { BRAND_UID: uid }, function(response) { - console.log("loadModels", selected['MODEL_ID'], selected['MODEL']); - $("#small_filter_models").empty(); $("#filter_models").empty(); @@ -96,7 +437,6 @@ function loadModels(uid) selected['MODEL_ID'] = id; loadModifications(uid); - updateCounter(selected); } else { @@ -113,9 +453,6 @@ function loadModifications(uid) MODEL_UID: uid }, function(response) { - console.log(response); - console.log("loadModifications", selected['MODIFICATION']); - $("#filter_modifications").empty(); if(selected['MODIFICATION'] !== undefined) @@ -134,20 +471,19 @@ function loadModifications(uid) $("#filter_modifications").append(""); } - updateCounter(selected); if(selected['MODIFICATION'] !== undefined) { $("#filter_modifications").val(selected['MODIFICATION']); } - else - { - updateCounter(selected); - } + + updateCounter(selected); }, "json"); } $(function() { + $(".catalog_filter_select").attr("disabled", true); + $("#catalog_filter_form").on("submit", function(event) { event.preventDefault(); @@ -241,6 +577,8 @@ $(function() $("#filter_models").find("option").first().text("Модель").attr("disabled", "disabled"); $("#filter_modifications").empty(); $("#filter_modifications").append(""); + + updateCounter(selected); } else { @@ -259,13 +597,10 @@ $(function() loadModifications(uid); } - - updateCounter(selected); }); $("#filter_brands").on("change", function(event) { - console.log("BBBBB", $(this).val()); if($(this).val() === '') { selected['BRAND'] = undefined; @@ -313,6 +648,8 @@ $(function() selected['MODIFICATION'] = undefined; $("#filter_models").find("option").first().text("Модель").attr("disabled", "disabled"); + + updateCounter(selected); } else { @@ -324,8 +661,6 @@ $(function() $("#filter_models").find("option").first().text("Любая").attr("disabled", false); loadModifications(uid); } - - updateCounter(selected); }); $("#filter_modifications").on("change", function(event) @@ -364,76 +699,22 @@ $(function() } window.location.href = p; - //$("#catalog_small_form").submit(); + }); + + $("#catalog_filter_reset_button").on("click", function() + { + selected = {}; + updateCounter({}, true); }); $("#rich_filter_toggle").on("click", function() { + $("#catalog_special_h2").addClass("catalog_h2_title_with_filter"); updateCounter(selected); $("#filter").addClass("visible").css("display", "block"); $("#catalog_small_filter").addClass("hidden").css("display", "none"); }); - $.get("/api/catalog/parameters/", - { - params: {}, - }, function(response) - { - for(let i in response.bodies) - { - $("#filter_bodies").append(""); - } - if(selected['BODY'] !== undefined && selected['BODY'] !== null && selected['BODY'] !== "") - { - $("#filter_bodies").val(selected['BODY']); - $("#filter_bodies").find("option").first().text("Любой").attr("disabled", false); - } - - for(let i in response.gears) - { - $("#filter_gears").append(""); - } - if(selected['GEAR'] !== undefined && selected['GEAR'] !== null && selected['GEAR'] !== "") - { - $("#filter_gears").val(selected['GEAR']); - $("#filter_gears").find("option").first().text("Любая").attr("disabled", false); - } - - for(let i in response.engine_fuels) - { - $("#filter_engine_fuels").append(""); - } - if(selected['ENGINE_FUEL'] !== undefined && selected['ENGINE_FUEL'] !== null && selected['ENGINE_FUEL'] !== "") - { - $("#filter_engine_fuels").val(selected['ENGINE_FUEL']); - $("#filter_engine_fuels").find("option").first().text("Любой").attr("disabled", false); - } - - for(let i in response.drives) - { - $("#filter_drives").append(""); - } - if(selected['DRIVE'] !== undefined && selected['DRIVE'] !== null && selected['DRIVE'] !== "") - { - $("#filter_drives").val(selected['DRIVE']); - $("#filter_drives").find("option").first().text("Любой").attr("disabled", false); - } - - if(selected['ENGINE_VOLUME_FROM'] !== undefined && selected['ENGINE_VOLUME_FROM'] !== null && selected['ENGINE_VOLUME_FROM'] !== "") - { - $("#filter_engine_volume_from").val(selected['ENGINE_VOLUME_FROM']); - $("#filter_engine_volume_from").find("option").first().text("Любой").attr("disabled", false); - } - - if(selected['ENGINE_VOLUME_TO'] !== undefined && selected['ENGINE_VOLUME_TO'] !== null && selected['ENGINE_VOLUME_TO'] !== "") - { - $("#filter_engine_volume_to").val(selected['ENGINE_VOLUME_TO']); - $("#filter_engine_volume_to").find("option").first().text("Любой").attr("disabled", false); - } - - console.log("response", response); - }, "json"); - $("#filter_bodies").on("change", function() { if($(this).val() !== "") @@ -481,28 +762,37 @@ $(function() $("#catalog_filter_search_button").on("click", function(e) { e.preventDefault(); - var p = path; - if($("#filter_brands").val() !== undefined && $("#filter_brands").val() !== null && $("#filter_brands").val() !== "") + if(total > 0) { - p = p + $("#filter_brands").val()+"/"; - } - if($("#filter_models").val() !== undefined && $("#filter_models").val() !== null && $("#filter_models").val() !== "") - { - p = p + $("#filter_models").val()+"/"; - } + var p = path; - var pa = {}; - for(let i in selected) - { - if(i !== "BRAND" && i !== "BRAND_ID" && i !== "MODEL" && i !== "MODEL_ID") + if($("#filter_brands").val() !== undefined && $("#filter_brands").val() !== null && $("#filter_brands").val() !== "") { - pa[i] = selected[i]; + p = p + $("#filter_brands").val()+"/"; + } + if($("#filter_models").val() !== undefined && $("#filter_models").val() !== null && $("#filter_models").val() !== "") + { + p = p + $("#filter_models").val()+"/"; } - } - p = p + "?"+$.param(pa); - window.location.href = p; + var pa = {}; + var pa_count = 0; + for(let i in selected) + { + if(i !== "BRAND" && i !== "BRAND_ID" && i !== "BRAND_UID" && i !== "MODEL" && i !== "MODEL_ID") + { + if(selected[i] !== undefined && selected[i] !== null && selected[i] !== "") + { + pa[i] = selected[i]; + pa_count++; + } + } + } + + if(pa_count > 0) { p = p + "?"+$.param(pa); } + window.location.href = p; + } }); $("#filter_engine_volume_from").on("change", function() @@ -527,49 +817,33 @@ $(function() updateCounter(selected); }); - /* - $("#engine_power_from").on("change", function(event) - { - inputs['engine_power_from'] = event.target.value; - }); - - $("#engine_power_to").on("change", function(event) - { - inputs['engine_power_to'] = event.target.value; - }); - - $("#engine_volume_from").on("change", function(event) - { - inputs['engine_volume_from'] = event.target.value; - }); - - $("#engine_volume_to").on("change", function(event) - { - inputs['engine_volume_to'] = event.target.value; - }); - */ - $(".sort_option").on("click", function() { console.log("path", path); + console.log("current_params", current_params); + var value = $(this).data("value"); var p = path; var o = {}; - for(let i in current) + + for(let i in current_params) { - if(i !== "SORT" && i !== "BRAND" && i !== "MODEL" && i !== "BRAND_ID" && i !== "MODEL_ID") + if(i !== "SORT" && i !== "BRAND" && i !== "MODEL" && i !== "BRAND_ID" && i !== "BRAND_UID" && i !== "MODEL_ID") { - o[i] = current[i]; + o[i] = current_params[i]; } } - if(current['BRAND'] !== undefined) + + if(current_params['BRAND'] !== undefined) { - p = p + current['BRAND']+"/"; + p = p + current_params['BRAND']+"/"; } - if(current['MODEL'] !== undefined) + + if(current_params['MODEL'] !== undefined) { - p = p + current['MODEL']+"/"; + p = p + current_params['MODEL']+"/"; } + p = p+"?"; //if(value !== "name") //{ @@ -579,9 +853,10 @@ $(function() var params = $.param(o); if(params.length > 0) { - p = "&"+params; + p += "&"+params; } + //console.log("p", p); document.location.href = p; }); 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 0b6b837..cec3110 100644 --- a/local/components/evolution/form.catalog.filter/templates/.default/template.php +++ b/local/components/evolution/form.catalog.filter/templates/.default/template.php @@ -59,40 +59,21 @@ $this->setFrameMode(true); .catalog_filter_spinner_animation div { box-sizing: content-box; }
-
-
- Новые
-
С пробегом
-
Все
- */ - ?> -
- -
- -
- - -
-
-
-
@@ -100,18 +81,18 @@ $this->setFrameMode(true);
-
-
-
@@ -119,13 +100,13 @@ $this->setFrameMode(true);
-
- @@ -135,7 +116,7 @@ $this->setFrameMode(true);
- @@ -159,4 +140,26 @@ $this->setFrameMode(true); ?>
+
+
+ Новые
+
С пробегом
+
Все
+ */ + ?> +
+
+ + +
+
\ No newline at end of file diff --git a/local/components/evolution/leasing.programs.entry/component.php b/local/components/evolution/leasing.programs.entry/component.php index 6d02824..d4e6ea4 100644 --- a/local/components/evolution/leasing.programs.entry/component.php +++ b/local/components/evolution/leasing.programs.entry/component.php @@ -64,6 +64,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $APPLICATION->SetPageProperty("title", $meta['ELEMENT_META_TITLE']); $APPLICATION->SetPageProperty("keywords", $meta['ELEMENT_META_KEYWORDS']); $APPLICATION->SetPageProperty("description", $meta['ELEMENT_META_DESCRIPTION']); + + $APPLICATION->AddHeadString(''); } $this->IncludeComponentTemplate(); diff --git a/local/components/evolution/leasing.programs.faq/templates/.default/script.js b/local/components/evolution/leasing.programs.faq/templates/.default/script.js index e9260b5..bbf8117 100644 --- a/local/components/evolution/leasing.programs.faq/templates/.default/script.js +++ b/local/components/evolution/leasing.programs.faq/templates/.default/script.js @@ -3,10 +3,34 @@ var faq_item_index = 0; $(function() { + var hash = document.location.hash.replace("#", ""); + + if(hash !== "") + { + $(".faq_item_title").each(function() + { + if($(this).data('id') == hash) + { + faq_section_index = $(this).data('section'); + faq_item_index = $(this).data('index'); + + $(".faq_section_button").removeClass("active"); + $(".faq_section_button_"+faq_section_index).addClass("active"); + $(".faq_items_list").css("display", "none"); + $(".faq_items_list_"+faq_section_index).css("display", "block"); + + $(".faq_item").removeClass("open"); + $(".faq_item_"+faq_item_index).addClass("open"); + + return false; + } + }); + } + $(".faq_item_title").on("click", function() { - let id = $(this).data('id'); - faq_item_index = id; + let index = $(this).data('index'); + faq_item_index = index; }); $("#faq_search_form_field").on("keydown", function(event) @@ -45,10 +69,14 @@ $(function() let section = $(this).data('section'); faq_section_index = section; + faq_item_index = 0; $(".faq_section_button").removeClass("active"); $(".faq_section_button_"+section).addClass("active"); $(".faq_items_list").css("display", "none"); $(".faq_items_list_"+section).css("display", "block"); + + $(".faq_item").removeClass("open"); + $(".faq_item_"+faq_item_index).addClass("open"); }); }); \ No newline at end of file diff --git a/local/components/evolution/leasing.programs.faq/templates/.default/template.php b/local/components/evolution/leasing.programs.faq/templates/.default/template.php index 61b1284..461b072 100644 --- a/local/components/evolution/leasing.programs.faq/templates/.default/template.php +++ b/local/components/evolution/leasing.programs.faq/templates/.default/template.php @@ -48,8 +48,8 @@ $this->setFrameMode(true);
"> -
"> -
+
faq_item faq_item_"> +

diff --git a/local/components/evolution/services.entry/component.php b/local/components/evolution/services.entry/component.php index 0e9d36a..226bd9d 100644 --- a/local/components/evolution/services.entry/component.php +++ b/local/components/evolution/services.entry/component.php @@ -64,6 +64,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $APPLICATION->SetPageProperty("title", $meta['ELEMENT_META_TITLE']); $APPLICATION->SetPageProperty("keywords", $meta['ELEMENT_META_KEYWORDS']); $APPLICATION->SetPageProperty("description", $meta['ELEMENT_META_DESCRIPTION']); + + $APPLICATION->AddHeadString(''); } $this->IncludeComponentTemplate(); diff --git a/local/components/evolution/special.offers.offer/component.php b/local/components/evolution/special.offers.offer/component.php index 7a558f1..6ba66cb 100644 --- a/local/components/evolution/special.offers.offer/component.php +++ b/local/components/evolution/special.offers.offer/component.php @@ -75,6 +75,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $APPLICATION->SetPageProperty("title", $meta['ELEMENT_META_TITLE']); $APPLICATION->SetPageProperty("keywords", $meta['ELEMENT_META_KEYWORDS']); $APPLICATION->SetPageProperty("description", $meta['ELEMENT_META_DESCRIPTION']); + + $APPLICATION->AddHeadString(''); } $this->IncludeComponentTemplate(); diff --git a/local/ilsa_update.php b/local/ilsa_update.php index db3aa33..ef79316 100644 --- a/local/ilsa_update.php +++ b/local/ilsa_update.php @@ -130,19 +130,27 @@ foreach($brands_and_models AS $brand_uid => $brand) //{ //добавляем новую марку $brand_existed = null; - $brand_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => 8, "PROPERTY_UID" => $brand_uid ], false, ["nPageSize" => 1], ["ID"] ); + $brand_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => 8, "PROPERTY_UID" => $brand_uid ], false, ["nPageSize" => 1], [] ); while($brand_search_ob = $brand_search_res->GetNextElement()) { $brand_existed = $brand_search_ob->GetFields(); + $brand_existed['PROPERTIES'] = $brand_search_ob->GetProperties(); + $bitrix_brands[$brand_uid] = $brand_existed['ID']; } $code = CUtil::translit( $brand['name'], "ru", [ "max_len" => 255, "change_case" => "L", "replace_space" => "-", "replace_other" => "-", ] ); if($brand_existed !== null) { - $brand_update_element = new CIBlockElement; - $brand_update_payload = [ "IBLOCK_SECTION" => false, "PROPERTY_VALUES" => [ "UID" => $brand_uid ], "NAME" => $brand['name'], "CODE" => $code, "ACTIVE" => "Y", ]; - $brand_update_result = $brand_update_element->Update($brand_existed['ID'], $brand_update_payload); + $brand_update_payload = [ + "ACTIVE" => "Y", + "CODE" => $code, + "UID" => $brand_uid, + "NAME" => $brand['name'], + "TRANSCRIPTION" => $brand_existed['PROPERTIES']['TRANSCRIPTION']['VALUE'], + "PROMO" => $brand_existed['PROPERTIES']['PROMO']['VALUE_ENUM_ID'], + ]; + CIBlockElement::SetPropertyValuesEx($brand_existed['ID'], IBLOCK_ID_BRANDS, $brand_update_payload, []); $result = models_check($bitrix_models, $bitrix_modifications, $bitrix_modifications_codes, $brand_uid, $brand); @@ -153,7 +161,17 @@ foreach($brands_and_models AS $brand_uid => $brand) else { $brand_element = new CIBlockElement; - $brand_payload = [ "IBLOCK_SECTION_ID" => false, "IBLOCK_ID" => 8, "PROPERTY_VALUES" => [ "UID" => $brand_uid ], "NAME" => $brand['name'], "CODE" => $code, "ACTIVE" => "Y", ]; + $brand_payload = [ + "IBLOCK_SECTION_ID" => false, + "IBLOCK_ID" => 8, + "PROPERTY_VALUES" => [ + "UID" => $brand_uid, + "TRANSCRIPTION" => $brand['name'], + ], + "NAME" => $brand['name'], + "CODE" => $code, + "ACTIVE" => "Y", + ]; if($new_brand_id = $brand_element->Add($brand_payload)) { @@ -195,9 +213,7 @@ function set_brand_activity($brand_uid, $active = "N") if($brand_id !== null) { - $brand_update_element = new CIBlockElement; - $brand_update_payload = [ "ACTIVE" => $active, ]; - $brand_update_result = $brand_update_element->Update($brand_id, $brand_update_payload); + CIBlockElement::SetPropertyValuesEx($brand_id, IBLOCK_ID_BRANDS, [ "ACTIVE" => $active, ], []); } } @@ -214,9 +230,7 @@ function set_model_activity($model_uid, $active = "N") if($model_id !== null) { - $model_update_element = new CIBlockElement; - $model_update_payload = [ "ACTIVE" => $active, ]; - $model_update_result = $model_update_element->Update($model_id, $model_update_payload); + CIBlockElement::SetPropertyValuesEx($model_id, IBLOCK_ID_MODELS, [ "ACTIVE" => $active, ], []); } } @@ -233,16 +247,14 @@ function set_modification_activity($modification_code, $active = "N") if($modification_id !== null) { - $modification_update_element = new CIBlockElement; - $modification_update_payload = [ "ACTIVE" => $active, ]; - $modification_update_result = $modification_update_element->Update($modification_id, $modification_update_payload); + CIBlockElement::SetPropertyValuesEx($modification_id, IBLOCK_ID_MODIFICATIONS, [ "ACTIVE" => $active, ], []); } } function set_car_activity($car_uid, $active = "N") { $car_id = null; - $car_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => 1, "PROPERTY_UID" => $car_uid ], false, false, [] ); + $car_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_UID" => $car_uid ], false, false, [] ); while($car_search_ob = $car_search_res->GetNextElement()) { @@ -252,9 +264,7 @@ function set_car_activity($car_uid, $active = "N") if($car_id !== null) { - $car_update_element = new CIBlockElement; - $car_update_payload = [ "ACTIVE" => $active, ]; - $car_update_result = $car_update_element->Update($car_id, $car_update_payload); + CIBlockElement::SetPropertyValuesEx($car_id, IBLOCK_ID_CATALOG_CARS_NEW, [ "ACTIVE" => $active, ], []); } } @@ -265,10 +275,12 @@ function models_check($bitrix_models, $bitrix_modifications, $bitrix_modificatio $model_name = $model['name']; $model_existed = null; - $model_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => 9, "PROPERTY_UID" => $model_uid ], false, ["nPageSize" => 1], ["ID"] ); + $model_search_res = CIBlockElement::GetList( [], [ "IBLOCK_ID" => 9, "PROPERTY_UID" => $model_uid ], false, ["nPageSize" => 1], [] ); while($model_search_ob = $model_search_res->GetNextElement()) { $model_existed = $model_search_ob->GetFields(); + $model_existed['PROPERTIES'] = $model_search_ob->GetProperties(); + $bitrix_models[$model_uid] = $model_existed['ID']; } @@ -278,14 +290,31 @@ function models_check($bitrix_models, $bitrix_modifications, $bitrix_modificatio { //print "MODEL ".$model_uid." EXISTED"; - $model_update_element = new CIBlockElement; - $model_update_payload = [ "IBLOCK_SECTION" => false, "PROPERTY_VALUES" => [ "BRAND_UID" => $brand_uid, "UID" => $model_uid, ], "NAME" => $model_name, "CODE" => $code, "ACTIVE" => "Y", ]; - $model_update_result = $model_update_element->Update($model_existed['ID'], $model_update_payload); + $model_update_payload = [ + "BRAND_UID" => $brand_uid, + "UID" => $model_uid, + "PROMO" => $model_existed['PROPERTIES']['PROMO']['VALUE_ENUM_ID'], + "NAME" => $model_name, + "CODE" => $code, + "ACTIVE" => "Y", + ]; + + CIBlockElement::SetPropertyValuesEx($model_existed['ID'], IBLOCK_ID_MODELS, $model_update_payload, []); } else { $model_element = new CIBlockElement; - $model_payload = [ "IBLOCK_SECTION_ID" => false, "IBLOCK_ID" => 9, "PROPERTY_VALUES" => [ "BRAND_UID" => $brand_uid, "UID" => $model_uid, ], "NAME" => $model_name, "CODE" => $code, "ACTIVE" => "Y", ]; + $model_payload = [ + "IBLOCK_SECTION_ID" => false, + "IBLOCK_ID" => 9, + "PROPERTY_VALUES" => [ + "BRAND_UID" => $brand_uid, + "UID" => $model_uid, + ], + "NAME" => $model_name, + "CODE" => $code, + "ACTIVE" => "Y", + ]; if($new_model_id = $model_element->Add($model_payload)) { @@ -409,9 +438,7 @@ foreach($json AS $car) if($car_existed !== null) { - $car_update_element = new CIBlockElement; - $car_update_payload = [ "IBLOCK_SECTION" => false, "NAME" => $name, "CODE" => $code, "PROPERTY_VALUES" => $PROPERTY_VALUES, "ACTIVE" => "Y", ]; - $car_update_result = $car_update_element->Update($car_existed['ID'], $car_update_payload); + CIBlockElement::SetPropertyValuesEx($model_existed['ID'], IBLOCK_ID_MODELS, array_merge($car_update_payload, $PROPERTY_VALUES), []); } else { diff --git a/local/templates/.default/components/bitrix/breadcrumb/evolution/template.php b/local/templates/.default/components/bitrix/breadcrumb/evolution/template.php index bcb83c1..b937707 100644 --- a/local/templates/.default/components/bitrix/breadcrumb/evolution/template.php +++ b/local/templates/.default/components/bitrix/breadcrumb/evolution/template.php @@ -10,7 +10,7 @@ if(empty($arResult)) $strReturn = ''; -$strReturn .= '
'; +$strReturn .= '
'; $itemSize = count($arResult); for($index = 0; $index < $itemSize; $index++) diff --git a/local/templates/.default/components/bitrix/menu/evolution/template.php b/local/templates/.default/components/bitrix/menu/evolution/template.php index efbc70a..fcb87dc 100644 --- a/local/templates/.default/components/bitrix/menu/evolution/template.php +++ b/local/templates/.default/components/bitrix/menu/evolution/template.php @@ -4,23 +4,46 @@ +
+
+
+
+ +
+ +
+
+ - 8 800 333 75 75 +
+ 8 800 333 75 75 + IncludeComponent( + "evolution:callback.button", + "", + Array() + ); ?> +
- +
\ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/.parameters.php b/local/templates/.default/components/bitrix/search.page/evolution/.parameters.php new file mode 100644 index 0000000..3c28a7a --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/.parameters.php @@ -0,0 +1,43 @@ + Array( + "NAME" => GetMessage("TP_BSP_USE_SUGGEST"), + "TYPE" => "CHECKBOX", + "DEFAULT" => "N", + ), +); +if(COption::GetOptionString("search", "use_social_rating") == "Y") +{ + $arTemplateParameters["SHOW_RATING"] = Array( + "NAME" => GetMessage("TP_BSP_SHOW_RATING"), + "TYPE" => "LIST", + "VALUES" => Array( + "" => GetMessage("TP_BSP_SHOW_RATING_CONFIG"), + "Y" => GetMessage("MAIN_YES"), + "N" => GetMessage("MAIN_NO"), + ), + "MULTIPLE" => "N", + "DEFAULT" => "", + ); + $arTemplateParameters["RATING_TYPE"] = Array( + "NAME" => GetMessage("TP_BSP_RATING_TYPE"), + "TYPE" => "LIST", + "VALUES" => Array( + "" => GetMessage("TP_BSP_RATING_TYPE_CONFIG"), + "like" => GetMessage("TP_BSP_RATING_TYPE_LIKE_TEXT"), + "like_graphic" => GetMessage("TP_BSP_RATING_TYPE_LIKE_GRAPHIC"), + "standart_text" => GetMessage("TP_BSP_RATING_TYPE_STANDART_TEXT"), + "standart" => GetMessage("TP_BSP_RATING_TYPE_STANDART_GRAPHIC"), + ), + "MULTIPLE" => "N", + "DEFAULT" => "", + ); + $arTemplateParameters["PATH_TO_USER_PROFILE"] = Array( + "NAME" => GetMessage("TP_BSP_PATH_TO_USER_PROFILE"), + "TYPE" => "STRING", + "DEFAULT" => "", + ); +} +?> diff --git a/local/templates/.default/components/bitrix/search.page/evolution/chain_template.php b/local/templates/.default/components/bitrix/search.page/evolution/chain_template.php new file mode 100644 index 0000000..bbf2055 --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/chain_template.php @@ -0,0 +1,16 @@ + "") + $arChainBody[] = ''.htmlspecialcharsex($item["TITLE"]).''; + else + $arChainBody[] = htmlspecialcharsex($item["TITLE"]); +} +return implode(' / ', $arChainBody); +?> \ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/lang/en/.parameters.php b/local/templates/.default/components/bitrix/search.page/evolution/lang/en/.parameters.php new file mode 100644 index 0000000..0efb009 --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/lang/en/.parameters.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/lang/en/template.php b/local/templates/.default/components/bitrix/search.page/evolution/lang/en/template.php new file mode 100644 index 0000000..ed89de2 --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/lang/en/template.php @@ -0,0 +1,27 @@ +Search query syntax:

A common search query is one or more words, for example:
contact information
This query will find pages containing both query words.

Logical operators allow building more complex queries, for example:
contact information or phone
This query will find pages containing either words "contact" and "information" or "phone".

contact information not phone
This query will find pages containing words "contact" and "information" but not "phone".
You can use brackets to build more complex queries.
"; +$MESS["SEARCH_LOGIC"] = "Logical operators:"; +$MESS["SEARCH_OPERATOR"] = "Operator"; +$MESS["SEARCH_SYNONIM"] = " Synonyms"; +$MESS["SEARCH_DESCRIPTION"] = "Description"; +$MESS["SEARCH_AND"] = "and"; +$MESS["SEARCH_AND_ALT"] = "Operator logical and is implied and can be omitted: a query "contact information" is fully equivalent to "contact and information"."; +$MESS["SEARCH_OR"] = "or"; +$MESS["SEARCH_OR_ALT"] = "Operator logical or allows searching for entities containing at least one of the operands."; +$MESS["SEARCH_NOT"] = "not"; +$MESS["SEARCH_NOT_ALT"] = "Operator logical not restricts searches to pages not containing the operand."; +$MESS["SEARCH_BRACKETS_ALT"] = "Round brackets define the logical operator precedence."; +$MESS["SEARCH_MODIFIED"] = "Modified:"; +$MESS["SEARCH_NOTHING_TO_FOUND"] = "Unfortunately, your search did not match any documents."; +$MESS["SEARCH_PATH"] = "Path:"; +$MESS["SEARCH_SORT_BY_RANK"] = "Sort by relevance"; +$MESS["SEARCH_SORTED_BY_DATE"] = "Sorted by date"; +$MESS["SEARCH_SORTED_BY_RANK"] = "Sorted by relevance"; +$MESS["SEARCH_SORT_BY_DATE"] = "Sort by date"; +$MESS["CT_BSP_ADDITIONAL_PARAMS"] = "Additional search criteria"; +$MESS["CT_BSP_KEYBOARD_WARNING"] = "Query input language changed for \"#query#\"."; +?> \ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/lang/ru/.parameters.php b/local/templates/.default/components/bitrix/search.page/evolution/lang/ru/.parameters.php new file mode 100644 index 0000000..0164a62 --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/lang/ru/.parameters.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/lang/ru/template.php b/local/templates/.default/components/bitrix/search.page/evolution/lang/ru/template.php new file mode 100644 index 0000000..4500a2f --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/lang/ru/template.php @@ -0,0 +1,27 @@ +Синтаксис поискового запроса:

Обычно запрос представляет из себя просто одно или несколько слов, например:
контактная информация
По такому запросу будут найдены страницы, на которых встречаются оба слова запроса.

Логические операторы позволяют строить более сложные запросы, например:
контактная информация или телефон
По такому запросу будут найдены страницы, на которых встречаются либо слова "контактная" и "информация", либо слово "телефон".

контактная информация не телефон
По такому запросу будут найдены страницы, на которых встречаются либо слова "контактная" и "информация", но не встречается слово "телефон".
Вы можете использовать скобки для построения более сложных запросов.
"; +$MESS["SEARCH_LOGIC"] = "Логические операторы:"; +$MESS["SEARCH_OPERATOR"] = "Оператор"; +$MESS["SEARCH_SYNONIM"] = " Синонимы"; +$MESS["SEARCH_DESCRIPTION"] = "Описание"; +$MESS["SEARCH_AND"] = "и"; +$MESS["SEARCH_AND_ALT"] = "Оператор логическое "и" подразумевается, его можно опускать: запрос "контактная информация" полностью эквивалентен запросу "контактная и информация"."; +$MESS["SEARCH_OR"] = "или"; +$MESS["SEARCH_OR_ALT"] = "Оператор логическое "или" позволяет искать товары, содержащие хотя бы один из операндов."; +$MESS["SEARCH_NOT"] = "не"; +$MESS["SEARCH_NOT_ALT"] = "Оператор логическое "не" ограничивает поиск страниц, не содержащих слово, указанное после оператора."; +$MESS["SEARCH_BRACKETS_ALT"] = "Круглые скобки задают порядок действия логических операторов."; +$MESS["SEARCH_MODIFIED"] = "Изменен:"; +$MESS["SEARCH_NOTHING_TO_FOUND"] = "К сожалению, на ваш поисковый запрос ничего не найдено."; +$MESS["SEARCH_PATH"] = "Путь:"; +$MESS["SEARCH_SORT_BY_RANK"] = "Сортировать по релевантности"; +$MESS["SEARCH_SORTED_BY_DATE"] = "Отсортировано по дате"; +$MESS["SEARCH_SORTED_BY_RANK"] = "Отсортировано по релевантности"; +$MESS["SEARCH_SORT_BY_DATE"] = "Сортировать по дате"; +$MESS["CT_BSP_ADDITIONAL_PARAMS"] = "Дополнительные параметры поиска"; +$MESS["CT_BSP_KEYBOARD_WARNING"] = "В запросе \"#query#\" восстановлена раскладка клавиатуры."; +?> \ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/result_modifier.php b/local/templates/.default/components/bitrix/search.page/evolution/result_modifier.php new file mode 100644 index 0000000..fb2281d --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/result_modifier.php @@ -0,0 +1,219 @@ +__component; // объект компонента +// +//if (is_object($cp)) +//{ +// // добавим в arResult компонента два поля - MY_TITLE и IS_OBJECT +// $cp->arResult['MY_TITLE'] = 'Мое название'; +// $cp->arResult['IS_OBJECT'] = 'Y'; +// $cp->SetResultCacheKeys(array('MY_TITLE','IS_OBJECT')); +// +// $APPLICATION->SetTitle($cp->arResult['MY_TITLE']); // не будет работать на каждом хите: +////отработает только первый раз, затем будет все браться из кеша и вызова $APPLICATION->SetTitle() +//// не будет. Поэтому изменение title делается в component_epilog, который выполняется на каждом хите. +// +//} + +$catalog_positions_ids = []; +$catalog_positions = []; + +$special_offers_ids = []; +$special_offers = []; + +$programs_ids = []; +$programs = []; + +$news_ids = []; +$news = []; + +$services_ids = []; +$services = []; + +foreach($arResult['SEARCH'] AS $arItem) +{ + if($arItem['PARAM2'] == IBLOCK_ID_CATALOG_CARS_NEW) + { + array_push($catalog_positions_ids, $arItem['ITEM_ID']); + } + + if($arItem['PARAM2'] == IBLOCK_ID_NEWS) + { + array_push($news_ids, $arItem['ITEM_ID']); + } + + if($arItem['PARAM2'] == IBLOCK_ID_SPECIALS) + { + array_push($special_offers_ids, $arItem['ITEM_ID']); + } + + if($arItem['PARAM2'] == IBLOCK_ID_SERVICES) + { + array_push($services_ids, $arItem['ITEM_ID']); + } + + if($arItem['PARAM2'] == IBLOCK_ID_PROGRAMS) + { + array_push($programs_ids, $arItem['ITEM_ID']); + } +} + +//print_r($catalog_positions_ids); +if(count($news_ids) > 0) +{ + $res_news = CIBlockElement::GetList([ 'NAME' => 'ASC' ], [ 'IBLOCK_ID' => IBLOCK_ID_NEWS, 'ID' => $news_ids ], false, [ + ]); + + while ($ob_element_news = $res_news->GetNextElement()) + { + $ar_res_news = $ob_element_news->GetFields(); + $ar_res_news['PROPERTIES'] = $ob_element_news->GetProperties(); + if(isset($ar_res_news['PREVIEW_PICTURE'])) + { + $ar_res_news['PREVIEW_PICTURE'] = CFile::GetPath($ar_res_news['PREVIEW_PICTURE']); + } + + $news[$ar_res_news['ID']] = $ar_res_news; + } +} + +if(count($special_offers_ids) > 0) +{ + $res_specials = CIBlockElement::GetList([ 'NAME' => 'ASC' ], [ 'IBLOCK_ID' => IBLOCK_ID_SPECIALS, 'ID' => $special_offers_ids ], false, [ + ]); + + while ($ob_element_specials = $res_specials->GetNextElement()) + { + $ar_res_specials = $ob_element_specials->GetFields(); + $ar_res_specials['PROPERTIES'] = $ob_element_specials->GetProperties(); + if(isset($ar_res_specials['PREVIEW_PICTURE'])) + { + $ar_res_specials['PREVIEW_PICTURE'] = CFile::GetPath($ar_res_specials['PREVIEW_PICTURE']); + } + + $special_offers[$ar_res_specials['ID']] = $ar_res_specials; + } +} + +if(count($services_ids) > 0) +{ + $res_services = CIBlockElement::GetList([ 'NAME' => 'ASC' ], [ 'IBLOCK_ID' => IBLOCK_ID_SERVICES, 'ID' => $services_ids ], false, [ + ]); + + while ($ob_element_services = $res_services->GetNextElement()) + { + $ar_res_services = $ob_element_services->GetFields(); + $ar_res_services['PROPERTIES'] = $ob_element_services->GetProperties(); + if(isset($ar_res_services['PREVIEW_PICTURE'])) + { + $ar_res_services['PREVIEW_PICTURE'] = CFile::GetPath($ar_res_services['PREVIEW_PICTURE']); + } + + $services[$ar_res_services['ID']] = $ar_res_services; + } +} + +if(count($programs_ids) > 0) +{ + $res_programs = CIBlockElement::GetList([ 'NAME' => 'ASC' ], [ 'IBLOCK_ID' => IBLOCK_ID_PROGRAMS, 'ID' => $programs_ids ], false, [ + ]); + + while ($ob_element_programs = $res_programs->GetNextElement()) + { + $ar_res_programs = $ob_element_programs->GetFields(); + $ar_res_programs['PROPERTIES'] = $ob_element_programs->GetProperties(); + if(isset($ar_res_programs['PREVIEW_PICTURE'])) + { + $ar_res_programs['PREVIEW_PICTURE'] = CFile::GetPath($ar_res_programs['PREVIEW_PICTURE']); + } + + $programs[$ar_res_programs['ID']] = $ar_res_programs; + } +} + +if(count($catalog_positions_ids) > 0) +{ + $res_catalog = CIBlockElement::GetList([ 'NAME' => 'ASC' ], [ 'IBLOCK_ID' => IBLOCK_ID_CATALOG_CARS_NEW, 'ID' => $catalog_positions_ids ], false, [ + /* + "NAME", + "DETAIL_PAGE_URL", + "BRAND", + "MODEL", + "BODY", + "MODIFICATION", + "ENGINE_FUEL", + "GEAR", + "ENGINE_POWER", + "PRICE", + "IMAGE_URL", + */ + ]); + + while ($ob_element_catalog = $res_catalog->GetNextElement()) + { + $ar_res_catalog = $ob_element_catalog->GetFields(); + $ar_res_catalog['PROPERTIES'] = $ob_element_catalog->GetProperties(); + $ar_res_catalog['PROPERTIES']['BRAND']['RELATED'] = get_related(IBLOCK_ID_BRANDS, $ar_res_catalog['PROPERTIES']['BRAND']['VALUE']); + $ar_res_catalog['PROPERTIES']['MODEL']['RELATED'] = get_related(IBLOCK_ID_MODELS, $ar_res_catalog['PROPERTIES']['MODEL']['VALUE']); + $ar_res_catalog['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(IBLOCK_ID_MODIFICATIONS, $ar_res_catalog['PROPERTIES']['MODIFICATION']['VALUE']); + + $ar_res_catalog['CALCULATION'] = []; + $ar_res_catalog['CALCULATION']['MONTHLY'] = number_format((($ar_res_catalog['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); + $ar_res_catalog['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res_catalog['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); + $ar_res_catalog['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res_catalog['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); + + $catalog_positions[$ar_res_catalog['ID']] = $ar_res_catalog; + + //print $ar_res_catalog['ID']." - ".$ar_res_catalog['NAME']."\n"; + } +} + +foreach($arResult['SEARCH'] AS $key => $item) +{ + if($item['PARAM2'] == IBLOCK_ID_CATALOG_CARS_NEW) + { + if(isset($catalog_positions[$item['ITEM_ID']])) + { + $arResult['SEARCH'][$key]['CAR'] = $catalog_positions[$item['ITEM_ID']]; + } + } + + if($item['PARAM2'] == IBLOCK_ID_NEWS) + { + if(isset($news[$item['ITEM_ID']])) + { + $arResult['SEARCH'][$key]['ENTRY'] = $news[$item['ITEM_ID']]; + } + } + + if($item['PARAM2'] == IBLOCK_ID_SPECIALS) + { + if(isset($special_offers[$item['ITEM_ID']])) + { + $arResult['SEARCH'][$key]['OFFER'] = $special_offers[$item['ITEM_ID']]; + } + } + + if($item['PARAM2'] == IBLOCK_ID_SERVICES) + { + if(isset($services[$item['ITEM_ID']])) + { + $arResult['SEARCH'][$key]['ENTRY'] = $services[$item['ITEM_ID']]; + } + } + + if($item['PARAM2'] == IBLOCK_ID_PROGRAMS) + { + if(isset($programs[$item['ITEM_ID']])) + { + $arResult['SEARCH'][$key]['ENTRY'] = $programs[$item['ITEM_ID']]; + } + } +} + +?> diff --git a/local/templates/.default/components/bitrix/search.page/evolution/style.css b/local/templates/.default/components/bitrix/search.page/evolution/style.css new file mode 100644 index 0000000..97b736c --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/style.css @@ -0,0 +1,8 @@ +a.search-page-params { + border-bottom: 1px dashed blue; + text-decoration: none; +} +div.search-page-params { + margin-top: 6px; +} +.search-item-rate {font-size: 11px;} \ No newline at end of file diff --git a/local/templates/.default/components/bitrix/search.page/evolution/template.php b/local/templates/.default/components/bitrix/search.page/evolution/template.php new file mode 100644 index 0000000..a60e8d7 --- /dev/null +++ b/local/templates/.default/components/bitrix/search.page/evolution/template.php @@ -0,0 +1,140 @@ + +

Результаты поиска

+
+
+
+
+ " /> +
+ +
+
+ + 0 ): ?> + + +
+

Ничего не найдено.
Попробуйте изменить запрос и повторить поиск

+
+ + + +
\ No newline at end of file diff --git a/local/templates/.default/components/bitrix/system.pagenavigation/catalog/template.php b/local/templates/.default/components/bitrix/system.pagenavigation/catalog/template.php index 969464f..4a2dcb3 100644 --- a/local/templates/.default/components/bitrix/system.pagenavigation/catalog/template.php +++ b/local/templates/.default/components/bitrix/system.pagenavigation/catalog/template.php @@ -8,10 +8,20 @@ function _renderPageNumber($section, $page, $p, $query) { if($page == $p) { - return "
  • ". $p ."
    • "; + if($p === 1) + { + return "
  • ". $p ."
    • "; + } + + return "
  • ". $p ."
    • "; } - return "
  • ". $p ."
    • "; + if($p === 1) + { + return "
  • ". $p ."
    • "; + } + + return "
  • ". $p ."
    • "; } $pagesLinks = []; @@ -102,7 +112,11 @@ else