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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2024-04-25 11:36:46 +03:00
parent 27aaff4a4b 32c2fd4e6c
commit 97116a2070
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RoutesApp/forms.py
View File

@@ -50,6 +50,9 @@ def routeForm_assign_choices_by_type_transport(form, type_transport):
class RouteForm(forms.ModelForm): class RouteForm(forms.ModelForm):
from_address_point_txt = forms.CharField(required=True) from_address_point_txt = forms.CharField(required=True)
to_address_point_txt = forms.CharField(required=True) to_address_point_txt = forms.CharField(required=True)
departure_DT = forms.DateTimeField(required=True, input_formats=['%d.%m.%Y %H:%M'])
arrival_DT = forms.DateTimeField(required=True, input_formats=['%d.%m.%Y %H:%M'])
class Meta: class Meta:
model = Route model = Route
exclude = [ exclude = [
@@ -61,8 +64,6 @@ class RouteForm(forms.ModelForm):
# print('check') # print('check')
cleaned_data = super(RouteForm, self).clean() cleaned_data = super(RouteForm, self).clean()
try: try:
if 'phone' in cleaned_data and 'phone' in cleaned_data: if 'phone' in cleaned_data and 'phone' in cleaned_data:

5
templates/blocks/profile/b_subscribe_current.html
View File

@@ -53,8 +53,9 @@
</div> </div>
<div class="clear_both"></div> <div class="clear_both"></div>
</div> </div>
<div class="inf_about_tarif_plan_text"><div style="font-weight: 600;">{% translate "При отказе или досрочном изменении тарифного" %}</div> {% translate "плана оплаченный период действия текущей подписки не пересчитывается." %}</div> <div class="inf_about_tarif_plan_text"><div style="font-weight: 600;">{% translate "При отказе или досрочном изменении тарифного" %}</div>
<div class="b_another_subscribes"> <div style="font-weight: 600;">{% translate "плана оплаченный период действия текущей подписки не пересчитывается." %}</div>
<div class="b_another_subscribes">
{% for item in subscribes %} {% for item in subscribes %}
{% if item.id != subscribe_for_user.subscribe.id %} {% if item.id != subscribe_for_user.subscribe.id %}