Merge pull request 'dev' (#7) from dev into main
Reviewed-on: sysadminix/tripwithbonus#7
This commit is contained in:
@@ -1,3 +1,15 @@
|
||||
<div>
|
||||
{% load static %}
|
||||
{% load i18n %}
|
||||
|
||||
<div class="page_paging_elements_1">
|
||||
{% include 'blocks/routes/b_my_routes_list.html' %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if last_block == False and next_page_els_count %}
|
||||
<div class="text-align-center">
|
||||
<button class="button-find-more-routes" id="{{ last_el }}" onclick="load_routes(this,null,{{ next_page_els_count }},'{{ owner_type }}')">{% trans "Показать ещё" %}<span class="col_vo_els_f_load"> {{ next_page_els_count }}</span></button>
|
||||
<div class="width-100 text-align-center mb-10">
|
||||
<img class="loader_f_loading_routes" src="{% static "img/svg/loader.svg" %}">
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
@@ -74,92 +74,9 @@
|
||||
|
||||
{% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
|
||||
<hr>
|
||||
<div class="departure_arrival">
|
||||
<div class="wrap_left">
|
||||
<label for="id_departure_DT">
|
||||
|
||||
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
|
||||
{% translate "Дата и время выезда" %}
|
||||
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
|
||||
{% translate "Дата и время вылета" %}
|
||||
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
|
||||
{% translate "Дата и время отправки" %}
|
||||
{% endif %}
|
||||
|
||||
</label>
|
||||
|
||||
|
||||
{# <input#}
|
||||
{# type="datetime-local"#}
|
||||
{# min= {% now "Y-m-d" %}T{% now "H:i" %}#}
|
||||
{# name="departure_DT"#}
|
||||
{# onchange="checkDate()"#}
|
||||
{# {% if form.fields.departure_DT.required %} required{% endif %}#}
|
||||
{# id="id_departure_DT"#}
|
||||
{# class="el_form_b_new_route"#}
|
||||
{# placeholder="Выберите дату и время"#}
|
||||
{# {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#}
|
||||
{# />#}
|
||||
{# boris change input #}
|
||||
<input
|
||||
class="el_form_b_new_route"
|
||||
{# onchange="checkDate()"#}
|
||||
{# onclick="setIcon(this)"#}
|
||||
onmouseup="hideErrors(this)"
|
||||
type="text"
|
||||
id="id_departure_DT"
|
||||
name="departure_DT"
|
||||
placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %}
|
||||
value="{{ form.initial.departure_DT|date:"d.m.Y H:m" }}"{% endif %}/>
|
||||
<div id="displayRegervation"></div>
|
||||
|
||||
{% if not errors_off and form.errors and form.errors.departure_DT %}
|
||||
<span id="error_departure_DT">{{ form.errors.departure_DT }}</span>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
<div id="arrival_div">
|
||||
<label for="id_arrival_DT">
|
||||
|
||||
{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'%}
|
||||
{% translate "Дата и время прибытия" %}
|
||||
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
|
||||
{% translate "Дата и время доставки посылки" %}
|
||||
{% endif %}
|
||||
|
||||
</label>
|
||||
{# <input#}
|
||||
{# type="datetime-local"#}
|
||||
{# min= {% now "Y-m-d" %}T{% now "H:i" %}#}
|
||||
{# name="arrival_DT"#}
|
||||
{# onchange="checkDate()"#}
|
||||
{# {% if form.fields.arrival_DT.required %} required{% endif %}#}
|
||||
{# id="id_arrival_DT"#}
|
||||
{# class="el_form_b_new_route"#}
|
||||
{# {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
|
||||
{# />#}
|
||||
{# boris change input #}
|
||||
<input
|
||||
class="el_form_b_new_route"
|
||||
onchange="checkDate()"
|
||||
onmouseup="hideErrors(this)"
|
||||
type="text"
|
||||
id="id_arrival_DT"
|
||||
name="arrival_DT"
|
||||
placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %}
|
||||
value="{{ form.initial.arrival_DT|date:"d.m.Y H:m" }}"{% endif %}/>
|
||||
|
||||
<div id="displayRegervation"></div>
|
||||
{# end #}
|
||||
{% if not errors_off and form.errors and form.errors.arrival_DT %}
|
||||
<span id="error_arrival_DT">{{ form.errors.arrival_DT }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="clear_both"></div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="from_to_country">
|
||||
<div class="from_to_country">
|
||||
<div class="from_country_container">
|
||||
<div class="local_city_time" hidden="hidden">{% if route.departure_DT %}{{ route.from_city.get_current_datetime }}{% elif form.initial.departure_DT %}{{ form.initial.departure_DT }}{% endif %}</div>
|
||||
<label for="id_from_address_point_txt">
|
||||
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
|
||||
{% translate "Пункт вылета" %}
|
||||
@@ -247,6 +164,92 @@
|
||||
</div>
|
||||
<div class="clear_both"></div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="departure_arrival">
|
||||
<div class="wrap_left">
|
||||
<label for="id_departure_DT">
|
||||
|
||||
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
|
||||
{% translate "Дата и время выезда" %}
|
||||
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
|
||||
{% translate "Дата и время вылета" %}
|
||||
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
|
||||
{% translate "Дата и время отправки" %}
|
||||
{% endif %}
|
||||
|
||||
</label>
|
||||
|
||||
|
||||
{# <input#}
|
||||
{# type="datetime-local"#}
|
||||
{# min= {% now "Y-m-d" %}T{% now "H:i" %}#}
|
||||
{# name="departure_DT"#}
|
||||
{# onchange="checkDate()"#}
|
||||
{# {% if form.fields.departure_DT.required %} required{% endif %}#}
|
||||
{# id="id_departure_DT"#}
|
||||
{# class="el_form_b_new_route"#}
|
||||
{# placeholder="Выберите дату и время"#}
|
||||
{# {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#}
|
||||
{# />#}
|
||||
{# boris change input #}
|
||||
<input
|
||||
class="el_form_b_new_route"
|
||||
{# onchange="checkDate()"#}
|
||||
{# onclick="setIcon(this)"#}
|
||||
onmouseup="hideErrors(this)"
|
||||
readonly
|
||||
type="text"
|
||||
id="id_departure_DT"
|
||||
name="departure_DT"
|
||||
placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %}
|
||||
value="{{ form.initial.departure_DT|date:"d.m.Y H:i" }}"{% endif %}/>
|
||||
<div id="displayRegervation"></div>
|
||||
|
||||
{% if not errors_off and form.errors and form.errors.departure_DT %}
|
||||
<span id="error_departure_DT">{{ form.errors.departure_DT }}</span>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
<div id="arrival_div">
|
||||
<label for="id_arrival_DT">
|
||||
|
||||
{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'%}
|
||||
{% translate "Дата и время прибытия" %}
|
||||
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
|
||||
{% translate "Дата и время доставки посылки" %}
|
||||
{% endif %}
|
||||
|
||||
</label>
|
||||
{# <input#}
|
||||
{# type="datetime-local"#}
|
||||
{# min= {% now "Y-m-d" %}T{% now "H:i" %}#}
|
||||
{# name="arrival_DT"#}
|
||||
{# onchange="checkDate()"#}
|
||||
{# {% if form.fields.arrival_DT.required %} required{% endif %}#}
|
||||
{# id="id_arrival_DT"#}
|
||||
{# class="el_form_b_new_route"#}
|
||||
{# {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
|
||||
{# />#}
|
||||
{# boris change input #}
|
||||
<input
|
||||
class="el_form_b_new_route"
|
||||
onchange="checkDate()"
|
||||
onmouseup="hideErrors(this)"
|
||||
type="text"
|
||||
readonly
|
||||
id="id_arrival_DT"
|
||||
name="arrival_DT"
|
||||
placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %}
|
||||
value="{{ form.initial.arrival_DT|date:"d.m.Y H:i" }}"{% endif %}/>
|
||||
|
||||
<div id="displayRegervation"></div>
|
||||
{# end #}
|
||||
{% if not errors_off and form.errors and form.errors.arrival_DT %}
|
||||
<span id="error_arrival_DT">{{ form.errors.arrival_DT }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="clear_both"></div>
|
||||
</div>
|
||||
|
||||
{# <div>#}
|
||||
{# <label for="id_from_city">{{ form.fields.from_city.label }}</label>#}
|
||||
|
||||
42
templates/inter/meta_OpenGraph.html
Normal file
42
templates/inter/meta_OpenGraph.html
Normal file
@@ -0,0 +1,42 @@
|
||||
|
||||
{% if page.url == 'main' %}
|
||||
|
||||
|
||||
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{% if page.url == 'about_service' and page.url == 'ru' %}
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:title" content="Express parcel delivery | TWB">
|
||||
<meta property="og:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
|
||||
<meta property="og:url" content="https://tripwb.com/en/page/about_service/">
|
||||
<meta property="og:image" content="https://tripwb.com/static/img/png/finlogo.png">
|
||||
<meta property="og:site_name" content="TWB">
|
||||
<meta property="og:locale" content="en_EN">
|
||||
<meta property="fb:app_id" content="tripwithbonus">
|
||||
|
||||
<meta name="twitter:title" content="Express parcel delivery | TWB">
|
||||
<meta name="twitter:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
|
||||
<meta name="twitter:card" content="summary">
|
||||
{% endif %}
|
||||
|
||||
{% if page.url == 'about_service' and page.url == 'en' %}
|
||||
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:title" content="Express parcel delivery | TWB">
|
||||
<meta property="og:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
|
||||
<meta property="og:url" content="https://tripwb.com/en/page/about_service/">
|
||||
<meta property="og:image" content="https://tripwb.com/static/img/png/finlogo.png">
|
||||
<meta property="og:site_name" content="TWB">
|
||||
<meta property="og:locale" content="en_EN">
|
||||
<meta property="fb:app_id" content="tripwithbonus">
|
||||
|
||||
<meta name="twitter:title" content="Express parcel delivery | TWB">
|
||||
<meta name="twitter:description" content="You can order fast delivery of parcels and letters to all CIS cities with us ✓ Competitive rates on the website ✓ Express parcel dispatch ➡️ Contact us">
|
||||
<meta name="twitter:card" content="summary">
|
||||
|
||||
{% endif %}
|
||||
@@ -153,7 +153,7 @@ src="https://www.facebook.com/tr?id=370775942506737&ev=PageView&noscript=1"
|
||||
init_ws()
|
||||
const beep = new Audio('/static/sounds/beep_2.mp3')
|
||||
</script>
|
||||
|
||||
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,17 @@
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
<div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
|
||||
{% if route.departure_DT %}
|
||||
{% with current_datetime=route.from_city.get_current_datetime %}
|
||||
{% with departure_datetime=route.departure_DT %}
|
||||
{% if current_datetime|date:"Y-m-d H:i:s" > departure_datetime|date:"Y-m-d H:i:s" %}
|
||||
<div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
|
||||
{% else %}
|
||||
<div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
{#<div class="carrier-card"{% if route.highlight_color %} style="border: 5px solid {{ route.highlight_color }};"{% endif %} data-number-of-route="{{ route.id }}">#}
|
||||
<div class="left-part-carrier-card">
|
||||
{# <div class="first-line-card-carrier">#}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<div onmousedown='selectItemAddrPoint({{ id }}, "{{ fullname }}", "{{ ctrl_name }}")' class="autocomplete-result" data-index="{{ index }}">
|
||||
<div onmousedown='selectItemAddrPoint({{ id }}, "{{ fullname }}", "{{ ctrl_name }}", "{{ city_DT }}")' class="autocomplete-result" data-index="{{ index }}">
|
||||
{% if airport_fullname %}<div>{{ airport_fullname|safe }}</div>{% endif %}
|
||||
<div class="autocomplete-location">{{ city_name }} / {{ country_name }}</div>
|
||||
</div>
|
||||
@@ -2,17 +2,21 @@
|
||||
{% load i18n %}
|
||||
{% load subscribes_tags_extra %}
|
||||
|
||||
{% if route.departure_DT %}
|
||||
{% now 'Y-m-d H:i:s' as current_date %}
|
||||
{% with departure_date_string=route.departure_DT|date:"Y-m-d H:i:s" %}
|
||||
{% if departure_date_string < current_date %}
|
||||
<div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
|
||||
{% else %}
|
||||
<div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
{#Current Datetime: {{ route.from_city.get_current_datetime }}<br>#}
|
||||
{#Departure DT:{{ route.departure_DT }}<br>#}
|
||||
|
||||
{% if route.departure_DT %}
|
||||
{% with current_datetime=route.from_city.get_current_datetime %}
|
||||
{% with departure_datetime=route.departure_DT %}
|
||||
{% if current_datetime|date:"Y-m-d H:i:s" > departure_datetime|date:"Y-m-d H:i:s" %}
|
||||
<div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
|
||||
{% else %}
|
||||
<div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
|
||||
<div class="left-part-carrier-card">
|
||||
{% if route.owner_type == 'mover' %}
|
||||
<div class="first-line-card-carrier">
|
||||
@@ -144,7 +148,7 @@
|
||||
<span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el"></span>
|
||||
<div class="clear_both"></div>
|
||||
</a>
|
||||
<a class="email_carrier" data-href="mailto:{{ route.owner.email }}">
|
||||
<a class="email_carrier" data-href="mailto:">
|
||||
<img class="inf_carrier_icon" src="{% static "/img/svg/email.svg" %}">
|
||||
<span class="email_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el"></span>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user