mirror of
https://framagit.org/la-chariotte/la-chariotte.git
synced 2025-05-03 12:21:52 +02:00
ref: change phone_mandatory into is_change_mandatory
This commit is contained in:
parent
4c494c8684
commit
39220a15d7
7 changed files with 11 additions and 11 deletions
|
@ -18,7 +18,7 @@ class GroupedOrderForm(forms.ModelForm):
|
||||||
widget=forms.TimeInput(attrs={"type": "time"}),
|
widget=forms.TimeInput(attrs={"type": "time"}),
|
||||||
initial=datetime.time(hour=23, minute=59, second=59),
|
initial=datetime.time(hour=23, minute=59, second=59),
|
||||||
)
|
)
|
||||||
phone_mandatory = forms.BooleanField(
|
is_phone_mandatory = forms.BooleanField(
|
||||||
label="Numéro de téléphone obligatoire pour les participants",
|
label="Numéro de téléphone obligatoire pour les participants",
|
||||||
required=False,
|
required=False,
|
||||||
)
|
)
|
||||||
|
@ -33,7 +33,7 @@ class GroupedOrderForm(forms.ModelForm):
|
||||||
"delivery_slot",
|
"delivery_slot",
|
||||||
"place",
|
"place",
|
||||||
"description",
|
"description",
|
||||||
"phone_mandatory",
|
"is_phone_mandatory",
|
||||||
]
|
]
|
||||||
widgets = {
|
widgets = {
|
||||||
"name": forms.TextInput(
|
"name": forms.TextInput(
|
||||||
|
|
|
@ -12,7 +12,7 @@ class Migration(migrations.Migration):
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name="groupedorder",
|
model_name="groupedorder",
|
||||||
name="phone_mandatory",
|
name="is_phone_mandatory",
|
||||||
field=models.BooleanField(
|
field=models.BooleanField(
|
||||||
default=False, verbose_name="Numéro de téléphone obligatoire"
|
default=False, verbose_name="Numéro de téléphone obligatoire"
|
||||||
),
|
),
|
||||||
|
|
|
@ -27,7 +27,7 @@ class GroupedOrder(models.Model):
|
||||||
description = models.TextField("Description", null=True, blank=True)
|
description = models.TextField("Description", null=True, blank=True)
|
||||||
total_price = models.DecimalField(max_digits=10, decimal_places=2, default=0)
|
total_price = models.DecimalField(max_digits=10, decimal_places=2, default=0)
|
||||||
code = models.CharField(auto_created=True)
|
code = models.CharField(auto_created=True)
|
||||||
phone_mandatory = models.BooleanField(
|
is_phone_mandatory = models.BooleanField(
|
||||||
default=False, verbose_name="Numéro de téléphone obligatoire"
|
default=False, verbose_name="Numéro de téléphone obligatoire"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -158,11 +158,11 @@
|
||||||
value="{{ order_author.last_name }}" required></p>
|
value="{{ order_author.last_name }}" required></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<p><label for="phone">Numéro de téléphone {% if not phone_required %}<em>(facultatif)</em> {% endif %}:</label>
|
<p><label for="phone">Numéro de téléphone {% if not is_phone_mandatory %}<em>(facultatif)</em> {% endif %}:</label>
|
||||||
<input id="phone" type="tel" pattern="[0-9]{10}"
|
<input id="phone" type="tel" pattern="[0-9]{10}"
|
||||||
placeholder="0601020304" name="phone"
|
placeholder="0601020304" name="phone"
|
||||||
value="{{ order_author.phone }}"
|
value="{{ order_author.phone }}"
|
||||||
{% if phone_required %}required{% endif %}></p>
|
{% if is_phone_mandatory %}required{% endif %}></p>
|
||||||
<p><label for="email">Adresse mail : </label>
|
<p><label for="email">Adresse mail : </label>
|
||||||
<input id="email" type="email" placeholder="exemple@mail.fr" name="email"
|
<input id="email" type="email" placeholder="exemple@mail.fr" name="email"
|
||||||
value="{{ order_author.email }}" required></p>
|
value="{{ order_author.email }}" required></p>
|
||||||
|
|
|
@ -136,7 +136,7 @@ class GroupedOrderDetailView(generic.DetailView):
|
||||||
"remaining_qty": remaining_qty,
|
"remaining_qty": remaining_qty,
|
||||||
"order_author": order_author,
|
"order_author": order_author,
|
||||||
# Used to set if the phone is required in the form
|
# Used to set if the phone is required in the form
|
||||||
"phone_required": grouped_order.phone_mandatory,
|
"is_phone_mandatory": grouped_order.is_phone_mandatory,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return context
|
return context
|
||||||
|
|
|
@ -670,7 +670,7 @@ class TestGroupedOrderDetailView:
|
||||||
name="gr order test",
|
name="gr order test",
|
||||||
orga_user=other_user,
|
orga_user=other_user,
|
||||||
)
|
)
|
||||||
assert grouped_order.phone_mandatory == True
|
assert grouped_order.is_phone_mandatory == True
|
||||||
item = models.Item.objects.create(
|
item = models.Item.objects.create(
|
||||||
name="test item 1", grouped_order=grouped_order, price=1, max_limit=2
|
name="test item 1", grouped_order=grouped_order, price=1, max_limit=2
|
||||||
)
|
)
|
||||||
|
@ -686,7 +686,7 @@ class TestGroupedOrderDetailView:
|
||||||
assert (
|
assert (
|
||||||
"Numéro de téléphone <em>(facultatif)</em>" not in response.content.decode()
|
"Numéro de téléphone <em>(facultatif)</em>" not in response.content.decode()
|
||||||
)
|
)
|
||||||
grouped_order.phone_mandatory = False
|
grouped_order.is_phone_mandatory = False
|
||||||
grouped_order.save()
|
grouped_order.save()
|
||||||
response = client.get(detail_url)
|
response = client.get(detail_url)
|
||||||
assert "gr order test" in response.content.decode()
|
assert "gr order test" in response.content.decode()
|
||||||
|
|
|
@ -13,7 +13,7 @@ def create_grouped_order(
|
||||||
days_before_deadline,
|
days_before_deadline,
|
||||||
name,
|
name,
|
||||||
orga_user,
|
orga_user,
|
||||||
phone_mandatory=True,
|
is_phone_mandatory=True,
|
||||||
):
|
):
|
||||||
date = timezone.now().date() + datetime.timedelta(days=days_before_delivery_date)
|
date = timezone.now().date() + datetime.timedelta(days=days_before_delivery_date)
|
||||||
deadline = timezone.now() + datetime.timedelta(days=days_before_deadline)
|
deadline = timezone.now() + datetime.timedelta(days=days_before_deadline)
|
||||||
|
@ -22,7 +22,7 @@ def create_grouped_order(
|
||||||
orga=orga_user,
|
orga=orga_user,
|
||||||
delivery_date=date,
|
delivery_date=date,
|
||||||
deadline=deadline,
|
deadline=deadline,
|
||||||
phone_mandatory=phone_mandatory,
|
is_phone_mandatory=is_phone_mandatory,
|
||||||
)
|
)
|
||||||
grouped_order.create_code_from_pk()
|
grouped_order.create_code_from_pk()
|
||||||
grouped_order.save()
|
grouped_order.save()
|
||||||
|
|
Loading…
Reference in a new issue