Merge remote-tracking branch 'origin/dev' into dev

static/js/range_calendar.js

@@ -148,9 +148,9 @@ function init_departure_DT() {
     if (!place_1) return;
 
     let hiddenTime = document.querySelector('.local_city_time').innerText;
-    let startDate;
-
 
+    let startDate = null;
+    if(hiddenTime){
         if (window.location.href.includes("/ru/")) {
 
             startDate = moment(hiddenTime, "D MMMM YYYY г. HH:mm", 'ru');
@@ -158,6 +158,12 @@ function init_departure_DT() {
 
             startDate = moment(hiddenTime, "MMMM D, YYYY, h:mm a", 'en');
         }
+    } else {
+        startDate = moment()
+    }
+
+
+
 
 
     $(place_1).daterangepicker({

static/js/user_profile.js

@@ -350,13 +350,22 @@ function selectItemAddrPoint(id, name, ctrl_name, city_DT){
             let input_list = document.getElementsByName(ctrl_name + '_list')[0];
             let tap_txt_cont = document.querySelector("#id_" + ctrl_name);
             let local_city_time = document.querySelector(".local_city_time");
+
+            if(ctrl_name === "from_address_point_txt" && local_city_time){
                 local_city_time.innerHTML = city_DT;
+            }
+
+
             tap_txt_cont.value = name;
             tap_txt_cont.setAttribute('title',name)
             let tap_cont = document.querySelector("#id_" + ctrl_name.slice(0, -4));
             tap_cont.value = id;
 
+            if (local_city_time){
                 init_departure_DT()
+                init_arrival_DT()
+            }
+
 
             if (tap_txt_cont.classList.contains('red_text')){
                  tap_txt_cont.classList.remove('red_text')
@@ -546,12 +555,16 @@ function sendRoute(el, routeID = null){
     // if (selected_owner_type[0].classList.contains('selected')){
     //
     // }else{}
+
+    let hiddenTime = document.querySelector('.local_city_time').innerText;
+
     let owner_type_value = document.getElementById('hide_owner_type').value
 
     let form = el.form
     let formData = new FormData(form);
     let owner_type = owner_type_value
     formData.set('owner_type', owner_type)
+    formData.set('hiddenTime', hiddenTime)
 
     let url = '/routes/create_or_change_route/'
     if (routeID !== null){
@@ -810,8 +823,8 @@ function OnSelectionChange(el) {
             // }
             sliderInit();
 
-            init_arrival_DT()
+            // init_arrival_DT()
-            init_departure_DT()
+            // init_departure_DT()
 
 
 

templates/blocks/profile/b_new_route.html

@@ -76,7 +76,7 @@
     <hr>
     <div class="from_to_country">
     <div class="from_country_container">
-        <div class="local_city_time" hidden="hidden"></div>
+        <div class="local_city_time" hidden="hidden">{% if route.departure_DT %}{{ route.from_city.get_current_datetime }}{% elif form.initial.departure_DT %}{{ form.initial.departure_DT }}{% endif %}</div>
         <label for="id_from_address_point_txt">
             {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia'  %}
                     {% translate "Пункт вылета" %}
@@ -197,6 +197,7 @@
 {#                    onchange="checkDate()"#}
 {#                    onclick="setIcon(this)"#}
                     onmouseup="hideErrors(this)"
+                    readonly
                     type="text"
                     id="id_departure_DT"
                     name="departure_DT"
@@ -235,6 +236,7 @@
                     onchange="checkDate()"
                     onmouseup="hideErrors(this)"
                     type="text"
+                    readonly
                     id="id_arrival_DT"
                     name="arrival_DT"
                     placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %}

templates/inter/meta_OpenGraph.html

@@ -0,0 +1,42 @@
+
+{% if page.url == 'main' %}
+
+
+
+{% endif %}
+
+
+
+
+
+{% if page.url == 'about_service' and page.url == 'ru' %}
+        <meta property="og:type" content="website">
+        <meta property="og:title" content="Express parcel delivery | TWB">
+        <meta property="og:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
+        <meta property="og:url" content="https://tripwb.com/en/page/about_service/">
+        <meta property="og:image" content="https://tripwb.com/static/img/png/finlogo.png">
+        <meta property="og:site_name" content="TWB">
+        <meta property="og:locale" content="en_EN">
+        <meta property="fb:app_id" content="tripwithbonus">
+
+        <meta name="twitter:title" content="Express parcel delivery | TWB">
+        <meta name="twitter:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
+        <meta name="twitter:card" content="summary">
+{% endif %}
+
+{% if page.url == 'about_service' and page.url == 'en' %}
+
+    <meta property="og:type" content="website">
+    <meta property="og:title" content="Express parcel delivery | TWB">
+    <meta property="og:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
+    <meta property="og:url" content="https://tripwb.com/en/page/about_service/">
+    <meta property="og:image" content="https://tripwb.com/static/img/png/finlogo.png">
+    <meta property="og:site_name" content="TWB">
+    <meta property="og:locale" content="en_EN">
+    <meta property="fb:app_id" content="tripwithbonus">
+
+    <meta name="twitter:title" content="Express parcel delivery | TWB">
+    <meta name="twitter:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
+    <meta name="twitter:card" content="summary">
+
+{% endif %}

templates/tb_base.html

@@ -7,7 +7,6 @@
 <html lang="{{ request.LANGUAGE_CODE }}">
 <head>
     <meta charset="UTF-8">
-{#    <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">#}
     <meta name="viewport" content="width=device-width,maximum-scale=1,minimum-scale=1,initial-scale=1,height=device-height">
     {% if page.description %}
         <meta name="description" content="{{ page.description }}">
@@ -19,6 +18,8 @@
     <meta name="google-site-verification" content="4V4upJSK2_4MBrr5ZXjcCLw3bBwXc4_gsnKudJAaWqI" />
     <meta name="yandex-verification" content="b8a976575e41fbbc" />
 
+    {% include "inter/meta_OpenGraph.html" %}
+
 <!-- Yandex.Metrika counter -->
 <script type="text/javascript" >
    (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
@@ -148,6 +149,7 @@ function gtag_report_conversion(url) {
 <body{% if page_type == 'routes' %} onscroll="scroll_ev(event,this)"{% endif %}>
 
     <div class="popup_wrapper">
+
         {% if not user.is_authenticated %}
             <div class="popup_content">
                 <div class="popup_cross" onclick="setCokie(182,'popup_show','false')">
@@ -160,7 +162,7 @@ function gtag_report_conversion(url) {
             </div>
 
         {% endif %}
-{#    ДОБАВИТЬ ПРОВЕРКУ НА ДАТУ РЕГИСТРАЦИИ ЧТОБЫ ПОПАП НЕ ПОЯВЛЯЛСЯ У ВСЕХ ЭТО ВРЕМЕННО#}
+
         {% if user.is_authenticated %}
             <div class="popup_content">
                 <div class="popup_cross" onclick="setCokie(182,'first_authorization','true')">