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 %} -
Détail de la commande groupée {{ grouped_order.id }}, avec la liste des produits associés
-{{ grouped_order }}
Organisateur·ice : {{ grouped_order.orga }}
Date de livraison : {{ grouped_order.delivery_date }}
- +Date limite de commande : {{ grouped_order.deadline }}
+ {% if grouped_order.description %}{{ grouped_order.description }}
{% endif %} {% if not user.is_authenticated %}Vous êtes l'organisateur·ice de cette commande groupée ? @@ -33,11 +34,11 @@