Rename delivery.producer to delivery.name

copanier/reports.py

@@ -9,7 +9,7 @@ from .models import Product
 def summary(delivery):
     wb = Workbook()
     ws = wb.active
-    ws.title = f"{delivery.producer} {delivery.from_date.date()}"
+    ws.title = f"{delivery.name} {delivery.from_date.date()}"
     headers = [
         "ref",
         "produit",
@@ -40,7 +40,7 @@ def summary(delivery):
 def full(delivery):
     wb = Workbook()
     ws = wb.active
-    ws.title = f"{delivery.producer} {delivery.from_date.date()}"
+    ws.title = f"{delivery.name} {delivery.from_date.date()}"
     headers = ["ref", "produit", "prix", "producer"] + [e for e in delivery.orders] + ["total"]
     ws.append(headers)
     for product in delivery.products:
@@ -62,7 +62,7 @@ def full(delivery):
 def products(delivery):
     wb = Workbook()
     ws = wb.active
-    ws.title = f"{delivery.producer} produits"
+    ws.title = f"{delivery.name} produits"
     fields = [f.name for f in get_fields(Product)]
     ws.append(fields)
     for product in delivery.products:
@@ -73,7 +73,7 @@ def products(delivery):
 def balance(delivery):
     wb = Workbook()
     ws = wb.active
-    ws.title = f"Solde {delivery.producer}"
+    ws.title = f"Solde {delivery.name}"
     ws.append(["Adhérent", "Montant", "Payé"])
     for email, order in delivery.orders.items():
         ws.append(

copanier/templates/delivery.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block body %}
-<h3>{{ delivery.producer }} {% include "includes/order_button.html" %}</h3>
+<h3>{{ delivery.name }} {% include "includes/order_button.html" %}</h3>
 {% include "includes/delivery_head.html" %}
 <article class="delivery">
     <table class="delivery">

copanier/templates/edit_delivery.html

@@ -8,7 +8,7 @@
 {% endif %}
 <form method="post">
     <label>
-        <p>Nom</p>
+        <p>Nom de la livraison</p>
         <input type="text" name="name" value="{{ delivery.name or '' }}">
     </label>
     <label>

copanier/templates/emails/order_summary.html

@@ -1,5 +1,5 @@
 <p>Bonjour,</p>
-<p>Voici le résumé de ta commande «{{ delivery.producer }}»</p>
+<p>Voici le résumé de ta commande «{{ delivery.name }}»</p>
 {% include "includes/order_summary.html" %}
 <p>Livraison: {{ delivery.where }}, le {{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</p>
 {% if delivery.is_open %}

copanier/templates/emails/order_summary.txt

@@ -1,6 +1,6 @@
 Salut salut,
 
-Voici le résumé de votre commande «{{ delivery.producer }}»
+Voici le résumé de votre commande «{{ delivery.name }}»
 
 Produit | Prix unitaire | Quantité
 

copanier/templates/includes/delivery_list.html

@@ -2,7 +2,7 @@
 <ul class="delivery">
 {% for delivery in deliveries %}
 <li>
-    <h3><a href="/livraison/{{ delivery.id }}"><i class="icon-hotairballoon"></i> {{ delivery.producer }}</a> {% include "includes/order_button.html" %}</h3>
+    <h3><a href="/livraison/{{ delivery.id }}"><i class="icon-hotairballoon"></i> {{ delivery.name }}</a> {% include "includes/order_button.html" %}</h3>
     {% include "includes/delivery_head.html" %}
 </li>
 <hr>

copanier/templates/place_order.html

@@ -2,7 +2,7 @@
 
 {% block body %}
 <article class="order">
-<h3>{% if delivery.producer %}<a href="/livraison/{{ delivery.id }}">{{ delivery.producer }}</a> — {% endif %}Commande de « {{ person.email }} »</h3>
+<h3><a href="/livraison/{{ delivery.id }}">{{ delivery.name }}</a> — Commande de « {{ person.email }} »</h3>
 {% include "includes/delivery_head.html" %}
 <form method="post">
     <table class="order">

copanier/templates/signing_sheet.html

@@ -2,7 +2,7 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<h2>{{ delivery.producer }} {{ delivery.from_date.date() }} - liste d'émargement</h2>
+<h2>{{ delivery.name }} {{ delivery.from_date.date() }} - liste d'émargement</h2>
 {% for email, order in delivery.orders.items() %}
     <h3>{{ email }}</h3>
     {% include "includes/order_summary.html" %}

tests/conftest.py

@@ -67,7 +67,7 @@ def app():  # Requested by Roll testing utilities.
 @pytest.fixture
 def delivery():
     return Delivery(
-        producer="Andines",
+        name="Andines",
         contact="mister@me.me",
         from_date=datetime.now() + timedelta(days=10),
         to_date=datetime.now() + timedelta(days=10),

tests/test_models.py

@@ -11,13 +11,13 @@ now = datetime.now
 
 def test_can_create_delivery():
     delivery = Delivery(
-        producer="Andines",
+        name="Andines",
         from_date=now(),
         to_date=now(),
         order_before=now(),
         contact="some@one.to",
     )
-    assert delivery.producer == "Andines"
+    assert delivery.name == "Andines"
     assert delivery.where == "Marché de la Briche"
     assert delivery.from_date.year == now().year
     assert not delivery.id
@@ -26,7 +26,7 @@ def test_can_create_delivery():
 def test_wrong_datetime_raise_valueerror():
     with pytest.raises(ValueError):
         Delivery(
-            producer="Andines",
+            name="Andines",
             order_before=now(),
             to_date=now(),
             from_date="pouet",
@@ -59,7 +59,7 @@ def test_can_create_product():
 
 def test_can_create_delivery_with_products():
     delivery = Delivery(
-        producer="Andines",
+        name="Andines",
         from_date=now(),
         to_date=now(),
         order_before=now(),
@@ -115,10 +115,10 @@ def test_can_persist_delivery(delivery):
 
 
 def test_can_load_delivery(delivery):
-    delivery.producer = "Corto"
+    delivery.name = "Corto"
     delivery.persist()
     loaded = Delivery.load(delivery.id)
-    assert loaded.producer == "Corto"
+    assert loaded.name == "Corto"
 
 
 def test_person_is_staff_if_email_is_in_config(monkeypatch):

tests/test_views.py

@@ -19,7 +19,7 @@ async def test_home_should_list_active_delivery(client, delivery):
     delivery.persist()
     resp = await client.get("/")
     assert resp.status == 200
-    assert delivery.producer in resp.body.decode()
+    assert delivery.name in resp.body.decode()
 
 
 async def test_home_should_redirect_to_login_if_not_logged(client):
@@ -32,7 +32,7 @@ async def test_home_should_redirect_to_login_if_not_logged(client):
 async def test_create_delivery(client):
     assert not list(Delivery.all())
     body = {
-        "producer": "Andines",
+        "name": "Andines",
         "where": "Marché de la Briche",
         "date": "2019-02-23",
         "from_time": "18:30:00",
@@ -44,7 +44,7 @@ async def test_create_delivery(client):
     assert resp.status == 302
     assert len(list(Delivery.all())) == 1
     delivery = list(Delivery.all())[0]
-    assert delivery.producer == "Andines"
+    assert delivery.name == "Andines"
     assert delivery.from_date.year == 2019
     assert delivery.from_date.hour == 18
     assert delivery.from_date.minute == 30
@@ -242,6 +242,6 @@ async def test_export_products(client, delivery):
     resp = await client.get(f"/livraison/{delivery.id}/exporter/produits")
     wb = load_workbook(filename=BytesIO(resp.body))
     assert list(wb.active.values) == [
-        ("name", "ref", "price", "unit", "description", "url", "img", "packing"),
+        ("name", "ref", "price", "unit", "description", "url", "img", "packing", "producer"),
-        ("Lait", "123", 1.5, None, None, None, None, None),
+        ("Lait", "123", 1.5, None, None, None, None, None, None),
     ]