Add marketing_email module
issue7835 review38711002
This commit is contained in:
1 parent
d7d3b9d241
commit
3fd0026360
2 files changed
+5
-6
No files matched your search
+2
-5
@@ -75,14 +75,11 @@ due.
|
||||
Configuration
|
||||
*************
|
||||
|
||||
The marketing_automation modules uses parameters from the section:
|
||||
|
||||
- `[email]`:
|
||||
|
||||
- `from`: The default `From` for the email.
|
||||
The marketing_automation module uses parameters from the section:
|
||||
|
||||
- `[marketing]`:
|
||||
|
||||
- `email_from`: The default `From` for the email.
|
||||
- `automation_base`: The base URL without a path for the unsubscribe URL
|
||||
and the empty image.
|
||||
The default value is created using the configuration `[web]` `hostname`.
|
||||
@@ -595,7 +595,9 @@ class Activity(ModelSQL, ModelView):
|
||||
.render())
|
||||
|
||||
msg = MIMEMultipart('alternative')
|
||||
msg['From'] = self.email_from or config.get('email', 'from')
|
||||
msg['From'] = (self.email_from
|
||||
or config.get('marketing', 'email_from')
|
||||
or config.get('email', 'from'))
|
||||
msg['To'] = to
|
||||
msg['Subject'] = Header(title, 'utf-8')
|
||||
if html2text:
|
||||
|
||||
Reference in new issue
Block a user