Merge remote-tracking branch 'origin/main'

2023-11-30 18:11:33 +03:00
parent 3a4c1b12a6 ce68dbee8a
commit fd1f4ff9b1
12 changed files with 235 additions and 108 deletions
--- a/templates/blocks/static_pages_blocks/b_advertisement.html
+++ b/templates/blocks/static_pages_blocks/b_advertisement.html
@@ -55,7 +55,7 @@
          </div>

          <div class="inputs_l">
-            <input name="phone" type="number" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
+            <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
            {% if form.tel and form.errors.tel %}
            <span>{{ form.errors.tel }}</span>
                 {% endif %}
--- a/templates/blocks/static_pages_blocks/b_feedback_form.html
+++ b/templates/blocks/static_pages_blocks/b_feedback_form.html
@@ -20,7 +20,7 @@
        >
            <div class="left_inputs_form">
                <div class="inputs_l">
-            <input name="username" type="text" placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
+            <input name="name" type="text" placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
            {% if form.username and form.errors.username %}
            <span>{{ form.errors.username }}</span>
                 {% endif %}
@@ -34,7 +34,7 @@
              </div>

              <div class="inputs_l">
-                <input name="tel" type="number" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
+                <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
                {% if form.tel and form.errors.tel %}
                <span>{{ form.errors.tel }}</span>
                     {% endif %}
@@ -44,7 +44,7 @@
                <div class="counter-box">
                    <label for="id_text"></label>
                    <textarea
-                            name="text"
+                            name="text_msg"
                            onFocus="this.select()"
                            oninput="counterText(this)"
                            id="id_text" class="feedback_form_message"
@@ -60,7 +60,7 @@

                </div>
                <div class="button_feedback_form">
-                    <button onclick="SendFeedbackForm(this)" id="send_feedback_form">{% translate 'Отправить сообщение' %}</button>
+                    <button onclick="RequestCommercialOffer(this)" id="send_feedback_form">{% translate 'Отправить сообщение' %}</button>

                </div>

--- a/templates/blocks/static_pages_blocks/b_partners.html
+++ b/templates/blocks/static_pages_blocks/b_partners.html
@@ -35,14 +35,14 @@
        <span id="sub_title_static">{% translate "Оставь заявку и получи пресональное предложение о партнерстве" %}</span>
    <form data-name="msg_from_partners">
          <div class="inputs_l">
-            <input name="username" type="text" placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
+            <input name="name" type="text" placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
            {% if form.username and form.errors.username %}
            <span>{{ form.errors.username }}</span>
                 {% endif %}
          </div>

          <div class="inputs_l">
-            <input name="tel" type="number" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
+            <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
            {% if form.tel and form.errors.tel %}
            <span>{{ form.errors.tel }}</span>
                 {% endif %}
--- a/templates/mail/m_request_offer.html
+++ b/templates/mail/m_request_offer.html
@@ -1,15 +1,23 @@

-<div style="font-family:Calibri,Candara,Segoe,'Segoe UI',Optima,Arial,sans-serif; padding:10px; background-color: #F8F8F8;">
-    <div style="line-height:1.0em;width: 660px">
+<div style="font-family:Calibri,Candara,Segoe,'Segoe UI',Optima,Arial,sans-serif;
+    padding:10px; background-color: #F8F8F8;"
+>
+    <div style="line-height:1.0em; width: 660px">
        <div style="padding:5px; text-align: center;">
            <img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
        </div>
-        <p style="font-weight:700;font-size:25px;text-align:center;padding:0;line-height:1em; text-transform: uppercase; color: #ff613a;">
+        <p style="font-weight:700; font-size:25px; text-align:center;
+            padding:0; line-height:1em; text-transform: uppercase; color: #ff613a;
+            margin: auto; max-width: 90%;
+        ">
            {{ message_title|safe }}
        </p>
