Merge branch 'master' into develop

This commit is contained in:
Levi 2017-06-12 23:51:03 -05:00
commit c7d29be24c
8 changed files with 264 additions and 405 deletions

View file

@ -21,10 +21,10 @@ class BaseEmail(object):
self.email = EmailMultiAlternatives(self.subject, text_content)
self.email.attach_alternative(html_content, "text/html")
self.email.from_email = kwargs.get(
'from',
'(ungleich) ungleich Support <info@ungleich.ch>'
)
if 'from_address' in kwargs:
self.email.from_email = kwargs.get('from_address')
else:
self.email.from_email = '(ungleich) ungleich Support <info@ungleich.ch>'
self.email.to = [kwargs.get('to', 'info@ungleich.com')]
def send(self):