From ad465c40abe7ec6baaf24a53ed28c3afbdc2fb2e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 18 Feb 2019 10:21:05 +0100
Subject: [PATCH] =?UTF-8?q?l=C3=B6schen=20von=20Produkten=20aus=20Offer=20?=
=?UTF-8?q?/=20Order=20gefixt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
process/OfferOrder_lib/process.js | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index c4af78a93e..a2004d9bac 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -136,21 +136,6 @@ function ItemUtils(pOfferOrderId, pTableName) {
}
}
-/**
- * get a new SqlCondition Object with tablename + "ITEM." + tablename + "ITEMID" = pItemId
- *
- * @param {String} pItemId item id
- * @param {String} [pTableName=this.tableName] table name, if this is not available
- *
- * @return {SqlCondition}
- */
-ItemUtils.prototype.getNewItemIdCondition = function(pItemId, pTableName)
-{
- if (pTableName == undefined)
- pTableName = this.tableName;
- return SqlCondition.begin().andPrepare(pTableName + "ITEM." + pTableName + "ITEMID", pItemId);
-}
-
/**
* get netto and vat for all items or for all given items.
*
@@ -350,7 +335,6 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
*/
ItemUtils.prototype.deletePartsList = function(itemId) {
var deletedItemIds = [];
-
//save address for this here to get class variables in recursive sub function __itemDeleteStatement
var self = this;
var statements = [];
@@ -365,11 +349,14 @@ ItemUtils.prototype.deletePartsList = function(itemId) {
return deletedItemIds;
//recursive function for building item delete statements
- function __itemDeleteStatement(itemId) {
+ function __itemDeleteStatement(itemId) {
var itemsToDelete = self.ItemTree[itemId].ids;
for (var i = 0; i < itemsToDelete.length; i++) {
- //unshift due to foreign key constraints (Delete hierarchically starting at the bottom)
- statements.unshift(self.getNewItemIdCondition(itemsToDelete[i], self.tableName).build("1 = 2"));
+ //unshift due to foreign key constraints (Delete hierarchically starting at the bottom)
+ statements.unshift([self.tableName + "ITEM", SqlCondition.begin()
+ .andPrepare(self.tableName + "ITEM." + self.tableName + "ITEMID", itemsToDelete[i])
+ .build("1 = 2")]);
+
deletedItemIds.push(itemsToDelete[i]);
__itemDeleteStatement(itemsToDelete[i]);
}
--
GitLab