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

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")
        }

templates/widgets/routes/w_my_route.html

@@ -143,10 +143,10 @@
                     {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>
                 <span class="name_carrier{% if route.owner == user %} active{% endif %}">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
 
-                <a class="phones_carrier" href="tel:{{ route.phone }}">
+                <a class="phones_carrier" href="tel:{%if route.phone == route.phone %}{{ route.phone }}{% endif %}">
                     <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                    <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span>
-                    <input value="{{ route.phone }}">
+                    <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{%if route.phone == route.phone %}{{ route.phone }}{% endif %}</span>
+                    <input value="{%if route.phone == route.phone %}{{ route.phone }}{% endif %}">
                     <div class="clear_both"></div>
                 </a>
                 <a class="email_carrier" href="mailto:{{ route.owner.email }}">

templates/widgets/w_carrier_card.html

@@ -105,9 +105,9 @@
                         <span class="name_carrier"></span>
                     {% endif %}
 
-                    <a class="phones_carrier" data-href="tel:{{ route.phone }}">
+                    <a class="phones_carrier" data-href="tel:{%if route.phone == route.phone %}{{ route.phone }}{% endif %}">
                         <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                        <span class="phones_carrier_span el_for_open_el {% if route.owner == user %} active{% endif %}">{{ route.phone }}</span>
+                        <span class="phones_carrier_span el_for_open_el {% if route.owner == user %} active{% endif %}">{%if route.phone == route.phone %}{{ route.phone }}{% endif %}</span>
         {#                <input value="{{ route.phone }}">#}
                         <div class="clear_both"></div>
                     </a>