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

Fix missing placeholders and reformat the sendmail view

Browse Source
This commit is contained in:
Raphael Michel
2017-05-10 15:14:23 +02:00
parent 8c457c057e
commit 90d14c004f
1 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/pretix/plugins/sendmail/views.py
View File

@@ -12,11 +12,10 @@ from django.utils.translation import ugettext_lazy as _
from django.views.generic import FormView, ListView from django.views.generic import FormView, ListView
from pretix.base.i18n import LazyI18nString, language from pretix.base.i18n import LazyI18nString, language
from pretix.base.models import LogEntry, Order from pretix.base.models import InvoiceAddress, LogEntry, Order
from pretix.base.services.mail import SendMailException, mail from pretix.base.services.mail import SendMailException, mail
from pretix.control.permissions import EventPermissionRequiredMixin from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.multidomain.urlreverse import build_absolute_uri from pretix.multidomain.urlreverse import build_absolute_uri
from . import forms from . import forms
logger = logging.getLogger('pretix.plugins.sendmail') logger = logging.getLogger('pretix.plugins.sendmail')
@@ -65,12 +64,13 @@ class SenderView(EventPermissionRequiredMixin, FormView):
if not orders: if not orders:
messages.error(self.request, _('There are no orders matching this selection.')) messages.error(self.request, _('There are no orders matching this selection.'))
return self.get(self.request, *self.args, **self.kwargs) return self.get(self.request, *self.args, **self.kwargs)
for o in orders:
if self.request.POST.get("action") == "preview": if self.request.POST.get("action") == "preview":
for l in self.request.event.settings.locales: for l in self.request.event.settings.locales:
with language(l): with language(l):
self.output[l] = [] self.output[l] = []
self.output[l].append(_('Subject: {subject}').format(subject=form.cleaned_data['subject'].localize(l))) self.output[l].append(
_('Subject: {subject}').format(subject=form.cleaned_data['subject'].localize(l)))
message = form.cleaned_data['message'].localize(l) message = form.cleaned_data['message'].localize(l)
preview_text = message.format( preview_text = message.format(
order='ORDER1234', order='ORDER1234',
@@ -80,13 +80,25 @@ class SenderView(EventPermissionRequiredMixin, FormView):
order_url=build_absolute_uri(self.request.event, 'presale:event.order', kwargs={ order_url=build_absolute_uri(self.request.event, 'presale:event.order', kwargs={
'order': 'ORDER1234', 'order': 'ORDER1234',
'secret': 'longrandomsecretabcdef123456' 'secret': 'longrandomsecretabcdef123456'
})) }),
invoice_name=_('John Doe'),
invoice_company=_('Sample Company LLC'),
)
self.output[l].append(preview_text) self.output[l].append(preview_text)
return self.get(self.request, *self.args, **self.kwargs) return self.get(self.request, *self.args, **self.kwargs)
else:
for o in orders:
try:
invoice_name = o.invoice_address.name
invoice_company = o.invoice_address.company
except InvoiceAddress.DoesNotExist:
invoice_name = ""
invoice_company = ""
try: try:
with language(o.locale): with language(o.locale):
mail(o.email, form.cleaned_data['subject'], form.cleaned_data['message'], mail(
o.email, form.cleaned_data['subject'], form.cleaned_data['message'],
{ {
'event': o.event, 'event': o.event,
'order': o.code, 'order': o.code,
@@ -95,7 +107,10 @@ class SenderView(EventPermissionRequiredMixin, FormView):
'order_url': build_absolute_uri(o.event, 'presale:event.order', kwargs={ 'order_url': build_absolute_uri(o.event, 'presale:event.order', kwargs={
'order': o.code, 'order': o.code,
'secret': o.secret 'secret': o.secret
})}, }),
'invoice_name': invoice_name,
'invoice_company': invoice_company,
},
self.request.event, locale=o.locale, order=o) self.request.event, locale=o.locale, order=o)
o.log_action( o.log_action(
'pretix.plugins.sendmail.order.email.sent', 'pretix.plugins.sendmail.order.email.sent',
@@ -112,7 +127,8 @@ class SenderView(EventPermissionRequiredMixin, FormView):
user=self.request.user, user=self.request.user,
data=dict(form.cleaned_data)) data=dict(form.cleaned_data))
if failures: if failures:
messages.error(self.request, _('Failed to send mails to the following users: {}'.format(' '.join(failures)))) messages.error(self.request,
_('Failed to send mails to the following users: {}'.format(' '.join(failures))))
else: else:
messages.success(self.request, _('Your message has been queued and will be sent to the selected users.')) messages.success(self.request, _('Your message has been queued and will be sent to the selected users.'))