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

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

Browse Source
This commit is contained in:
SDE
2025-01-15 18:12:24 +03:00
parent 89058ed264 c247bfcefa
commit 72c658c594
7 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
static/v2/css/widgets/w_route_card.css
View File

@@ -6,7 +6,7 @@
--big-font-size: 16px;
--medium-font-size: 14px;
--small-font-size: 12px;
--small-font-size: 10px;
--route-text-container-bg: #F1F1F1;
--route-text-container-padding: 15px;
@@ -22,6 +22,16 @@
--route_card_route_data-margin-top: 30px;
--route-btn-border: 1.5px solid #FF613A;
--route-btn-border-radius: 10px;
--route-btn-padding: 7.5px 0;
--route-btn-width: 171px;
--route-btn-bg: #FFFFFF;
--route-btn-hover-bg: #FF613A;
--route-btn-hover-text-color: #FFFFFF;
--route-btn-title-color: #272424;
--route-btn-text-data-color: #27242499;
background: var(--route-card-bg);
box-shadow: var(--route-card-box_shadow);
border-radius: 10px;
@@ -143,6 +153,7 @@
justify-content: center;
gap: 5px;
margin-bottom: 10px;
margin-top: 8px;
.route_transport_name{
font-size: var(--medium-font-size);
font-weight: 600;
@@ -162,6 +173,7 @@
border-radius: 100%;
position: absolute;
top: -10px;
z-index: 2;
&:first-of-type{
border: 3px solid #065BFF;
left: 0;
@@ -175,9 +187,62 @@
width: calc(100% - 10px);
margin-left: 10px;
height: 4px;
position: absolute;
top: 2px;
z-index: 1;
background: linear-gradient(90deg, rgba(6,91,255,1) 0%, rgba(69,194,38,1) 100%);
}
}
}
}
.route_card_actions_container{
margin-top: 23px;
display: flex;
justify-content: space-between;
align-items: center;
.delete_route{
cursor: pointer;
color: #27242499;
font-size: var(--medium-font-size);
&:hover{
color: #FF613A;
}
}
.right_part_action_btns{
display: flex;
align-items: center;
gap: 20px;
}
.route_btn{
cursor: pointer;
&.solid{
--route-btn-width: 222px;
--route-btn-padding: 12px 0;
--route-btn-bg: #FF613A;
--route-btn-title-color: #ffffff;
}
width: var(--route-btn-width);
border: var(--route-btn-border);
border-radius: var(--route-btn-border-radius);
padding: var(--route-btn-padding);
background: var(--route-btn-bg);
height: 100%;
text-align: center;
transition: 200ms all;
&:hover{
background: var(--route-btn-hover-bg);
.route_btn_title{color: var(--route-btn-hover-text-color);}
.route_btn_data{color: var(--route-btn-hover-text-color);}
box-shadow: 0 4px 4px rgba(189, 104, 104, 0.25);
}
.route_btn_title{
color: var(--route-btn-title-color);
font-size: var(--medium-font-size);
}
.route_btn_data{
font-size: var(--small-font-size);
color: var(--route-btn-text-data-color);
}
}
}
}

11
static/v2/js/forms.js
View File

@@ -117,4 +117,15 @@ function dataToFormData(data) {
formData.append(key, data[key]);
}
return formData;
}
function selectInputWContainer (el, callback) {
if (!el) return;
let $field = el.closest('.field_container');
if (!$field) return;
let $input = $field.querySelector('input');
$input.focus()
if (callback) callback(el);
}

6
templates/v2/forms/f_create_customer_route.html
View File

@@ -7,8 +7,8 @@
{% trans "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" as attention_type_transport %}
<label for="id_cargo_type"><div class="required_field_icon">*</div> {% trans "Каким способом Вы хотите отправить?" %}</label>
{% include 'v2/widgets/w_radio_inputs.html' with name='type_transport' callback='updateCargoTypeInForm' list=form.fields.type_transport.choices initial=form.initial.type_transport %}
{% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %}
{% if form.errors.type_transport %}<div class="error_container">{{ form.errors.type_transport.0 }}</div>{% endif %}
{% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %}
</div>
</div>
@@ -44,8 +44,8 @@
{% trans "Если вы оставите это поле пустым - перевозчики смогут только написать вам в личные сообщения на нашем сайте TripWB.com" as attention_phone %}
<label for="id_cargo_type">{% trans "Контактный номер телефона, по которому с Вами могут связаться перевозчики" %}</label>
<input class="half" style="height: unset;" type="text" name="phone" id="id_phone" placeholder="{% trans 'Укажите телефон' %}"{% if form.initial.phone %} value="{{ form.initial.phone }}" {% endif %}>
{% include 'v2/widgets/w_pay_attention.html' with text=attention_phone %}
{% if form.errors.phone %}<div class="error_container">{{ form.errors.phone.0 }}</div>{% endif %}
{% include 'v2/widgets/w_pay_attention.html' with text=attention_phone %}
</div>
</div>
<div class="form_line">
@@ -60,8 +60,8 @@
<div class="field_container line" data-type="checkbox" data-name="receive_msg_by_email">
<div class="checkbox{% if form.initial.receive_msg_by_email %} checked{% endif %}" onclick="chooseCheckbox(this)"></div>
<div class="checkbox_label" onclick="chooseCheckbox(this)">{% trans "Хочу получать уведомления на E-mail о появлении перевозчика по моим критериям" %}</div>
{% include 'v2/widgets/w_additional_info.html' %}
{% if form.errors.receive_msg_by_email %}<div class="error_container">{{ form.errors.receive_msg_by_email.0 }}</div>{% endif %}
{% include 'v2/widgets/w_additional_info.html' %}
</div>
</div>

