From f30aad2aae845ca7b508267b5694d877156ae2eb Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 31 Oct 2019 14:40:23 +0100
Subject: [PATCH] order: fix copy actions (address)
---
entity/Order_entity/entityfields/cancel/onActionProcess.js | 5 +++--
.../Order_entity/entityfields/neworder/onActionProcess.js | 2 --
.../entityfields/transferdeliverynote/onActionProcess.js | 6 +++---
.../entityfields/transferinvoice/onActionProcess.js | 7 +++----
process/Order_lib/process.js | 1 +
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/entity/Order_entity/entityfields/cancel/onActionProcess.js b/entity/Order_entity/entityfields/cancel/onActionProcess.js
index f138c6f5779..ac1aa595f2f 100644
--- a/entity/Order_entity/entityfields/cancel/onActionProcess.js
+++ b/entity/Order_entity/entityfields/cancel/onActionProcess.js
@@ -21,6 +21,8 @@ var footer = vars.getString("$field.FOOTER");
var offerId = vars.getString("$field.OFFER_ID");
var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
+var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
var rowId = vars.getString("$field.OBJECT_ROWID");
var objectType = vars.getString("$field.OBJECT_TYPE");
var dunningDate = vars.getString("$field.DUNNINGDATE");
@@ -29,8 +31,7 @@ var orderType= $KeywordRegistry.orderType$cancellation();
var cancellation= vars.getString("$field.CANCELLATION");
var orderStatus=vars.getString("$field.ORDERSTATUS");
-
-OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
+OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/neworder/onActionProcess.js b/entity/Order_entity/entityfields/neworder/onActionProcess.js
index d84e79a2958..d73a39e61fe 100644
--- a/entity/Order_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Order_entity/entityfields/neworder/onActionProcess.js
@@ -22,7 +22,5 @@ var orderType= vars.getString("$field.ORDERTYPE");
var cancellation= vars.getString("$field.CANCELLATION");
var orderStatus=vars.getString("$field.ORDERSTATUS");
-
-
OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js b/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
index 7df2878f715..d45901068c7 100644
--- a/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
+++ b/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
@@ -12,6 +12,8 @@ var footer = vars.getString("$field.FOOTER");
var offerId = vars.getString("$field.OFFER_ID");
var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
+var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
var rowId = vars.getString("$field.OBJECT_ROWID");
var objectType = vars.getString("$field.OBJECT_TYPE");
var dunningDate = vars.getString("$field.DUNNINGDATE");
@@ -20,7 +22,5 @@ var orderType= $KeywordRegistry.orderType$deliverynote();
var cancellation= vars.getString("$field.CANCELLATION");
var orderStatus=vars.getString("$field.ORDERSTATUS");
-
-
-OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
+OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js b/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
index ee940353c0b..8c722274346 100644
--- a/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
+++ b/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
@@ -12,6 +12,8 @@ var footer = vars.getString("$field.FOOTER");
var offerId = vars.getString("$field.OFFER_ID");
var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
var paymentTerm = vars.getString("$field.PAYMENTTERMS");
+var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
+var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
var rowId = vars.getString("$field.OBJECT_ROWID");
var objectType = vars.getString("$field.OBJECT_TYPE");
var dunningDate = vars.getString("$field.DUNNINGDATE");
@@ -20,7 +22,4 @@ var orderType= $KeywordRegistry.orderType$invoice();
var cancellation= vars.getString("$field.CANCELLATION");
var orderStatus=vars.getString("$field.ORDERSTATUS");
-
-
-OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
-
\ No newline at end of file
+OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index b4f3079120d..1b63174cd48 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -92,6 +92,7 @@ OrderUtils.createNewOrder = function(pContextId, pRowId, pRelationId)
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
+//TODO refactor function to minimize the params and only give an object that contains the data
OrderUtils.copyOrder = function (pOfferId, pContactId, pOrderType, pLanguage, pCurrency, pHeader, pFooter, pDeliveryTerm, pPaymentTerm, pPaymentAddress, pDeliveryAddress, pObjectType, pRowId, pDunningDate, pDunningLevel, pCancellation, pOrderStatus)
{
var params = {
--
GitLab