diff --git a/copanier/config.py b/copanier/config.py index c62a8e9..c813fff 100644 --- a/copanier/config.py +++ b/copanier/config.py @@ -15,6 +15,7 @@ STAFF = [] LOCALE = "fr_FR.UTF-8" #LOCALE = "en_US.UTF-8" SITE_NAME = "Copanier" +SITE_URL = "http://localhost:2244" SITE_DESCRIPTION = "Shared orders" EMAIL_SIGNATURE = "The kind people behind copanier" diff --git a/copanier/emails.py b/copanier/emails.py index 1aac560..44d38bd 100644 --- a/copanier/emails.py +++ b/copanier/emails.py @@ -16,7 +16,7 @@ def send(to, subject, body, html=None, copy=None, attachments=None): if not config.SEND_EMAILS: body = body.replace("https", "http") - return print("Sending email", str(body)) + return print("Sending email", str(body.encode('utf-8'))) message.send( to=to, @@ -37,7 +37,7 @@ def send_from_template(env, template, to, subject, **params): send(to, subject, body=txt, html=html) -def send_order(request, env, person, delivery, order, group_id): +def send_order(request, env, person, delivery, order, group_id, **kwargs): send_from_template( env, "order_summary", @@ -48,4 +48,5 @@ def send_order(request, env, person, delivery, order, group_id): delivery=delivery, request=request, group_id=group_id, + **kwargs, ) diff --git a/copanier/templates/base.html b/copanier/templates/base.html index 910c3a7..6e4a52f 100644 --- a/copanier/templates/base.html +++ b/copanier/templates/base.html @@ -7,11 +7,11 @@ {% if title %}{{ title }} - {% endif %}{{ config.SITE_NAME }} - - - - - + + + + + {% block head %} {% endblock head %} @@ -60,8 +60,8 @@ - - + + {% if message %}