Skip to content
Snippets Groups Projects
Commit 48690410 authored by Andreas Fräder's avatar Andreas Fräder
Browse files

[Projekt: xRM-Marketing][TicketNr.: 2001303][Serienmail Versand nicht möglich]

[Projekt: xRM-Marketing][TicketNr.: 2001261][ Serienmail Reiter Empfänger, falsche Statuswerte]
[Projekt: xRM-Marketing][TicketNr.: 2001287][[Bug] Marketing - Kopieren der Mosaico Templates]
parent bd2a58bc
No related branches found
No related tags found
No related merge requests found
......@@ -305,6 +305,8 @@
<dbRecordFieldMapping>
<name>IS_TEST_RECIPIENT.value</name>
<recordfield>BULKMAILRECIPIENT.IS_TEST_RECIPIENT</recordfield>
<isFilterable v="true" />
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>HASCOMMUNICATIONREJECTION.value</name>
......
......@@ -58,6 +58,7 @@
<consumer>KeywordMosaicoBaseTemplate</consumer>
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/basetemplate/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/basetemplate/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordMosaicoBaseTemplate</name>
......@@ -157,6 +158,7 @@
<consumer>KeywordMosaicoTemplateCategory</consumer>
<groupable v="true" />
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
<name>openAdminView</name>
......
import("system.vars");
import("system.result");
import("KeywordRegistry_basic");
import("Keyword_lib");
result.string(KeywordUtils.getViewValue($KeywordRegistry.mosaicoBaseTemplate(), vars.get("$field.BASETEMPLATE")));
\ No newline at end of file
import("system.vars");
import("system.result");
import("KeywordRegistry_basic");
import("Keyword_lib");
result.string(KeywordUtils.getViewValue($KeywordRegistry.mosaicoTemplateCategory(), vars.get("$field.CATEGORY")));
\ No newline at end of file
......@@ -2,6 +2,6 @@ import("system.vars");
import("system.neon");
var params = {
"copyMosaicoTemplateIdParam" : vars.get("$field.MOSAICOTEMPLATEID")
"CopyMosaicoTemplateIdParam" : vars.get("$field.MOSAICOTEMPLATEID")
};
neon.openContext("MosaicoTemplate", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
......@@ -91,7 +91,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
useTemplateAttachments = Utils.toBoolean(useTemplateAttachments);
var template = BulkMailUtils.getBulkMailTemplate(pBulkMailId, templateId, true, useTemplateAttachments, mosaicoTemplateId);
var template = BulkMailUtils.getBulkMailTemplate(pBulkMailId, templateId, true, false, useTemplateAttachments, mosaicoTemplateId);
var recipientData;
var testRecipientData;
......@@ -473,7 +473,8 @@ BulkMailUtils.addRecipients = function (pBulkMailId, pContactIds)
return sqlBuilder.buildInsertStatement({
"BULKMAIL_ID": pBulkMailId,
"CONTACT_ID": contactId,
"STATUS": $KeywordRegistry.bulkMailRecipientStatus$pending(),
"STATUS": $KeywordRegistry.bulkMailRecipientStatus$added(),
"IS_TEST_RECIPIENT" : 0,
"EMAIL_ADDRESS": standardMail
}, "BULKMAILRECIPIENT", "BULKMAILRECIPIENTID");
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment