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

1.3.0 get_routes in my_routes TRI-251

Browse Source
This commit is contained in:
ArtemB
2024-09-24 15:05:01 +03:00
parent b4beac26a7
commit 393f165095
2 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
static/js/user_profile.js
View File

@@ -605,8 +605,17 @@ function sendRoute(el, routeID = null){
inline:'start' inline:'start'
}); });
let currentUrl = window.location.pathname;
let newUrl = '';
if(currentUrl.includes('/create_route_for_customer')){
newUrl = currentUrl.replace('/create_route_for_customer', '/my_routes');
}else if(currentUrl.includes('/create_route_for_mover')){
newUrl = currentUrl.replace('/create_route_for_mover', '/my_routes');
}
window.history.replaceState(null, '', newUrl);

62
templates/tb_base.html
View File

@@ -148,37 +148,37 @@ function gtag_report_conversion(url) {
<body{% if page_type == 'routes' %} onscroll="scroll_ev(event,this)"{% endif %}> <body{% if page_type == 'routes' %} onscroll="scroll_ev(event,this)"{% endif %}>
<div class="popup_wrapper"> {# <div class="popup_wrapper">#}
{##}
{% if not user.is_authenticated %} {# {% if not user.is_authenticated %}#}
<div class="popup_content"> {# <div class="popup_content">#}
<div class="popup_cross" onclick="setCokie(182,'popup_show','false')"> {# <div class="popup_cross" onclick="setCokie(182,'popup_show','false')">#}
<img src="/static/img/svg/cross_popup.svg" alt=""> {# <img src="/static/img/svg/cross_popup.svg" alt="">#}
</div> {# </div>#}
<div class="popup_img"><img src="/static/img/svg/close_gift.svg" alt=""></div> {# <div class="popup_img"><img src="/static/img/svg/close_gift.svg" alt=""></div>#}
<div class="popup_title">{% translate "Попробуй бесплатно" %}</div> {# <div class="popup_title">{% translate "Попробуй бесплатно" %}</div>#}
<div class="popup_text">{% blocktranslate %} Зарегистрируйся сейчас и получи бонус <br> <span id="poup_text_bold">3 месяца бесплатного пользования!</span> {% endblocktranslate %}</div> {# <div class="popup_text">{% blocktranslate %} Зарегистрируйся сейчас и получи бонус <br> <span id="poup_text_bold">3 месяца бесплатного пользования!</span> {% endblocktranslate %}</div>#}
<button class="confirm_profile_btn" onclick="setCokie(182,'popup_show','false', '{% url "registration_page" %}')">{% translate "Зарегистрироваться" %}</button> {# <button class="confirm_profile_btn" onclick="setCokie(182,'popup_show','false', '{% url "registration_page" %}')">{% translate "Зарегистрироваться" %}</button>#}
</div> {# </div>#}
{##}
{% endif %} {# {% endif %}#}
{##}
{% if user.is_authenticated %} {# {% if user.is_authenticated %}#}
<div class="popup_content"> {# <div class="popup_content">#}
<div class="popup_cross" onclick="setCokie(182,'first_authorization','true')"> {# <div class="popup_cross" onclick="setCokie(182,'first_authorization','true')">#}
<img src="/static/img/svg/cross_popup.svg" alt=""> {# <img src="/static/img/svg/cross_popup.svg" alt="">#}
</div> {# </div>#}
<div class="popup_img"> {# <div class="popup_img">#}
<img src="/static/img/svg/open_gift.svg" alt=""> {# <img src="/static/img/svg/open_gift.svg" alt="">#}
</div> {# </div>#}
<div class="popup_title">{% translate "Добро пожаловать!" %}</div> {# <div class="popup_title">{% translate "Добро пожаловать!" %}</div>#}
<div class="popup_text">{% blocktranslate %} Команда Trip With Bonus <br> поздравляет вас с регистрацией и дарит <br> <span id="poup_text_bold">3 месяца бесплатного пользования сервисом</span> {% endblocktranslate %}</div> {# <div class="popup_text">{% blocktranslate %} Команда Trip With Bonus <br> поздравляет вас с регистрацией и дарит <br> <span id="poup_text_bold">3 месяца бесплатного пользования сервисом</span> {% endblocktranslate %}</div>#}
<button class="confirm_profile_btn" onclick="setCokie(182,'first_authorization','true')">{% translate "Забрать подарок" %}</button> {# <button class="confirm_profile_btn" onclick="setCokie(182,'first_authorization','true')">{% translate "Забрать подарок" %}</button>#}
<div id="authenticated_img"></div> {# <div id="authenticated_img"></div>#}
</div> {# </div>#}
{##}
{% endif %} {# {% endif %}#}
</div> {# </div>#}
<div class="cookie_block"> <div class="cookie_block">
<div class="container_content_cookie_block"> <div class="container_content_cookie_block">