public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development-tb

Browse source 
# Conflicts:
#	server/lib/template-sender.js
#	server/routes/api.js
This commit is contained in:
Tomas Bures 2019-07-10 02:13:19 +04:00
commit a22187ef12
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
server/routes/api.js
View file

@ -311,6 +311,7 @@ router.postAsync('/templates/:templateId/send', async (req, res) => {
const emails = input.EMAIL.split(',');
// TODO: attachments: input.ATTACHMENTS || []
const info = await templates.sendAsTransactionalEmail(req.context, templateId, sendConfigurationId, emails, input.SUBJECT, input.VARIABLES);
res.json({ data: info });