From 9bc0a3ff38780c7231d998202da4cdcd6784d722 Mon Sep 17 00:00:00 2001
From: "p.neub" <p.neub@adito.de>
Date: Tue, 9 Nov 2021 13:59:43 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=202002123][Fe?=
=?UTF-8?q?hler=20beim=20Hinzuf=C3=BCgen=20eines=20Produktes=20im=20Angebo?=
=?UTF-8?q?t]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
process/OfferOrder_lib/process.js | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index b65c2293ba..7d890d2866 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -764,15 +764,14 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
//We want to sum up the prices directly under the current item to calculate the price if we don't have an valid price for them
function _handleSumUpPricesOfItems(pOrder, pTreestruct, pSumUpPrices, pPriceObj, pQuantity, pStatements)
{
-
var currentStruc = pTreestruct;
var sumUpPrices = pSumUpPrices;
var quantity = pQuantity;
var order = pOrder;
var summandObject = {};
var calculatedPrices = {};
- var priceObj = pPriceObj;
- for (var i = order.length; i > -1; i--)//we do this backwards because otherwiese we would run into problems when trying to build the sum (we could have items without an price yet)
+ var priceObj = Object.assign({}, pPriceObj); // shallow copy object
+ for (var i = order.length; i > -1; i--) // we do this backwards because otherwiese we would run into problems when trying to build the sum (we could have items without an price yet)
{
if(sumUpPrices.hasOwnProperty(order[i]))
{
@@ -784,12 +783,12 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
var childPrice;
if(pPriceObj[child] != undefined)
{
- childPrice = priceObj[child]["price"]*priceObj[child]["quantity"]
+ childPrice = priceObj[child]["price"]*priceObj[child]["quantity"];
}
else if(summandObject[child] != undefined && summandObject[child][child] != undefined)
{
- childPrice = priceObj[Object.keys(summandObject[child][child])[0]]["price"]*priceObj[child]["quantity"]
- vat = pPriceObj[Object.keys(summandObject[child][child])[0]]["vat"]
+ childPrice = priceObj[Object.keys(summandObject[child][child])[0]]["price"]*priceObj[child]["quantity"];
+ vat = pPriceObj[Object.keys(summandObject[child][child])[0]]["vat"];
}
else
{
@@ -809,8 +808,6 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
priceObj[order[i]] = {};
priceObj[order[i]]["price"] = calcPrice*sumUpPrices[order[i]];
priceObj[order[i]]["vat"] = vat;
-
-
}
}
@@ -838,7 +835,7 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
}
}
}
-};
+}
/**
* Recursive function to build the tree structure so we can later sum up the prices accordingly (call for every item (top-down))
--
GitLab