CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix #397 -- Fix problems with reminder email

Browse Source
This commit is contained in:
Raphael Michel
2017-02-03 14:09:03 +01:00
parent 7146d984d0
commit 43abe14293
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/pretix/base/services/orders.py
View File

@@ -7,6 +7,7 @@ from typing import List, Optional
import pytz import pytz
from celery.exceptions import MaxRetriesExceededError from celery.exceptions import MaxRetriesExceededError
from django.conf import settings
from django.db import transaction from django.db import transaction
from django.db.models import F, Q from django.db.models import F, Q
from django.dispatch import receiver from django.dispatch import receiver
@@ -433,12 +434,13 @@ def send_expiry_warnings(sender, **kwargs):
today = now().replace(hour=0, minute=0, second=0) today = now().replace(hour=0, minute=0, second=0)
for o in Order.objects.filter(expires__gte=today, expiry_reminder_sent=False, status=Order.STATUS_PENDING).select_related('event'): for o in Order.objects.filter(expires__gte=today, expiry_reminder_sent=False, status=Order.STATUS_PENDING).select_related('event'):
settings = eventcache.get(o.event.pk, None) eventsettings = eventcache.get(o.event.pk, None)
if settings is None: if eventsettings is None:
settings = o.event.settings eventsettings = o.event.settings
eventcache[o.event.pk] = settings eventcache[o.event.pk] = eventsettings
days = settings.get('mail_days_order_expire_warning', as_type=int) days = eventsettings.get('mail_days_order_expire_warning', as_type=int)
tz = pytz.timezone(eventsettings.get('timezone', settings.TIME_ZONE))
if days and (o.expires - today).days <= days: if days and (o.expires - today).days <= days:
o.expiry_reminder_sent = True o.expiry_reminder_sent = True
o.save() o.save()
@@ -449,21 +451,22 @@ def send_expiry_warnings(sender, **kwargs):
invoice_name = "" invoice_name = ""
invoice_company = "" invoice_company = ""
try: try:
mail( with language(o.locale):
o.email, _('Your order is about to expire: %(code)s') % {'code': o.code}, mail(
settings.mail_text_order_expire_warning, o.email, _('Your order is about to expire: %(code)s') % {'code': o.code},
{ eventsettings.mail_text_order_expire_warning,
'event': o.event.name, {
'url': build_absolute_uri(o.event, 'presale:event.order', kwargs={ 'event': o.event.name,
'order': o.code, 'url': build_absolute_uri(o.event, 'presale:event.order', kwargs={
'secret': o.secret 'order': o.code,
}), 'secret': o.secret
'expire_date': date_format(o.expires, 'SHORT_DATE_FORMAT'), }),
'invoice_name': invoice_name, 'expire_date': date_format(o.expires.astimezone(tz), 'SHORT_DATE_FORMAT'),
'invoice_company': invoice_company, 'invoice_name': invoice_name,
}, 'invoice_company': invoice_company,
o.event, locale=o.locale },
) o.event, locale=o.locale
)
except SendMailException: except SendMailException:
logger.exception('Reminder email could not be sent') logger.exception('Reminder email could not be sent')
else: else: