Merge branch 'm_1086484_senderAddress_keyword' into '2021.2'

[Projekt: xRM-Marketing][TicketNr.: 1086484][Serienmail: definierbare...

See merge request xrm/basic!1503

.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

.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml

+<?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

.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml

+<?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

.liquibase/Data_alias/basic/2021.2.2/changelog.xml

@@ -13,4 +13,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

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>

entity/BulkMail_entity/entityfields/sender/valueProcess.js

-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

entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js

+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.bulkMailSenderAddress());
\ No newline at end of file

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