sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.0.42 fix form

Browse Source
This commit is contained in:
SBD
2025-01-16 17:18:12 +03:00
parent b3e8d75539
commit 529b324817
8 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/pages/profile/p_user_profile.html
View File

@@ -32,11 +32,13 @@
<script src='{% static "v2/js/widgets/w_select_country.js" %}'></script>
<script src='{% static "v2/js/widgets/w_radio_inputs.js" %}'></script>
<script src='{% static "v2/js/widgets/w_route_card.js" %}'></script>
<script src='{% static "v2/js/widgets/w_daterangepicker.js" %}'></script>
<script src='{% static "v2/js/widgets/w_textarea_w_counter.js" %}'></script>
<script src='{% static "v2/js/forms/f_make_poster_order.js" %}'></script>
<script src='{% static "v2/js/forms/f_make_mover_order.js" %}'></script>
{% include "connect_ws_js.html" %}
<link rel="stylesheet" href="{% static "v2/css/widgets/w_route_card.css" %}">
<script defer src='{% static "js/check_new_messages.js" %}'></script>

5
templates/v2/blocks/b_my_routes.html
View File

@@ -1,7 +1,8 @@
{% load static %}
{% load i18n %}
<link rel="stylesheet" href="{% static "v2/css/widgets/w_route_card.css" %}">
<div class="b_my_routes">
{% include 'v2/widgets/w_customer_route_card.html' %}
{% for route in routes %}
{% include 'v2/widgets/w_customer_route_card.html' with route=route %}
{% endfor %}
</div>

43
templates/v2/widgets/w_customer_route_card.html
View File

@@ -1,24 +1,28 @@
{% load i18n %}
{% load static %}
<div class="w_customer_route_card w_route_card">
<div class="w_customer_route_card w_route_card" data-route_id="{{ route.id }}" data-owner_type="{{ route.owner_type }}">
<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" %}">
<img class="route_card_owner_avatar" src="{% static "v2/icons/widgets/w_additional_info/Info.svg" %}">
<div class="route_card_owner_info">
<div class="route_card_info_left_part">
<div class="card_owner_name">Александр</div>
<div class="card_owner_name">{{ route.owner.username }}</div>
<div class="card_splitter"></div>
<div class="card_owner_type">Нужен перевозчик</div>
<div class="card_cargo_type">Тип посылки: <div class="orange">Документы</div></div>
<div class="card_owner_type {{ route.owner_type }}">{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}</div>
<div class="card_cargo_type">Тип посылки: <div class="orange">{{ route.get_cargo_type_display }}</div></div>
</div>
<div class="route_btn inactive" style="--route-btn-width: 206px;--route-btn-height: min-content;">
<img src="{% static "v2/icons/widgets/w_route_card/phone.svg" %}" alt="">
<div class="title big">+ 6 (666) 666-66-66</div>
<img src="{% static "v2/icons/widgets/w_route_card/phone_half_opacity.svg" %}" alt="">
<div class="route_btn_title big">{{ route.phone }}</div>
</div>
</div>
<div class="route_card_text_container">
Требуется забрать документы из Минска и отдать в Варшаве. Цена перевозки договорная. Требуется забрать документы из Минска и отдать в Варшаве.
{% if route.comment %}
{{ route.comment }}
{% else %}
{% trans "Комментарий отсутствует" %}
{% endif %}
</div>
</div>
<div class="route_card_route_data">
@@ -26,18 +30,25 @@
<div class="label departure_from">{% trans "Забрать из:" %}</div>
<div class="place">
<div class="country">
<img src="{% static "v2/icons/widgets/w_select_country/flag_of_belarus_temp.svg" %}" alt="">
<div class="country_code">BY</div>
<img src="{{ route.from_city.country.flag.url }}" alt="">
<div class="country_code">{{ route.from_city.name }}</div>
</div>
<div class="place_title">
Минск/Беларусь
{{ route.from_city.name }}/{{ route.from_city.country.name }}
</div>
</div>
</div>
<div class="route_way_data">
<div class="route_transport">
<div class="route_transport_name">Авиаперевозка</div>
<img src="{% static "v2/icons/widgets/w_route_card/plane.svg" %}" alt="">
<div class="route_transport_name">{{ route.get_type_transport_display }}</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="">
{% elif route.type_transport == 'road' %}
<img src="{% static "v2/icons/widgets/w_route_card/car.svg" %}" alt="">
{% elif route.type_transport == 'avia' %}
<img src="{% static "v2/icons/widgets/w_route_card/plane.svg" %}" alt="">
{% endif %}
</div>
<div class="way_progress_line_container">
<div class="way_progress_round"></div>
@@ -50,11 +61,11 @@
<div class="label arrival_to">{% trans "Доставить в:" %}</div>
<div class="place">
<div class="country">
<img src="{% static "v2/icons/widgets/w_select_country/flag_of_belarus_temp.svg" %}" alt="">
<div class="country_code">BY</div>
<img src="{{ route.to_city.country.flag.url }}" alt="">
<div class="country_code">{{ route.to_city.name }}</div>
</div>
<div class="place_title">
Минск/Беларусь
{{ route.to_city.name }}/{{ route.to_city.country.name }}
</div>
</div>
</div>
@@ -70,7 +81,7 @@
<div class="route_btn_title">{% trans "Выделить цветом" %}</div>
<div class="route_btn_data">Осталось выделений: 0</div>
</div>
<div class="route_btn solid" data-action="change">
<div class="route_btn solid" data-action="change" onclick="changeRoute(this)">
<div class="route_btn_title">{% trans "Редактировать" %}</div>
</div>
</div>