Merge pull request 'main' (#13) from main into dev

Reviewed-on: #13

robots.txt

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

static/js/registration.js

@@ -30,6 +30,27 @@ function SendRegistrationForm(el, user_id){
             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')
@@ -38,7 +59,6 @@ function SendRegistrationForm(el, user_id){
               console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.');
             }
 
-
         },
         error: function (data, exception){
             document.querySelector(".register").innerHTML = data.responseJSON.html

templates/blocks/b_footer.html

@@ -22,6 +22,7 @@
                     <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/tb_base.html

@@ -137,7 +137,21 @@ function gtag_report_conversion(url) {
 {#    <script src="{% static "js/range_calendar.js" %}"></script>#}
     <script src="{% static "js/range_calendar.js" %}"></script>
 
-    <link rel="icon" href="{% static 'favicon.svg' %}" sizes="any" type="image/svg+xml">
+    <link rel="icon" href="{% static 'favicon/favicon.svg' %}" sizes="any" type="image/svg+xml">
+    <link rel="apple-touch-icon" sizes="57x57" href={% static 'favicon/apple-icon-57x57.png'%} >
+    <link rel="apple-touch-icon" sizes="60x60" href={% static "favicon/apple-icon-60x60.png"%}>
+    <link rel="apple-touch-icon" sizes="72x72" href={% static "favicon/apple-icon-72x72.png"%}>
+    <link rel="apple-touch-icon" sizes="76x76" href={% static "favicon/apple-icon-76x76.png"%}>
+    <link rel="apple-touch-icon" sizes="114x114" href={% static "favicon/apple-icon-114x114.png"%}>
+    <link rel="apple-touch-icon" sizes="120x120" href={% static "favicon/apple-icon-120x120.png"%}>
+    <link rel="apple-touch-icon" sizes="144x144" href={% static "favicon/apple-icon-144x144.png"%}>
+    <link rel="apple-touch-icon" sizes="152x152" href={% static "favicon/apple-icon-152x152.png"%}>
+    <link rel="apple-touch-icon" sizes="180x180" href={% static "favicon/apple-icon-180x180.png"%}>
+    <link rel="icon" type="image/png" sizes="192x192"  href={% static "favicon/android-icon-192x192.png"%}>
+    <link rel="icon" type="image/png" sizes="32x32" href={% static "favicon/favicon-32x32.png"%}>
+    <link rel="icon" type="image/png" sizes="96x96" href={% static "favicon/favicon-96x96.png"%}>
+    <link rel="icon" type="image/png" sizes="16x16" href={% static "favicon/favicon-16x16.png"%}>
+
 
     {% block meta %}
     {% endblock %}

templates/widgets/w_chat_right_panel_tickets.html

@@ -9,7 +9,8 @@
         <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>#}