1.1.59 upd the calendar initialization after receiving an error when submitting the form

1.1.56 upd meta OG
2024-08-02 17:35:17 +03:00 · 2024-08-01 17:17:58 +03:00
4 changed files with 52 additions and 4 deletions
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -555,12 +555,16 @@ function sendRoute(el, routeID = null){
    // if (selected_owner_type[0].classList.contains('selected')){
    //
    // }else{}
-        let owner_type_value = document.getElementById('hide_owner_type').value
+
+    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){
--- a/templates/blocks/profile/b_new_route.html
+++ b/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">{% if route.departure_DT %}{{ route.from_city.get_current_datetime }}{% endif %}</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 "Пункт вылета" %}
--- a/templates/inter/meta_OpenGraph.html
+++ b/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 %}
--- a/templates/tb_base.html
+++ b/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')">
Author	SHA1	Message	Date
ArtemB	a7128908f4	1.1.59 upd the calendar initialization after receiving an error when submitting the form	2024-08-02 17:35:17 +03:00
ArtemB	0ef2f9aeb1	1.1.56 upd meta OG	2024-08-01 17:17:58 +03:00