diff --git a/copanier/reports.py b/copanier/reports.py index 2d720f0..4f362e8 100644 --- a/copanier/reports.py +++ b/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( diff --git a/copanier/templates/delivery.html b/copanier/templates/delivery.html index 085a50d..ca95a83 100644 --- a/copanier/templates/delivery.html +++ b/copanier/templates/delivery.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block body %} -

{{ delivery.producer }} {% include "includes/order_button.html" %}

+

{{ delivery.name }} {% include "includes/order_button.html" %}

{% include "includes/delivery_head.html" %}
diff --git a/copanier/templates/edit_delivery.html b/copanier/templates/edit_delivery.html index 2251b0c..48edc8d 100644 --- a/copanier/templates/edit_delivery.html +++ b/copanier/templates/edit_delivery.html @@ -8,7 +8,7 @@ {% endif %}
diff --git a/copanier/templates/signing_sheet.html b/copanier/templates/signing_sheet.html index 504268f..a7793d8 100644 --- a/copanier/templates/signing_sheet.html +++ b/copanier/templates/signing_sheet.html @@ -2,7 +2,7 @@ -

{{ delivery.producer }} {{ delivery.from_date.date() }} - liste d'émargement

+

{{ delivery.name }} {{ delivery.from_date.date() }} - liste d'émargement

{% for email, order in delivery.orders.items() %}

{{ email }}

{% include "includes/order_summary.html" %} diff --git a/tests/conftest.py b/tests/conftest.py index 4eb9c4a..ba2a064 100644 --- a/tests/conftest.py +++ b/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), diff --git a/tests/test_models.py b/tests/test_models.py index 4cc531d..a3674e2 100644 --- a/tests/test_models.py +++ b/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): diff --git a/tests/test_views.py b/tests/test_views.py index 7604b33..ff56793 100644 --- a/tests/test_views.py +++ b/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"), - ("Lait", "123", 1.5, None, None, None, None, None), + ("name", "ref", "price", "unit", "description", "url", "img", "packing", "producer"), + ("Lait", "123", 1.5, None, None, None, None, None, None), ]