From aec622831dea6c6b875bce796d2d0197c8c8ced1 Mon Sep 17 00:00:00 2001
From: sysadminix <sa@a3-global.com>
Date: Fri, 25 Oct 2024 13:03:17 +0300
Subject: [PATCH 1/3] TRI-275 disable googlesindicator script in head section

---
 static/js/global_js.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/static/js/global_js.js b/static/js/global_js.js
index 9d084c5..a018c96 100644
--- a/static/js/global_js.js
+++ b/static/js/global_js.js
@@ -227,11 +227,11 @@ function checkStateCookie () {
     if (!window.document.cookie.includes("allow_cookie=true")){
         document.querySelector(".cookie_block").classList.add("show")
     }
-    if (!window.document.cookie.includes("popup_show=false")){
-        setTimeout(() => {
-                document.querySelector('.popup_wrapper').classList.add('show');
-            }, 15000);
-    }
+    // if (!window.document.cookie.includes("popup_show=false")){
+    //     setTimeout(() => {
+    //             document.querySelector('.popup_wrapper').classList.add('show');
+    //         }, 15000);
+    // }
     if(!window.document.cookie.includes("first_authorization=true") && window.document.getElementById('authenticated_img')){
         document.querySelector(".popup_wrapper").classList.add("show")
        }
-- 
2.20.1


From 995733d6e31c2a4ebde2c6364017784593b24c97 Mon Sep 17 00:00:00 2001
From: sysadminix <sa@a3-global.com>
Date: Fri, 25 Oct 2024 13:04:25 +0300
Subject: [PATCH 2/3] TRI-275 disable googlesindicator script in head section

---
 static/js/global_js.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/static/js/global_js.js b/static/js/global_js.js
index a018c96..9d084c5 100644
--- a/static/js/global_js.js
+++ b/static/js/global_js.js
@@ -227,11 +227,11 @@ function checkStateCookie () {
     if (!window.document.cookie.includes("allow_cookie=true")){
         document.querySelector(".cookie_block").classList.add("show")
     }
-    // if (!window.document.cookie.includes("popup_show=false")){
-    //     setTimeout(() => {
-    //             document.querySelector('.popup_wrapper').classList.add('show');
-    //         }, 15000);
-    // }
+    if (!window.document.cookie.includes("popup_show=false")){
+        setTimeout(() => {
+                document.querySelector('.popup_wrapper').classList.add('show');
+            }, 15000);
+    }
     if(!window.document.cookie.includes("first_authorization=true") && window.document.getElementById('authenticated_img')){
         document.querySelector(".popup_wrapper").classList.add("show")
        }
-- 
2.20.1


From cfe37ec57d536bf7d57a932279187dc311b70f65 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Fri, 1 Nov 2024 14:58:11 +0300
Subject: [PATCH 3/3] 1.3.1 counters in footer TRI-276

---
 static/js/range_calendar.js    |  4 ++--
 templates/blocks/b_footer.html | 39 ++++++++++++++++++++++++++++++++++
 templates/tb_base.html         | 37 --------------------------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/static/js/range_calendar.js b/static/js/range_calendar.js
index 4e1612c..e10ce45 100644
--- a/static/js/range_calendar.js
+++ b/static/js/range_calendar.js
@@ -98,8 +98,8 @@ function init_arrival_DT (date=null,single=true,hour=true){
     }
 
 
-    let onl_param = ""
-    if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
+    let onl_param = "";
+    if (window.location.href.includes("/create_route_for_mover") || window.location.href.includes("create_route_for_customer/")){
         onl_param = "singleDatePicker"
     }
     let place_1 = document.querySelector("#id_arrival_DT")
diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html
index 56de7cd..125bc8e 100644
--- a/templates/blocks/b_footer.html
+++ b/templates/blocks/b_footer.html
@@ -101,4 +101,43 @@
       </div>
     </div>
 
+<!-- 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)};
+   m[i].l=1*new Date();
+   for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
+   k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
+   (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+   ym(97070898, "init", {
+        clickmap:true,
+        trackLinks:true,
+        accurateTrackBounce:true,
+        webvisor:true,
+        ecommerce:"dataLayer"
+   });
+</script>
+<noscript><div><img src="https://mc.yandex.ru/watch/97070898" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+<!-- /Yandex.Metrika counter -->
+
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-2WW2PTG5BM"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-2WW2PTG5BM');
+</script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=AW-16654215692">
+</script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'AW-16654215692');
+</script>
+
   </footer>
\ No newline at end of file
diff --git a/templates/tb_base.html b/templates/tb_base.html
index 8b3255b..b50cbcd 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -20,44 +20,7 @@
 
     {% include "inter/meta_OpenGraph_Schema.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)};
-   m[i].l=1*new Date();
-   for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
-   k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
-   (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
 
-   ym(97070898, "init", {
-        clickmap:true,
-        trackLinks:true,
-        accurateTrackBounce:true,
-        webvisor:true,
-        ecommerce:"dataLayer"
-   });
-</script>
-<noscript><div><img src="https://mc.yandex.ru/watch/97070898" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
-<!-- /Yandex.Metrika counter -->
-
-<!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-2WW2PTG5BM"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-2WW2PTG5BM');
-</script>
-<!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=AW-16654215692">
-</script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'AW-16654215692');
-</script>
 
 <!-- Event snippet for Sign-up conversion page
 In your html page, add the snippet and call gtag_report_conversion when someone clicks on the chosen link or button. -->
-- 
2.20.1