From a8d03450732bd24292696ca17ba73c5efe703586 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 10 Jul 2024 08:18:33 +0200
Subject: [PATCH] refactor: refs #6453 order_confirmWithUser

---
 .../procedures/order_confirmWithUser.sql      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/db/routines/hedera/procedures/order_confirmWithUser.sql b/db/routines/hedera/procedures/order_confirmWithUser.sql
index 76ff4e723..61a7421cf 100644
--- a/db/routines/hedera/procedures/order_confirmWithUser.sql
+++ b/db/routines/hedera/procedures/order_confirmWithUser.sql
@@ -17,7 +17,7 @@ BEGIN
 	DECLARE vShipment DATE;
 	DECLARE vTicketFk INT;
 	DECLARE vNotes VARCHAR(255);
-	DECLARE vItem INT;
+	DECLARE vItemFk INT;
 	DECLARE vConcept VARCHAR(30);
 	DECLARE vAmount INT;
 	DECLARE vPrice DECIMAL(10,2);
@@ -46,12 +46,12 @@ BEGIN
 			GROUP BY r.warehouse_id;
 
 	DECLARE cRows CURSOR FOR
-		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate, i.isFloramondo
-			FROM order_row r
-				JOIN vn.item i ON i.id = r.item_id
+		SELECT r.id, r.itemFk, i.name, r.amount, r.price, r.rate, i.isFloramondo
+			FROM orderRow r
+				JOIN vn.item i ON i.id = r.itemFk
 			WHERE r.amount
-				AND r.warehouse_id = vWarehouseFk
-				AND r.order_id = vSelf
+				AND r.warehouseFk = vWarehouseFk
+				AND r.orderFk = vSelf
 			ORDER BY r.rate DESC;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
@@ -185,7 +185,7 @@ BEGIN
 		OPEN cRows;
 		lRows: LOOP
 			SET vDone = FALSE;
-			FETCH cRows INTO vRowFk, vItem, vConcept, vAmount, vPrice, vRate, vIsLogifloraItem;
+			FETCH cRows INTO vRowFk, vItemFk, vConcept, vAmount, vPrice, vRate, vIsLogifloraItem;
 
 			IF vDone THEN
 				LEAVE lRows;
@@ -197,7 +197,7 @@ BEGIN
 				FROM vn.sale s
 				WHERE ticketFk = vTicketFk
 					AND price = vPrice
-					AND itemFk = vItem
+					AND itemFk = vItemFk
 					AND discount = 0
 				LIMIT 1;
 
@@ -215,7 +215,7 @@ BEGIN
 					WHERE rc.rowFk = vRowFk;
 
 				INSERT INTO vn.sale
-					SET itemFk = vItem,
+					SET itemFk = vItemFk,
 						ticketFk = vTicketFk,
 						concept = vConcept,
 						quantity = vAmount,
@@ -244,11 +244,11 @@ BEGIN
 				SELECT GREATEST(0, available) INTO vAvailable
 					FROM cache.availableNoRaids
 					WHERE calc_id = vCalcFk
-						AND item_id = vItem;
+						AND item_id = vItemFk;
 
 				UPDATE cache.availableNoRaids
 					SET available = GREATEST(0, available - vAmount)
-					WHERE item_id = vItem
+					WHERE item_id = vItemFk
 						AND calc_id = vCalcFk;
 
 				INSERT INTO edi.putOrder (
@@ -273,7 +273,7 @@ BEGIN
 							LEFT JOIN edi.clientFHAdminNumber ca ON ca.clientFk = vClientFk
 							JOIN edi.floraHollandConfig fhc
 							JOIN `order` o ON o.id = vSelf
-						WHERE i.id = vItem
+						WHERE i.id = vItemFk
 							AND di.LatestOrderDateTime > util.VN_NOW()
 							AND vAmount > vAvailable
 						LIMIT 1;