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

GeneralApp/views.py

@@ -16,12 +16,45 @@ import json
 from datetime import datetime, timedelta
 
 def test_code(request):
+
+    if (not request.user
+        or not request.user.is_active
+        or not request.user.is_authenticated
+        or not request.user.is_staff
+    ):
+        raise Http404
+
     from RoutesApp.funcs import get_city_by_type_transport_and_address_point
     from RoutesApp.models import Route
     from ReferenceDataApp.models import Airport, City
 
     res = None
 
+    from_air = Airport.objects.get(iata_code='MSQ')
+    to_air = Airport.objects.get(iata_code='SVO')
+
+    routes = [
+        Route(
+            type_transport='avia',
+            departure_DT=datetime(year=2024, month=9, day=1),
+            arrival_DT=datetime(year=2024, month=9, day=3),
+            from_address_point = from_air.id,
+            to_address_point = to_air.id,
+            from_city = from_air.city,
+            to_city = to_air.city,
+            weight = item,
+            phone = '1234567890',
+            owner = request.user
+        ) for item in range(1000)
+    ]
+
+    Route.objects.bulk_create(routes)
+
+
+    # from RoutesApp.search_matches import search_matches
+    # routes = Route.objects.filter()[:10]
+    # msg = search_matches(routes)
+
     # from ReferenceDataApp.funcs import parse_data
     # parse_data()
 

robots.txt

@@ -1,5 +1,4 @@
 User-agent: *
-Allow: /
+Disallow: /
-Disallow: */admin/*
 
-Host: tripwb.com
+Host: dev.tripwb.com

static/js/dynamic_loading_routes.js

@@ -177,7 +177,7 @@ function load_routes (el,news=null,incrase,owner_type) {
             }
             let first_block_iteration = document.querySelector(`.page_paging_elements_${paging_iterator}`)
             let insert_place = null
-            if (first_block_iteration.innerHTML){
+            if (first_block_iteration && first_block_iteration.innerHTML){
                 paging_iterator++
                 let new_page_paging_elements = document.createElement('div')
                 new_page_paging_elements.classList.add(`page_paging_elements_${paging_iterator}`)

static/js/registration.js

@@ -21,27 +21,6 @@ function SendRegistrationForm(el){
             window.sessionStorage.removeItem('mailingSubscribeRequired')
             window.sessionStorage.removeItem('email')
 
-            fbq('track', 'Contact');
-
-
-            ttq.identify({
-                "email": "<hashed_email_address>", // string. The email of the customer if available. It must be hashed with SHA-256 on the client side.
-                "phone_number": "<hashed_phone_number>", // string. The phone number of the customer if available. It must be hashed with SHA-256 on the client side.
-                "external_id": "<hashed_extenal_id>" // string. Any unique identifier, such as loyalty membership IDs, user IDs, and external cookie IDs.It must be hashed with SHA-256 on the client side.
-            });
-
-            ttq.track('CompleteRegistration', {
-                "contents": [
-                    {
-                        "content_id": "<content_identifier>", // string. ID of the product. Example: "1077218".
-                        "content_type": "<content_type>", // string. Either product or product_group.
-                        "content_name": "<content_name>" // string. The name of the page or product. Example: "shirt".
-                    }
-                ],
-                "value": "<content_value>", // number. Value of the order or items sold. Example: 100.
-                "currency": "<content_currency>" // string. The 4217 currency code. Example: "USD".
-            });
-
 
             if(typeof ym === 'function'){
                 ym(97070898,'reachGoal','Registration')
@@ -50,6 +29,7 @@ function SendRegistrationForm(el){
               console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.');
             }
 
+
         },
         error: function (data, exception){
             document.querySelector(".register").innerHTML = data.responseJSON.html

templates/blocks/b_footer.html

@@ -22,7 +22,6 @@
                     <a href="https://vk.com/club226251027" target="_blank"><img class="svg" src="/static/img/svg/vk.svg"></a>
                     <a href="https://www.tiktok.com/@.tripwithbonus?_t=8njaU5JVCBK&_r=1" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a>
                     <a href="https://youtube.com/@twb-bonus?si=k_YFiY86vBdvvHFN" target="_blank"><img class="svg" src="/static/img/svg/Youtube.svg"></a>
-                    <a href="https://t.me/+XA6A8Ls7fYw2Yzli" target="_blank"><img class="svg" src="/static/img/svg/Telegram.svg"></a>
                 </div>
           </div>
             <div class="second-column">

templates/inter/meta_OpenGraph.html

@@ -1,42 +0,0 @@
-
-{% 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

@@ -18,7 +18,7 @@
     <meta name="google-site-verification" content="4V4upJSK2_4MBrr5ZXjcCLw3bBwXc4_gsnKudJAaWqI" />
     <meta name="yandex-verification" content="b8a976575e41fbbc" />
 
-    {% include "inter/meta_OpenGraph.html" %}
+    {% include "inter/meta_OpenGraph_Schema.html" %}
 
 <!-- Yandex.Metrika counter -->
 <script type="text/javascript" >

templates/widgets/routes/w_my_route.html

@@ -1,17 +1,18 @@
 {% load static %}
 {% load i18n %}
 
-
 {% if route.departure_DT %}
     {% with current_datetime=route.from_city.get_current_datetime %}
             {% with departure_datetime=route.departure_DT %}
+                {% with highlight_end_DT=route.highlight_end_DT %}
                     {% if current_datetime|date:"Y-m-d H:i:s" > departure_datetime|date:"Y-m-d H:i:s" %}
                         <div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
                     {% else %}
-                    <div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
+                        <div class="carrier-card {% if route.highlight_color and highlight_end_DT|date:"Y-m-d H:i:s" > current_datetime|date:"Y-m-d H:i:s" %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
                     {% endif %}
                 {% endwith %}
             {% endwith %}
+    {% endwith %}
 {% endif %}
 {#<div class="carrier-card"{% if route.highlight_color %} style="border: 5px solid {{ route.highlight_color }};"{% endif %} data-number-of-route="{{ route.id }}">#}
     <div class="left-part-carrier-card">

templates/widgets/w_chat_right_panel_tickets.html

@@ -9,8 +9,7 @@
         <span class="user_name_messenger">{{ item.owner.last_name }} {{ item.owner.first_name }}</span>
         <span class="last-message-messenger-user-tab">{{ item.name }}</span>
     </div>
-{#    {% if item.unread_msgs_count %}#}
+    {% if item.unread_msgs_count %}
-    {% if unanswered_msgs_count > 0 %}
         <div class="right-part-tab-user">
             <div class="cost-messages-in-user-tab-messenger">
 {#                <span>{{ item.unread_msgs_count }}</span>#}