diff --git a/TODO b/TODO index 642de39..e785910 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,5 @@ Éditer directement depuis la vue « distribution » + x Ajouter un menu pour revenir à l'élément parent facilement x Repenser l'interface pour la rendre plus simple x Refaire une interface plus simple (moins de boutons partout, qu'on s'y retrouve plus) diff --git a/copanier/templates/delivery/place_order.html b/copanier/templates/delivery/place_order.html index 5dcc0b6..bd7f6ce 100644 --- a/copanier/templates/delivery/place_order.html +++ b/copanier/templates/delivery/place_order.html @@ -2,20 +2,21 @@ {% block body %} {% set group_name = request.groups.groups.get(person.name, person).name %} -
-

- {{ delivery.name }} - — Commande pour {{ group_name }} - {% if order.phone_number %} - ({{ order.phone_number }}) - {% endif %}

-

+ +
+

{{ delivery.name }}

+

Commande pour {{ group_name }} + {% if order.phone_number %} + ({{ order.phone_number }}) + {% endif %} +

{% include "includes/delivery_head.html" %} +
{% for producer in delivery.producers.values() %}

{{ producer.name }}

- +
@@ -34,9 +35,6 @@ diff --git a/copanier/templates/includes/delivery_table.html b/copanier/templates/includes/delivery_table.html index 53b38bf..e0f26c3 100644 --- a/copanier/templates/includes/delivery_table.html +++ b/copanier/templates/includes/delivery_table.html @@ -65,9 +65,7 @@ {% if delivery.has_packing %} {% endif %} - {% if edit_mode %} - - {% endif %} + {% if not list_only %} {% for email, order in delivery.orders.items() %}
Produit
{{ product }} {% if product.rupture %}(RUPTURE !){% endif %} {% if product.description or product.img %} - {% with unique_id=loop.index %} - {% include "includes/modal_product.html" %} - {% endwith %} {% endif %} {{ product.price | round(2) }} €{{ delivery.total_for_producer(producer) }} €