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

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

Browse Source
This commit is contained in:
SDE
2024-08-22 13:41:47 +03:00
parent 85f6e69d63 83aeab9341
commit c60b9942f6
6 changed files with 1028 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/dynamic_loading_routes.js
View File

@@ -177,7 +177,7 @@ function load_routes (el,news=null,incrase,owner_type) {
}
let first_block_iteration = document.querySelector(`.page_paging_elements_${paging_iterator}`)
let insert_place = null
if (first_block_iteration.innerHTML){
if (first_block_iteration && first_block_iteration.innerHTML){
paging_iterator++
let new_page_paging_elements = document.createElement('div')
new_page_paging_elements.classList.add(`page_paging_elements_${paging_iterator}`)

42
templates/inter/meta_OpenGraph.html
View File

@@ -1,42 +0,0 @@
{% 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 %}

1018
templates/inter/meta_OpenGraph_Schema.html Normal file
View File

File diff suppressed because it is too large Load Diff

2
templates/tb_base.html
View File

@@ -18,7 +18,7 @@
<meta name="google-site-verification" content="4V4upJSK2_4MBrr5ZXjcCLw3bBwXc4_gsnKudJAaWqI" />
<meta name="yandex-verification" content="b8a976575e41fbbc" />
{% include "inter/meta_OpenGraph.html" %}
{% include "inter/meta_OpenGraph_Schema.html" %}
<!-- Yandex.Metrika counter -->
<script type="text/javascript" >

5
templates/widgets/routes/w_my_route.html
View File

@@ -1,17 +1,18 @@
{% load static %}
{% load i18n %}
{% if route.departure_DT %}
{% with current_datetime=route.from_city.get_current_datetime %}
{% with departure_datetime=route.departure_DT %}
{% with highlight_end_DT=route.highlight_end_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 }}">
<div class="carrier-card {% if route.highlight_color and highlight_end_DT|date:"Y-m-d H:i:s" > current_datetime|date:"Y-m-d H:i:s" %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
{% endif %}
{% endwith %}
{% 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">

19
templates/widgets/w_carrier_card.html
View File

@@ -18,24 +18,7 @@
{% endif %}
<div class="left-part-carrier-card">
{% if route.owner_type == 'mover' %}
<div class="first-line-card-carrier">
<div class="carrier-title">
{% translate "Перевозчик:" %}
</div>
<div class="type_transportation_carrier">
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
{% elif route.type_transport == 'avia'%}
<img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
{% endif %}
{{ route.get_type_transport_display }}
</div>
<div class="clear_both"></div>
</div>
{% endif %}
{% if route.owner_type == 'customer' %}
{% if route.owner_type == 'customer' or route.owner_type == 'mover' %}
<div class="route_info_about">
<span class="cargo_type_disp">
{% translate "Тип: " %}{{ route.get_cargo_type_display }}