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

Merge of of PR #827

Browse source
This commit is contained in:
Tomas Bures 2020-01-11 13:59:59 +01:00
parent 2204bbe70c
commit 57907f9260
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/lib/message-sender.js
View file

@ -682,7 +682,7 @@ async function queueCampaignMessageTx(tx, sendConfigurationId, listId, subscript
}); });
} }
async function queueAPITransactionalMessage(tx, sendConfigurationId, email, subject, html, text, tagLanguage, mergeTags, attachments) { async function queueAPITransactionalMessageTx(tx, sendConfigurationId, email, subject, html, text, tagLanguage, mergeTags, attachments) {
const msgData = { const msgData = {
to: { to: {
address: email address: email
@ -788,4 +788,4 @@ module.exports.queueCampaignMessageTx = queueCampaignMessageTx;
module.exports.queueSubscriptionMessage = queueSubscriptionMessage; module.exports.queueSubscriptionMessage = queueSubscriptionMessage;
module.exports.dropQueuedMessage = dropQueuedMessage; module.exports.dropQueuedMessage = dropQueuedMessage;
module.exports.getMessage = getMessage; module.exports.getMessage = getMessage;
module.exports.queueAPITransactionalMessage = queueAPITransactionalMessage; module.exports.queueAPITransactionalMessageTx = queueAPITransactionalMessageTx;

8
server/models/templates.js
View file

@ -163,13 +163,13 @@ async function remove(context, id) {
} }
async function sendAsTransactionalEmail(context, templateId, sendConfigurationId, emails, subject, mergeTags, attachments) { async function sendAsTransactionalEmail(context, templateId, sendConfigurationId, emails, subject, mergeTags, attachments) {
await knex.transaction(async tx => { const template = await getById(context, templateId, false);
const template = await getById(context, templateId, false);
await shares.enforceEntityPermission(context, 'sendConfiguration', sendConfigurationId, 'sendWithoutOverrides'); await shares.enforceEntityPermission(context, 'sendConfiguration', sendConfigurationId, 'sendWithoutOverrides');
await knex.transaction(async tx => {
for (const email of emails) { for (const email of emails) {
await messageSender.queueAPITransactionalMessage(tx, sendConfigurationId, email, subject, template.html, template.text, template.tag_language, {...mergeTags, EMAIL: email }, attachments); await messageSender.queueAPITransactionalMessageTx(tx, sendConfigurationId, email, subject, template.html, template.text, template.tag_language, {...mergeTags, EMAIL: email }, attachments);
} }
}); });
} }