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

RoutesApp/admin.py

@@ -30,6 +30,7 @@ class Admin_Route(Admin_Trans_BaseModel):
     ]
 
     search_fields = [
+        'id',
         'owner__first_name', 'owner__last_name', 'from_city__name', 'to_city__name', 'owner__email'
     ]
     raw_id_fields = ['from_city', 'to_city']

RoutesApp/templatetags/routes_tags.py

@@ -3,10 +3,38 @@ __author__ = 'SDE'
 from django import template
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _
 
 register = template.Library()
 
 
+cargo_type_for_show = {
+    'letter': _('Документы/письмо'),
+    'package': _('Посылка'),
+    'passenger': _('Попутчик'),
+    'parcel': _('Бандероль'),
+    'cargo': _('Груз'),
+}
+
+type_transport_for_show = {
+    'road': _('Автоперевозка'),
+    'avia': _('Авиатранспорт'),
+    '': _('Авто/Авиаперевозка'),
+}
+
+
+@register.filter
+@stringfilter
+def get_type_transport_for_show(value):
+    return mark_safe(type_transport_for_show[value])
+
+
+@register.filter
+@stringfilter
+def get_cargo_type_for_show(value):
+    return mark_safe(cargo_type_for_show[value])
+
+
 @register.filter
 @stringfilter
 def get_splited_cargo_type(value):

templates/v2/content_widgets/w_route_card/route_card_info_data.html

@@ -1,5 +1,6 @@
 {% load static %}
 {% load i18n %}
+{% load routes_tags %}
 
 <div class="route_card_info_data">
     <img class="route_card_text_img" src="{% static "v2/icons/widgets/w_route_card/route_card_avatar_spline.svg" %}">
@@ -9,7 +10,7 @@
             <div class="card_owner_name">{{ route.owner }}</div>
             <div class="card_splitter"></div>
             <div class="card_owner_type {{ route.owner_type }}">{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}</div>
-            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.get_cargo_type_display }}</div></div>
+            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.cargo_type|get_cargo_type_for_show }}</div></div>
         </div>
         <div class="route_btn inactive" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 11px;">
             <img src="{% static "v2/icons/widgets/w_route_card/phone_half_opacity.svg" %}" alt="">
@@ -31,7 +32,7 @@
     <div class="route_card_owner_info">
         <div class="route_card_info_left_part">
             <div class="card_owner_type {{ route.owner_type }}">{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}</div>
-            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.get_cargo_type_display }}</div></div>
+            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.cargo_type|get_cargo_type_for_show }}</div></div>
         </div>
         <div class="route_btn inactive" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 11px;">
             <img src="{% static "v2/icons/widgets/w_route_card/phone_half_opacity.svg" %}" alt="">

templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html

@@ -1,5 +1,6 @@
 {% load static %}
 {% load i18n %}
+{% load routes_tags %}
 
 <div class="route_card_info_data">
     <img class="route_card_text_img" src="{% static "v2/icons/widgets/w_route_card/route_card_avatar_spline.svg" %}">
@@ -9,7 +10,7 @@
             <div class="card_owner_name">{{ route.owner }}</div>
             <div class="card_splitter"></div>
             <div class="card_owner_type {{ route.owner_type }}">{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}</div>
-            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.get_cargo_type_display }}</div></div>
+            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.cargo_type|get_cargo_type_for_show }}</div></div>
         </div>
         <div class="respond_route_cont" style="display: none;">
             <div class="route_btn unhovered" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 11px;">
@@ -58,7 +59,7 @@
     <div class="route_card_owner_info">
         <div class="route_card_info_left_part">
             <div class="card_owner_type {{ route.owner_type }}">{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}</div>
-            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.get_cargo_type_display }}</div></div>
+            <div class="card_cargo_type">{% trans "Тип посылки:" %} <div class="orange">{{ route.cargo_type|get_cargo_type_for_show }}</div></div>
         </div>
     </div>
     <div class="card_owner_name">{{ route.owner }}</div>

templates/v2/content_widgets/w_route_card/route_card_route_data.html

@@ -1,5 +1,6 @@
 {% load static %}
 {% load i18n %}
+{% load routes_tags %}
 
 <div class="route_card_route_data_cont">
     <div class="route_card_route_data">
@@ -17,7 +18,7 @@
         </div>
         <div class="route_way_data">
             <div class="route_transport">
-                <div class="route_transport_name">{{ route.get_type_transport_display }}</div>
+                <div class="route_transport_name">{{ route.type_transport|get_type_transport_for_show }}</div>
                 {% if route.type_transport == '' %}
                     <img src="{% static "v2/icons/widgets/w_route_card/plane.svg" %}" alt="">
                     <img src="{% static "v2/icons/widgets/w_route_card/car.svg" %}" alt="">
@@ -92,7 +93,7 @@
             </div>
             <div class="route_way_data">
                 <div class="route_transport">
-                    <div class="route_transport_name">{{ route.get_type_transport_display }}</div>
+                    <div class="route_transport_name">{{ route.type_transport|get_type_transport_for_show }}</div>
                     {% if route.type_transport == '' %}
                         <img src="{% static "v2/icons/widgets/w_route_card/plane.svg" %}" alt="">
                         <img src="{% static "v2/icons/widgets/w_route_card/car.svg" %}" alt="">