Mail signature

src/pretix/base/services/mail.py

@@ -114,6 +114,16 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
                 subject = "[%s] %s" % (prefix, subject)
 
             body_plain += "\r\n\r\n-- \r\n"
+
+            signature = str(event.settings.get('mail_text_signature'))
+            if signature:
+                signature = signature.format(event=event.name)
+                signature_md = signature.replace('\n', '<br>\n')
+                signature_md = bleach.linkify(bleach.clean(markdown.markdown(signature_md), tags=bleach.ALLOWED_TAGS + ['p', 'br']))
+                htmlctx['signature'] = signature_md
+                body_plain += signature
+                body_plain += "\r\n\r\n-- \r\n"
+
             body_plain += _(
                 "You are receiving this email because you placed an order for {event}."
             ).format(event=event.name)

src/pretix/base/settings.py

@@ -187,6 +187,10 @@
         'default': settings.MAIL_FROM,
         'type': str
     },
+    'mail_text_signature': {
+        'type': LazyI18nString,
+        'default': ""
+    },
     'mail_text_resend_link': {
         'type': LazyI18nString,
         'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,

src/pretix/base/templates/pretixbase/email/plainwrapper.html

@@ -148,6 +148,18 @@ <h1><a href="{{ site_url }}" target="_blank">{{ site }}</a></h1>
                 </td>
             </tr>
         {% endif %}
+	{% if signature %}
+            <tr>
+                <td class="gap"></td>
+            </tr>
+            <tr>
+                <td class="order containertd">
+                    <div class="content">
+                        {{ signature | safe }}
+                    </div>
+                </td>
+            </tr>
+        {% endif %}
         <tr>
             <td class="footer">
                 <div>

src/pretix/control/forms/event.py

@@ -474,6 +474,15 @@ class MailSettingsForm(SettingsForm):
         label=_("Sender address"),
         help_text=_("Sender address for outgoing emails")
     )
+
+    mail_text_signature = I18nFormField(
+        label=_("Signature"),
+        required=False,
+        widget=I18nTextarea,
+        help_text=_("This will be attached to every email. Available placeholders: {event}"),
+        validators=[PlaceholderValidator(['{event}'])]
+    )
+
     mail_text_order_placed = I18nFormField(
         label=_("Text"),
         required=False,

src/pretix/control/templates/pretixcontrol/event/mail.html

@@ -10,6 +10,7 @@
             <legend>{% trans "E-mail settings" %}</legend>
             {% bootstrap_field form.mail_prefix layout="horizontal" %}
             {% bootstrap_field form.mail_from layout="horizontal" %}
+            {% bootstrap_field form.mail_text_signature layout="horizontal" %}
         </fieldset>
         <fieldset>
             <legend>{% trans "E-mail content" %}</legend>

src/tests/base/test_mail.py

@@ -48,6 +48,18 @@ def test_send_mail_with_event_sender(env):
     assert djmail.outbox[0].from_email == 'foo@bar'
 
 
+@pytest.mark.django_db
+def test_send_mail_with_event_signature(env):
+    djmail.outbox = []
+    event, user, organizer = env
+    event.settings.set('mail_text_signature', 'This is a test signature.')
+    mail('dummy@dummy.dummy', 'Test subject', 'mailtest.txt', {}, event)
+
+    assert len(djmail.outbox) == 1
+    assert djmail.outbox[0].to == [user.email]
+    assert 'This is a test signature.' in djmail.outbox[0].body
+
+
 @pytest.mark.django_db
 def test_send_mail_with_default_sender(env):
     djmail.outbox = []