diff --git a/copanier/__init__.py b/copanier/__init__.py index 8cdfd23..650d490 100644 --- a/copanier/__init__.py +++ b/copanier/__init__.py @@ -242,7 +242,7 @@ async def place_order(request, response, id): if user and user.email == email: # Only send email if order has been placed by the user itself. emails.send_order( - env, person=Person(email=email), delivery=delivery, order=order + request, env, person=Person(email=email), delivery=delivery, order=order ) response.message(f"La commande pour «{email}» a bien été prise en compte!") response.redirect = f"/livraison/{delivery.id}" @@ -263,9 +263,9 @@ async def send_order(request, response, id): response.message(f"Aucune commande pour «{email}»", status="warning") else: emails.send_order( - env, person=Person(email=email), delivery=delivery, order=order + request, env, person=Person(email=email), delivery=delivery, order=order ) - response.message(f"Commande envoyée à «{email}»") + response.message(f"Résumé de commande envoyé à «{email}»") response.redirect = f"/livraison/{delivery.id}" diff --git a/copanier/emails.py b/copanier/emails.py index 767d63d..9b627b7 100644 --- a/copanier/emails.py +++ b/copanier/emails.py @@ -35,16 +35,16 @@ def send(to, subject, body, html=None): server.quit() -def send_order(env, person, delivery, order): +def send_order(request, env, person, delivery, order): html = env.get_template("emails/order_summary.html").render( - order=order, delivery=delivery + order=order, delivery=delivery, request=request ) txt = env.get_template("emails/order_summary.txt").render( - order=order, delivery=delivery + order=order, delivery=delivery, request=request ) send( person.email, - f"Copanier: résumé de votre commande {delivery.producer}", + f"Copanier: résumé de la commande {delivery.producer}", body=txt, html=html, ) diff --git a/copanier/templates/emails/order_summary.html b/copanier/templates/emails/order_summary.html index 058995f..2ce8dc8 100644 --- a/copanier/templates/emails/order_summary.html +++ b/copanier/templates/emails/order_summary.html @@ -1,5 +1,8 @@

Bonjour,

-

Voici le résumé de votre commande «{{ delivery.producer }}»

+

Voici le résumé de ta commande «{{ delivery.producer }}»

{% include "includes/order_summary.html" %}

Livraison: {{ delivery.where }}, le {{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}

+{% if delivery.is_open %} +

Tu peux la modifier (jusqu'au {{ delivery.order_before|date }}) en cliquant ici.

+{% endif %}

Bonne journée!

diff --git a/copanier/templates/emails/order_summary.txt b/copanier/templates/emails/order_summary.txt index da952b6..ee14890 100644 --- a/copanier/templates/emails/order_summary.txt +++ b/copanier/templates/emails/order_summary.txt @@ -14,4 +14,11 @@ Total: {{ order.total(delivery.products) if order else 0 }} € Livraison: {{ delivery.where }}, le {{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }} +{% if delivery.is_open %} +Tu peux la modifier (jusqu'au {{ delivery.order_before|date }}) en cliquant ici: + +https://{{ request.host }}/livraison/{{ delivery.id }}/commander + +{% endif %} + Bonne journée!