From b3cc0085ff54d6f84a84c8b3dc832df239d663e1 Mon Sep 17 00:00:00 2001
From: Laetitia <laetitia.getti@hotmail.fr>
Date: Sat, 15 Feb 2025 17:43:30 +0100
Subject: [PATCH] Make phone not mandatory

---
 la_chariotte/order/forms.py                   |  5 ++++
 .../0028_groupedorder_is_phone_mandatory.py   | 20 +++++++++++++
 ...set_phone_mandatory_for_existing_orders.py | 20 +++++++++++++
 la_chariotte/order/models.py                  |  3 ++
 .../templates/order/grouped_order_create.html |  7 +++--
 .../templates/order/grouped_order_detail.html | 13 ++++----
 .../order/grouped_order_overview.html         |  2 +-
 .../templates/order/grouped_order_update.html |  5 +++-
 la_chariotte/order/views/grouped_order.py     |  7 +++--
 .../tests/test_order_views_grouped_order.py   | 30 +++++++++++++++++++
 la_chariotte/tests/utils.py                   | 12 ++++++--
 11 files changed, 110 insertions(+), 14 deletions(-)
 create mode 100644 la_chariotte/order/migrations/0028_groupedorder_is_phone_mandatory.py
 create mode 100644 la_chariotte/order/migrations/0029_set_phone_mandatory_for_existing_orders.py

diff --git a/la_chariotte/order/forms.py b/la_chariotte/order/forms.py
index 8e28d5a..2cf2817 100644
--- a/la_chariotte/order/forms.py
+++ b/la_chariotte/order/forms.py
@@ -18,6 +18,10 @@ class GroupedOrderForm(forms.ModelForm):
         widget=forms.TimeInput(attrs={"type": "time"}),
         initial=datetime.time(hour=23, minute=59, second=59),
     )
+    is_phone_mandatory = forms.BooleanField(
+        label="Numéro de téléphone obligatoire pour les participants",
+        required=False,
+    )
 
     class Meta:
         model = GroupedOrder
@@ -29,6 +33,7 @@ class GroupedOrderForm(forms.ModelForm):
             "delivery_slot",
             "place",
             "description",
+            "is_phone_mandatory",
         ]
         widgets = {
             "name": forms.TextInput(
diff --git a/la_chariotte/order/migrations/0028_groupedorder_is_phone_mandatory.py b/la_chariotte/order/migrations/0028_groupedorder_is_phone_mandatory.py
new file mode 100644
index 0000000..809fd55
--- /dev/null
+++ b/la_chariotte/order/migrations/0028_groupedorder_is_phone_mandatory.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.16 on 2024-12-08 15:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0027_remove_groupedorder_total_price_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="groupedorder",
+            name="is_phone_mandatory",
+            field=models.BooleanField(
+                default=False, verbose_name="Numéro de téléphone obligatoire"
+            ),
+        ),
+    ]
diff --git a/la_chariotte/order/migrations/0029_set_phone_mandatory_for_existing_orders.py b/la_chariotte/order/migrations/0029_set_phone_mandatory_for_existing_orders.py
new file mode 100644
index 0000000..2b6a0a9
--- /dev/null
+++ b/la_chariotte/order/migrations/0029_set_phone_mandatory_for_existing_orders.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.16 on 2024-12-08 15:41
+
+from django.db import migrations
+
+def set_phone_mandatory(apps, schema_editor):
+    """For continuity, force mandatory phone for the orders that were created so far."""
+    GroupedOrder = apps.get_model("order", "GroupedOrder")
+    for grouped_order in GroupedOrder.objects.all():
+        grouped_order.is_phone_mandatory = True
+        grouped_order.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0028_groupedorder_is_phone_mandatory"),
+    ]
+
+    operations = [
+        migrations.RunPython(set_phone_mandatory),
+    ]
diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py
index 7dd7c0c..5450f72 100644
--- a/la_chariotte/order/models.py
+++ b/la_chariotte/order/models.py
@@ -26,6 +26,9 @@ class GroupedOrder(models.Model):
     )
     description = models.TextField("Description", null=True, blank=True)
     code = models.CharField(auto_created=True)
