diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py index 0aa203f..93c0ea3 100644 --- a/la_chariotte/order/models.py +++ b/la_chariotte/order/models.py @@ -119,7 +119,7 @@ class Order(models.Model): author = models.ForeignKey(OrderAuthor, on_delete=models.CASCADE) articles_nb = models.PositiveIntegerField(default=0) price = models.DecimalField(max_digits=10, decimal_places=2, default=0) - created_date = models.DateTimeField("Date de la commande", auto_now_add=True) + created_date = models.DateTimeField("Date et heure de commande", auto_now_add=True) note = models.TextField(max_length=200, null=True, blank=True) def compute_order_articles_nb(self): diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html index f8f5660..b80aed5 100644 --- a/la_chariotte/order/templates/order/grouped_order_detail.html +++ b/la_chariotte/order/templates/order/grouped_order_detail.html @@ -33,7 +33,7 @@ {% endif %}

- Commandes avant le {{ grouped_order.deadline }} + Commandes avant le {{ grouped_order.deadline|date:'d M Y' }} à {{ grouped_order.deadline|date:'H:i' }}

diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html index 266f300..67077f2 100644 --- a/la_chariotte/order/templates/order/grouped_order_overview.html +++ b/la_chariotte/order/templates/order/grouped_order_overview.html @@ -25,7 +25,7 @@

{{ grouped_order.place }}

{% endif %}

- Commandes avant le {{ grouped_order.deadline }} + Commandes avant le {{ grouped_order.deadline|date:'d M Y' }} à {{ grouped_order.deadline|date:'H:i' }}

Livraison le {{ grouped_order.delivery_date }}{% if grouped_order.delivery_slot %}, {{ grouped_order.delivery_slot }}{% endif %} @@ -180,43 +180,36 @@