From 72d7ea82debddbc1fdf62f0064fe48159c78fe1f Mon Sep 17 00:00:00 2001
From: Laetitia Getti <laetitia@hashbang.fr>
Date: Tue, 9 May 2023 16:15:09 +0200
Subject: [PATCH] add description and place fields in grouped order

---
 la_chariotte/order/forms.py                   |  2 +-
 ...pedorder_description_groupedorder_place.py | 26 +++++++++++++++++++
 la_chariotte/order/models.py                  |  2 ++
 .../templates/order/grouped_order_detail.html | 11 ++++----
 .../order/grouped_order_overview.html         |  2 ++
 5 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 la_chariotte/order/migrations/0015_groupedorder_description_groupedorder_place.py

diff --git a/la_chariotte/order/forms.py b/la_chariotte/order/forms.py
index dc66c3f..8ae13a8 100644
--- a/la_chariotte/order/forms.py
+++ b/la_chariotte/order/forms.py
@@ -9,7 +9,7 @@ from la_chariotte.order.models import GroupedOrder, Item
 class GroupedOrderForm(ModelForm):
     class Meta:
         model = GroupedOrder
-        fields = ["name", "deadline", "delivery_date"]
+        fields = ["name", "deadline", "delivery_date", "place", "description"]
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user")
diff --git a/la_chariotte/order/migrations/0015_groupedorder_description_groupedorder_place.py b/la_chariotte/order/migrations/0015_groupedorder_description_groupedorder_place.py
new file mode 100644
index 0000000..0d237a1
--- /dev/null
+++ b/la_chariotte/order/migrations/0015_groupedorder_description_groupedorder_place.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2 on 2023-05-09 14:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("order", "0014_item_max_limit_item_price"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="groupedorder",
+            name="description",
+            field=models.TextField(
+                blank=True, null=True, verbose_name="Description de la commande groupée"
+            ),
+        ),
+        migrations.AddField(
+            model_name="groupedorder",
+            name="place",
+            field=models.CharField(
+                blank=True, max_length=100, null=True, verbose_name="Lieu de livraison"
+            ),
+        ),
+    ]
diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py
index d8d44d4..08db4b5 100644
--- a/la_chariotte/order/models.py
+++ b/la_chariotte/order/models.py
@@ -14,6 +14,8 @@ class GroupedOrder(models.Model):
     )
     delivery_date = models.DateField("Date de livraison")
     deadline = models.DateTimeField("Date limite de commande")
+    place = models.CharField(max_length=100, null=True, blank=True, verbose_name="Lieu de livraison")
+    description = models.TextField("Description", null=True, blank=True)
 
     class Meta:
         unique_together = ["delivery_date", "name", "orga"]
diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html
index f91857d..66d12df 100644
--- a/la_chariotte/order/templates/order/grouped_order_detail.html
+++ b/la_chariotte/order/templates/order/grouped_order_detail.html
@@ -2,13 +2,14 @@
 
 {% block title %}{{ grouped_order }}{% endblock %}
 
+{% block content_title %}{{ grouped_order }} : commander{% endblock %}
+
 {% block content %}
-  <p>Détail de la commande groupée {{ grouped_order.id }}, avec la liste des produits associés</p>
-  <br>
   <p>{{ grouped_order }}
   <p>Organisateur·ice : {{ grouped_order.orga }}</p>
   <p>Date de livraison : {{ grouped_order.delivery_date }}</p>
-
+  <p>Date limite de commande : {{ grouped_order.deadline }}</p>
+  {% if grouped_order.description %}<p>{{ grouped_order.description }}</p>{% endif %}
   {% if not user.is_authenticated %}
     <p>Vous êtes l'organisateur·ice de cette commande groupée ?
       <a href="{% url 'order:grouped_order_overview' grouped_order.id %}">
@@ -33,11 +34,11 @@
   <form action="{% url 'order:order' grouped_order.id %}" method="post">
     {% csrf_token %}
     <fieldset>
-        <legend><h1>{{ grouped_order }}</h1></legend>
+        <legend><h1>Commander</h1></legend>
         {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
         {% for item in grouped_order.item_set.all %}
             <input type="radio" name="item" id="item{{ forloop.counter }}" value="{{ item.id }}">
-            <label for="item{{ forloop.counter }}">{{ item.name }}</label><br>
+            <label for="item{{ forloop.counter }}">{{ item }}</label><br>
         {% endfor %}
     </fieldset>
     <input type="submit" value="Order">
diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html
index d072cad..7414344 100644
--- a/la_chariotte/order/templates/order/grouped_order_overview.html
+++ b/la_chariotte/order/templates/order/grouped_order_overview.html
@@ -8,6 +8,8 @@
   <p>{{ grouped_order }}
   <p>Organisateur·ice : {{ grouped_order.orga }}</p>
   <p>Date de livraison : {{ grouped_order.delivery_date }}</p>
+  <p>Date limite de commande : {{ grouped_order.deadline }}</p>
+  {% if grouped_order.description %}<p>{{ grouped_order.description }}</p>{% endif %}
 
   les produits commandés pour cette commande groupée : 
   <ul>