Skip to content
Snippets Groups Projects
Commit 63ef1f7a authored by Mohamed Mansour's avatar Mohamed Mansour
Browse files

Made offers changeable in Receipt, added Auswahlmöglichkeit für 

Kopf und Fußtexte
parent dfdd1dab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 185 additions and 7 deletions
.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
+ 30
− 0
View file @ 63ef1f7a
......@@ -97,5 +97,35 @@
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
<column name="BOOL_VALUE" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="beb7691f-ff9e-4344-89e1-d2664f7384e0"/>
<column name="KEYID" value="5"/>
<column name="TITLE" value="Receipt Header Text"/>
<column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d57bf04f-574e-42b4-99e5-31f630239bf6"/>
<column name="AB_KEYWORD_ENTRY_ID" value="beb7691f-ff9e-4344-89e1-d2664f7384e0"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
<column name="BOOL_VALUE" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="267d1707-99db-40fa-914a-e36ba22e3ad6"/>
<column name="KEYID" value="6"/>
<column name="TITLE" value="Receipt Footer Text"/>
<column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="0d7d908e-6b0b-45ec-9e2f-d5b83e8d96df"/>
<column name="AB_KEYWORD_ENTRY_ID" value="267d1707-99db-40fa-914a-e36ba22e3ad6"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
<column name="BOOL_VALUE" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+ 12
− 0
View file @ 63ef1f7a
......@@ -244,6 +244,18 @@
<fieldName>Templates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>93242043-ddc2-414e-84c8-610342b0bd85</name>
<entityName>Order_entity</entityName>
<fieldName>DocumentTemplateTexHeader</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>62dc5f05-4203-40b3-9d34-cbbefc8264ae</name>
<entityName>Order_entity</entityName>
<fieldName>DocumentTemplateTexFooter</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
......
entity/Offer_entity/Offer_entity.aod
+ 6
− 0
View file @ 63ef1f7a
......@@ -389,6 +389,12 @@
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
<entityName>Order_entity</entityName>
<fieldName>Offers</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Order_entity/Order_entity.aod
+ 66
− 1
View file @ 63ef1f7a
......@@ -93,6 +93,7 @@
<entityField>
<name>FOOTER</name>
<title>Footer text</title>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/footer/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Orderitems</name>
......@@ -372,8 +373,9 @@
<entityField>
<name>OFFER_ID</name>
<title>Offer</title>
<consumer>Offers</consumer>
<linkedContext>Offer</linkedContext>
<state>READONLY</state>
<state>AUTO</state>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/displayValueProcess.js</displayValueProcess>
</entityField>
......@@ -714,6 +716,69 @@
<entityParameter>
<name>OrderDeliveryTerm_param</name>
</entityParameter>
<entityConsumer>
<name>Offers</name>
<dependency>
<name>dependency</name>
<entityName>Offer_entity</entityName>
<fieldName>ContactOffers</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>DocumentTemplateTexHeader</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>DocumentTemplateTypeClassification_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>DocumentTemplateTexFooter</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>DocumentTemplateTypeClassification_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>ChosenTexHeader</name>
<title>Choose Header</title>
<consumer>DocumentTemplateTexHeader</consumer>
</entityField>
<entityField>
<name>ChosenTexFooter</name>
<title>Choose Footer</title>
<consumer>DocumentTemplateTexFooter</consumer>
</entityField>
<entityParameter>
<name>OrderFooter_param</name>
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js 0 → 100644
+ 2
− 0
View file @ 63ef1f7a
import("system.result");
result.string("TEX");
\ No newline at end of file
entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js 0 → 100644
+ 2
− 0
View file @ 63ef1f7a
import("system.result");
result.string(6);
\ No newline at end of file
entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js 0 → 100644
+ 2
− 0
View file @ 63ef1f7a
import("system.result");
result.string("TEX");
\ No newline at end of file
entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js 0 → 100644
+ 2
− 0
View file @ 63ef1f7a
import("system.result");
result.string("5")
\ No newline at end of file
entity/Order_entity/entityfields/footer/valueProcess.js 0 → 100644
+ 23
− 0
View file @ 63ef1f7a
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if (vars.exists("$param.OrderFooter_param"))
{
result.string(vars.get("$param.OrderFooter_param"));
}
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Danke sehr:")
if (vars.get("$field.ChosenTexFooter") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexFooter") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
\ No newline at end of file
entity/Order_entity/entityfields/header/valueProcess.js
+ 22
− 6
View file @ 63ef1f7a
import("system.result");
import("system.vars");
if (vars.exists("$param.OrderHeader_param"))
{
result.string(vars.get("$param.OrderHeader_param"));
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if (vars.exists("$param.OrderHeader_param"))
{
result.string(vars.get("$param.OrderHeader_param"));
}
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:")
if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexHeader") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
\ No newline at end of file
entity/Order_entity/entityfields/offers/children/contactid_param/valueProcess.js 0 → 100644
+ 10
− 0
View file @ 63ef1f7a
import("system.result");
import("system.vars");
import("Contact_lib");
if (vars.get("$field.CONTACT_ID"))
{
var ids = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
if (ids.length >= 3 && ids[2])
result.string(ids[2]);
}
\ No newline at end of file
neonView/OrderEdit_view/OrderEdit_view.aod
+ 8
− 0
View file @ 63ef1f7a
......@@ -60,10 +60,18 @@
<name>f79c4c09-8082-4c88-83f5-a26aaf425c12</name>
<entityField>OFFER_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>cd8bcf86-80d7-47f8-88da-f425417198d8</name>
<entityField>ChosenTexHeader</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ed71986f-303c-4118-a895-51ec31ba8775</name>
<entityField>HEADER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>f1729940-3df7-44c7-9acf-911f247ad832</name>
<entityField>ChosenTexFooter</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name>
<entityField>FOOTER</entityField>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment