From c83bd0e2930b80ae34543f1f10a43c120c34d9a7 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 3 Jun 2015 14:01:33 +0200 Subject: [PATCH] Move mail() to services/ --- src/pretix/base/{ => services}/mail.py | 0 src/pretix/base/services/orders.py | 3 ++- src/pretix/presale/views/checkout.py | 2 +- src/pretix/presale/views/event.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename src/pretix/base/{ => services}/mail.py (100%) diff --git a/src/pretix/base/mail.py b/src/pretix/base/services/mail.py similarity index 100% rename from src/pretix/base/mail.py rename to src/pretix/base/services/mail.py diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index cbcc93f68..c9d57ce5d 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -38,7 +38,8 @@ def mark_order_paid(order, provider=None, info=None, date=None, manual=None, for for quota in quotas_locked: quota.release() - from pretix.base.mail import mail + from pretix.base.services import mail + mail( order.user, _('Payment received for your order: %(code)s') % {'code': order.code}, 'pretixpresale/email/order_paid.txt', diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py index b6664f7bf..ac4d135c3 100644 --- a/src/pretix/presale/views/checkout.py +++ b/src/pretix/presale/views/checkout.py @@ -10,7 +10,7 @@ from django.utils.functional import cached_property from django.utils.timezone import now from django.views.generic import TemplateView from django.utils.translation import ugettext_lazy as _ -from pretix.base.mail import mail +from pretix.base.services.mail import mail from pretix.base.models import CartPosition, QuestionAnswer, Quota, Order, OrderPosition from pretix.base.signals import register_payment_providers from pretix.presale.forms.checkout import QuestionsForm diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index eeca529dd..49b3a88e2 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -12,7 +12,7 @@ from django.contrib.auth import login from django.views.generic import TemplateView, View from django.utils.translation import ugettext_lazy as _ from django.conf import settings -from pretix.base.mail import mail +from pretix.base.services.mail import mail from pretix.base.models import User from pretix.presale.forms.auth import GlobalRegistrationForm, LocalRegistrationForm, PasswordForgotForm, \ PasswordRecoverForm