From a9016e2a9f837ac70101838638e8b5df6611b86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=83taireau?= <alexis@notmyidea.org>
Date: Sat, 4 Apr 2020 21:28:28 +0200
Subject: [PATCH] Fix order page

---
 TODO                                          |  1 +
 copanier/templates/delivery/place_order.html  | 22 +++++++++----------
 .../templates/includes/delivery_table.html    |  4 +---
 3 files changed, 12 insertions(+), 15 deletions(-)

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 %}
-<article class="order">
-<h3>
-    <a href="/distribution/{{ delivery.id }}">{{ delivery.name }}</a>
-    — Commande pour {{ group_name }} 
-    {% if order.phone_number %}
-    (<a href="tel:{{ order.phone_number }}">{{ order.phone_number }}</a>)
-    {% endif %}</p>
- </h3>
+
+<div class="header">
+    <h1>{{ delivery.name }}</h1>
+    <h4>Commande pour {{ group_name }}
+        {% if order.phone_number %}
+        (<a href="tel:{{ order.phone_number }}">{{ order.phone_number }}</a>)
+        {% endif %}
+    </h4>
 {% include "includes/delivery_head.html" %}
+</div>
 
 <form method="post">
     {% for producer in delivery.producers.values() %}
     <h2>{{ producer.name }}</h2>
-    <table class="order">
+    <table class="order pure-table">
         <thead>
         <tr>
             <th class="product">Produit</th>
@@ -34,9 +35,6 @@
         <tr>
             <th class="product {% if product.rupture %}rupture{% endif %}">{{ product }} {% if product.rupture %}(RUPTURE !){% endif %}
                 {% if product.description or product.img %}
-                    {% with unique_id=loop.index %}
-                        {% include "includes/modal_product.html" %}
-                    {% endwith %}
                 {% endif %}
             </th>
             <td>{{ product.price | round(2) }} €</td>
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 %}
                 <td>—</td>
             {% endif %}
-            {% if edit_mode %}
-            <td>—</td>
-            {% endif %}
+          
             <th class="total">{{ delivery.total_for_producer(producer) }} €</th>
             {% if not list_only %}
                 {% for email, order in delivery.orders.items() %}