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

0.0.155 routes

Browse Source
This commit is contained in:
SBD
2025-02-17 15:18:16 +03:00
parent c59c5d929b
commit 8e6111dfb1
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
static/v2/js/widgets/w_daterangepicker.js
View File

@@ -36,10 +36,11 @@ function datarangepickerinitAll(){
}
function daterangepickerInit(el, callback, date) {
let $datarangepicker = el.querySelector('input')
let min_date = moment()
if (date){
min_date = moment(date);
let $datarangepicker = el.querySelector('input');
let min_date = moment(date)
if ($datarangepicker.dataset.set_min_date === 'false' || $datarangepicker.dataset.set_min_date === false) {
min_date = moment('1900-01-01');
}
$($datarangepicker).daterangepicker({
"autoapply": true,
@@ -47,7 +48,7 @@ function daterangepickerInit(el, callback, date) {
"singleDatePicker": !!el.dataset.range,
"timePicker": false,
"timePicker24Hour": false,
"minDate": moment(date),
"minDate": min_date,
"locale": setLocalSets(),
}, function (start, end, label) {
let $parent = el.closest('.w_daterangepicker')

1
static/v2/js/widgets/w_route_card.js
View File

@@ -14,6 +14,7 @@ function changeRoute(el) {
success: (res) => {
if (!res.html) return;
$(".info_profile")[0].innerHTML = res.html;
datarangepickerinitAll()
}, error: (res) => {
}

2
templates/v2/blocks/b_search_routes.html
View File

@@ -28,7 +28,7 @@
</div>
<div class="field_container" data-type="date" data-name="arrival_DT">
<label for="id_arrival_DT">{% trans "Дата (период) доставки" %}</label>
{% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' range='true' initial=form.initial.arrival_DT %}
{% include 'v2/widgets/w_daterangepicker.html' with set_min_date='false' name='arrival_DT' range='true' initial=form.initial.arrival_DT %}
{% if form.errors.arrival_DT %}<div class="error_container">{{ form.errors.arrival_DT.0 }}</div>{% endif %}
</div>
<button type="submit">{% trans "Найти посылку" %}</button>

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

@@ -35,7 +35,7 @@
<div class="form_line _50_grid">
<div class="field_container" data-type="date" data-name="arrival_DT">
<label for="id_arrival_DT"><div class="required_field_icon">*</div> {% trans "Дата доставки посылки" %}</label>
{% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' initial=form.initial.arrival_DT %}
{% include 'v2/widgets/w_daterangepicker.html' with set_min_date='true' name='arrival_DT' initial=form.initial.arrival_DT %}
{% if form.errors.arrival_DT %}<div class="error_container">{{ form.errors.arrival_DT.0 }}</div>{% endif %}
</div>
</div>

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

@@ -28,12 +28,12 @@
<div class="form_line _50_grid">
<div class="field_container" data-type="date" data-name="departure_DT">
<label for="id_departure_DT"><div class="required_field_icon">*</div> {% trans "Дата отправления" %}</label>
{% include 'v2/widgets/w_daterangepicker.html' with name='departure_DT' initial=form.initial.departure_DT %}
{% include 'v2/widgets/w_daterangepicker.html' with set_min_date='true' name='departure_DT' initial=form.initial.departure_DT %}
{% if form.errors.departure_DT %}<div class="error_container">{{ form.errors.departure_DT.0 }}</div>{% endif %}
</div>
<div class="field_container" data-type="date" data-name="arrival_DT">
<label for="id_arrival_DT"><div class="required_field_icon">*</div> {% trans "Дата прибытия" %}</label>
{% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' initial=form.initial.arrival_DT %}
{% include 'v2/widgets/w_daterangepicker.html' with set_min_date='true' name='arrival_DT' initial=form.initial.arrival_DT %}
{% if form.errors.arrival_DT %}<div class="error_container">{{ form.errors.arrival_DT.0 }}</div>{% endif %}
</div>
</div>

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

@@ -3,7 +3,7 @@
<div class="w_daterangepicker" onclick="selectInputWContainer(this)">
<div class="date_range_input_cont">
<input class="dropped" {% if range %}data-range="{{ range }}"{% endif %} type="text" name="{{ name }}" id="id_{{ name }}" autocomplete="off"{% if initial %} value="{{ initial|date:'d.m.Y' }}"{% endif %}>
<input class="dropped" data-set_min_date="{{ set_min_date }}" {% if range %}data-range="{{ range }}"{% endif %} 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="">
</div>
</div>