Merge branch 'master' into development

This commit is contained in:
Tomas Bures 2018-08-06 21:02:41 +05:30
commit 877e0a857d
44 changed files with 5260 additions and 366 deletions

View file

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