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

Merged pull request #412

Browse source
This commit is contained in:
Tomas Bures 2018-08-05 17:22:31 +05:30
commit fe7d34e0f6
10 changed files with 219 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

99
lib/models/triggers.js
View file

@ -1,8 +1,10 @@
'use strict'; 'use strict';
let log = require('npmlog');
let tools = require('../tools'); let tools = require('../tools');
let db = require('../db'); let db = require('../db');
let lists = require('./lists'); let lists = require('./lists');
let segments = require('./segments');
let util = require('util'); let util = require('util');
let _ = require('../translate')._; let _ = require('../translate')._;
let tableHelpers = require('../table-helpers'); let tableHelpers = require('../table-helpers');
@ -55,7 +57,9 @@ module.exports.list = callback => {
'`triggers`.`description` AS `description`', '`triggers`.`description` AS `description`',
'`triggers`.`enabled` AS `enabled`', '`triggers`.`enabled` AS `enabled`',
'`triggers`.`list` AS `list`', '`triggers`.`list` AS `list`',
'`triggers`.`segment` AS `segment`',
'`lists`.`name` AS `list_name`', '`lists`.`name` AS `list_name`',
'`segments`.`name` AS `segment_name`',
'`source`.`id` AS `source_campaign`', '`source`.`id` AS `source_campaign`',
'`source`.`name` AS `source_campaign_name`', '`source`.`name` AS `source_campaign_name`',
'`dest`.`id` AS `dest_campaign`', '`dest`.`id` AS `dest_campaign`',
@ -69,7 +73,7 @@ module.exports.list = callback => {
'`triggers`.`created` AS `created`' '`triggers`.`created` AS `created`'
]; ];
let query = 'SELECT ' + tableFields.join(', ') + ' FROM `triggers` LEFT JOIN `campaigns` `source` ON `source`.`id`=`triggers`.`source_campaign` LEFT JOIN `campaigns` `dest` ON `dest`.`id`=`triggers`.`dest_campaign` LEFT JOIN `lists` ON `lists`.`id`=`triggers`.`list` LEFT JOIN `custom_fields` ON `custom_fields`.`list` = `triggers`.`list` AND `custom_fields`.`column`=`triggers`.`column` ORDER BY `triggers`.`name`'; let query = 'SELECT ' + tableFields.join(', ') + ' FROM `triggers` LEFT JOIN `campaigns` `source` ON `source`.`id`=`triggers`.`source_campaign` LEFT JOIN `campaigns` `dest` ON `dest`.`id`=`triggers`.`dest_campaign` LEFT JOIN `lists` ON `lists`.`id`=`triggers`.`list` LEFT JOIN `segments` ON `segments`.`id`=`triggers`.`segment` LEFT JOIN `custom_fields` ON `custom_fields`.`list` = `triggers`.`list` AND `custom_fields`.`column`=`triggers`.`column` ORDER BY `triggers`.`name`';
connection.query(query, (err, rows) => { connection.query(query, (err, rows) => {
connection.release(); connection.release();
if (err) { if (err) {
@ -105,32 +109,70 @@ module.exports.getQuery = (id, callback) => {
let intervalQuery = (column, seconds, treshold) => column + ' <= NOW() - INTERVAL ' + seconds + ' SECOND AND ' + column + ' >= NOW() - INTERVAL ' + (treshold + seconds) + ' SECOND'; let intervalQuery = (column, seconds, treshold) => column + ' <= NOW() - INTERVAL ' + seconds + ' SECOND AND ' + column + ' >= NOW() - INTERVAL ' + (treshold + seconds) + ' SECOND';
let query = false;
switch (trigger.rule) { let getSegmentQuery = (segmentId, next) => {
case 'subscription': segmentId = Number(segmentId);
query = 'SELECT id FROM `subscription__' + trigger.list + '` subscription WHERE ' + intervalQuery('`' + trigger.column + '`', trigger.seconds, treshold) + ' AND id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit; if (!segmentId) {
break; return next(null, {
case 'campaign': where: '',
switch (trigger.column) { values: []
case 'delivered': });
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription WHERE campaign.status=1 AND ' + intervalQuery('`campaign`.`created`', trigger.seconds, treshold) + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit; }
break;
case 'not_clicked': segments.getQuery(segmentId, 'subscription', next);
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=0 WHERE campaign.status=1 AND ' + intervalQuery('`campaign`.`created`', trigger.seconds, treshold) + ' AND tracker.created IS NULL AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit; };
break;
case 'not_opened': getSegmentQuery(trigger.segment, (err, queryData) => {
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=-1 WHERE campaign.status=1 AND ' + intervalQuery('`campaign`.`created`', trigger.seconds, treshold) + ' AND tracker.created IS NULL AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit; if (err) {
break; log.err('Triggers', err);
case 'clicked': return null;
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=0 WHERE campaign.status=1 AND ' + intervalQuery('`tracker`.`created`', trigger.seconds, treshold) + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit; }
break;
case 'opened': let query = false;
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=-1 WHERE campaign.status=1 AND ' + intervalQuery('`tracker`.`created`', trigger.seconds, treshold) + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit; let querySegmentSubscription = '';
break; let querySegmentTriggertable = '';
if (trigger.segment > 0)
{
querySegmentSubscription = (queryData.where ? ' AND (' + queryData.where + ')' : '');
querySegmentTriggertable = ' AND triggertable.`segment` = ' + trigger.segment;
}
switch (trigger.rule) {
case 'subscription':
query = 'SELECT id FROM `subscription__' + trigger.list + '` subscription WHERE status=1 AND ' + intervalQuery('`' + trigger.column + '`', trigger.seconds, treshold) + ' ' + querySegmentSubscription + ' AND id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' ' + querySegmentTriggertable + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit;
break;
case 'campaign':
switch (trigger.column) {
case 'delivered':
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription WHERE campaign.status=1 AND ' + intervalQuery('`campaign`.`created`', trigger.seconds, treshold) + ' ' + querySegmentSubscription + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' ' + querySegmentTriggertable + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit;
break;
case 'not_clicked':
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=0 WHERE campaign.status=1 AND ' + intervalQuery('`campaign`.`created`', trigger.seconds, treshold) + ' AND tracker.created IS NULL ' + querySegmentSubscription + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' ' + querySegmentTriggertable + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit;
break;
case 'not_opened':
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=-1 WHERE campaign.status=1 AND ' + intervalQuery('`campaign`.`created`', trigger.seconds, treshold) + ' AND tracker.created IS NULL ' + querySegmentSubscription + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' ' + querySegmentTriggertable + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit;
break;
case 'clicked':
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=0 WHERE campaign.status=1 AND ' + intervalQuery('`tracker`.`created`', trigger.seconds, treshold) + ' ' + querySegmentSubscription + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' ' + querySegmentTriggertable + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit;
break;
case 'opened':
query = 'SELECT subscription.id AS id FROM `subscription__' + trigger.list + '` subscription LEFT JOIN `campaign__' + trigger.sourceCampaign + '` campaign ON campaign.list=' + trigger.list + ' AND subscription.id=campaign.subscription LEFT JOIN `campaign_tracker__' + trigger.sourceCampaign + '` tracker ON tracker.list=campaign.list AND tracker.subscriber=subscription.id AND tracker.link=-1 WHERE campaign.status=1 AND ' + intervalQuery('`tracker`.`created`', trigger.seconds, treshold) + ' ' + querySegmentSubscription + ' AND subscription.id NOT IN (SELECT subscription FROM `trigger__' + id + '` triggertable WHERE triggertable.`list` = ' + trigger.list + ' ' + querySegmentTriggertable + ' AND triggertable.`subscription` = subscription.`id`) LIMIT ' + limit;
break;
}
break;
}
if (trigger.segment > 0) {
let values = queryData.values.concat([trigger.list, trigger.segment]);
for (let i = 0; i < values.length; i++) {
query = query.replace('?', db.escape(values[i]));
} }
break; }
}
callback(null, query); callback(null, query);
});
}); });
}; };
@ -168,6 +210,7 @@ module.exports.create = (trigger, callback) => {
let name = (trigger.name || '').toString().trim(); let name = (trigger.name || '').toString().trim();
let description = (trigger.description || '').toString().trim(); let description = (trigger.description || '').toString().trim();
let listId = Number(trigger.list) || 0; let listId = Number(trigger.list) || 0;
let segmentId = Number(trigger.segmentId) || 0;
let seconds = (Number(trigger.days) || 0) * 24 * 3600; let seconds = (Number(trigger.days) || 0) * 24 * 3600;
let rule = (trigger.rule || '').toString().toLowerCase().trim(); let rule = (trigger.rule || '').toString().toLowerCase().trim();
let destCampaign = Number(trigger.destCampaign) || 0; let destCampaign = Number(trigger.destCampaign) || 0;
@ -220,8 +263,8 @@ module.exports.create = (trigger, callback) => {
return callback(err); return callback(err);
} }
let keys = ['name', 'description', 'list', 'source_campaign', 'rule', 'column', 'seconds', 'dest_campaign', 'last_check']; let keys = ['name', 'description', 'list', 'segment', 'source_campaign', 'rule', 'column', 'seconds', 'dest_campaign', 'last_check'];
let values = [name, description, list.id, sourceCampaign, rule, column, seconds, destCampaign]; let values = [name, description, list.id, segmentId, sourceCampaign, rule, column, seconds, destCampaign];
let query = 'INSERT INTO `triggers` (`' + keys.join('`, `') + '`) VALUES (' + values.map(() => '?').join(', ') + ', NOW())'; let query = 'INSERT INTO `triggers` (`' + keys.join('`, `') + '`) VALUES (' + values.map(() => '?').join(', ') + ', NOW())';

2
meta.json
View file

@ -1,3 +1,3 @@
{ {
"schemaVersion": 30 "schemaVersion": 31
} }

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "mailtrain", "name": "mailtrain",
"private": true, "private": true,
"version": "1.23.2", "version": "1.24.0",
"description": "Self hosted email newsletter app", "description": "Self hosted email newsletter app",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

188
routes/triggers.js
View file

@ -5,6 +5,7 @@ let router = new express.Router();
let triggers = require('../lib/models/triggers'); let triggers = require('../lib/models/triggers');
let campaigns = require('../lib/models/campaigns'); let campaigns = require('../lib/models/campaigns');
let lists = require('../lib/models/lists'); let lists = require('../lib/models/lists');
let segments = require('../lib/models/segments');
let fields = require('../lib/models/fields'); let fields = require('../lib/models/fields');
let striptags = require('striptags'); let striptags = require('striptags');
let passport = require('../lib/passport'); let passport = require('../lib/passport');
@ -58,15 +59,23 @@ router.get('/create-select', passport.csrfProtection, (req, res, next) => {
}); });
router.post('/create-select', passport.parseForm, passport.csrfProtection, (req, res) => { router.post('/create-select', passport.parseForm, passport.csrfProtection, (req, res) => {
if (!req.body.list) { // Check if req.body.list is in correct format ("listId:segmentId")
if (!req.body.list || !/([\d]+):([\d]+)/.test(req.body.list)) {
req.flash('danger', _('Could not find selected list')); req.flash('danger', _('Could not find selected list'));
return res.redirect('/triggers/create-select'); return res.redirect('/triggers/create-select');
} }
res.redirect('/triggers/' + encodeURIComponent(req.body.list) + '/create');
let listId = parseInt(req.body.list.split(':')[0]);
let segmentId = parseInt(req.body.list.split(':')[1]);
res.redirect('/triggers/' + encodeURIComponent(listId) + '/' + encodeURIComponent(segmentId) + '/create');
}); });
router.get('/:listId/create', passport.csrfProtection, (req, res, next) => { router.get('/:listId/:segmentId/create', passport.csrfProtection, (req, res, next) => {
let listId = parseInt(req.params.listId);
let segmentId = parseInt(req.params.segmentId);
let data = tools.convertKeys(req.query, { let data = tools.convertKeys(req.query, {
skip: ['layout'] skip: ['layout']
}); });
@ -74,52 +83,69 @@ router.get('/:listId/create', passport.csrfProtection, (req, res, next) => {
data.csrfToken = req.csrfToken(); data.csrfToken = req.csrfToken();
data.days = Math.max(Number(data.days) || 1, 1); data.days = Math.max(Number(data.days) || 1, 1);
lists.get(req.params.listId, (err, list) => { lists.get(listId, (err, list) => {
if (err || !list) { if (err || !list) {
req.flash('danger', err && err.message || err || _('Could not find selected list')); req.flash('danger', err && err.message || err || _('Could not find selected list'));
return res.redirect('/triggers/create-select'); return res.redirect('/triggers/create-select');
} }
fields.list(list.id, (err, fieldList) => {
if (err && !fieldList) { segments.get(segmentId, (err, segment) => {
fieldList = []; if (segmentId > 0 && err) {
req.flash('danger', err && err.message || err || _('Error while finding selected segment'));
return res.redirect('/triggers/create-select');
} }
data.columns = triggers.defaultColumns.concat(fieldList.filter(field => fields.genericTypes[field.type] === 'date')).map(field => ({ segments.subscribers(segmentId, true, (err, segmentSubscribers) => {
column: field.column, if (segmentId > 0 && err) {
name: field.name, req.flash('danger', err && err.message || err || _('Error while finding selected segment'));
selected: data.column === field.column return res.redirect('/triggers/create-select');
}));
campaigns.list(0, 300, (err, campaignList) => {
if (err) {
return next(err);
} }
data.sourceCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id).map(campaign => ({ fields.list(list.id, (err, fieldList) => {
id: campaign.id, if (err && !fieldList) {
name: campaign.name, fieldList = [];
selected: Number(data.sourceCampaign) === campaign.id }
}));
data.destCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id && campaign.type === 4).map(campaign => ({ data.columns = triggers.defaultColumns.concat(fieldList.filter(field => fields.genericTypes[field.type] === 'date')).map(field => ({
id: campaign.id, column: field.column,
name: campaign.name, name: field.name,
selected: Number(data.destCampaign) === campaign.id selected: data.column === field.column
})); }));
data.list = list; campaigns.list(0, 300, (err, campaignList) => {
data.isSubscription = data.rule === 'subscription' || !data.rule; if (err) {
data.isCampaign = data.rule === 'campaign'; return next(err);
}
data.campaignOptions = triggers.defaultCampaignEvents.map(evt => ({ data.sourceCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id).map(campaign => ({
option: evt.option, id: campaign.id,
name: evt.name, name: campaign.name,
selected: Number(data.sourceCampaign) === evt.option selected: Number(data.sourceCampaign) === campaign.id
})); }));
data.isSend = true; data.destCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id && (segmentId <= 0 || campaign.segment === segmentId) && campaign.type === 4).map(campaign => ({
id: campaign.id,
name: campaign.name,
selected: Number(data.destCampaign) === campaign.id
}));
res.render('triggers/create', data); data.list = list;
data.segment = segment;
data.segmentSubscribers = segmentSubscribers;
data.isSubscription = data.rule === 'subscription' || !data.rule;
data.isCampaign = data.rule === 'campaign';
data.campaignOptions = triggers.defaultCampaignEvents.map(evt => ({
option: evt.option,
name: evt.name,
selected: Number(data.sourceCampaign) === evt.option
}));
data.isSend = true;
res.render('triggers/create', data);
});
});
}); });
}); });
}); });
@ -154,51 +180,73 @@ router.get('/edit/:id', passport.csrfProtection, (req, res, next) => {
req.flash('danger', err && err.message || err || _('Could not find selected list')); req.flash('danger', err && err.message || err || _('Could not find selected list'));
return res.redirect('/triggers'); return res.redirect('/triggers');
} }
fields.list(list.id, (err, fieldList) => {
if (err && !fieldList) { segments.get(trigger.segment, (err, segment) => {
fieldList = []; if (trigger.segment > 0 && err) {
req.flash('danger', err && err.message || err || _('Error while finding selected segment'));
return res.redirect('/triggers');
} }
campaigns.list(0, 300, (err, campaignList) => { let segmentId = 0;
if (err) { if (trigger.segment > 0) {
return next(err); segmentId = segment.id;
}
segments.subscribers(segmentId, true, (err, segmentSubscribers) => {
if (trigger.segment > 0 && err) {
req.flash('danger', err && err.message || err || _('Error while finding selected segment subscribers'));
return res.redirect('/triggers');
} }
trigger.sourceCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id).map(campaign => ({ fields.list(list.id, (err, fieldList) => {
id: campaign.id, if (err && !fieldList) {
name: campaign.name, fieldList = [];
selected: Number(trigger.sourceCampaign) === campaign.id }
}));
trigger.destCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id && campaign.type === 4).map(campaign => ({ campaigns.list(0, 300, (err, campaignList) => {
id: campaign.id, if (err) {
name: campaign.name, return next(err);
selected: Number(trigger.destCampaign) === campaign.id }
}));
trigger.list = list; trigger.sourceCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id).map(campaign => ({
trigger.isSubscription = trigger.rule === 'subscription' || !trigger.rule; id: campaign.id,
trigger.isCampaign = trigger.rule === 'campaign'; name: campaign.name,
selected: Number(trigger.sourceCampaign) === campaign.id
}));
trigger.columns = triggers.defaultColumns.concat(fieldList.filter(field => fields.genericTypes[field.type] === 'date')).map(field => ({ trigger.destCampaigns = (campaignList || []).filter(campaign => campaign.list === list.id && campaign.type === 4).map(campaign => ({
column: field.column, id: campaign.id,
name: field.name, name: campaign.name,
selected: trigger.isSubscription && trigger.column === field.column selected: Number(trigger.destCampaign) === campaign.id
})); }));
trigger.campaignOptions = triggers.defaultCampaignEvents.map(evt => ({ trigger.list = list;
option: evt.option, trigger.segment = segment;
name: evt.name, trigger.segmentSubscribers = segmentSubscribers;
selected: trigger.isCampaign && trigger.column === evt.option trigger.isSubscription = trigger.rule === 'subscription' || !trigger.rule;
})); trigger.isCampaign = trigger.rule === 'campaign';
if (trigger.rule !== 'subscription') { trigger.columns = triggers.defaultColumns.concat(fieldList.filter(field => fields.genericTypes[field.type] === 'date')).map(field => ({
trigger.column = null; column: field.column,
} name: field.name,
selected: trigger.isSubscription && trigger.column === field.column
}));
trigger.isSend = true; trigger.campaignOptions = triggers.defaultCampaignEvents.map(evt => ({
option: evt.option,
name: evt.name,
selected: trigger.isCampaign && trigger.column === evt.option
}));
res.render('triggers/edit', trigger); if (trigger.rule !== 'subscription') {
trigger.column = null;
}
trigger.isSend = true;
res.render('triggers/edit', trigger);
});
});
}); });
}); });
}); });

