Merge branch 'hotfix/gift-cert-fix' into 'master'

Hotfix/gift cert fix

See merge request lilschool/site!286

apps/user/forms.py

@@ -14,7 +14,7 @@ class UserEditForm(forms.ModelForm):
     phone = PhoneNumberField()
     # city = forms.CharField()
     # country = forms.CharField()
-    birthday = forms.DateField(input_formats=['%d.%m.%Y'], required=False)
+    birthday = forms.DateField(input_formats=['%d/%m/%Y'], required=False)
     # gender = forms.ChoiceField(choices=User.GENDER_CHOICES, required=False)
     gender = forms.CharField(required=False)
     # about = forms.CharField()
@@ -32,7 +32,7 @@ class UserEditForm(forms.ModelForm):
     photo = forms.ImageField(required=False)
 
     child_gender = forms.CharField(required=False)
-    child_birthday = forms.DateField(input_formats=['%d.%m.%Y'], required=False)
+    child_birthday = forms.DateField(input_formats=['%d/%m/%Y'], required=False)
     child_first_name = forms.CharField(required=False)
     child_last_name = forms.CharField(required=False)
 

apps/user/templates/user/profile-settings.html

@@ -154,7 +154,7 @@
           <div class="form__field field{% if form.phone.errors %} error{% endif %}">
             <div class="field__label">НОМЕР ТЕЛЕФОНА РОДИТЕЛЯ</div>
             <div class="field__wrap">
-              <input name='phone' class="field__input" type="phone" placeholder="+7 (999) 999-99-99" value="{{ user.phone }}">
+              <input name='phone' class="field__input" type="phone" placeholder="+7 (999) 999-99-99" value="{{ user.phone|default:'' }}">
             </div>
             {% for error in form.phone.errors %}
             <div class="field__error">{{ error }}</div>