From 4bf00bd428fb1455411f4bbc6596f02460f2c838 Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Tue, 25 Jun 2024 12:51:14 +0200
Subject: [PATCH] version 240625

---
 .../floranet/procedures/catalogue_get.sql     | 27 +++++++++++--------
 .../floranet/procedures/deliveryDate_get.sql  |  4 +--
 .../floranet/procedures/order_confirm.sql     |  4 +--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/db/routines/floranet/procedures/catalogue_get.sql b/db/routines/floranet/procedures/catalogue_get.sql
index 7ce32cfac..1e224c810 100644
--- a/db/routines/floranet/procedures/catalogue_get.sql
+++ b/db/routines/floranet/procedures/catalogue_get.sql
@@ -1,16 +1,15 @@
-DROP PROCEDURE IF EXISTS floranet.catalogue_get;
-
 DELIMITER $$
 $$
-CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
 READS SQL DATA
 proc:BEGIN
 /**
- * Returns list, price and all the stuff regarding the floranet items.
+ * Returns list, price and all the stuff regarding the floranet items, for the designed shop
  * 
  * @param vLanded Delivery date
  * @param vPostalCode Delivery address postal code
  */
+	DECLARE vAddressFk INT;
 	DECLARE vLastCatalogueFk INT;
 	DECLARE vLockName VARCHAR(20);
 	DECLARE vLockTime INT;
@@ -21,7 +20,7 @@ proc:BEGIN
 
 		RESIGNAL;
 	END;
-	
+
 	SET vLockName = 'catalogue_get';
 	SET vLockTime = 15;
 
@@ -32,6 +31,15 @@ proc:BEGIN
 	SELECT MAX(id) INTO vLastCatalogueFk
 		FROM catalogue;
 
+	SELECT addressFk 
+		INTO vAddressFk
+		FROM addressPostCode apc 
+			WHERE apc.dayOfWeek = dayOfWeek(vLanded) 
+				AND NOW() < vLanded - INTERVAL apc.hoursInAdvance HOUR
+				AND apc.postCode = vPostalCode
+		-- Aquí hay que incluir los criterios de selección de tienda
+		LIMIT 1;
+
 	INSERT INTO catalogue(
 					name,
 					price,
@@ -51,17 +59,14 @@ proc:BEGIN
 				it.name, 
 				CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image), 
 				i.description,
-				apc.addressFk
+				vAddressFk
 			FROM vn.item i
 				JOIN (SELECT itemFk, SUM(quantity * cost) price 
 						FROM recipe
 						GROUP BY itemFk) r ON r.itemFk = i.id
 				JOIN vn.itemType it ON it.id = i.typeFk
-				JOIN addressPostCode apc 
-					ON apc.dayOfWeek = dayOfWeek(vLanded) 
-					AND NOW() < vLanded - INTERVAL apc.hoursInAdvance HOUR
-					AND apc.postCode = vPostalCode
-				JOIN vn.address a ON a.id = apc.addressFk;
+				JOIN addressPostCode apc ON addressFk = vAddressFk
+				JOIN vn.address a ON a.id = vAddressFk;
 
 	SELECT *
 		FROM catalogue
diff --git a/db/routines/floranet/procedures/deliveryDate_get.sql b/db/routines/floranet/procedures/deliveryDate_get.sql
index a235e8c31..70cb48818 100644
--- a/db/routines/floranet/procedures/deliveryDate_get.sql
+++ b/db/routines/floranet/procedures/deliveryDate_get.sql
@@ -1,8 +1,6 @@
-DROP PROCEDURE IF EXISTS floranet.deliveryDate_get;
-
 DELIMITER $$
 $$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15))
     READS SQL DATA
 BEGIN
 /**
diff --git a/db/routines/floranet/procedures/order_confirm.sql b/db/routines/floranet/procedures/order_confirm.sql
index 3b9413da9..98e15bbab 100644
--- a/db/routines/floranet/procedures/order_confirm.sql
+++ b/db/routines/floranet/procedures/order_confirm.sql
@@ -101,7 +101,7 @@ proc:BEGIN
 			vNewTicketFk,
 			c.itemFk,
 			CONCAT('Entrega: ',c.name),
-			- c.price,
+			- apc.deliveryCost,
 			1
 			FROM catalogue c
 				JOIN addressPostCode apc 
@@ -119,7 +119,7 @@ proc:BEGIN
 			vNewTicketFk,
 			r.elementFk,
 			i.longName,
-			r.cost,
+			0,
 			r.quantity
 			FROM catalogue c
 				JOIN recipe r ON r.itemFk = c.itemFk
-- 
2.40.1