Merge pull request 'dev' (#26) from dev into main

Reviewed-on: #26

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 = {

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

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='Укажите номер для связи'),
+        ),
+    ]

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'))

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")){
+    // if (!window.document.cookie.includes("popup_show=false")){
-        setTimeout(() => {
+    //     setTimeout(() => {
-                document.querySelector('.popup_wrapper').classList.add('show');
+    //             document.querySelector('.popup_wrapper').classList.add('show');
-            }, 15000);
+    //         }, 15000);
-    }
+    // }
     if(!window.document.cookie.includes("first_authorization=true") && window.document.getElementById('authenticated_img')){
         document.querySelector(".popup_wrapper").classList.add("show")
        }

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
         }
     });
 }

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 !== null){
            agree_error.classList.add('hide')
        } else if(el.id === 'id_arrival_DT' && error_arrival_DT !== null){
            error_arrival_DT.classList.add('hide')

templates/widgets/routes/w_my_route.html

@@ -143,10 +143,10 @@
                     {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>
                 <span class="name_carrier{% if route.owner == user %} active{% endif %}">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
 
-                <a class="phones_carrier" href="tel:{{ route.phone }}">
+                <a class="phones_carrier" href="tel:{%if route.phone == route.phone %}{{ route.phone }}{% endif %}">
                     <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                    <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span>
+                    <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{%if route.phone == route.phone %}{{ route.phone }}{% endif %}</span>
-                    <input value="{{ route.phone }}">
+                    <input value="{%if route.phone == route.phone %}{{ route.phone }}{% endif %}">
                     <div class="clear_both"></div>
                 </a>
                 <a class="email_carrier" href="mailto:{{ route.owner.email }}">

templates/widgets/w_carrier_card.html

@@ -105,9 +105,9 @@
                         <span class="name_carrier"></span>
                     {% endif %}
 
-                    <a class="phones_carrier" data-href="tel:{{ route.phone }}">
+                    <a class="phones_carrier" data-href="tel:{%if route.phone == route.phone %}{{ route.phone }}{% endif %}">
                         <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                        <span class="phones_carrier_span el_for_open_el {% if route.owner == user %} active{% endif %}">{{ route.phone }}</span>
+                        <span class="phones_carrier_span el_for_open_el {% if route.owner == user %} active{% endif %}">{%if route.phone == route.phone %}{{ route.phone }}{% endif %}</span>
         {#                <input value="{{ route.phone }}">#}
                         <div class="clear_both"></div>
                     </a>