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

Merge pull request #956 from mjmayer/add_global_url_to_transaction_email

Browse source 
Add global urls to transactional email mergeTags
This commit is contained in:
Tomas Bures 2020-09-03 06:22:39 +02:00 • committed by GitHub
commit 4bfe7b4349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/routes/api.js
View file

@ -18,6 +18,8 @@ const slugify = require('slugify');
const passport = require('../lib/passport'); const passport = require('../lib/passport');
const templates = require('../models/templates'); const templates = require('../models/templates');
const campaigns = require('../models/campaigns'); const campaigns = require('../models/campaigns');
const urls = require('../lib/urls')
const { getMergeTagsForBases } = require('../../shared/templates')
const {castToInteger} = require('../lib/helpers'); const {castToInteger} = require('../lib/helpers');
const {getSystemSendConfigurationId} = require('../../shared/send-configurations'); const {getSystemSendConfigurationId} = require('../../shared/send-configurations');
@ -362,7 +364,9 @@ router.postAsync('/templates/:templateId/send', async (req, res) => {
} }
const emails = input.EMAIL.split(','); const emails = input.EMAIL.split(',');
const mergeTags = input.TAGS || {}; const mergeTagsGlobal = getMergeTagsForBases(urls.getTrustedUrl(), urls.getSandboxUrl(), urls.getPublicUrl());
const mergeTagsLocal = input.TAGS || {};
const mergeTags = { ...mergeTagsGlobal, ...mergeTagsLocal}
const subject = input.SUBJECT || ''; const subject = input.SUBJECT || '';
const attachments = input.ATTACHMENTS || []; const attachments = input.ATTACHMENTS || [];