diff --git a/copanier/models.py b/copanier/models.py index 64bc136..0f8a948 100644 --- a/copanier/models.py +++ b/copanier/models.py @@ -311,6 +311,18 @@ class Delivery(PersistedBase): max_age = self.from_date.date() - timedelta(days=60) return any([product.last_update.date() < max_age for product in products]) + @property + def dates(self): + delivery_date = self.from_date.date() + return { + "creation_date": self.order_before - timedelta(weeks=4), + "price_update_start": self.order_before - timedelta(weeks=4), + "price_update_deadline": self.order_before - timedelta(weeks=2), + "order_before": self.order_before, + "adjustment_deadline": self.order_before + timedelta(days=4), + "delivery_date": delivery_date + } + @property def has_products(self): return len(self.products) > 0 @@ -495,15 +507,3 @@ class Delivery(PersistedBase): percentage_person = person_amount / producer_total shipping = percentage_person * producer_shipping return shipping - - @property - def dates(self): - delivery_date = self.from_date.date() - return { - "creation_date": self.order_before - timedelta(weeks=4), - "price_update_start": self.order_before - timedelta(weeks=4), - "price_update_deadline": self.order_before - timedelta(weeks=2), - "order_before": self.order_before, - "adjustment_deadline": self.order_before + timedelta(days=4), - "delivery_date": delivery_date - } diff --git a/copanier/templates/delivery/show_toolbox.html b/copanier/templates/delivery/show_toolbox.html index b4b9c0f..29a12de 100644 --- a/copanier/templates/delivery/show_toolbox.html +++ b/copanier/templates/delivery/show_toolbox.html @@ -11,6 +11,7 @@ {% set display_counts = True %} {% include "includes/delivery_head.html" %} +
Au cas où, quoi.
+Ça peut être utile pour leur envoyer un email groupé.
-