diff --git a/copanier/templates/delivery/list_deliveries.html b/copanier/templates/delivery/list_deliveries.html index cac622b..9fa033e 100644 --- a/copanier/templates/delivery/list_deliveries.html +++ b/copanier/templates/delivery/list_deliveries.html @@ -3,13 +3,6 @@

Distributions

-
- -
{% with deliveries=incoming %} @@ -27,4 +20,11 @@ Voir les distributions archivées
{% endif %} +
+ +
{% endblock body %} diff --git a/copanier/templates/delivery/show_delivery.html b/copanier/templates/delivery/show_delivery.html index 6197201..82e11e3 100644 --- a/copanier/templates/delivery/show_delivery.html +++ b/copanier/templates/delivery/show_delivery.html @@ -5,12 +5,8 @@

{{ delivery.name }}

{% if delivery.products %} - {% if delivery.status == delivery.OPEN %}Commandes ouvertes jusqu'au {{ delivery.order_before|date }} - {% elif delivery.status == delivery.ADJUSTMENT %}Ajustements en cours - {% elif delivery.status == delivery.CLOSED %}Fermée - {% elif delivery.status == delivery.ARCHIVED %}Archivée - {% elif delivery.status == delivery.NEED_PRICE_UPDATE %}Mise à jour des prix* - {% endif %}{% endif %} + {% include "includes/delivery_status.html" %} + {% endif %} {% include "includes/order_button.html" %}

diff --git a/copanier/templates/includes/delivery_head.html b/copanier/templates/includes/delivery_head.html index 0c1db26..4aa5fc2 100644 --- a/copanier/templates/includes/delivery_head.html +++ b/copanier/templates/includes/delivery_head.html @@ -1,12 +1,15 @@ \ No newline at end of file diff --git a/copanier/templates/includes/delivery_status.html b/copanier/templates/includes/delivery_status.html new file mode 100644 index 0000000..e1b29dc --- /dev/null +++ b/copanier/templates/includes/delivery_status.html @@ -0,0 +1,6 @@ +{% if delivery.status == delivery.OPEN %}Commandes ouvertes jusqu'au {{ delivery.order_before|date }} +{% elif delivery.status == delivery.ADJUSTMENT %}Ajustements en cours +{% elif delivery.status == delivery.CLOSED %}Fermée +{% elif delivery.status == delivery.ARCHIVED %}Archivée +{% elif delivery.status == delivery.NEED_PRICE_UPDATE %}Mise à jour des prix* +{% endif %} \ No newline at end of file