Merge branch '1079762_mailversand_bug' into '2021.0'

[Projekt: xRM-Marketing][TicketNr.: 1079762][Fehler: Mailversand (inkl....

See merge request xrm/basic!872

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)
     {

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());
                         }
                     }
-            }
+                }
 
             }
         }