From 23623d35630cbe6ac51af24bfe278f4bfa24c81a Mon Sep 17 00:00:00 2001
From: Alexis M <alexis@notmyidea.org>
Date: Fri, 19 Jul 2019 01:58:06 +0200
Subject: [PATCH] Split orders by producer to ease the reading

---
 copanier/models.py                  |  4 ++--
 copanier/templates/delivery.html    |  4 ++--
 copanier/templates/place_order.html | 16 +++++++---------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/copanier/models.py b/copanier/models.py
index 77910e8..9769201 100644
--- a/copanier/models.py
+++ b/copanier/models.py
@@ -163,8 +163,8 @@ class Product(Base):
 
     def __str__(self):
         out = self.name
-        if self.unit:
-            out += f" ({self.unit})"
+        # if self.unit:
+        #     out += f" ({self.unit})"
         return out
 
 
diff --git a/copanier/templates/delivery.html b/copanier/templates/delivery.html
index f59ec52..89d8b4d 100644
--- a/copanier/templates/delivery.html
+++ b/copanier/templates/delivery.html
@@ -5,9 +5,9 @@
 {% include "includes/delivery_head.html" %}
 <article class="delivery">
 {% if delivery.has_products %}
-    {% include "includes/delivery_table.html" %}
+    {% include "includes/delivery_list.html" %}
 {% else %}
-<p>Mince, aucun produit n'est encore défini pour cette livraison !</p>
+<p>Aucun produit n'est encore défini pour cette livraison.</p>
 {% if request.user and request.user.is_staff %}
 <div class="inline-text">Pour rajouter des produits, il faut d'abord <a href="/livraison/{{ delivery.id }}/exporter/produits"><i class="icon-layers"></i> télécharger le tableur avec les produits</a>, le modifier localement sur votre machine puis &nbsp;</div> <div class="inline-text">{% with unique_id="import-products" %}{% include "includes/modal_import_products.html" %}{% endwith %}.</div>
 {% endif %}
diff --git a/copanier/templates/place_order.html b/copanier/templates/place_order.html
index 2ce1931..994fa87 100644
--- a/copanier/templates/place_order.html
+++ b/copanier/templates/place_order.html
@@ -2,15 +2,15 @@
 
 {% block body %}
 <article class="order">
-<h3><a href="/livraison/{{ delivery.id }}">{{ delivery.name }}</a> — Commande de « {{ person.email }} »</h3>
+<h3><a href="/livraison/{{ delivery.id }}">{{ delivery.name }}</a> — Commande pour « {{ person.email }} »</h3>
 {% include "includes/delivery_head.html" %}
 <form method="post">
+
+    {% for producer in delivery.producers %}
+    <h2>{{ producer }}</h2>
     <table class="order">
         <thead>
         <tr>
-            {% if delivery.has_multiple_producers %}
-                <th class="producer">Producteur</th>
-            {% endif %}
             <th class="product">Produit</th>
             <th class="price">Prix</th>
             {% if delivery.has_packing %}
@@ -23,11 +23,8 @@
         </tr>
         </thead>
         <tbody>
-        {% for product in delivery.products %}
+        {% for product in delivery.get_products_by(producer) %}
         <tr>
-            {% if delivery.has_multiple_producers and (loop.first or loop.previtem.producer != product.producer) %}
-              <th class="producer" rowspan="{{ delivery.get_products_by(product.producer) | length }}">{{ product.producer }}</th>
-            {% endif %}
             <th class="product">{{ product }}
                 {% if product.description or product.img %}
                     {% with unique_id=loop.index %}
@@ -39,7 +36,7 @@
             {% if delivery.has_packing %}
                 <td {% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} class="missing" title="Les commandes individuelles ne correspondent pas aux conditionnements"{% endif %}>{{ product.packing or "—" }}{% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} (−{{ delivery.product_missing(product) }}){% endif %}</td>
             {% endif %}
-            <td class="with-input"><input {% if delivery.status != delivery.OPEN %}type="text" readonly{% else%}type="number"{% endif%} min=0 name="wanted:{{ product.ref }}" value="{{ order[product].wanted }}"></td>
+            <td class="with-input"><input {% if delivery.status != delivery.OPEN %}type="text" readonly{% else%}type="number"{% endif%} min=0 name="wanted:{{ product.ref }}" value="{{ order[product].wanted }}"> x {{ product.unit }}</td>
             {% if delivery.status == delivery.ADJUSTMENT or order.has_adjustments %}
                 <td class="with-input"><input type="number" name="adjustment:{{ product.ref }}" value="{{ order[product].adjustment }}" {% if not delivery.product_missing(product) %}readonly{% endif %}></td>
             {% endif %}
@@ -47,6 +44,7 @@
         {% endfor %}
         </tbody>
     </table>
+    {% endfor %}
     <p>Total: {{ order.total(delivery.products) if order else 0 }} €</p>
     {% if delivery.is_passed %}
     <p>Commande soldée: <input type="checkbox" name="paid" {% if order.paid %}checked{% endif %}></p>