From e9b3dc1da99f8175c145341c8cc8d233f5d8607f Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 12 Nov 2024 10:50:15 +0300 Subject: [PATCH 1/7] 1.7.13 route phone is not exists --- RoutesApp/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RoutesApp/models.py b/RoutesApp/models.py index f9d2051..e1210ad 100644 --- a/RoutesApp/models.py +++ b/RoutesApp/models.py @@ -57,7 +57,7 @@ class Route(BaseModel): verbose_name=_('Куда можете доставить?')) cargo_type = models.CharField(choices=cargo_type_choices, default='parcel', verbose_name=_('Могу перевезти')) weight = models.IntegerField(verbose_name=_('Укажите вес до (кг)')) - phone = models.CharField(verbose_name=_('Укажите номер для связи')) + phone = models.CharField(verbose_name=_('Укажите номер для связи'), blank=True, null=True) extra_phone = models.CharField(verbose_name=_('Дополнительный номер'), blank=True, null=True) receive_msg_by_email = models.BooleanField(default=False, verbose_name=_('Получать уведомления по E-mail')) receive_msg_by_sms = models.BooleanField(default=False, verbose_name=_('Получать уведомления по SMS')) From f80f8d8c7eb31c52e0717bcce24f80ca3e992cf2 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 12 Nov 2024 10:51:40 +0300 Subject: [PATCH 2/7] 1.7.14 route phone is not exists --- RoutesApp/migrations/0009_alter_route_phone.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 RoutesApp/migrations/0009_alter_route_phone.py diff --git a/RoutesApp/migrations/0009_alter_route_phone.py b/RoutesApp/migrations/0009_alter_route_phone.py new file mode 100644 index 0000000..78d7d6c --- /dev/null +++ b/RoutesApp/migrations/0009_alter_route_phone.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2024-11-12 10:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('RoutesApp', '0008_route_highlight_end_dt'), + ] + + operations = [ + migrations.AlterField( + model_name='route', + name='phone', + field=models.CharField(blank=True, null=True, verbose_name='Укажите номер для связи'), + ), + ] From e14072e82980bd04b84115e10431d6093b3bde0f Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 12 Nov 2024 12:01:28 +0300 Subject: [PATCH 3/7] 1.7.15 fix registration.js 71 --- static/js/registration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/registration.js b/static/js/registration.js index d35e724..eceb9d5 100644 --- a/static/js/registration.js +++ b/static/js/registration.js @@ -68,7 +68,7 @@ function SendRegistrationForm(el, user_id){ }, error: function (data, exception){ - document.querySelector(".register").innerHTML = data.responseJSON.html + document.querySelector(".register").innerHTML = data.responseText } }); } From cfb7acfddb7d4dd1082612c4a7db6fa2268eb3f6 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 12 Nov 2024 12:15:52 +0300 Subject: [PATCH 4/7] 1.7.15 fix user_profile.js 1312 --- static/js/user_profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 749c3d4..ee5381f 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -1308,7 +1308,7 @@ function hideErrors(el) { error_feeedback_text.classList.add('hide') } else if(error_feeedback === footer_button && error_footer !== null ){ error_footer.classList.add('hide') - } else if(el.id === 'agreement_check'){ + } else if(el.id === 'agreement_check' && agree_error){ agree_error.classList.add('hide') } else if(el.id === 'id_arrival_DT' && error_arrival_DT !== null){ error_arrival_DT.classList.add('hide') From dbee8dabb1fc74a8a451d92b088e7385c1bec920 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 12 Nov 2024 12:33:10 +0300 Subject: [PATCH 5/7] 1.3.2 phone is not required TRI-249, TRI-265 --- static/js/global_js.js | 10 +++++----- templates/widgets/routes/w_my_route.html | 6 +++--- templates/widgets/w_carrier_card.html | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/static/js/global_js.js b/static/js/global_js.js index 9d084c5..a018c96 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -227,11 +227,11 @@ function checkStateCookie () { if (!window.document.cookie.includes("allow_cookie=true")){ document.querySelector(".cookie_block").classList.add("show") } - if (!window.document.cookie.includes("popup_show=false")){ - setTimeout(() => { - document.querySelector('.popup_wrapper').classList.add('show'); - }, 15000); - } + // if (!window.document.cookie.includes("popup_show=false")){ + // setTimeout(() => { + // document.querySelector('.popup_wrapper').classList.add('show'); + // }, 15000); + // } if(!window.document.cookie.includes("first_authorization=true") && window.document.getElementById('authenticated_img')){ document.querySelector(".popup_wrapper").classList.add("show") } diff --git a/templates/widgets/routes/w_my_route.html b/templates/widgets/routes/w_my_route.html index 87c5122..99be9f9 100644 --- a/templates/widgets/routes/w_my_route.html +++ b/templates/widgets/routes/w_my_route.html @@ -143,10 +143,10 @@ {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}> {{ route.owner.last_name }} {{ route.owner.first_name }} - + - {{ route.phone }} - + {%if route.phone == route.phone %}{{ route.phone }}{% endif %} +
+ - {{ route.phone }} + {%if route.phone == route.phone %}{{ route.phone }}{% endif %} {# #}
From 8afdfc87c5e2b727cebfa782558df058ed332d43 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 12 Nov 2024 12:42:10 +0300 Subject: [PATCH 6/7] 1.7.16 registration send mail test --- AuthApp/js_views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 5226337..9d7cdd0 100644 --- a/AuthApp/js_views.py +++ b/AuthApp/js_views.py @@ -711,6 +711,7 @@ def registration_ajax(request): } res = send_check_email_after_registration(mail_Dict, user) + print(str(res)) # res = send_registration_mail(mail_Dict, user) res_Dict = { From 94f677ae6feff63a834e37280e7317bd0d9c48b5 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 12 Nov 2024 12:52:46 +0300 Subject: [PATCH 7/7] 1.7.17 get_routes_Dict send techmail if user undefined --- RoutesApp/funcs.py | 6 ++++++ static/js/user_profile.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index 7555e8e..cbef7b5 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -1,3 +1,5 @@ +from BaseModels.mailSender import techSendMail +from GeneralApp.funcs_options import get_mail_send_options from .models import * from .forms import * from django.utils.translation import gettext as _ @@ -169,6 +171,10 @@ def get_routes_Dict(user=None, data=None): kwargs.update({ 'owner': user }) + else: + msg = f'get_routes_Dict not have user - user={str(user)}, data={str(data)}' + mail_sets = get_mail_send_options() + techSendMail(mail_sets, msg) from_el = None to_el = None diff --git a/static/js/user_profile.js b/static/js/user_profile.js index ee5381f..4236194 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -1308,7 +1308,7 @@ function hideErrors(el) { error_feeedback_text.classList.add('hide') } else if(error_feeedback === footer_button && error_footer !== null ){ error_footer.classList.add('hide') - } else if(el.id === 'agreement_check' && agree_error){ + } else if(el.id === 'agreement_check' && agree_error !== null){ agree_error.classList.add('hide') } else if(el.id === 'id_arrival_DT' && error_arrival_DT !== null){ error_arrival_DT.classList.add('hide')