From 410733211be38826a48207178f6252912e1c73b8 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Wed, 20 Dec 2023 14:03:59 +0300
Subject: [PATCH] 0.0.328 fix bug in lalble b_new_route.html | upd style title
 for routes on main page | commented out the code in b_chats.html for i icon

---
 static/css/mobile_styles.css              |  2 +-
 static/css/styles(boris).css              |  7 +++-
 templates/blocks/profile/b_chats.html     |  2 +-
 templates/blocks/profile/b_new_route.html | 49 +++++++++++++----------
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css
index f62aa01..3ef416c 100644
--- a/static/css/mobile_styles.css
+++ b/static/css/mobile_styles.css
@@ -1047,7 +1047,7 @@
     .cargo_type_trans{
         display: block;
         margin-bottom: 15px;
-        float: unset;
+        /*float: unset;*/
     }
 
     .from-to-country-container-carrier{
diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index 104637f..2c23dbe 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -1536,7 +1536,12 @@
     font-weight: 500;
     font-size: 20px;
     color: #272424;
-    padding-bottom: 10px;
+
+    margin-bottom: 10px;
+    border: 2px solid #FF613A;
+    border-radius: 10px;
+    padding: 5px;
+    text-align: center;
 }
 
 .name_carrier{
diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html
index 54fbdfe..c06f517 100644
--- a/templates/blocks/profile/b_chats.html
+++ b/templates/blocks/profile/b_chats.html
@@ -68,7 +68,7 @@
                 <a href="tel:{{ cur_receiver.user_profile.phone }}">
                     <img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">
                 </a>
-                <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
+{#                <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">#}
             </div>
         </div>
         <div class="bottom_part_of_chats">
diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index 83850dc..9f046ff 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -56,7 +56,16 @@
     {% endif %}
   </div>
 
-    <input id="hide_owner_type" type="hidden" value="{{ form.initial.owner_type }}">
+{#    <input id="hide_owner_type" type="hidden" value="{{ form.initial.owner_type }}">#}
+    <input
+            id="hide_owner_type"
+            type="hidden"
+            {% if form.initial.owner_type %}
+                value="{{ form.initial.owner_type }}"
+            {% elif form.data.owner_type %}
+                value="{{ form.data.owner_type }}"
+            {% endif %}
+    >
 
 {% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
     <hr>
@@ -64,11 +73,11 @@
           <div class="wrap_left">
               <label for="id_departure_DT">
 
-                {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
                     {% translate "Дата и время выезда" %}
-                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
                     {% translate "Дата и время вылета" %}
-                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' or form.initial.type_transport == 'avia' %}
+                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
                     {% translate "Дата и время отправки" %}
                 {% endif %}
 
@@ -107,13 +116,9 @@
           <div id="arrival_div">
           <label for="id_arrival_DT">
 
-              {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+              {% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'%}
                     {% translate "Дата и время прибытия" %}
-                {% elif form.initial.owner_type == 'mover' and  form.initial.type_transport == 'avia' %}
-                    {% translate "Дата и время прибытия" %}
-                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'avia'  %}
-                    {% translate "Дата и время доставки посылки" %}
-                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road'  %}
+                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
                     {% translate "Дата и время доставки посылки" %}
               {% endif %}
 
@@ -151,11 +156,11 @@
   <div class="from_to_country">
     <div class="from_country_container">
         <label for="id_from_address_point_txt">
-            {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+            {% 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 "Пункт вылета" %}
-                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
                     {% translate "Пункт выезда" %}
-                {% elif form.initial.owner_type == 'customer' %}
+                {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer'  %}
                     {% translate "Пункт отправки" %}
             {% endif %}
         </label>
@@ -196,11 +201,11 @@
     </div>
     <div class="wrap_right">
     <label for="id_to_address_point_txt">
-        {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+        {% 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 "Пункт прилета" %}
-            {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+            {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
                 {% translate "Пункт приезда" %}
-            {% elif form.initial.owner_type == 'customer'%}
+            {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer'%}
                 {% translate "Пункт прибытия" %}
         {% endif %}
     </label>
@@ -249,9 +254,9 @@
   <div class="from_to_place">
     <div class="wrap_left">
         <label for="id_from_place">
-             {% if form.initial.owner_type == 'mover' %}
+             {% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'    %}
                     {% translate "Откуда можете забрать?" %}
-             {% elif form.initial.owner_type == 'customer' %}
+             {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
                     {% translate "Откуда нужно забрать посылку?" %}
              {% endif %}
         </label>
@@ -274,9 +279,9 @@
     </div>
     <div class="wrap_right">
     <label for="id_to_place">
-        {% if form.initial.owner_type == 'mover' %}
+        {% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover' %}
                     {% translate "Куда можете доставить?" %}
-        {% elif form.initial.owner_type == 'customer' %}
+        {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
                     {% translate "Куда нужно доставить посылку?" %}
         {% endif %}
     </label>
@@ -302,9 +307,9 @@
 <hr>
 
   <div>
-    <label>{% if form.initial.owner_type == 'mover' %}
+    <label>{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover' %}
                     {% translate "Могу перевезти:" %}
-        {% elif form.initial.owner_type == 'customer' %}
+        {% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
                     {% translate "Что нужно перевезти?" %}
         {% endif %}
     </label>