4
services/triggers.js
View file

@ -82,8 +82,8 @@ function fireTrigger(trigger, callback) {
} }
let subscriber = rows[pos++].id; let subscriber = rows[pos++].id;
let query = 'INSERT INTO `trigger__' + trigger.id + '` (`list`, `subscription`) VALUES (?,?)'; let query = 'INSERT INTO `trigger__' + trigger.id + '` (`list`, `segment`, `subscription`) VALUES (?,?,?)';
let values = [trigger.list, subscriber]; let values = [trigger.list, trigger.segment, subscriber];
connection.query(query, values, (err, result) => { connection.query(query, values, (err, result) => {
if (err && err.code !== 'ER_DUP_ENTRY') { if (err && err.code !== 'ER_DUP_ENTRY') {

12
setup/sql/upgrade-00031.sql Normal file
View file

@ -0,0 +1,12 @@
# Header section
# Define incrementing schema version number
SET @schema_version = '31';
# Add segment support for triggers
ALTER TABLE `triggers` ADD `segment` INT(11) UNSIGNED NOT NULL AFTER `list`;
ALTER TABLE `trigger` ADD `segment` INT(11) UNSIGNED NOT NULL AFTER `list`;
# Footer section
LOCK TABLES `settings` WRITE;
INSERT INTO `settings` (`key`, `value`) VALUES('db_schema_version', @schema_version) ON DUPLICATE KEY UPDATE `value`=@schema_version;
UNLOCK TABLES;

12
views/triggers/create-select.hbs
View file

@ -17,9 +17,19 @@
<select class="form-control" name="list" required> <select class="form-control" name="list" required>
<option value=""> –– {{#translate}}Select{{/translate}} ––</option> <option value=""> –– {{#translate}}Select{{/translate}} ––</option>
{{#each listItems}} {{#each listItems}}
<option value="{{id}}"> <option value="{{id}}:0">
{{name}} <span class="text-muted"> &mdash; {{subscribers}} {{#translate}}subscribers{{/translate}}</span> {{name}} <span class="text-muted"> &mdash; {{subscribers}} {{#translate}}subscribers{{/translate}}</span>
</option> </option>
{{#if segments}}
<optgroup label="{{name}} segments">
{{#each segments}}
<option value="{{../id}}:{{id}}" {{#if selected}} selected {{/if}}>
{{../name}}: {{name}}
</option>
{{/each}}
</optgroup>
{{/if}}
{{/each}} {{/each}}
</select> </select>
</div> </div>

2
views/triggers/create.hbs
View file

@ -30,7 +30,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">{{#translate}}List{{/translate}}</label> <label class="col-sm-2 control-label">{{#translate}}List{{/translate}}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static"><a href="/lists/view/{{list.id}}">{{list.name}}</a> <span class="text-muted"> – {{list.subscribers}} {{#translate}}subscribers{{/translate}}</span></p> <p class="form-control-static"><a href="/lists/view/{{list.id}}">{{list.name}}</a> <span class="text-muted"> {{#if segment.id}}– <a href="/lists/view/{{list.id}}?segment={{segment.id}}">{{segment.name}}</a>{{/if}} <span class="text-muted"> – {{#if segment.id}} {{segmentSubscribers}} {{else}} {{list.subscribers}} {{/if}} {{#translate}}subscribers{{/translate}}</span><input id="segmentId" name="segmentId" type="hidden" value="{{segment.id}}"></p>
</div> </div>
</div> </div>

2
views/triggers/edit.hbs
View file

@ -43,7 +43,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">{{#translate}}List{{/translate}}</label> <label class="col-sm-2 control-label">{{#translate}}List{{/translate}}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static"><a href="/lists/view/{{list.id}}">{{list.name}}</a> <span class="text-muted"> – {{list.subscribers}} {{#translate}}subscribers{{/translate}}</span></p> <p class="form-control-static"><a href="/lists/view/{{list.id}}">{{list.name}}</a> <span class="text-muted"> {{#if segment.id}}– <a href="/lists/view/{{list.id}}?segment={{segment.id}}">{{segment.name}}</a>{{/if}} <span class="text-muted"> – {{#if segment.id}} {{segmentSubscribers}} {{else}} {{list.subscribers}} {{/if}} {{#translate}}subscribers{{/translate}}</span><input id="segmentId" name="segmentId" type="hidden" value="{{segment.id}}"></p>
</div> </div>
</div> </div>

2
views/triggers/triggers.hbs
View file

@ -64,7 +64,7 @@
{{description}} {{description}}
</td> </td>
<td class="text-info"> <td class="text-info">
<a href="/lists/view/{{list}}">{{listName}}</a> <a href="/lists/view/{{list}}">{{listName}}</a>{{#if segment}} - <a href="/lists/view/{{list}}?segment={{segment}}">{{segmentName}}</a>{{/if}}
</td> </td>
<td class="text-info"> <td class="text-info">
{{{formatted}}} {{{formatted}}}