From 1301af9d84fc7082f24e57215567f08e7469e062 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Thu, 1 Aug 2024 10:22:44 +0300
Subject: [PATCH 1/7] 1.1.51 upd the local time check of the selected city

---
 static/js/range_calendar.js | 16 +++++++++++-----
 static/js/user_profile.js   |  7 ++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/static/js/range_calendar.js b/static/js/range_calendar.js
index 545714d..4e1612c 100644
--- a/static/js/range_calendar.js
+++ b/static/js/range_calendar.js
@@ -148,18 +148,24 @@ 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/")) {
 
-    if (window.location.href.includes("/ru/")) {
+            startDate = moment(hiddenTime, "D MMMM YYYY г. HH:mm", 'ru');
+        } else {
 
-        startDate = moment(hiddenTime, "D MMMM YYYY г. HH:mm", 'ru');
+            startDate = moment(hiddenTime, "MMMM D, YYYY, h:mm a", 'en');
+        }
     } else {
-
-        startDate = moment(hiddenTime, "MMMM D, YYYY, h:mm a", 'en');
+        startDate = moment()
     }
 
 
+
+
+
     $(place_1).daterangepicker({
         "autoapply": true,
         "linkedCalendars": false,
diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index 37a5633..e31717f 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -350,7 +350,12 @@ 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");
-            local_city_time.innerHTML = city_DT;
+
+            if(ctrl_name === "from_address_point_txt"){
+                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));

From 3a497d09dfa41640dcdec7ba8e6cb8f68e108204 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Thu, 1 Aug 2024 10:44:18 +0300
Subject: [PATCH 2/7] 1.1.51 upd initialization for init_departure_DT() 
 init_arrival_DT()

---
 static/js/user_profile.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index e31717f..f9e0be9 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -362,6 +362,7 @@ function selectItemAddrPoint(id, name, ctrl_name, city_DT){
             tap_cont.value = id;
 
             init_departure_DT()
+            init_arrival_DT()
 
             if (tap_txt_cont.classList.contains('red_text')){
                  tap_txt_cont.classList.remove('red_text')
@@ -815,8 +816,8 @@ function OnSelectionChange(el) {
             // }
             sliderInit();
 
-            init_arrival_DT()
-            init_departure_DT()
+            // init_arrival_DT()
+            // init_departure_DT()
 
 
 

From 2bc9aa7a1ca0b6b27495f4cc2705d3334b004428 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Thu, 1 Aug 2024 11:04:23 +0300
Subject: [PATCH 3/7] 1.1.53 added a local time reference when editing route

---
 templates/blocks/profile/b_new_route.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index 36e5abb..92382ee 100644
--- 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"></div>
+        <div class="local_city_time" hidden="hidden">{% if route.departure_DT %}{{ route.from_city.get_current_datetime }}{% 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 "Пункт вылета" %}

From d1ad6cfa24e3cba0d2a2a959d429459801a6b6be Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Thu, 1 Aug 2024 11:12:26 +0300
Subject: [PATCH 4/7] 1.1.54 add readonly for departure/arrival input

---
 templates/blocks/profile/b_new_route.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index 92382ee..cf91382 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -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 %}

From 312a706d00aa56e07796541dde2589351288eff6 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Thu, 1 Aug 2024 17:06:05 +0300
Subject: [PATCH 5/7] 1.1.55 fix function selectItemAddrPoint on main page

---
 static/js/user_profile.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index f9e0be9..da4b825 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -351,7 +351,7 @@ function selectItemAddrPoint(id, name, ctrl_name, city_DT){
             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"){
+            if(ctrl_name === "from_address_point_txt" && local_city_time){
                 local_city_time.innerHTML = city_DT;
             }
 
@@ -361,8 +361,11 @@ function selectItemAddrPoint(id, name, ctrl_name, city_DT){
             let tap_cont = document.querySelector("#id_" + ctrl_name.slice(0, -4));
             tap_cont.value = id;
 
-            init_departure_DT()
-            init_arrival_DT()
+            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')

From 0ef2f9aeb129022794ad74bcfdb42e3d959c4836 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Thu, 1 Aug 2024 17:17:58 +0300
Subject: [PATCH 6/7] 1.1.56 upd meta OG

---
 templates/inter/meta_OpenGraph.html | 42 +++++++++++++++++++++++++++++
 templates/tb_base.html              |  6 +++--
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 templates/inter/meta_OpenGraph.html

diff --git a/templates/inter/meta_OpenGraph.html b/templates/inter/meta_OpenGraph.html
new file mode 100644
index 0000000..d1aedc5
--- /dev/null
+++ 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 %}
\ No newline at end of file
diff --git a/templates/tb_base.html b/templates/tb_base.html
index 6da3102..8aacbdf 100644
--- 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')">

From a7128908f466b166aaf1cd6c860861b08e7feff9 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Fri, 2 Aug 2024 17:35:17 +0300
Subject: [PATCH 7/7] 1.1.59 upd the calendar initialization after receiving an
 error when submitting the form

---
 static/js/user_profile.js                 | 6 +++++-
 templates/blocks/profile/b_new_route.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index da4b825..f926260 100644
--- 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){
diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index cf91382..01ad618 100644
--- 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 "Пункт вылета" %}