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

Fixed settings form for resend link

Browse Source
This commit is contained in:
Raphael Michel
2016-03-15 18:01:39 +01:00
parent 1f665e6f48
commit 004cb1c262
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/control/forms/event.py
View File

@@ -250,7 +250,7 @@ class MailSettingsForm(SettingsForm):
widget=I18nTextarea, widget=I18nTextarea,
help_text=_("Available placeholders: {event}, {url}") help_text=_("Available placeholders: {event}, {url}")
) )
mail_text_order_resend = I18nFormField( mail_text_resend_link = I18nFormField(
label=_("Resend link"), label=_("Resend link"),
required=False, required=False,
widget=I18nTextarea, widget=I18nTextarea,

1
src/pretix/control/templates/pretixcontrol/event/mail.html
View File

@@ -14,6 +14,7 @@
<legend>{% trans "E-mail content" %}</legend> <legend>{% trans "E-mail content" %}</legend>
{% bootstrap_field form.mail_text_order_placed layout="horizontal" %} {% bootstrap_field form.mail_text_order_placed layout="horizontal" %}
{% bootstrap_field form.mail_text_order_paid layout="horizontal" %} {% bootstrap_field form.mail_text_order_paid layout="horizontal" %}
{% bootstrap_field form.mail_text_resend_link layout="horizontal" %}
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>{% trans "SMTP settings" %}</legend> <legend>{% trans "SMTP settings" %}</legend>

3
src/pretix/control/views/orders.py
View File

@@ -209,8 +209,7 @@ class OrderResendLink(OrderView):
def post(self, *args, **kwargs): def post(self, *args, **kwargs):
with language(self.order.locale): with language(self.order.locale):
mail( mail(
self.order.email, self.order.email, _('Your order: %(code)s') % {'code': self.order.code},
_('Your order: %(code)s') % {'code': self.order.code},
self.order.event.settings.mail_text_resend_link, self.order.event.settings.mail_text_resend_link,
{ {
'event': self.order.event.name, 'event': self.order.event.name,