From c2d7312f72bd8f82707e04dfa5bb9150db092f49 Mon Sep 17 00:00:00 2001
From: Martin Groppe <m.groppe@adito.de>
Date: Mon, 29 Nov 2021 16:59:32 +0100
Subject: [PATCH] [Projekt: xRM-Marketing][TicketNr.: 1086484][Serienmail:
definierbare...
---
.../Data_alias/basic/2021.2.0/changelog.xml | 2 +-
.../basic/2021.2.2/BulkMail/changelog.xml | 6 +++++
.../insertBulkMailSenderAddressKeyword.xml | 24 +++++++++++++++++++
.../Data_alias/basic/2021.2.2/changelog.xml | 1 +
entity/BulkMail_entity/BulkMail_entity.aod | 17 ++++++++++++-
.../entityfields/sender/valueProcess.js | 8 -------
.../containername_param/valueProcess.js | 4 ++++
process/KeywordRegistry_basic/process.js | 2 ++
8 files changed, 54 insertions(+), 10 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
create mode 100644 .liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
delete mode 100644 entity/BulkMail_entity/entityfields/sender/valueProcess.js
create mode 100644 entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
diff --git a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
index 6cf5d524b14..e45780f3a8c 100644
--- a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
@@ -13,4 +13,4 @@
<include relativeToChangelogFile="true" file="EwsContactSync/changelog.xml"/>
<include relativeToChangelogFile="true" file="Export/changelog.xml"/>
<include relativeToChangelogFile="true" file="insert_ProductGroupcode.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
new file mode 100644
index 00000000000..1f04bc2b992
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="insertBulkMailSenderAddressKeyword.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
new file mode 100644
index 00000000000..0fc18b63a15
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
@@ -0,0 +1,24 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="m.groppe" id="50badea9-da46-4aa0-94ed-a2c3db2874ac">
+ <insert tableName="AB_KEYWORD_CATEGORY">
+ <column name="AB_KEYWORD_CATEGORYID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+ <column name="NAME" value="BulkmailSenderAddress"/>
+ <column name="SORTINGBY" valueNumeric="0"/>
+ <column name="SORTINGDIRECTION" value="ASC"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="c4773a13-314d-4f00-a7d3-ab65947586ba"/>
+ <column name="KEYID" value="news@adito.de"/>
+ <column name="TITLE" value="news@adito.de"/>
+ <column name="CONTAINER"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
index 3531213312b..21037e1fc0c 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -10,4 +10,5 @@
<include relativeToChangelogFile="true" file="Mosaico/insert_mosaico_color_keyword.xml"/>
<include relativeToChangelogFile="true" file="mailbridge/changelog.xml"/>
<include relativeToChangelogFile="true" file="OfferOrder/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="BulkMail/changelog.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 5a95e209f60..c91cdcca4a5 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -93,8 +93,9 @@
<entityField>
<name>SENDER</name>
<title>Sender address</title>
+ <consumer>SenderAddressKeyword</consumer>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sender/valueProcess.js</valueProcess>
+ <textInputAllowed v="true" />
<onValidation>%aditoprj%/entity/BulkMail_entity/entityfields/sender/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -641,6 +642,20 @@
<fieldName>ISO3Name</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>SenderAddressKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/BulkMail_entity/entityfields/sender/valueProcess.js b/entity/BulkMail_entity/entityfields/sender/valueProcess.js
deleted file mode 100644
index 88626d51738..00000000000
--- a/entity/BulkMail_entity/entityfields/sender/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Communication_lib");
-import("system.result");
-import("Employee_lib");
-
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-result.string(CommUtil.getStandardMail(EmployeeUtils.getCurrentContactId()));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js b/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
new file mode 100644
index 00000000000..6429e2a55e0
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.bulkMailSenderAddress());
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 678044ed045..96b33aae0bf 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -521,6 +521,8 @@ $KeywordRegistry.linkEvaluationType$default = function(){return "LINKEVALUATION_
$KeywordRegistry.linkEvaluationType$ignore = function(){return "LINKEVALUATION_IGNORE";};
$KeywordRegistry.linkEvaluationType$unsubscribe = function(){return "LINKEVALUATION_UNSUBSCRIBE";};
+$KeywordRegistry.bulkMailSenderAddress = function() {return "BulkmailSenderAddress";};
+
$KeywordRegistry.mosaicoBaseTemplate = function(){return "MosaicoBaseTemplate";};
$KeywordRegistry.mosaicoColor = function(){return "MosaicoColor";};
$KeywordRegistry.mosaicoTemplateCategory = function(){return "MosaicoTemplateCategory";};
\ No newline at end of file
--
GitLab