6
templates/v2/forms/f_create_mover_route.html
View File

@@ -7,8 +7,8 @@
{% trans "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" as attention_type_transport %}
<label for="id_cargo_type"><div class="required_field_icon">*</div> {% trans "Укажите способ, которым вы можете перевезти" %}</label>
{% include 'v2/widgets/w_radio_inputs.html' with name='type_transport' callback='updateCargoTypeInForm' list=form.fields.type_transport.choices initial=form.initial.type_transport %}
{% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %}
{% if form.errors.type_transport %}<div class="error_container">{{ form.errors.type_transport.0 }}</div>{% endif %}
{% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %}
</div>
</div>
@@ -49,8 +49,8 @@
{% trans "Если вы оставите это поле пустым - перевозчики смогут только написать вам в личные сообщения на нашем сайте TripWB.com" as attention_phone %}
<label for="id_cargo_type">{% trans "Контактный номер телефона, по которому с Вами могут связаться перевозчики" %}</label>
<input class="half" style="height: unset;" type="text" name="phone" id="id_phone" placeholder="{% trans 'Укажите телефон' %}"{% if form.initial.phone %} value="{{ form.initial.phone }}" {% endif %}>
{% include 'v2/widgets/w_pay_attention.html' with text=attention_phone %}
{% if form.errors.phone %}<div class="error_container">{{ form.errors.phone.0 }}</div>{% endif %}
{% include 'v2/widgets/w_pay_attention.html' with text=attention_phone %}
</div>
</div>
<div class="form_line">
@@ -65,8 +65,8 @@
<div class="field_container line" data-type="checkbox" data-name="receive_msg_by_email">
<div class="checkbox{% if form.initial.receive_msg_by_email %} checked{% endif %}" onclick="chooseCheckbox(this)"></div>
<div class="checkbox_label" onclick="chooseCheckbox(this)">{% trans "Хочу получать уведомления на E-mail о появлении перевозчика по моим критериям" %}</div>
{% include 'v2/widgets/w_additional_info.html' %}
{% if form.errors.receive_msg_by_email %}<div class="error_container">{{ form.errors.receive_msg_by_email.0 }}</div>{% endif %}
{% include 'v2/widgets/w_additional_info.html' %}
</div>
</div>

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

@@ -57,4 +57,20 @@
</div>
</div>
</div>
<div class="route_card_actions_container">
<div class="delete_route">{% trans "Удалить" %}</div>
<div class="right_part_action_btns">
<div class="route_btn" data-action="up">
<div class="route_btn_title">{% trans "Поднять" %}</div>
<div class="route_btn_data">Осталось поднятий: 2</div>
</div>
<div class="route_btn" data-action="solid">
<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_title">{% trans "Редактировать" %}</div>
</div>
</div>
</div>
</div>

2
templates/v2/widgets/w_daterangepicker.html
View File

@@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
<div class="w_daterangepicker">
<div class="w_daterangepicker" onclick="selectInputWContainer(this)">
<div class="date_range_input_cont">
<input class="dropped" type="text" name="{{ name }}" id="id_{{ name }}" autocomplete="off"{% if initial %} value="{{ initial|date:'d.m.Y' }}"{% endif %}>
<img onclick="clickOnDateIconE(this)" src="{% static "v2/icons/widgets/w_datarangepicker/datarangepicker_icon.svg" %}" alt="">

4
templates/v2/widgets/w_select_country.html
View File

@@ -2,13 +2,13 @@
{% load i18n %}
<div class="w_select_country closed">
<div class="w_select_country_header" onclick="openCountruSelectIfDataEnter(this)">
<div class="w_select_country_header" onclick="selectInputWContainer(this, openCountruSelectIfDataEnter)">
<div class="select_country_header_left_part">
<div class="container_inf_about_country">
<img class="country_flag_img_container"{% if initial.country.flag %} src="{{ initial.country.flag.url }}"{% endif %}>
<div class="country_code">{% if initial.country.short_code %}{{ initial.country.short_code }}{% endif %}</div>
</div>
<input class="dropped" type="text" name="{{ name }}" id="id_{{ name }}" placeholder="{{ placeholder }}" oninput="searchCountry(this)" data-value="" data-id="" value="{% if initial.name %}{{ initial.name }}/{{ initial.country.name }}{% endif %}">
<input class="dropped" type="text" name="{{ name }}" id="id_{{ name }}" placeholder="{{ placeholder }}" oninput="searchCountry(this)" data-value="{% if initial %}{{ initial.name }}/{{ initial.country.name }}{% endif %}" data-id="{% if initial.id %}{{ initial.id }}{% endif %}" value="{% if initial.name %}{{ initial.name }}/{{ initial.country.name }}{% endif %}">
</div>
<img class="w_select_country_icon" src="{% static "v2/icons/widgets/w_select_country/pin.svg" %}" alt="">
</div>