[Projekt: OBJECT CARPET + TOUCAN-T / CRM / 2020 (OC/TT)][TicketNr.:...

[Projekt: OBJECT CARPET + TOUCAN-T / CRM / 2020 (OC/TT)][TicketNr.: 1067111][Gesamtrabatt in Angeboten]

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>

entity/Offer_entity/entityfields/discount/onValidation.js

+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

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");

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;