From 599f22a25de9e25e26a405a223770be432468134 Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Tue, 14 May 2024 09:03:49 +0200
Subject: [PATCH] catalogue tiene en cuenta apc

---
 db/routines/floranet/procedures/catalogue_get.sql   |  9 +++++++--
 db/routines/floranet/procedures/contact_request.sql | 13 +++++++++++--
 .../floranet/procedures/deliveryDate_get.sql        |  2 +-
 db/routines/floranet/procedures/order_put.sql       | 12 ++++++------
 db/routines/floranet/procedures/sliders_get.sql     | 13 ++++++-------
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/db/routines/floranet/procedures/catalogue_get.sql b/db/routines/floranet/procedures/catalogue_get.sql
index 32624f383..d67f7555e 100644
--- a/db/routines/floranet/procedures/catalogue_get.sql
+++ b/db/routines/floranet/procedures/catalogue_get.sql
@@ -42,8 +42,8 @@ proc:BEGIN
 					image,
 					description
 				)
-		SELECT 	i.name,
-				i.`size`,
+		SELECT 	CONCAT(i.name, ' by ',a.nickname),
+				i.`size` + apc.deliveryCost,
 				i.id,
 				vLanded,
 				vPostalCode,
@@ -52,6 +52,11 @@ proc:BEGIN
 				i.description
 			FROM vn.item i
 				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
 			WHERE it.code IN ('FNR','FNP');
 
 	SELECT *
diff --git a/db/routines/floranet/procedures/contact_request.sql b/db/routines/floranet/procedures/contact_request.sql
index 2ca25b87d..c479945cc 100644
--- a/db/routines/floranet/procedures/contact_request.sql
+++ b/db/routines/floranet/procedures/contact_request.sql
@@ -13,8 +13,17 @@ BEGIN
 /**
  * Set actions for contact request
  * 
- * @param vPostalCode Delivery address postal code
+ * @param vName Name
+ * @param vPhone Phone number
+ * @param vEmail e-mail
+ * @param vMessage text of the message
  */
-	
+
+	CALL vn.mail_insert(
+		'pako@verdnatura.es',
+		vEmail,
+		'Contact request',
+		CONCAT('Phone: ',vPhone, ' Message: ', vMessage)
+	);
 END$$
 DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/floranet/procedures/deliveryDate_get.sql b/db/routines/floranet/procedures/deliveryDate_get.sql
index 75e9d6257..a235e8c31 100644
--- a/db/routines/floranet/procedures/deliveryDate_get.sql
+++ b/db/routines/floranet/procedures/deliveryDate_get.sql
@@ -21,7 +21,7 @@ BEGIN
 					apc.dayOfWeek - vCurrentDayOfWeek,
 					7 - apc.dayOfWeek
 					) DAY nextDay,
-	NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime
+	NOW() + INTERVAL apc.hoursInAdvance HOUR minDeliveryTime
 	FROM addressPostCode apc
 		WHERE apc.postCode = vPostalCode
 	HAVING nextDay > minDeliveryTime) sub;
diff --git a/db/routines/floranet/procedures/order_put.sql b/db/routines/floranet/procedures/order_put.sql
index 979588f8f..ec0295ca7 100644
--- a/db/routines/floranet/procedures/order_put.sql
+++ b/db/routines/floranet/procedures/order_put.sql
@@ -10,12 +10,12 @@ BEGIN
 	INSERT INTO `order`
 		SET catalogueFk = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.products[0].id')),
 			customerName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerName')),
-    		email = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.email')),
-    		customerPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerPhone')),
-    		message= JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.message')),
-    		deliveryName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryName')),
-    		address = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.address')),
-    		deliveryPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryPhone'));						
+			email = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.email')),
+			customerPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerPhone')),
+			message= JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.message')),
+			deliveryName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryName')),
+			address = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.address')),
+			deliveryPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryPhone'));						
 
 	SELECT LAST_INSERT_ID() orderFk;
 END$$
diff --git a/db/routines/floranet/procedures/sliders_get.sql b/db/routines/floranet/procedures/sliders_get.sql
index 0e4aa297a..bafda4732 100644
--- a/db/routines/floranet/procedures/sliders_get.sql
+++ b/db/routines/floranet/procedures/sliders_get.sql
@@ -9,12 +9,11 @@ BEGIN
  * Returns list of url for sliders.
  */
 	SELECT 
-        CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image) url,
-        i.longName
-    FROM vn.item i
-        JOIN vn.itemType it ON it.id = i.typeFk
-    WHERE it.code IN ('FNR','FNP')
-   	LIMIT 3;
-    
+		CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image) url,
+		i.longName
+	FROM vn.item i
+		JOIN vn.itemType it ON it.id = i.typeFk
+	WHERE it.code IN ('FNR','FNP')
+	LIMIT 3;
 END$$
 DELIMITER ;
\ No newline at end of file