+    is_phone_mandatory = models.BooleanField(
+        default=False, verbose_name="Numéro de téléphone obligatoire"
+    )
 
     def create_code_from_pk(self):
         """When a grouped order is created, a unique code is generated, to be used to
diff --git a/la_chariotte/order/templates/order/grouped_order_create.html b/la_chariotte/order/templates/order/grouped_order_create.html
index 3accfb1..01c8858 100644
--- a/la_chariotte/order/templates/order/grouped_order_create.html
+++ b/la_chariotte/order/templates/order/grouped_order_create.html
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 
+{% load crispy_forms_tags %}
+
 {% block title %}Nouvelle commande groupée{% endblock %}
 
 {% block content %}
@@ -10,8 +12,9 @@
         <p class="title">Nouvelle commande groupée</p>
         <div class="columns">
             <div class="column is-8">
-                <form method="post" onsubmit="deadlinePassedCheck(event)">{% csrf_token %}
-                    {{ form.as_p }}
+                <form method="post" onsubmit="deadlinePassedCheck(event)">
+                    {% csrf_token %}
+                    {{ form | crispy }}
                     <div class="buttons">
                         <a class="button is-light" href="{% url 'order:index' %}">Annuler</a>
                         <input class="button is-primary" type="submit" value="Suivant">
diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html
index b80aed5..b73d467 100644
--- a/la_chariotte/order/templates/order/grouped_order_detail.html
+++ b/la_chariotte/order/templates/order/grouped_order_detail.html
@@ -158,16 +158,18 @@
                                        value="{{ order_author.last_name }}" required></p>
                         </div>
                         <div class="column">
-                            <p><label for="phone">Numéro de téléphone :</label>
-                                <input id="phone" type="tel" pattern="[0-9]{10}" placeholder="0601020304" name="phone"
-                                       value="{{ order_author.phone }}" required></p>
+                            <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}" 
+                                placeholder="0601020304" name="phone"
+                                       value="{{ order_author.phone }}"
+                                       {% if is_phone_mandatory %}required{% endif %}></p>
                             <p><label for="email">Adresse mail : </label>
                                 <input id="email" type="email" placeholder="exemple@mail.fr" name="email"
                                        value="{{ order_author.email }}" required></p>
                         </div>
                     </div>
-                    <p><label for="note">Note à l'organisateur·ice</label>
-                        <textarea id="note" rows=3 placeholder="(facultatif)" name="note">{{ note }}</textarea></p>
+                    <p><label for="note">Note à l'organisateur·ice<em> (facultatif)</em> :</label>
+                        <textarea id="note" rows=3 name="note">{{ note }}</textarea></p>
 
                     <div class="buttons">
                         <button id="submit" type="submit" value="Order" class="button is-primary">
@@ -186,7 +188,6 @@
         // Compute total price whenever a value in input is modified
         document.getElementById("inputs-parent").addEventListener("change", function () {
             inputs = [...document.getElementsByTagName("input")].filter(input => input.getAttribute("name").indexOf("quantity_") === 0);  //filter the inputs to get the quantity inputs only
-
             prices = {{ prices_dict | safe }};
             let total_price = 0;
 
diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html
index 4a3715c..4418505 100644
--- a/la_chariotte/order/templates/order/grouped_order_overview.html
+++ b/la_chariotte/order/templates/order/grouped_order_overview.html
@@ -161,7 +161,7 @@
         <tr>
           <td>{{ order.author }}</td>
           <td>{{ order.price }} €</td>
-          <td><a href="mailto:{{ order.author.email }}">{{ order.author.email }}</a></td>
+          <td><a href="mailto:{{ order.author.email }}">{{ order.author.email }}</a>{% if order.author.phone %} / {{ order.author.phone }}{% endif %}</td>
           <td>
             <button class="button is-info is-small js-modal-trigger" data-target="order-detail-{{ order.id }}">
             Voir
diff --git a/la_chariotte/order/templates/order/grouped_order_update.html b/la_chariotte/order/templates/order/grouped_order_update.html
index e6ad3b4..eaad0cd 100644
--- a/la_chariotte/order/templates/order/grouped_order_update.html
+++ b/la_chariotte/order/templates/order/grouped_order_update.html
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
 
+{% load crispy_forms_tags %}
+
 {% block title %}Modifier la commande groupée{% endblock %}
 
 {% block content %}
@@ -9,13 +11,14 @@
 <div class="box">
     <p class="title">{{ grouped_order.name }} - modifier</p>
     <form method="post" onsubmit="deadlinePassedCheck(event)">{% csrf_token %}
-        {{ form.as_p }}
+        {{ form | crispy }}
         <div class="buttons">
             <a class="button is-light" href="{% url 'order:index' %}">Annuler</a>
             <input class="button is-primary" type="submit" value="Suivant">
         </div>
     </form>
 </div>
+
 {% endblock %}
 
 {% block extra_js %}
diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py
index 27fe47f..55d9cca 100644
--- a/la_chariotte/order/views/grouped_order.py
+++ b/la_chariotte/order/views/grouped_order.py
@@ -112,7 +112,8 @@ class GroupedOrderDetailView(generic.DetailView):
         return get_object_or_404(GroupedOrder, code=self.kwargs.get("code"))
 
     def get_context_data(self, **kwargs):
-        items = self.get_object().item_set.all()
+        grouped_order = self.get_object()
+        items = grouped_order.item_set.all()
 
         remaining_qty = {item.id: item.get_remaining_nb() for item in items}
         prices_dict = {item.id: item.price for item in items}
@@ -133,6 +134,8 @@ class GroupedOrderDetailView(generic.DetailView):
                 "prices_dict": json.dumps(prices_dict, cls=DjangoJSONEncoder),
                 "remaining_qty": remaining_qty,
                 "order_author": order_author,
+                # Used to set if the phone is required in the form
+                "is_phone_mandatory": grouped_order.is_phone_mandatory,
             }
         )
         return context
@@ -358,7 +361,7 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView):
         response = http.HttpResponse(
             content_type="text/csv",
             headers={
-                "Content-Disposition": f'attachment; filename="{ context["object"].name }-commandes"'
+                "Content-Disposition": f'attachment; filename="{context["object"].name}-commandes"'
             },
         )
         writer = csv.writer(response, delimiter=";")
diff --git a/la_chariotte/tests/test_order_views_grouped_order.py b/la_chariotte/tests/test_order_views_grouped_order.py
index ce4ad17..ce6fa36 100644
--- a/la_chariotte/tests/test_order_views_grouped_order.py
+++ b/la_chariotte/tests/test_order_views_grouped_order.py
@@ -662,6 +662,36 @@ class TestGroupedOrderDetailView:
         assert order.price == 4
         assert item.get_remaining_nb() == 16
 
+    def test_phone_not_required_display(self, client, other_user):
+        """a user orders something without entering phone when it is required"""
+        grouped_order = create_grouped_order(
+            days_before_delivery_date=5,
+            days_before_deadline=2,
+            name="gr order test",
+            orga_user=other_user,
+        )
+        assert grouped_order.is_phone_mandatory == True
+        item = models.Item.objects.create(
+            name="test item 1", grouped_order=grouped_order, price=1, max_limit=2
+        )
+        detail_url = reverse(
+            "order:grouped_order_detail",
+            kwargs={
+                "code": grouped_order.code,
+            },
+        )
+        response = client.get(detail_url)
+        assert response.status_code == 200
+        assert "gr order test" in response.content.decode()
+        assert (
+            "Numéro de téléphone <em>(facultatif)</em>" not in response.content.decode()
+        )
+        grouped_order.is_phone_mandatory = False
+        grouped_order.save()
+        response = client.get(detail_url)
+        assert "gr order test" in response.content.decode()
+        assert "Numéro de téléphone <em>(facultatif)</em>" in response.content.decode()
+
 
 class TestGroupedOrderOverview:
     def test_get_overview(self, client_log):
diff --git a/la_chariotte/tests/utils.py b/la_chariotte/tests/utils.py
index d1b9e4e..6cdeca8 100644
--- a/la_chariotte/tests/utils.py
+++ b/la_chariotte/tests/utils.py
@@ -9,12 +9,20 @@ pytestmark = pytest.mark.django_db
 
 
 def create_grouped_order(
-    days_before_delivery_date, days_before_deadline, name, orga_user
+    days_before_delivery_date,
+    days_before_deadline,
+    name,
+    orga_user,
+    is_phone_mandatory=True,
 ):
     date = timezone.now().date() + datetime.timedelta(days=days_before_delivery_date)
     deadline = timezone.now() + datetime.timedelta(days=days_before_deadline)
     grouped_order = models.GroupedOrder.objects.create(
-        name=name, orga=orga_user, delivery_date=date, deadline=deadline
+        name=name,
+        orga=orga_user,
+        delivery_date=date,
+        deadline=deadline,
+        is_phone_mandatory=is_phone_mandatory,
     )
     grouped_order.create_code_from_pk()
     grouped_order.save()