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

Fixed Merge Tags #206 #236

Browse source
This commit is contained in:
witzig 2017-06-02 00:24:26 +02:00
parent 6d39d497ee
commit 466bf225a3
5 changed files with 82 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/models/fields.js
View file

@ -458,7 +458,7 @@ module.exports.getRow = (fieldList, values, useDate, showAll, onlyExisting) => {
value: Number(valueList[field.column]) || 0,
visible: !!field.visible,
mergeTag: field.key,
mergeValue: Number(valueList[field.column]) || Number(field.defaultValue) || 0,
mergeValue: (Number(valueList[field.column]) || Number(field.defaultValue) || 0).toString(),
['type' + (field.type || '').toString().trim().replace(/(?:^|\-)([a-z])/g, (m, c) => c.toUpperCase())]: true
};
row.push(item);

2
lib/models/subscriptions.js
View file

@ -355,7 +355,7 @@ module.exports.getWithMergeTags = (listId, cid, callback) => {
TIMEZONE: subscription.tz || ''
};
fields.getRow(fieldList, subscription, true, true).forEach(field => {
fields.getRow(fieldList, subscription, false, true).forEach(field => {
if (field.mergeTag) {
subscription.mergeTags[field.mergeTag] = field.mergeValue || '';
}