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

Belege: Created chosen deliveryaddress und chosenpaymemt address, 

added erstellungsdatum, stateprocess fixes, setpaid und setdunning
stateprocess fixed, beleg image auf ordertype angepasst, preview und
edit view angepasst, dunning und paid view auf smalledit angepasst.
parent 1a5720b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 119 additions and 41 deletions
entity/Order_entity/Order_entity.aod
+ 37
− 5
View file @ 774a28d1
......@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
<title>Receipt</title>
<grantUpdateProcess>%aditoprj%/entity/Order_entity/grantUpdateProcess.js</grantUpdateProcess>
<contentTitleProcess>%aditoprj%/entity/Order_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:DOLLAR</iconId>
......@@ -38,7 +39,7 @@
</entityField>
<entityField>
<name>SALESORDERDATE</name>
<title>Date</title>
<title>Creation date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
......@@ -271,6 +272,11 @@
<name>ADDRESS</name>
<contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
......@@ -485,6 +491,7 @@
<entityField>
<name>PAID</name>
<title>Paid</title>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paid/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>Unpaid</name>
......@@ -524,7 +531,6 @@
<title>Pay due date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<selectionModeProcess>%aditoprj%/entity/Order_entity/entityfields/payduedate/selectionModeProcess.js</selectionModeProcess>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/payduedate/valueProcess.js</valueProcess>
</entityField>
......@@ -646,16 +652,15 @@
<name>DELIVERYADDRESS</name>
<title>Delivery address</title>
<contentType>LONG_TEXT</contentType>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/deliveryaddress/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PAYMENTADDRESS</name>
<title>Payment address</title>
<consumer>PossibleAddresses</consumer>
<contentType>LONG_TEXT</contentType>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/paymentaddress/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>KeywordPaymentTerms</name>
......@@ -834,6 +839,33 @@
<onActionProcess>%aditoprj%/entity/Order_entity/entityfields/setpaid/onActionProcess.js</onActionProcess>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/setpaid/stateProcess.js</stateProcess>
</entityActionField>
<entityField>
<name>ChosenPaymentAddress</name>
<title>Choose payment address</title>
<consumer>PossibleAddresses</consumer>
<mandatory v="false" />
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>ChosenDeliveryAddress</name>
<title>Choose delivery address</title>
<consumer>PossibleAddresses</consumer>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/chosendeliveryaddress/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosendeliveryaddress/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Order_entity/entityfields/paymentaddress/displayValueProcess.js → entity/Order_entity/entityfields/chosendeliveryaddress/displayValueProcess.js
+ 1
− 1
View file @ 774a28d1
......@@ -2,4 +2,4 @@ import("system.vars");
import("PostalAddress_lib");
import("system.result");
result.string(AddressUtils.getFormattedOnlineAddressById(vars.get("$field.PAYMENTADDRESS")))
\ No newline at end of file
result.string(AddressUtils.getFormattedOnlineAddressById(vars.get("$field.ChosenPaymentAddress")))
\ No newline at end of file
entity/Order_entity/entityfields/paymentaddress/onValueChange.js → entity/Order_entity/entityfields/chosendeliveryaddress/onValueChange.js
+ 2
− 1
View file @ 774a28d1
......@@ -8,4 +8,5 @@ var newAddressId = vars.get("local.value");
if (newAddressId)
{
neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
}
\ No newline at end of file
}
\ No newline at end of file
entity/Order_entity/entityfields/chosendeliveryaddress/valueProcess.js 0 → 100644
+ 11
− 0
View file @ 774a28d1
import("Contact_lib");
import("system.result");
import("system.neon");
import("system.vars");
if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null))
{
var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
if (defaultAddressId)
result.string(defaultAddressId);
}
\ No newline at end of file
entity/Order_entity/entityfields/chosenpaymentaddress/displayValueProcess.js 0 → 100644
+ 5
− 0
View file @ 774a28d1
import("system.vars");
import("PostalAddress_lib");
import("system.result");
result.string(AddressUtils.getFormattedOnlineAddressById(vars.get("$field.ChosenPaymentAddress")))
\ No newline at end of file
entity/Order_entity/entityfields/chosenpaymentaddress/onValueChange.js 0 → 100644
+ 13
− 0
View file @ 774a28d1
import("system.vars");
import("system.neon");
import("PostalAddress_lib");
import("Entity_lib");
var newAddressId = vars.get("local.value");
if (newAddressId)
{
neon.setFieldValue("$field.PAYMENTADDRESS", AddressUtils.getAddressById(newAddressId));
neon.setFieldValue("$field.ChosenDeliveryAddress", AddressUtils.getAddressById(newAddressId));
neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(newAddressId));
}
\ No newline at end of file
entity/Order_entity/entityfields/chosenpaymentaddress/valueProcess.js 0 → 100644
+ 11
− 0
View file @ 774a28d1
import("Contact_lib");
import("system.result");
import("system.neon");
import("system.vars");
if (((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null))
{
var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
if (defaultAddressId)
result.string(defaultAddressId);
}
\ No newline at end of file
entity/Order_entity/entityfields/deliveryaddress/valueProcess.js
+ 2
− 2
View file @ 774a28d1
import("system.result");
import("system.vars");
if (vars.exists("$param.OfferAddress_param"))
if (vars.exists("$param.OrderAddress_param"))
{
result.string(vars.get("$param.OfferAddress_param"));
result.string(vars.get("$param.OrderAddress_param"));
}
\ No newline at end of file
entity/Order_entity/entityfields/deliveryterms/displayValueProcess.js
+ 0
− 2
View file @ 774a28d1
import("system.neon");
import("system.result");
import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string(KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), vars.get("$field.DELIVERYTERMS")));
entity/Order_entity/entityfields/deliveryterms/valueProcess.js
+ 1
− 1
View file @ 774a28d1
......@@ -9,7 +9,7 @@ import("Contact_lib");
if (vars.exists("$param.OrderDeliveryTerm_param") && vars.get("$param.OrderDeliveryTerm_param"))
if (vars.get("$param.OrderDeliveryTerm_param"))
{
result.string(vars.get("$param.OrderDeliveryTerm_param"));
}
......
entity/Order_entity/entityfields/dunningdate/stateProcess.js
+ 6
− 2
View file @ 774a28d1
......@@ -3,7 +3,11 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic")
if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice() || neon.OPERATINGSTATE_NEW )
if((vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice()) || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(neon.COMPONENTSTATE_AUTO);
}
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
\ No newline at end of file
entity/Order_entity/entityfields/dunninglevel/stateProcess.js
+ 6
− 2
View file @ 774a28d1
......@@ -3,7 +3,11 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic")
if(vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice()|| neon.OPERATINGSTATE_NEW)
if((vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice()) || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(neon.COMPONENTSTATE_AUTO);
}
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
\ No newline at end of file
entity/Order_entity/entityfields/image/valueProcess.js
+ 1
− 1
View file @ 774a28d1
import("system.vars");
import("system.result");
result.string("TEXT:" + vars.getString("$field.STATUS.displayValue"));
result.string("TEXT:" + vars.getString("$field.ORDERTYPE.displayValue"));
entity/Order_entity/entityfields/paid/stateProcess.js 0 → 100644
+ 13
− 0
View file @ 774a28d1
import("system.result");
import("system.vars");
import("system.neon");
import("KeywordRegistry_basic")
if((vars.get("$field.ORDERTYPE") == $KeywordRegistry.orderType$invoice()) || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(neon.COMPONENTSTATE_AUTO);
}
else
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
\ No newline at end of file
entity/Order_entity/entityfields/paydate/stateProcess.js
+ 6
− 2
View file @ 774a28d1
......@@ -3,7 +3,11 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic")
if(vars.get("$field.ORDERTYPE") != $KeywordRegistry.orderType$confirmation()|| neon.OPERATINGSTATE_NEW)
if(vars.get("$field.ORDERTYPE") != $KeywordRegistry.orderType$confirmation()|| vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(neon.COMPONENTSTATE_AUTO);
}
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
\ No newline at end of file
entity/Order_entity/entityfields/paydate/valueProcess.js
+ 0
− 14
View file @ 774a28d1
import("system.vars");
import("system.result");
import("system.neon");
import("Date_lib");
if (vars.get("$this.value") == null){
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")|| neon.OPERATINGSTATE_NEW )
{
result.string(DateUtils.getTodayUTC());
}
else
result.string(vars.get("$this.value"));
}
\ No newline at end of file
entity/Order_entity/entityfields/payduedate/valueProcess.js
+ 1
− 1
View file @ 774a28d1
......@@ -4,4 +4,4 @@ import("system.vars");
import("Keyword_lib");
var days= KeywordUtils.getAttributeRelation(vars.get("$field.PAYMENTTERMS"), "PaymentTerm", "dayNumber", "0");
result.string(parseInt(vars.get("$field.PAYDATE")) + datetime.ONE_DAY * parseInt(days));
\ No newline at end of file
result.string(parseInt(vars.get("$field.SALESORDERDATE")) + datetime.ONE_DAY * parseInt(days));
\ No newline at end of file
entity/Order_entity/entityfields/paymentaddress/valueProcess.js
+ 2
− 6
View file @ 774a28d1
import("Contact_lib");
import("system.result");
import("system.neon");
import("system.vars");
if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && !vars.get("$field.ADDRESS"))
if (vars.get("$param.OrderAddress_param") == null)
{
var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
if (defaultAddressId)
result.string(defaultAddressId);
result.string(vars.get("$param.OrderAddress_param"));
}
\ No newline at end of file
entity/Order_entity/entityfields/paymentterms/valueProcess.js
+ 1
− 1
View file @ 774a28d1
......@@ -8,7 +8,7 @@ import("system.vars");
import("Attribute_lib");
if (vars.get("$this.value") == null) {
if (vars.exists("$param.OrderPaymentTerm_param") && vars.get("$param.OrderPaymentTerm_param"))
if (vars.get("$param.OrderPaymentTerm_param"))
{
result.string(vars.get("$param.OrderPaymentTerm_param"));
}
......
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