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

Merge pull request #609 from trucknet-io/bugfix/#606

Browse source 
Added getting of variables to TemplateSender [Resolves #606]
This commit is contained in:
Tomas Bures 2019-06-11 18:59:47 +02:00 • committed by GitHub
commit afe12cba0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/lib/template-sender.js
View file

@ -3,6 +3,8 @@
const mailers = require('./mailers');
const tools = require('./tools');
const templates = require('../models/templates');
const { getMergeTagsForBases } = require('../../shared/templates');
const { getTrustedUrl, getSandboxUrl, getPublicUrl } = require('../lib/urls');
class TemplateSender {
constructor(options) {
@ -27,15 +29,21 @@ class TemplateSender {
)
]);
const variables = {
EMAIL: options.email,
...getMergeTagsForBases(getTrustedUrl(), getSandboxUrl(), getPublicUrl()),
...options.variables
};
const html = tools.formatTemplate(
template.html,
null,
options.variables,
variables,
true
);
const subject = tools.formatTemplate(
options.subject || template.description || template.name,
options.variables
variables
);
return mailer.sendTransactionalMail(
{