diff --git a/bitrix/php_interface/init.php b/bitrix/php_interface/init.php index e1389f4..6a9b729 100644 --- a/bitrix/php_interface/init.php +++ b/bitrix/php_interface/init.php @@ -161,10 +161,6 @@ function zerof_request($path, $query) $hash = hash_hmac("SHA1", $data, $key_sha1, false); $hash_base64 = base64_encode(hex2bin($hash)); - //print "HASH ".$hash_base64."\n"; - //print "DATE ".$date."\n"; - //print "\n"; - $headers = [ "Authorization: ZWS ".ZEROF_USERNAME.":".$hash_base64, "Date: ".$date, @@ -178,6 +174,7 @@ function zerof_request($path, $query) } $request = curl_init(); + curl_setopt($request, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); curl_setopt($request, CURLOPT_URL, $url); curl_setopt($request, CURLOPT_CONNECTTIMEOUT, 30); curl_setopt($request, CURLOPT_TIMEOUT, 30); @@ -209,8 +206,6 @@ function zerof_get_images($task_uid) $tasks_trucks_in_pass_data = json_decode(html_entity_decode($tasks_trucks_in_pass), true); $tasks_trucks_in_new_data = json_decode(html_entity_decode($tasks_trucks_in_new), true); - //var_dump($images_response_array); - $tasks = array_merge( $tasks_car_in_process_data[array_keys($tasks_car_in_process_data)[0]], $tasks_car_in_pass_data[array_keys($tasks_car_in_pass_data)[0]], diff --git a/local/components/evolution/catalog.brands/component.php b/local/components/evolution/catalog.brands/component.php index b9f5cc9..30eccb6 100644 --- a/local/components/evolution/catalog.brands/component.php +++ b/local/components/evolution/catalog.brands/component.php @@ -15,8 +15,8 @@ use Bitrix\Main\Context, Bitrix\Main\Loader, Bitrix\Iblock; -//if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) -//{ +if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) +{ if(CModule::IncludeModule('iblock')) { $arResult = [ @@ -35,6 +35,11 @@ use Bitrix\Main\Context, $brands_ar_res = $brands_ob_element->GetFields(); $brands_ar_res['PROPERTIES'] = $brands_ob_element->GetProperties(); + if(!empty($brands_ar_res['PREVIEW_PICTURE'])) + { + $brands_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($brands_ar_res['PREVIEW_PICTURE']); + } + if(isset($arParams['PROPERTIES_FILTER_ARRAY'])) { $brand_image_filter = array_merge( @@ -53,11 +58,7 @@ use Bitrix\Main\Context, } else { - if(isset($brands_ar_res['PREVIEW_PICTURE'])) - { - $brands_ar_res['PREVIEW_PICTURE'] = CFile::GetPath($brands_ar_res['PREVIEW_PICTURE']); - } - else + if(empty($brands_ar_res['PREVIEW_PICTURE'])) { $brand_image_filter = [ "ACTIVE" => "Y", "IBLOCK_ID" => IBLOCK_ID_CATALOG_CARS_NEW, "PROPERTY_BRAND" => $brands_ar_res['ID'] ]; @@ -77,4 +78,4 @@ use Bitrix\Main\Context, $this->IncludeComponentTemplate(); } -//} \ No newline at end of file +} \ 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 index b0e426b..faa4ade 100644 --- a/local/components/evolution/catalog.promo.brand/component.php +++ b/local/components/evolution/catalog.promo.brand/component.php @@ -55,7 +55,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); $ar_res['CALCULATION'] = []; - $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); + $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); diff --git a/local/components/evolution/catalog.promo.model/component.php b/local/components/evolution/catalog.promo.model/component.php index 4105dd8..4d7c0c7 100644 --- a/local/components/evolution/catalog.promo.model/component.php +++ b/local/components/evolution/catalog.promo.model/component.php @@ -44,7 +44,7 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); $ar_res['CALCULATION'] = []; - $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); + $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); diff --git a/local/components/evolution/catalog/component.php b/local/components/evolution/catalog/component.php index 3d3f5b7..94acd28 100644 --- a/local/components/evolution/catalog/component.php +++ b/local/components/evolution/catalog/component.php @@ -176,8 +176,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) } } - //$APPLICATION->AddHeadString(''); - if(isset($arParams['MODIFICATION'])) { if(!empty($arParams['MODIFICATION'])) @@ -295,53 +293,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $query_arr['BODY'] = $arParams['BODY']; } - //$pages_url = $pages_url."/"; - if(count($query_arr) > 0) { $query = http_build_query($query_arr); } - //if(!empty($_SERVER['REDIRECT_QUERY_STRING'])) - //{ - // $query = $_SERVER['REDIRECT_QUERY_STRING']; - //} - - /* - if(isset($arParams["sort"])) - { - $sort = $arParams["sort"]; - } - - if(isset($arParams["options"])) - { - $options = $arParams["options"]; - } - else - { - //$options = false; - } - - if(isset($arParams["filter"])) - { - $filter = array_merge($filter, $arParams["filter"]); - } - - if(!empty($_REQUEST['filter']['city_id'])) - { - $filter['PROPERTY_CITY'] = $_REQUEST['filter']['city_id']; - } - - //if(!empty($_REQUEST['filter']['subway_id'])) - //{ - //$filter['PROPERTY_SUBWAY'] = $_REQUEST['filter']['subway_id']; - //} - - if(is_array($_REQUEST['subways'])) - { - $subs = Array(); foreach($_REQUEST['subways'] AS $s) { array_push($subs, $s); } - $filter['PROPERTY_SUBWAY'] = $subs; - } - */ if($arParams['leasing_program'] && $arParams['leasing_program'] !== "") { @@ -409,37 +364,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['PROPERTIES']['MODIFICATION']['RELATED'] = get_related(10, $ar_res['PROPERTIES']['MODIFICATION']['VALUE']); $ar_res['CALCULATION'] = []; - $ar_res['CALCULATION']['MONTHLY'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 10), 0, ".", " "); + $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); - //print "\n"; - //print "\n\n\n"; - - /* - if(isset($ar_res['PREVIEW_PICTURE'])) - { - $ar_res['PREVIEW_PICTURE_SRC'] = get_image_path($ar_res['PREVIEW_PICTURE']); - } - - if(!empty($ar_res['PROPERTIES']['PHOTO_ICON']['VALUE'])) - { - $ar_res['PROPERTIES']['PHOTO_ICON']['SRC'] = get_image_path($ar_res['PROPERTIES']['PHOTO_ICON']['VALUE']); - } - - if(!empty($ar_res['PROPERTIES']['CITY']['VALUE'])) - { - $ar_res['PROPERTIES']['CITY']['RELATED'] = get_related_array(10, $ar_res['PROPERTIES']['CITY']['VALUE']); - } - - if(!empty($ar_res['PROPERTIES']['SUBWAY']['VALUE'])) - { - $ar_res['PROPERTIES']['SUBWAY']['RELATED'] = get_related_array(12, $ar_res['PROPERTIES']['SUBWAY']['VALUE']); - } - */ - $arResult['ITEMS'][] = $ar_res; } } @@ -513,16 +441,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) if(isset($ar_city['PROPERTIES']['OFFICES']['RELATED'][0])) { $ar_city['LEADER_CRM_ID'] = $ar_city['PROPERTIES']['LEADER_CRM_ID']['VALUE']; - - /* - $ar_city['LEADER_NAME'] = $ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_NAME']['VALUE']; - $ar_city['LEADER_POSITION'] = $ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_POSITION']['VALUE']; - - if(!empty($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_POSITION']['VALUE'])) - { - $ar_city['LEADER_PHOTO'] = CFile::GetPath($ar_city['PROPERTIES']['OFFICES']['RELATED'][0]['PROPERTIES']['LEADER_PHOTO']['VALUE']); - } - */ } $arResult['CITY'] = $ar_city; @@ -536,42 +454,21 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) if(!empty($arResult['SELECTED']['MODEL'])) { - //array_unshift($breadcrumbs, [ - // "NAME" => $ar_city['NAME'], - // "URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/".$arResult['SELECTED']['BRAND']."/".$arResult['SELECTED']['MODEL']."/", - //]); - $APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП | Эволюция"); $APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный."); $APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$arResult['TITLES']['MODEL']." ".$ar_city['NAME']." в лизинг"); - - //$APPLICATION->AddHeadString(''); } elseif(!empty($arResult['SELECTED']['BRAND'])) { - //array_unshift($breadcrumbs, [ - // "NAME" => $ar_city['NAME'], - // "URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/".$arResult['SELECTED']['BRAND']."/", - //]); - $APPLICATION->SetPageProperty("title", $arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП | Эволюция"); $APPLICATION->SetPageProperty("description", "Новые автомобили ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг для юридических лиц и ИП. Вы можете купить ".$arResult['TITLES']['BRAND']." в ".$ar_city['PROPERTIES']['CASE']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии ".CENTRAL_PHONE_FORMATTED." - звонок по России бесплатный."); $APPLICATION->SetPageProperty("keywords", $arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг, купить ".$arResult['TITLES']['BRAND']." ".$ar_city['NAME']." в лизинг"); - - //$APPLICATION->AddHeadString(''); } else { - //array_unshift($breadcrumbs, [ - // "NAME" => $ar_city['NAME'], - // "URL" => "https://".SITE_SERVER_NAME."/regions/".$ar_city['CODE']."/", - //]); - $APPLICATION->SetPageProperty("title", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП | Эволюция"); $APPLICATION->SetPageProperty("description", "Лизинговая компания Эволюция предлагает быстрое оформление авто в лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE']." для юридических лиц и ИП. Выгодные цены, спецпредложения, простое оформление, консультирование и сопровождение."); $APPLICATION->SetPageProperty("keywords", "Лизинг в ".$ar_city['PROPERTIES']['CASE']['VALUE'].", лизинг авто ".$ar_city['NAME'].", купить машину в лизинг ".$ar_city['NAME'].""); - - //$APPLICATION->AddHeadString(''); } $APPLICATION->AddHeadString(' 0 ? "/" : "").'"/>'); @@ -588,45 +485,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) if(!isset($arParams['PROGRAM'])) { $APPLICATION->AddHeadString(' 0 ? "/" : "").'"/>'); - /* - if(isset($arResult['SELECTED']['BRAND'])) - { - if(isset($arResult['SELECTED']['MODEL'])) - { - $APPLICATION->AddHeadString(''); - } - else - { - $APPLICATION->AddHeadString(''); - } - } - else - { - $APPLICATION->AddHeadString(''); - } - */ - - /* - if($parameters_filter_count === 0 && !empty($arParams['BODY'])) - { - $bodies_element_res = CIBlockElement::GetList(["NAME" => "ASC"], ["IBLOCK_ID" => IBLOCK_ID_BODIES, "=NAME" => $arParams['BODY']], false, []); - while ($bodies_element_ob_element = $bodies_element_res->GetNextElement()) - { - $bodies_ar_res = $bodies_element_ob_element->GetFields(); - $bodies_ar_res['PROPERTIES'] = $bodies_element_ob_element->GetProperties(); - - $APPLICATION->SetPageProperty("title", mb_ucfirst($bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE'])." в лизинг для юридических лиц и ИП в Москве - купить новый ".$bodies_ar_res['PROPERTIES']['SINGULAR_NAME']['VALUE']." в лизинг | Эволюция"); - $APPLICATION->SetPageProperty("description", "Новые автомобили ".$bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE']." в лизинг для юридических лиц и ИП в Москве и в других регионах России. Вы можете купить ".$bodies_ar_res['PROPERTIES']['SINGULAR_NAME']['VALUE']." в лизинг от официальных дилеров, автосалонов на выгодных условиях со скидкой. Телефон горячей линии 8 (800) 333-75-75 - звонок по России бесплатный."); - $APPLICATION->SetPageProperty("keywords", mb_ucfirst($bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE'])." в лизинг, купить ".$bodies_ar_res['PROPERTIES']['SINGULAR_NAME']['VALUE']." в лизинг"); - - $arResult['TITLE'] = mb_ucfirst($bodies_ar_res['PROPERTIES']['PLURAL_NAME']['VALUE'])." в лизинг"; - $arResult['SUBTITLE'] = " для юридических лиц и ИП"; - } - - //print "BODY MODE"; - //die(); - } - */ } } @@ -656,24 +514,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) if(isset($_REQUEST['ajax'])) { $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(); diff --git a/local/components/evolution/used.catalog/component.php b/local/components/evolution/used.catalog/component.php index ef5f71d..21a8091 100644 --- a/local/components/evolution/used.catalog/component.php +++ b/local/components/evolution/used.catalog/component.php @@ -181,8 +181,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) } } - //$APPLICATION->AddHeadString(''); - if(isset($arParams['MODIFICATION'])) { if(!empty($arParams['MODIFICATION'])) @@ -380,53 +378,10 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $query_arr['PARKING_CITY'] = $arParams['PARKING_CITY']; } - //$pages_url = $pages_url."/"; - if(count($query_arr) > 0) { $query = http_build_query($query_arr); } - //if(!empty($_SERVER['REDIRECT_QUERY_STRING'])) - //{ - // $query = $_SERVER['REDIRECT_QUERY_STRING']; - //} - - /* - if(isset($arParams["sort"])) - { - $sort = $arParams["sort"]; - } - - if(isset($arParams["options"])) - { - $options = $arParams["options"]; - } - else - { - //$options = false; - } - - if(isset($arParams["filter"])) - { - $filter = array_merge($filter, $arParams["filter"]); - } - - if(!empty($_REQUEST['filter']['city_id'])) - { - $filter['PROPERTY_CITY'] = $_REQUEST['filter']['city_id']; - } - - //if(!empty($_REQUEST['filter']['subway_id'])) - //{ - //$filter['PROPERTY_SUBWAY'] = $_REQUEST['filter']['subway_id']; - //} - - if(is_array($_REQUEST['subways'])) - { - $subs = Array(); foreach($_REQUEST['subways'] AS $s) { array_push($subs, $s); } - $filter['PROPERTY_SUBWAY'] = $subs; - } - */ $arResult['SHOW_SPECIAL_OFFERS'] = false; $arResult['SHOW_PROMO_BRANDS'] = false; @@ -457,7 +412,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $price = $ar_res['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] > 0 ? $ar_res['PROPERTIES']['PRICE_WITH_DISCOUNT']['VALUE'] : $ar_res['PROPERTIES']['PRICE']['VALUE']; $ar_res['CALCULATION'] = []; - $ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " "); + $ar_res['CALCULATION']['MONTHLY'] = number_format(($price / CALCULATION_COEFFICIENT), 0, ".", " "); + //$ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " "); $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " "); @@ -532,24 +488,6 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) if(isset($_REQUEST['ajax'])) { $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(); diff --git a/urlrewrite.php b/urlrewrite.php index a6dad10..5a17d53 100644 --- a/urlrewrite.php +++ b/urlrewrite.php @@ -328,7 +328,7 @@ $arUrlRewrite=array ( ), array ( - 'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/kuzov-([a-zA-Z0-9_-]+)/(\\?(.*))?$#', + 'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/kuzov-([a-zA-Z0-9_-]+)/#', 'RULE' => 'TYPE=body®ION=$1&BODY_SLUG=$2', 'ID' => '', 'PATH' => '/regions/landing.php', @@ -336,7 +336,7 @@ $arUrlRewrite=array ( ), array ( - 'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/dvigatel-([a-zA-Z0-9_-]+)/(\\?(.*))?$#', + 'CONDITION' => '#^/regions/([a-zA-Z0-9_-]+)/dvigatel-([a-zA-Z0-9_-]+)/#', 'RULE' => 'TYPE=engine_fuel®ION=$1&ENGINE_FUEL_SLUG=$2', 'ID' => '', 'PATH' => '/regions/landing.php', diff --git a/used/position.php b/used/position.php index 546dc46..9a93100 100644 --- a/used/position.php +++ b/used/position.php @@ -18,7 +18,7 @@ $APPLICATION->AddChainItem("С пробегом", "/used/"); [ "OFFER" => $OFFER, "initial_payment" => 20, - "lease_period" => 15, + "lease_period" => 36, "redemption_payment" => 5, "CAR_PRICE_MIN" => 100000, "CAR_PRICE_MAX" => 20000000,