From 80a61066a061e9fefd96a6e60f414b592a1f3f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=83taireau?= Date: Tue, 7 Apr 2020 16:41:07 +0200 Subject: [PATCH] Reorganize URLs and templates. Reorganizing the URLs seems to fix an issue with namespace collision in the URLs. - URLs for product related operations are now in the /produits/ namespace ; - Templates are now using a formalism of action_subject.html, which makes it simpler to find find them. --- .../ajust_product.html} | 0 .../{balance.html => compute_balance.html} | 0 .../{edit.html => edit_delivery.html} | 2 +- .../{archives.html => list_archives.html} | 0 .../{list.html => list_deliveries.html} | 0 ...email.html => prepare_referent_email.html} | 0 .../{show.html => show_delivery.html} | 10 +-- ...ing_sheet.html => show_signing_sheet.html} | 0 .../{toolbox.html => show_toolbox.html} | 4 +- .../groups/{edit.html => edit_group.html} | 0 .../groups/{list.html => list_groups.html} | 0 .../templates/includes/delivery_table.html | 6 +- .../templates/{sesame.html => login.html} | 0 .../copy.html => products/copy_products.html} | 0 .../templates/products/delete_producer.html | 2 +- .../{delete.html => delete_product.html} | 4 +- .../templates/products/edit_producer.html | 20 ++--- .../products/{edit.html => edit_product.html} | 45 ++-------- ...ping_fees.html => edit_shipping_fees.html} | 2 +- .../{list.html => list_products.html} | 8 +- copanier/views/delivery.py | 22 ++--- copanier/views/groups.py | 6 +- copanier/views/login.py | 10 +-- copanier/views/products.py | 84 ++++++++----------- 24 files changed, 92 insertions(+), 133 deletions(-) rename copanier/templates/{products/ajust.html => delivery/ajust_product.html} (100%) rename copanier/templates/delivery/{balance.html => compute_balance.html} (100%) rename copanier/templates/delivery/{edit.html => edit_delivery.html} (92%) rename copanier/templates/delivery/{archives.html => list_archives.html} (100%) rename copanier/templates/delivery/{list.html => list_deliveries.html} (100%) rename copanier/templates/delivery/{referent_email.html => prepare_referent_email.html} (100%) rename copanier/templates/delivery/{show.html => show_delivery.html} (80%) rename copanier/templates/delivery/{signing_sheet.html => show_signing_sheet.html} (100%) rename copanier/templates/delivery/{toolbox.html => show_toolbox.html} (83%) rename copanier/templates/groups/{edit.html => edit_group.html} (100%) rename copanier/templates/groups/{list.html => list_groups.html} (100%) rename copanier/templates/{sesame.html => login.html} (100%) rename copanier/templates/{delivery/copy.html => products/copy_products.html} (100%) rename copanier/templates/products/{delete.html => delete_product.html} (89%) rename copanier/templates/products/{edit.html => edit_product.html} (57%) rename copanier/templates/products/{shipping_fees.html => edit_shipping_fees.html} (79%) rename copanier/templates/products/{list.html => list_products.html} (56%) diff --git a/copanier/templates/products/ajust.html b/copanier/templates/delivery/ajust_product.html similarity index 100% rename from copanier/templates/products/ajust.html rename to copanier/templates/delivery/ajust_product.html diff --git a/copanier/templates/delivery/balance.html b/copanier/templates/delivery/compute_balance.html similarity index 100% rename from copanier/templates/delivery/balance.html rename to copanier/templates/delivery/compute_balance.html diff --git a/copanier/templates/delivery/edit.html b/copanier/templates/delivery/edit_delivery.html similarity index 92% rename from copanier/templates/delivery/edit.html rename to copanier/templates/delivery/edit_delivery.html index eceaa05..7029f56 100644 --- a/copanier/templates/delivery/edit.html +++ b/copanier/templates/delivery/edit_delivery.html @@ -12,7 +12,7 @@ {% endif %}
  • - Gérer les produits / product⋅eur⋅rice⋅s + Gérer les produits / product⋅eur⋅rice⋅s
    • diff --git a/copanier/templates/delivery/archives.html b/copanier/templates/delivery/list_archives.html similarity index 100% rename from copanier/templates/delivery/archives.html rename to copanier/templates/delivery/list_archives.html diff --git a/copanier/templates/delivery/list.html b/copanier/templates/delivery/list_deliveries.html similarity index 100% rename from copanier/templates/delivery/list.html rename to copanier/templates/delivery/list_deliveries.html diff --git a/copanier/templates/delivery/referent_email.html b/copanier/templates/delivery/prepare_referent_email.html similarity index 100% rename from copanier/templates/delivery/referent_email.html rename to copanier/templates/delivery/prepare_referent_email.html diff --git a/copanier/templates/delivery/show.html b/copanier/templates/delivery/show_delivery.html similarity index 80% rename from copanier/templates/delivery/show.html rename to copanier/templates/delivery/show_delivery.html index afd7138..2719a7f 100644 --- a/copanier/templates/delivery/show.html +++ b/copanier/templates/delivery/show_delivery.html @@ -21,7 +21,7 @@
  •  Imprimer… @@ -38,7 +38,7 @@  Modifier la distrib
  • -  Produits +  Produits
    • {% endif %} Merci de mettre à jour les prix pour « {{ producer.name }} ».

    +

    Merci de mettre à jour les prix pour « {{ producer.name }} ».

    {% endif %} {% endfor %} {% include "includes/delivery_table.html" %} @@ -64,8 +64,8 @@ {% if request.user and request.user.is_staff %} Occupons-nous donc de ça ! Deux options :
      -
    1. Ajouter les product⋅eurs⋅rices à la main ;
      2. -
    2. Ou bien copier les produits d'une autre distribution.
      3. +
    3. Ajouter les product⋅eurs⋅rices à la main ;
      4. +
    4. Ou bien copier les produits d'une autre distribution.
    {% endif %} diff --git a/copanier/templates/delivery/signing_sheet.html b/copanier/templates/delivery/show_signing_sheet.html similarity index 100% rename from copanier/templates/delivery/signing_sheet.html rename to copanier/templates/delivery/show_signing_sheet.html diff --git a/copanier/templates/delivery/toolbox.html b/copanier/templates/delivery/show_toolbox.html similarity index 83% rename from copanier/templates/delivery/toolbox.html rename to copanier/templates/delivery/show_toolbox.html index 7c0eb5c..4ff7f8a 100644 --- a/copanier/templates/delivery/toolbox.html +++ b/copanier/templates/delivery/show_toolbox.html @@ -14,11 +14,11 @@

    Avant et pendant la distribution

      Modifier la commande (dates, lieu, référent⋅e, etc) -  Modifier les produits, les product⋅rices⋅eurs +  Modifier les produits, les product⋅rices⋅eurs   Gérer les groupes / colocs

    Une fois les commandes passées (après le {{ delivery.order_before|date }})

    -  Télécharger les bons de distribution +  Télécharger les bons de distribution   Télécharger le tableau des commandes   Envoyer les infos de commande aux référent⋅e⋅s diff --git a/copanier/templates/groups/edit.html b/copanier/templates/groups/edit_group.html similarity index 100% rename from copanier/templates/groups/edit.html rename to copanier/templates/groups/edit_group.html diff --git a/copanier/templates/groups/list.html b/copanier/templates/groups/list_groups.html similarity index 100% rename from copanier/templates/groups/list.html rename to copanier/templates/groups/list_groups.html diff --git a/copanier/templates/includes/delivery_table.html b/copanier/templates/includes/delivery_table.html index 1a89e8a..dda8151 100644 --- a/copanier/templates/includes/delivery_table.html +++ b/copanier/templates/includes/delivery_table.html @@ -9,13 +9,13 @@ {% if producer_obj.needs_price_update(delivery) %}*{% endif %} {% if edit_mode or request.user.is_staff or producer_obj.referent == request.user.email %} -   Gérer ce⋅tte producteur⋅rice +   Gérer ce⋅tte producteur⋅rice {% endif %}
    {% if producer_obj.description %}{{ producer_obj.description }}{% endif %}. Référent⋅e : {{ producer_obj.referent_name }} / {{ producer_obj.referent_tel }}
    {% if not delivery.get_products_by(producer) %} -😔 Ce⋅tte producteur⋅rice n'a pas encore de produits. Voulez vous en rajouter un ? +😔 Ce⋅tte producteur⋅rice n'a pas encore de produits. Voulez vous en rajouter un ? {% else %} @@ -43,7 +43,7 @@ {% for product in delivery.get_products_by(producer) %} - {% if delivery.has_packing %} diff --git a/copanier/templates/sesame.html b/copanier/templates/login.html similarity index 100% rename from copanier/templates/sesame.html rename to copanier/templates/login.html diff --git a/copanier/templates/delivery/copy.html b/copanier/templates/products/copy_products.html similarity index 100% rename from copanier/templates/delivery/copy.html rename to copanier/templates/products/copy_products.html diff --git a/copanier/templates/products/delete_producer.html b/copanier/templates/products/delete_producer.html index 121473d..e98c2b1 100644 --- a/copanier/templates/products/delete_producer.html +++ b/copanier/templates/products/delete_producer.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block toplink %}↶ Retourner a « {{producer.name}} »{% endblock %} +{% block toplink %}↶ Retourner a « {{producer.name}} »{% endblock %} {% block body %}
    diff --git a/copanier/templates/products/delete.html b/copanier/templates/products/delete_product.html similarity index 89% rename from copanier/templates/products/delete.html rename to copanier/templates/products/delete_product.html index 38c6afb..2b50bb0 100644 --- a/copanier/templates/products/delete.html +++ b/copanier/templates/products/delete_product.html @@ -51,13 +51,13 @@ {% for product in products %}
    - + - + {% endfor %}
    {% if edit_mode %}{% endif %}{% if edit_mode %} {% endif %}{{ product }}{% if edit_mode %}{% endif %}{% if product.rupture %} {{ product.rupture }}{% endif %} + {% if edit_mode %}{% endif %}{% if edit_mode %} {% endif %}{{ product }}{% if edit_mode %}{% endif %}{% if product.rupture %} {{ product.rupture }}{% endif %} {{ product.price | round(2) }} €{% if product.packing %}{{ product.packing }} x {% endif %} {{ product.unit }}
    {{ product.name }}{{ product.name }} {{ product.price }}€ {{ product.unit }} {{ product.description }} {% if product.packing %}{{ product.packing }}{% endif %} {% if product.rupture %}RUPTURE !!{% endif %}éditeréditer
    diff --git a/copanier/templates/products/edit_producer.html b/copanier/templates/products/edit_producer.html index 45b6e2f..aabef76 100644 --- a/copanier/templates/products/edit_producer.html +++ b/copanier/templates/products/edit_producer.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block toplink %}↶ Retourner aux produits{% endblock %} +{% block toplink %}↶ Retourner aux produits{% endblock %} {% block body %}
    @@ -8,17 +8,17 @@
    @@ -67,14 +67,14 @@ {% if delivery.shipping.get(producer.id) %}

    Frais de livraison

    Des frais de livraison de {{ delivery.shipping[producer.id] }}€ ont été enregistrés pour ce producteur. -Modifier +Modifier {% endif %} {% if products %}

    Produits - Ajouter un produit + Ajouter un produit {% if producer.needs_price_update(delivery) %} - Marquer les prix comme OK + Marquer les prix comme OK {% endif %}

    Vous pouvez éditer les produits en cliquant sur leur nom.

    @@ -92,13 +92,13 @@ Des frais de livraison de {{ delivery.shipping[producer.id] }}€ ont été enre {% for product in products %} - {{ product.name }} + {{ product.name }} {{ product.price }}€ {{ product.unit }} {{ product.description }} {% if product.packing %}{{ product.packing }}{% endif %} {% if product.rupture %}RUPTURE !!{% endif %} - supprimer + supprimer {% endfor %} diff --git a/copanier/templates/products/edit.html b/copanier/templates/products/edit_product.html similarity index 57% rename from copanier/templates/products/edit.html rename to copanier/templates/products/edit_product.html index 17111ca..0d9726a 100644 --- a/copanier/templates/products/edit.html +++ b/copanier/templates/products/edit_product.html @@ -1,22 +1,22 @@ {% extends "base.html" %} -{% block toplink %}↶ Retourner aux produits de {{ producer.name }}{% endblock %} +{% block toplink %}↶ Retourner aux produits de {{ producer.name }}{% endblock %} {% block body %}
    {% if product.ref %}

    Modifier le produit « {{ product.name }} »

    +
    + +
    {% else %}

    {{ producer.name }} : Nouveau produit

    {% endif %} -
    - -
    @@ -51,34 +51,5 @@
    -{% if products %} -

    Produits

    - - - - - - - - - - - - - -{% for product in products %} - - - - - - - - - -{% endfor %} -
    ProduitPrixUnitéDescriptionPackagingRupture ?
    {{ product.name }}{{ product.price }}€{{ product.unit }}{{ product.description }}{% if product.packing %}{{ product.packing }}{% endif %}{% if product.rupture %}RUPTURE !!{% endif %}éditer
    -{% endif %} -
    {% endblock body %} diff --git a/copanier/templates/products/shipping_fees.html b/copanier/templates/products/edit_shipping_fees.html similarity index 79% rename from copanier/templates/products/shipping_fees.html rename to copanier/templates/products/edit_shipping_fees.html index a139ceb..cc58ca3 100644 --- a/copanier/templates/products/shipping_fees.html +++ b/copanier/templates/products/edit_shipping_fees.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block toplink %}↶ Retourner aux produits{% endblock %} +{% block toplink %}↶ Retourner aux produits{% endblock %} {% block body %}
    diff --git a/copanier/templates/products/list.html b/copanier/templates/products/list_products.html similarity index 56% rename from copanier/templates/products/list.html rename to copanier/templates/products/list_products.html index ecf1a48..8bc9001 100644 --- a/copanier/templates/products/list.html +++ b/copanier/templates/products/list_products.html @@ -6,19 +6,19 @@

    {% if producers %} - Télécharger la liste des commandes en PDF + Télécharger la liste des commandes en PDF {% endif %} - {% if referent %}Voici la liste des product⋅eurs⋅rices dont {{ referent }} est référent⋅e. voir tous les produits{% endif %} + {% if referent %}Voici la liste des product⋅eurs⋅rices dont {{ referent }} est référent⋅e. voir tous les produits{% endif %}

    diff --git a/copanier/views/delivery.py b/copanier/views/delivery.py index 4b68714..a3300aa 100644 --- a/copanier/views/delivery.py +++ b/copanier/views/delivery.py @@ -20,7 +20,7 @@ async def home(request, response): response.redirect = "/groupes" return response.html( - "delivery/list.html", + "delivery/list_deliveries.html", incoming=Delivery.incoming(), former=Delivery.former(), archives=list(Delivery.all(is_archived=True)), @@ -30,7 +30,7 @@ async def home(request, response): @app.route("/archives", methods=["GET"]) async def view_archives(request, response): response.html( - "delivery/archives.html", {"deliveries": Delivery.all(is_archived=True)} + "delivery/list_archives.html", {"deliveries": Delivery.all(is_archived=True)} ) @@ -60,7 +60,7 @@ async def unarchive_delivery(request, response, id): @app.route("/distribution", methods=["GET"]) async def new_delivery(request, response): - response.html("delivery/edit.html", delivery={}) + response.html("delivery/edit_delivery.html", delivery={}) @app.route("/distribution", methods=["POST"]) @@ -83,7 +83,7 @@ async def create_delivery(request, response): async def pdf_for_producer(request, response, id, producer): delivery = Delivery.load(id) response.pdf( - "product_list.html", + "list_products.html", {"list_only": True, "delivery": delivery, "producers": [producer]}, filename=utils.prefix(f"bon-de-commande-{producer}.pdf", delivery), ) @@ -93,7 +93,7 @@ async def pdf_for_producer(request, response, id, producer): async def delivery_toolbox(request, response, id): delivery = Delivery.load(id) response.html( - "delivery/toolbox.html", + "delivery/show_toolbox.html", { "delivery": delivery, "referents": [p.referent for p in delivery.producers.values()], @@ -155,7 +155,7 @@ async def export_products(request, response, id): @staff_only async def edit_delivery(request, response, id): delivery = Delivery.load(id) - response.html("delivery/edit.html", {"delivery": delivery}) + response.html("delivery/edit_delivery.html", {"delivery": delivery}) @app.route("/distribution/{id}/edit", methods=["POST"]) @@ -176,7 +176,7 @@ async def post_delivery(request, response, id): @app.route("/distribution/{id}", methods=["GET"]) async def view_delivery(request, response, id): delivery = Delivery.load(id) - response.html("delivery/show.html", {"delivery": delivery}) + response.html("delivery/show_delivery.html", {"delivery": delivery}) @app.route("/distribution/{id}/commander", methods=["POST", "GET"]) @@ -276,7 +276,7 @@ async def place_order(request, response, id): async def signing_sheet(request, response, id): delivery = Delivery.load(id) response.pdf( - "delivery/signing_sheet.html", + "delivery/show_signing_sheet.html", {"delivery": delivery}, css="signing-sheet.css", filename=utils.prefix("commandes-par-groupe.pdf", delivery), @@ -316,7 +316,9 @@ async def adjust_product(request, response, id, ref): response.message(f"Le produit «{product.ref}» a bien été ajusté!") response.redirect = delivery_url else: - response.html("adjust_product.html", {"delivery": delivery, "product": product}) + response.html( + "delivery/adjust_product.html", {"delivery": delivery, "product": product} + ) @app.route("/distribution/{id}/solde", methods=["GET"]) @@ -364,7 +366,7 @@ async def delivery_balance(request, response, id): for debiter, amount, crediter in results: results_dict[debiter][crediter] = amount - template_name = "delivery/balance.html" + template_name = "delivery/compute_balance.html" template_args = { "delivery": delivery, "debiters": debiters, diff --git a/copanier/views/groups.py b/copanier/views/groups.py index b85c5bc..6375bd3 100644 --- a/copanier/views/groups.py +++ b/copanier/views/groups.py @@ -10,7 +10,7 @@ async def on_startup(): @app.route("/groupes", methods=["GET"]) async def handle_groups(request, response): - response.html("groups/list.html", {"groups": request["groups"]}) + response.html("groups/list_groups.html", {"groups": request["groups"]}) @app.route("/groupes/{id}/rejoindre", method=["GET"]) @@ -43,7 +43,7 @@ async def create_group(request, response): request["groups"].persist() response.message(f"Le groupe {group.name} à bien été créé") response.redirect = "/" - response.html("groups/edit.html", group=group) + response.html("groups/edit_group.html", group=group) @app.route("/groupes/{id}/éditer", methods=["GET", "POST"]) @@ -60,7 +60,7 @@ async def edit_group(request, response, id): request["groups"].groups[id] = group request["groups"].persist() response.redirect = "/groupes" - response.html("groups/edit.html", group=group) + response.html("groups/edit_group.html", group=group) @app.route("/groupes/{id}/supprimer", methods=["GET"]) diff --git a/copanier/views/login.py b/copanier/views/login.py index 5c7d08d..91c4856 100644 --- a/copanier/views/login.py +++ b/copanier/views/login.py @@ -18,7 +18,7 @@ async def auth_required(request, response): decoded = utils.read_token(token) email = decoded.get("sub") if not email: - response.redirect = f"/sésame?next={request.path}" + response.redirect = f"/connexion?next={request.path}" return response groups = Groups.load() @@ -33,12 +33,12 @@ async def auth_required(request, response): session.user.set(user) -@app.route("/sésame", methods=["GET"], unprotected=True) +@app.route("/connexion", methods=["GET"], unprotected=True) async def sesame(request, response): - response.html("sesame.html") + response.html("login.html") -@app.route("/sésame", methods=["POST"], unprotected=True) +@app.route("/connexion", methods=["POST"], unprotected=True) async def send_sesame(request, response): email = request.form.get("email").lower() token = utils.create_token(email) @@ -61,7 +61,7 @@ async def send_sesame(request, response): response.redirect = "/" -@app.route("/sésame/{token}", methods=["GET"], unprotected=True) +@app.route("/connexion/{token}", methods=["GET"], unprotected=True) async def set_sesame(request, response, token): decoded = utils.read_token(token) if not decoded: diff --git a/copanier/views/products.py b/copanier/views/products.py index 66ff289..0fb4927 100644 --- a/copanier/views/products.py +++ b/copanier/views/products.py @@ -6,11 +6,11 @@ from ..models import Delivery, Product, Producer from .. import utils -@app.route("/distribution/{id}/produits") -@app.route("/distribution/{id}/produits.pdf") +@app.route("/produits/{id}") +@app.route("/produits/{id}/produits.pdf") async def list_products(request, response, id): delivery = Delivery.load(id) - template_name = "products/list.html" + template_name = "products/list_products.html" template_params = { "edit_mode": True, "list_only": True, @@ -29,7 +29,7 @@ async def list_products(request, response, id): response.html(template_name, template_params) -@app.route("/distribution/{delivery_id}/{producer_id}/éditer", methods=["GET", "POST"]) +@app.route("/produits/{delivery_id}/producteurs/{producer_id}", methods=["GET", "POST"]) async def edit_producer(request, response, delivery_id, producer_id): delivery = Delivery.load(delivery_id) producer = delivery.producers.get(producer_id) @@ -48,13 +48,14 @@ async def edit_producer(request, response, delivery_id, producer_id): { "delivery": delivery, "producer": producer, - "products": delivery.get_products_by(producer.id), + "products": delivery.get_products_by(producer_id), }, ) @app.route( - "/distribution/{delivery_id}/{producer_id}/supprimer", methods=["GET", "POST"] + "/produits/{delivery_id}/producteurs/{producer_id}/supprimer", + methods=["GET", "POST"], ) async def delete_producer(request, response, delivery_id, producer_id): # Delete the producer and all the related products. @@ -70,7 +71,7 @@ async def delete_producer(request, response, delivery_id, producer_id): delivery.persist() response.message(f"{producer.name} à bien été supprimé !") - response.redirect = f"/distribution/{delivery.id}/produits" + response.redirect = f"/produits/{delivery.id}" response.html( "products/delete_producer.html", @@ -82,26 +83,7 @@ async def delete_producer(request, response, delivery_id, producer_id): ) -@app.route("/distribution/{delivery_id}/{producer_id}/frais", methods=["GET", "POST"]) -async def handle_shipping_fees(request, response, delivery_id, producer_id): - delivery = Delivery.load(delivery_id) - producer = delivery.producers.get(producer_id) - if request.method == "POST": - form = request.form - producer.referent = form.get("referent") - producer.referent_tel = form.get("referent_tel") - producer.referent_name = form.get("referent_name") - producer.description = form.get("description") - producer.contact = form.get("contact") - delivery.producers[producer_id] = producer - delivery.persist() - - response.html( - "products/shipping_fees.html", {"delivery": delivery, "producer": producer} - ) - - -@app.route("/producteurices/créer/{delivery_id}", methods=["GET", "POST"]) +@app.route("/produits/{delivery_id}/producteurs/créer", methods=["GET", "POST"]) async def create_producer(request, response, delivery_id): delivery = Delivery.load(delivery_id) producer = None @@ -120,7 +102,7 @@ async def create_producer(request, response, delivery_id): delivery.producers[producer_id] = producer delivery.persist() response.message(f"« {producer.name} » à bien été créé !") - response.redirect = f"/distribution/{delivery.id}/{producer.id}/éditer" + response.redirect = f"/produits/{delivery.id}/producteurs/{producer.id}" response.html( "products/edit_producer.html", {"delivery": delivery, "producer": producer} @@ -128,7 +110,7 @@ async def create_producer(request, response, delivery_id): @app.route( - "/distribution/{delivery_id}/{producer_id}/produit/{product_ref}/éditer", + "/produits/{delivery_id}/producteurs/{producer_id}/produits/{product_ref}", methods=["GET", "POST"], ) async def edit_product(request, response, delivery_id, producer_id, product_ref): @@ -153,16 +135,18 @@ async def edit_product(request, response, delivery_id, producer_id, product_ref) product.rupture = None delivery.persist() response.message("Le produit à bien été modifié") - response.redirect = f"/distribution/{delivery_id}/{producer_id}/éditer" + response.redirect = f"/produits/{delivery_id}/producteurs/{producer_id}" return response.html( - "products/edit.html", + "products/edit_product.html", {"delivery": delivery, "product": product, "producer": producer}, ) -@app.route("/distribution/{delivery_id}/{producer_id}/valider-prix", methods=["GET"]) +@app.route( + "/produits/{delivery_id}/producteurs/{producer_id}/valider-prix", methods=["GET"] +) async def mark_producer_prices_as_ok(request, response, delivery_id, producer_id): delivery = Delivery.load(delivery_id) producer = delivery.producers.get(producer_id) @@ -175,10 +159,10 @@ async def mark_producer_prices_as_ok(request, response, delivery_id, producer_id response.message( f"Les prix ont été marqués comme OK pour « { producer.name } », merci !" ) - response.redirect = f"/distribution/{delivery_id}/{producer_id}/éditer" + response.redirect = f"/produits/{delivery_id}/producteurs/{producer_id}" -@app.route("/distribution/{delivery_id}/valider-prix", methods=["GET"]) +@app.route("/produits/{delivery_id}/valider-prix", methods=["GET"]) async def mark_all_prices_as_ok(request, response, delivery_id): delivery = Delivery.load(delivery_id) @@ -187,22 +171,24 @@ async def mark_all_prices_as_ok(request, response, delivery_id): delivery.persist() response.message(f"Les prix ont été marqués comme OK pour toute la distribution !") - response.redirect = f"/distribution/{delivery_id}/produits" + response.redirect = f"/produits/{delivery_id}" @app.route( - "/distribution/{delivery_id}/{producer_id}/{product_ref}/supprimer", methods=["GET"] + "/produits/{delivery_id}/producteurs/{producer_id}/produits/{product_ref}/supprimer", + methods=["GET"], ) async def delete_product(request, response, delivery_id, producer_id, product_ref): delivery = Delivery.load(delivery_id) product = delivery.delete_product(product_ref) delivery.persist() response.message(f"Le produit « { product.name } » à bien été supprimé.") - response.redirect = f"/distribution/{delivery_id}/{producer_id}/éditer" + response.redirect = f"/produits/{delivery_id}/producteurs/{producer_id}" @app.route( - "/distribution/{delivery_id}/{producer_id}/ajouter-produit", methods=["GET", "POST"] + "/produits/{delivery_id}/producteurs/{producer_id}/produits/créer", + methods=["GET", "POST"], ) async def create_product(request, response, delivery_id, producer_id): delivery = Delivery.load(delivery_id) @@ -218,17 +204,17 @@ async def create_product(request, response, delivery_id, producer_id): delivery.products.append(product) delivery.persist() response.message("Le produit à bien été créé") - response.redirect = f"/distribution/{delivery_id}/{producer_id}/éditer" + response.redirect = f"/produits/{delivery_id}/producteurs/{producer_id}" return response.html( - "products/edit.html", + "products/edit_product.html", {"delivery": delivery, "producer": producer, "product": product}, ) @app.route( - "/distribution/{delivery_id}/{producer_id}/frais-de-livraison", + "/produits/{delivery_id}/producteurs/{producer_id}/frais-de-livraison", methods=["GET", "POST"], ) async def set_shipping_price(request, response, delivery_id, producer_id): @@ -242,11 +228,11 @@ async def set_shipping_price(request, response, delivery_id, producer_id): delivery.shipping[producer_id] = shipping delivery.persist() response.message("Les frais de livraison ont bien été enregistrés, merci !") - response.redirect = f"/distribution/{delivery_id}/produits" + response.redirect = f"/produits/{delivery_id}" return response.html( - "products/shipping_fees.html", + "products/edit_shipping_fees.html", { "delivery": delivery, "producer": producer, @@ -255,17 +241,17 @@ async def set_shipping_price(request, response, delivery_id, producer_id): ) -@app.route("/distribution/{id}/copier", methods=["GET"]) -async def copy_products(request, response, id): +@app.route("/produits/{id}/copier", methods=["GET"]) +async def copy_products_get(request, response, id): deliveries = Delivery.all() - response.html("delivery/copy.html", {"deliveries": deliveries}) + response.html("products/copy_products.html", {"deliveries": deliveries}) -@app.route("/distribution/{id}/copier", methods=["POST"]) -async def copy_products(request, response, id): +@app.route("/produits/{id}/copier", methods=["POST"]) +async def copy_products_post(request, response, id): delivery = Delivery.load(id) to_copy = delivery.load(request.form.get("to_copy")) delivery.producers = to_copy.producers delivery.products = to_copy.products delivery.persist() - response.redirect = f"/distribution/{id}" + response.redirect = f"/produits/{id}"