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

Merge with upstream

Browse source
This commit is contained in:
vladimir 2017-05-27 14:07:56 +02:00
commit 25bb4afa80
60 changed files with 2177 additions and 1215 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/models/campaigns.js
View file

@ -1056,13 +1056,13 @@ module.exports.updateMessage = (message, status, updateSubscription, callback) =
let statusCode;
if (status === 'unsubscribed') {
statusCode = 2;
}
if (status === 'bounced') {
statusCode = 3;
}
if (status === 'complained') {
statusCode = 4;
statusCode = subscriptions.Status.UNSUBSCRIBED;
} else if (status === 'bounced') {
statusCode = subscriptions.Status.BOUNCED;
} else if (status === 'complained') {
statusCode = subscriptions.Status.COMPLAINED;
} else {
return callback(new Error(_('Unrecognized message status')));
}
let query = 'UPDATE `campaigns` SET `' + status + '`=`' + status + '`+1 WHERE id=? LIMIT 1';
@ -1076,7 +1076,7 @@ module.exports.updateMessage = (message, status, updateSubscription, callback) =
}
if (updateSubscription) {
subscriptions.changeStatus(message.subscription, message.list, statusCode === 2 ? message.campaign : false, statusCode, callback);
subscriptions.changeStatus(message.list, message.subscription, statusCode === subscriptions.Status.UNSUBSCRIBED ? message.campaign : false, statusCode, callback);
} else {
return callback(null, true);
}