-        <div style="line-height:1.0em;font-size:18px;margin-top: 5px; margin-left: 30px; box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); padding: 30px; border-radius: 10px; background-color: #FFF;">
+        <div style="line-height:1.0em; font-size:18px; margin: 5px 30px;
+            box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
+            padding: 30px; border-radius: 10px; background-color: #FFF;"
+        >
 {#            <p style="line-height:1.0em;font-size:18px;margin-top: 5px; margin-left: 80px">#}
-                {{ message_text|safe }}
+                {{ message_text|safe|linebreaksbr }}
 {#            </p>#}
        </div>
        {% for button in message_buttons %}
--- a/templates/widgets/w_carrier_card.html
+++ b/templates/widgets/w_carrier_card.html
@@ -2,21 +2,48 @@
 {% load i18n %}
 <div class="carrier-card" data-number-of-route="{{ route.id }}">
    <div class="left-part-carrier-card">
-        <div class="first-line-card-carrier">
-            <div class="carrier-title">
-               {% translate "Перевозчик:" %}
-            </div>

-            <div class="type_transportation_carrier">
-                {% if route.type_transport == 'road' %}
-                    <img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
-                    {% elif route.type_transport == 'avia'%}
-                    <img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
-                {% endif %}
-                {{ route.get_type_transport_display }}
+        {% if route.owner_type == 'mover'  %}
+            <div class="first-line-card-carrier">
+                <div class="carrier-title">
+                   {% translate "Перевозчик:" %}
+                </div>
+
+                <div class="type_transportation_carrier">
+                    {% if route.type_transport == 'road' %}
+                        <img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
+                        {% elif route.type_transport == 'avia'%}
+                        <img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
+                    {% endif %}
+                    {{ route.get_type_transport_display }}
+                </div>
+                <div class="clear_both"></div>
            </div>
+        {% endif %}
+        {% if route.owner_type == 'customer'  %}
+            <div class="route_info_about">
+                    <span class="cargo_type_disp">
+                        {% translate "Тип: " %}{{ route.get_cargo_type_display }}
+                    </span>
+
+                    <span class="cargo_weight">
+                       {% translate "Вес: " %}{{ route.weight }} {% translate "кг" %}
+                    </span>
+
+                    <span class="cargo_type_trans">
+
+                        {% if route.type_transport == 'road' %}
+                            <img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
+                            {% elif route.type_transport == 'avia'%}
+                            <img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
+                        {% endif %}
+
+                        {{ route.get_type_transport_display }}
+                    </span>
            <div class="clear_both"></div>
-        </div>
+
+            </div>
+        {% endif %}
        <div class="from-to-country-container-carrier">
            <div class="from-to-country-text left fl-left txt-al-right" title="{{ route.from_country_n_city_str }}">
                {{ route.from_country_n_city_str }}
@@ -31,7 +58,16 @@
    </div>
 {#    <div class="splliter-left-right-part-carrier-card"></div>#}
    <div class="inf_carrier_container">
-        <div class="title_container_inf_carrier">{% translate "Контакты отправителия:" %}</div>
+        <div class="title_container_inf_carrier">
+            {% translate 'Контакты' %}
+            {% if route.owner_type == 'mover' %}
+                {% translate "перевозчика" %}
+                <img class="inf_carrier_icon" src="{% static "/img/svg/mover.svg" %}"/>
+            {% elif route.owner_type == 'customer'%}
+                {% translate "отправителя" %}
+                <img class="inf_carrier_icon" src="{% static "/img/svg/cargo.svg" %}"/>
+            {% endif %}
+        </div>
        <div>
            <img src="{% static "/delete_later/Avatar.png" %}">
            <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
--- a/templates/widgets/w_msg_send_success.html
+++ b/templates/widgets/w_msg_send_success.html
@@ -0,0 +1,9 @@
+{% load static %}
+{% load i18n %}
+
+    <div
+        onclick="hideBlock(this)"
+        class="msg_send">
+
+        {% translate 'Ваше сообщение отправлено' %}
+    </div>
--- a/templates/widgets/w_route_info.html
+++ b/templates/widgets/w_route_info.html
@@ -15,13 +15,13 @@
 {#            </div>#}
 {#            <div class="clear_both"></div>#}
 {#        </div>#}
-                    <div class="route_info_about">
+                <div class="route_info_about">
                    <span class="cargo_type_disp">
-                        {% translate "Тип:" %}{{ route.get_cargo_type_display }}
+                        {% translate "Тип: " %}{{ route.get_cargo_type_display }}
                    </span>

                    <span class="cargo_weight">
-                       {% translate "Вес:" %}{{ route.weight }} {% translate "кг" %}
+                       {% translate "Вес: " %}{{ route.weight }} {% translate "кг" %}
                    </span>

                    <span class="cargo_type_trans">
@@ -85,12 +85,29 @@
                            {% translate "Редактировать" %}
                    </button>
                </div>
+
                <div class="button_remove_route">
                     <button
-                             onclick="confirmRemove(this)"
-                            id="remove_route">
+                             onclick="confirmRemove(this, {{ route.id }})"
+                             class="remove_route"
+                             id="remove_route_{{ route.id }}">
                            {% translate "Удалить" %}
                    </button>
+
+                    <button
+                            onclick="removeRoute(this,{{ route.id }},{once: true})"
+                            class="confirm_remove"
+                            id="confirm_remove_{{ route.id }}">
+                        {% translate "Подтвердить удаление" %}
+                    </button>
+
+                    <button
+                            onclick="cancelRemove({{ route.id }})"
+                            class="cancel_remove"
+                            id="cancel_remove_{{ route.id }}">
+                        {% translate "Отменить удаление" %}
+                    </button>
+
                </div>
            </div>
            {% if route.owner != user %}