diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js b/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js index da5905dd40d05e6350fa2decc5da91f870a689f7..3d3dceaa05778ab5c2a4e31f1ad5b95e7239fb92 100644 --- a/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js +++ b/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js @@ -24,7 +24,7 @@ else .medium($KeywordRegistry.communicationMediumCampaign$mail(), "BULKMAILRECIPIENT.EMAIL_ADDRESS") .rejected() .existNoSettings() - .getCondition()); + .buildCondition()); } if (excludeBlacklisted) { diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js index 6261b7d59664073cc80b657c534ff99346673c4f..93e1b3884b09c9af857966d9de9cd3ba6daec47f 100644 --- a/process/Bulkmail_lib/process.js +++ b/process/Bulkmail_lib/process.js @@ -175,7 +175,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun) subject : activitySubject, content : email.body }; - let contactLink = [[ContactUtils.getContextByPersOrg(personId, organisationid), contactId]]; + let contactLink = [[ContactUtils.getContextByPersOrg(personId, organisationId), contactId]]; ActivityUtils.insertNewActivity(activityData, bulkMailLink.concat(contactLink)); } }); @@ -209,7 +209,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun) { let isSuccess = false; - let contactId = recipientData[i][1]; + let contactId = recipientData[i]["CONTACT_ID"]; let email = mails[contactId]; if (email !== undefined) @@ -218,11 +218,12 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun) email.subject = "Test: "+subjects[contactId]; for (let j =0; j<testRecipientData.length;j++) { - if(testRecipientData[j][1]){ + if(testRecipientData[j][1]) + { email.toRecipients = [testRecipientData[j][1]]; isSuccess = email.send(); - Array.prototype.push.call(isSuccess ? successIds : failedIds, recipientData[i][0]); + Array.prototype.push.call(isSuccess ? successIds : failedIds, recipientData[i]["BULKMAILRECIPIENTID"]); if (testRecipientData[j][0]) { @@ -231,7 +232,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun) this.storeEmlFile(pBulkMailId, mailrunId, mailLogId,email.getEML()); } } - } + } } }