Skip to content
Snippets Groups Projects
Commit 742cc8d6 authored by Alexander Vögl's avatar Alexander Vögl
Browse files

OrderRefactoring

parent 90589c7a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 120 deletions
entity/Order_entity/Order_entity.aod
+ 1
− 81
View file @ 742cc8d6
......@@ -269,25 +269,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>OrderCurrency_param</name>
<expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderLanguage_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderHeader_param</name>
<expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>Languages</name>
<dependency>
......@@ -469,6 +450,7 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/paydate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PAYDUEDATE</name>
......@@ -673,16 +655,6 @@
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningtext/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OrderPaymentTerm_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderDeliveryTerm_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>Offers</name>
<dependency>
......@@ -743,31 +715,6 @@
<title>Choose Footer</title>
<consumer>DocumentTemplateTexFooter</consumer>
</entityField>
<entityParameter>
<name>OrderFooter_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderDunningDate_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderDunningLevel_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderType_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderCancellation_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>ChosenPaymentAddress</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/chosenpaymentaddress/documentation.adoc</documentation>
......@@ -796,33 +743,6 @@
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityParameter>
<name>OrderCode_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderStatus_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderVersnr_param</name>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderPaymentAddress_param</name>
<expose v="true" />
<documentation>%aditoprj%/entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>OrderDeliveryAddress_param</name>
<expose v="true" />
<documentation>%aditoprj%/entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
<name>newOrder</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
......
entity/Order_entity/afterUiInit.js
+ 4
− 0
View file @ 742cc8d6
......@@ -6,4 +6,8 @@ import("Attribute_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
if(vars.get("$param.Copy_param"))
neon.setFieldValues(JSON.parse(vars.get("$param.Copy_param")))
}
entity/Order_entity/entityfields/dunningtext/valueProcess.js
+ 1
− 8
View file @ 742cc8d6
......@@ -4,12 +4,5 @@ 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 ){
if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || neon.OPERATINGSTATE_NEW) && vars.get("$this.value") == null)
result.string(translate.text("Please pay the outstanding amount,this is you first/second reminder."))
}
}
\ No newline at end of file
entity/Order_entity/entityfields/orderdeliveryaddress_param/documentation.adoc deleted 100644 → 0
+ 0
− 1
View file @ 90589c7a
Carries the delivery address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js deleted 100644 → 0
+ 0
− 8
View file @ 90589c7a
import("system.logging");
import("system.vars");
import("system.db");
import("system.result");
var salesorderid = vars.get("$field.SALESORDERID")
if(salesorderid)
result.string(db.cell("select ISOLANGUAGE from SALESORDER where SALESORDERID = '" + salesorderid + "'"))
\ No newline at end of file
entity/Order_entity/entityfields/orderpaymentaddress_param/documentation.adoc deleted 100644 → 0
+ 0
− 1
View file @ 90589c7a
Carries the main address of the receipt. Can also be set from the offer if a receipt is to be created from a specified offer.
\ No newline at end of file
entity/Order_entity/entityfields/paydate/valueProcess.js 0 → 100644
+ 7
− 0
View file @ 742cc8d6
import("system.logging");
import("system.neon");
import("system.vars");
import("system.result");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")//we need "", because we are in EditMode
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/Order_entity/entityfields/salesordercode/valueProcess.js
+ 1
− 6
View file @ 742cc8d6
......@@ -4,9 +4,4 @@ import("system.neon");
import("Order_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
if (vars.exists("$param.OrderCode_param") && vars.get("$param.OrderCode_param"))
result.string(vars.get("$param.OrderCode_param"));
else
result.string(OrderUtils.getNextOrderNumber());
}
\ No newline at end of file
result.string(OrderUtils.getNextOrderNumber());
process/Offer_lib/process.js
+ 18
− 12
View file @ 742cc8d6
......@@ -387,18 +387,24 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
* @param pHeader {String} [header=""]
*/
OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress, pHeader)
{
var params = {
"ContactId_param" : pContactId,
"ObjectRowId_param" : pRowId,
"ObjectType_param" : pContextId,
"OrderLanguage_param" : pLanguage,
"OfferId_param" : pOfferId,
"OrderCurrency_param" : pCurrency || "",
"OrderPaymentAddress_param" : pAddress || "",
"OrderHeader_param" : pHeader || ""
};
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
{
var fieldparams =
{
"$field.CONTACT_ID" : pContactId,
"$field.ISOLANGUAGE" : pLanguage,
"$field.OFFER_ID" : pOfferId,
"$field.CURRENCY" : pCurrency || "",
"$field.HEADER" : pHeader || "",
"$field.PAYMENTADDRESS" : pAddress || "",
"$field.OBJECT_TYPE" : pContextId || "",
"$field.OBJECT_ROWID" : pRowId || ""
};
var params = {};
params["Copy_param"] = JSON.stringify(fieldparams);
params["OfferId_param"] = pOfferId;
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
/**
......
process/Order_lib/process.js
+ 10
− 3
View file @ 742cc8d6
......@@ -79,15 +79,20 @@ OrderUtils.isDeletable = function(status) {
OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
{
var params = {};
var fieldparams = {};
if (pRowId && pContextId)
{
params["ObjectRowId_param"] = pRowId;
params["ObjectType_param"] = pContextId;
fieldparams["$field.OBJECT_TYPE"] = pContextId || "",
fieldparams["$field.OBJECT_ROWID"] = pRowId || ""
}
if (pRelationId)
{
fieldparams["$field.CONTACT_ID"] = pRelationId;
params["ContactId_param"] = pRelationId;
}
params["Copy_param"] = JSON.stringify(fieldparams);
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
......@@ -116,8 +121,9 @@ OrderUtils.copyOrder = function (pSourceOfferId, pContactId, pOrderType, pLangua
"$field.ORDERSTATUS" : pOrderStatus || ""
};
var params = {}
var params = {};
params["Copy_param"] = JSON.stringify(fieldparams);
params["OfferId_param"] = pSourceOfferId;
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
......@@ -441,6 +447,7 @@ OrderUtils.buildReminderReport = function (pOrderID)
orderData[7] = datetime.toDate(orderData[7], translate.text("dd.MM.yyyy", language));
orderData[18] = datetime.toDate(orderData[18], translate.text("dd.MM.yyyy", language));
orderData[19] = KeywordUtils.getViewValue("DunningLevel", orderData[19]);
var orderItemFields = [
"SALESORDERITEM.INFO",
......
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