diff --git a/copanier/templates/delivery/show_delivery.html b/copanier/templates/delivery/show_delivery.html index bd0665e..2faf048 100644 --- a/copanier/templates/delivery/show_delivery.html +++ b/copanier/templates/delivery/show_delivery.html @@ -22,7 +22,7 @@  Imprimer… @@ -64,7 +64,7 @@ {% 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. Ajouter les product⋅eurs⋅rices à la main ;
  3. Ou bien copier les produits d'une autre distribution.
diff --git a/copanier/templates/delivery/show_toolbox.html b/copanier/templates/delivery/show_toolbox.html index a4d4e01..fe7ce26 100644 --- a/copanier/templates/delivery/show_toolbox.html +++ b/copanier/templates/delivery/show_toolbox.html @@ -72,23 +72,23 @@ Avant et pendant la distribution : Une fois les commandes passées : Pour préparer la distribution : {% endblock %} \ No newline at end of file diff --git a/copanier/templates/emails/access_granted.html b/copanier/templates/emails/access_granted.html index 4e2e3d0..bab3ca4 100644 --- a/copanier/templates/emails/access_granted.html +++ b/copanier/templates/emails/access_granted.html @@ -2,6 +2,6 @@

Voici le sésame, clique dessus pour t'authentifier, ou copie-colle-le dans ton navigateur:

-https://{{ hostname }}/connexion/{{ token }} +https://{{ hostname }}{{ url_for('set_sesame', token=token) }}

{{ config.EMAIL_SIGNATURE }}

diff --git a/copanier/templates/emails/access_granted.txt b/copanier/templates/emails/access_granted.txt index c607bf6..0e95738 100644 --- a/copanier/templates/emails/access_granted.txt +++ b/copanier/templates/emails/access_granted.txt @@ -2,6 +2,6 @@ Hey ho! Voici le sésame, clique dessus pour accéder à la commande : -https://{{ hostname }}/connexion/{{ token }} +https://{{ hostname }}{{ url_for('set_sesame', token=token) }} {{ config.EMAIL_SIGNATURE }} diff --git a/copanier/templates/groups/edit_group.html b/copanier/templates/groups/edit_group.html index 8c80d7e..8190fb5 100644 --- a/copanier/templates/groups/edit_group.html +++ b/copanier/templates/groups/edit_group.html @@ -27,7 +27,7 @@ {% if group.id %} {% endif %} diff --git a/copanier/templates/groups/list_groups.html b/copanier/templates/groups/list_groups.html index d40c122..0bad5b9 100644 --- a/copanier/templates/groups/list_groups.html +++ b/copanier/templates/groups/list_groups.html @@ -6,7 +6,7 @@
@@ -36,12 +36,12 @@ {% endfor %} - {% if group.id != request['user'].group_id %}rejoindre{% endif %} éditer + {% if group.id != request['user'].group_id %}rejoindre{% endif %} éditer {% endfor %} -

Tu ne fais partie d'aucun des groupes listés ici ? Tu peux  en créer un nouveau

+

Tu ne fais partie d'aucun des groupes listés ici ? Tu peux  en créer un nouveau

{% endblock %} \ No newline at end of file diff --git a/copanier/templates/includes/delivery_small_list.html b/copanier/templates/includes/delivery_small_list.html index 981d0e8..6b20848 100644 --- a/copanier/templates/includes/delivery_small_list.html +++ b/copanier/templates/includes/delivery_small_list.html @@ -2,7 +2,7 @@ diff --git a/copanier/templates/includes/delivery_table.html b/copanier/templates/includes/delivery_table.html index 5c7267c..a998d01 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 %} @@ -31,7 +31,7 @@ {% set orderer_name = request.groups.groups[orderer].name %} {% for product in delivery.get_products_by(producer) %} - {% if delivery.has_packing %} @@ -51,7 +51,7 @@ {{ delivery.product_wanted(product) }} {% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} (−{{ delivery.product_missing(product) }}) - {% if request.user.is_staff %}ajuster{% endif %} + {% if request.user.is_staff %}ajuster{% endif %} {% endif %} {% if not list_only %} diff --git a/copanier/templates/includes/order_button.html b/copanier/templates/includes/order_button.html index d7fc9c7..651df2c 100644 --- a/copanier/templates/includes/order_button.html +++ b/copanier/templates/includes/order_button.html @@ -1,5 +1,5 @@ {% if (delivery.status == delivery.OPEN or delivery.status == delivery.ADJUSTMENT) and delivery.has_products %} - + {% if delivery.status == delivery.ADJUSTMENT %} Ajuster ma commande {% elif delivery.status == delivery.OPEN %} @@ -8,5 +8,5 @@ {% endif %} {% if request.user.email in delivery.orders %} -  {{ delivery.total_for(request.user) }} € +  {{ delivery.total_for(request.user) }} € {% endif %} diff --git a/copanier/templates/includes/toplinks.html b/copanier/templates/includes/toplinks.html deleted file mode 100644 index dd54c05..0000000 --- a/copanier/templates/includes/toplinks.html +++ /dev/null @@ -1,7 +0,0 @@ -{% if link == "deliveries" %} -↶ Retourner à la liste des distributions -{% elif link == "products" %} -↶ Retourner à la liste des produits -{% elif link == "producer" %} -↶ Retourner à la fiche product⋅eur⋅rice -{% endif %} \ No newline at end of file diff --git a/copanier/templates/products/delete_producer.html b/copanier/templates/products/delete_producer.html index e98c2b1..9a8ecb3 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_product.html b/copanier/templates/products/delete_product.html index 2b50bb0..3c7c3f0 100644 --- a/copanier/templates/products/delete_product.html +++ b/copanier/templates/products/delete_product.html @@ -34,34 +34,5 @@
-{% if products %} -

