From 6238e1df985ce4a3366a729033481a8c3978eaf7 Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Wed, 22 May 2019 16:09:52 +0200
Subject: [PATCH] Add Mail sender name option

---
 src/pretix/base/services/mail.py                           | 3 ++-
 src/pretix/base/settings.py                                | 4 ++++
 src/pretix/control/forms/event.py                          | 6 ++++++
 src/pretix/control/templates/pretixcontrol/event/mail.html | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py
index d2d42a2e4a..14023015d3 100644
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -100,7 +100,8 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
         subject = str(subject).format_map(context)
         sender = sender or (event.settings.get('mail_from') if event else settings.MAIL_FROM)
         if event:
-            sender = formataddr((str(event.name), sender))
+            sender_name = event.settings.mail_from_name or str(event.name)
+            sender = formataddr((sender_name, sender))
         else:
             sender = formataddr((settings.PRETIX_INSTANCE_NAME, sender))
 
diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index f3b2fbf320..952970965e 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -301,6 +301,10 @@ DEFAULTS = {
         'default': settings.MAIL_FROM,
         'type': str
     },
+    'mail_from_name': {
+        'default': None,
+        'type': str
+    },
     'mail_text_signature': {
         'type': LazyI18nString,
         'default': ""
diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py
index 2601a6e487..e892e0f5e7 100644
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -810,6 +810,12 @@ class MailSettingsForm(SettingsForm):
         label=_("Sender address"),
         help_text=_("Sender address for outgoing emails"),
     )
+    mail_from_name = forms.CharField(
+        label=_("Sender name"),
+        help_text=_("Sender name used in conjunction with the sender address for outgoing emails. "
+                    "Defaults to your event name."),
+        required=False
+    )
     mail_bcc = forms.CharField(
         label=_("Bcc address"),
         help_text=_("All emails will be sent to this address as a Bcc copy"),
diff --git a/src/pretix/control/templates/pretixcontrol/event/mail.html b/src/pretix/control/templates/pretixcontrol/event/mail.html
index b91b658972..fe9f604016 100644
--- a/src/pretix/control/templates/pretixcontrol/event/mail.html
+++ b/src/pretix/control/templates/pretixcontrol/event/mail.html
@@ -12,6 +12,7 @@
             <legend>{% trans "General settings" %}</legend>
             {% bootstrap_field form.mail_prefix layout="control" %}
             {% bootstrap_field form.mail_from layout="control" %}
+            {% bootstrap_field form.mail_from_name layout="control" %}
             {% bootstrap_field form.mail_text_signature layout="control" %}
             {% bootstrap_field form.mail_bcc layout="control" %}
         </fieldset>