From 88a2a65cc910e98452aa6029509aab85ed067bd8 Mon Sep 17 00:00:00 2001
From: "s.garb" <s.garb@sneumaier-nb.aditosoftware.local>
Date: Fri, 4 Dec 2020 06:48:23 +0100
Subject: [PATCH] [Projekt: OBJECT CARPET + TOUCAN-T / CRM / 2020
(OC/TT)][TicketNr.: 1067111][Gesamtrabatt in Angeboten]
---
entity/Offer_entity/Offer_entity.aod | 1 +
.../Offer_entity/entityfields/discount/onValidation.js | 10 ++++++++++
entity/Offer_entity/recordcontainers/db/onDBInsert.js | 2 +-
process/Offer_lib/process.js | 1 +
4 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 entity/Offer_entity/entityfields/discount/onValidation.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 7d50bb201e..854e5e7e7c 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1072,6 +1072,7 @@
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Offer_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
<name>DISCOUNTED_NET</name>
diff --git a/entity/Offer_entity/entityfields/discount/onValidation.js b/entity/Offer_entity/entityfields/discount/onValidation.js
new file mode 100644
index 0000000000..595a5d9aae
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount/onValidation.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("Util_lib");
+import("Entity_lib");
+
+var value = vars.get("local.value");
+var validationResult = NumberUtils.validateIsBetweenFloat("Discount", value, 0, 100);
+
+if (validationResult)
+ result.string(validationResult);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
index 30cc525485..c7d3c3336e 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -13,7 +13,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var offerId = vars.get("$local.uid");
var discount = rowdata["OFFER.DISCOUNT"];
- if (vars.exists("$param.OfferOriginal_Id_param"))
+ if (vars.exists("$param.OfferOriginal_Id_param") && vars.get("$param.OfferOriginal_Id_param"))
OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), offerId, discount);
var activityId = vars.get("$param.ActivityId_param");
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index d2385a6adb..a33f0a530a 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -609,6 +609,7 @@ OfferItemUtils.prototype.reOrgItems = function() {
OfferItemUtils.getDiscountedNet = function(pExcludedIs, pOfferId, pDiscount, pExcludedProductgroups){
+ pDiscount = pDiscount ? pDiscount : 0;
var ret;
var sum = 0;
var sumExcluded = 0;
--
GitLab