Produits

- -
{% if request.user and (request.user.is_staff or request.user.is_referent(delivery)) %} - {{ orderer_name }} + {{ orderer_name }} {% else %} {{ orderer_name }} {% endif %} @@ -43,7 +43,7 @@
{% if edit_mode %}{% endif %}{% if edit_mode %} {% endif %}{% if product.rupture %} (rupture){% endif %} {{ product }}{% if edit_mode %}{% endif %} + {% if edit_mode %}{% endif %}{% if edit_mode %} {% endif %}{% if product.rupture %} (rupture){% endif %} {{ product }}{% if edit_mode %}{% endif %} {{ product.price | round(2) }} €{% if product.packing %}{{ product.packing }} x {% endif %} {{ product.unit }}
- - - - - - - - - - - -{% 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/edit_producer.html b/copanier/templates/products/edit_producer.html index aabef76..959466c 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_product.html b/copanier/templates/products/edit_product.html index 0d9726a..587bea5 100644 --- a/copanier/templates/products/edit_product.html +++ b/copanier/templates/products/edit_product.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block toplink %}↶ Retourner aux produits de {{ producer.name }}{% endblock %} +{% block toplink %}↶ Retourner aux produits de {{ producer.name }}{% endblock %} {% block body %} @@ -10,7 +10,7 @@
diff --git a/copanier/templates/products/edit_shipping_fees.html b/copanier/templates/products/edit_shipping_fees.html index cc58ca3..5055756 100644 --- a/copanier/templates/products/edit_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 a {{ producer.name }}{% endblock %} {% block body %}
diff --git a/copanier/templates/products/list_products.html b/copanier/templates/products/list_products.html index 8bc9001..2d4a445 100644 --- a/copanier/templates/products/list_products.html +++ b/copanier/templates/products/list_products.html @@ -6,20 +6,14 @@
-

- {% if producers %} - 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 %} -

{% include "includes/delivery_table.html" %} diff --git a/copanier/views/delivery.py b/copanier/views/delivery.py index ce54656..62dd0db 100644 --- a/copanier/views/delivery.py +++ b/copanier/views/delivery.py @@ -284,7 +284,7 @@ async def show_orders_summary(request, response, id): @app.route("/distribution/{id}/rapport-complet.xlsx", methods=["GET"]) -async def xls_full_report(request, response, id): +async def generate_report(request, response, id): delivery = Delivery.load(id) date = delivery.to_date.strftime("%Y-%m-%d") response.xlsx( diff --git a/copanier/views/login.py b/copanier/views/login.py index 66d0856..d41a18a 100644 --- a/copanier/views/login.py +++ b/copanier/views/login.py @@ -50,6 +50,7 @@ async def send_sesame(request, response): f"Sésame {config.SITE_NAME}", hostname=request.host, token=token.decode(), + url_for=app.url_for, ) except RuntimeError: response.message("Oops, impossible d'envoyer le courriel…", status="error") diff --git a/copanier/views/products.py b/copanier/views/products.py index 79e56b7..11d246e 100644 --- a/copanier/views/products.py +++ b/copanier/views/products.py @@ -147,7 +147,7 @@ async def edit_product(request, response, delivery_id, producer_id, product_ref) @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): +async def validate_producer_prices(request, response, delivery_id, producer_id): delivery = Delivery.load(delivery_id) producer = delivery.producers.get(producer_id) @@ -217,7 +217,7 @@ async def create_product(request, response, delivery_id, producer_id): "/produits/{delivery_id}/producteurs/{producer_id}/frais-de-livraison", methods=["GET", "POST"], ) -async def set_shipping_price(request, response, delivery_id, producer_id): +async def edit_shipping_price(request, response, delivery_id, producer_id): delivery = Delivery.load(delivery_id) producer = delivery.producers.get(producer_id)