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

Allow to override sender for mail

Browse Source
This commit is contained in:
Raphael Michel
2017-07-06 18:06:07 +02:00
parent f28d5f19a7
commit fa6102bbad
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/base/services/mail.py
View File

@@ -33,7 +33,7 @@ class SendMailException(Exception):
def mail(email: str, subject: str, template: Union[str, LazyI18nString], def mail(email: str, subject: str, template: Union[str, LazyI18nString],
context: Dict[str, Any]=None, event: Event=None, locale: str=None, context: Dict[str, Any]=None, event: Event=None, locale: str=None,
order: Order=None, headers: dict=None): order: Order=None, headers: dict=None, sender: str=None):
""" """
Sends out an email to a user. The mail will be sent synchronously or asynchronously depending on the installation. Sends out an email to a user. The mail will be sent synchronously or asynchronously depending on the installation.
@@ -58,6 +58,9 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
:param locale: The locale to be used while evaluating the subject and the template :param locale: The locale to be used while evaluating the subject and the template
:param sender: Set the sender email address. If not set and ``event`` is set, the event's default will be used,
otherwise the system default.
:raises MailOrderException: on obvious, immediate failures. Not raising an exception does not necessarily mean :raises MailOrderException: on obvious, immediate failures. Not raising an exception does not necessarily mean
that the email has been sent, just that it has been queued by the email backend. that the email has been sent, just that it has been queued by the email backend.
""" """
@@ -90,7 +93,7 @@ def mail(email: str, subject: str, template: Union[str, LazyI18nString],
body = tpl.render(context) body = tpl.render(context)
body_md = bleach.linkify(markdown.markdown(body)) body_md = bleach.linkify(markdown.markdown(body))
sender = event.settings.get('mail_from') if event else settings.MAIL_FROM sender = sender or (event.settings.get('mail_from') if event else settings.MAIL_FROM)
subject = str(subject) subject = str(subject)
body_plain = body body_plain = body