From 8b68fcf088748e05f824191649b80ee72ae65bac Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Apr 2022 14:40:29 +0200
Subject: [PATCH] change new code

---
 db/changes/10440-fallas/00-manaCustomerUpdate.sql  | 2 +-
 db/changes/10440-fallas/00-manaSpellersRequery.sql | 4 ++--
 db/changes/10440-fallas/00-ticketRefund.sql        | 4 ++--
 db/changes/10451-april/00-ticket_doRefund.sql      | 4 ++--
 db/tests/vn/zone_getLanded.spec.js                 | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/changes/10440-fallas/00-manaCustomerUpdate.sql b/db/changes/10440-fallas/00-manaCustomerUpdate.sql
index 80838bca2..69807443a 100644
--- a/db/changes/10440-fallas/00-manaCustomerUpdate.sql
+++ b/db/changes/10440-fallas/00-manaCustomerUpdate.sql
@@ -40,7 +40,7 @@ BEGIN
             INTO vFromDated 
         FROM bs.manaCustomer;
 
-    WHILE timestampadd(DAY,30,vFromDated) < CURDATE() DO
+    WHILE timestampadd(DAY,30,vFromDated) < vn.VN_CURDATE() DO
 
         SELECT
                 timestampadd(DAY,30,vFromDated),
diff --git a/db/changes/10440-fallas/00-manaSpellersRequery.sql b/db/changes/10440-fallas/00-manaSpellersRequery.sql
index 9c1a10c6a..e762750e1 100644
--- a/db/changes/10440-fallas/00-manaSpellersRequery.sql
+++ b/db/changes/10440-fallas/00-manaSpellersRequery.sql
@@ -11,7 +11,7 @@ BEGIN
  */  
 	DECLARE vWorkerIsExcluded BOOLEAN;
 	DECLARE vFromDated DATE;
-    DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
+    DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,vn.VN_CURDATE());
 	DECLARE vMana INT;
     DECLARE vAutoMana INT;
     DECLARE vClaimMana INT;
@@ -63,7 +63,7 @@ BEGIN
 					FROM greuge g
 						JOIN client c ON c.id = g.clientFk
 					WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
-						AND g.shipped > vFromDated and g.shipped < CURDATE()				
+						AND g.shipped > vFromDated and g.shipped < vn.VN_CURDATE()				
 				UNION ALL				
 				SELECT cc.mana
 					FROM clientManaCache cc
diff --git a/db/changes/10440-fallas/00-ticketRefund.sql b/db/changes/10440-fallas/00-ticketRefund.sql
index 66de21e91..f8b2162b4 100644
--- a/db/changes/10440-fallas/00-ticketRefund.sql
+++ b/db/changes/10440-fallas/00-ticketRefund.sql
@@ -51,13 +51,13 @@ BEGIN
 		)
 		SELECT
 					vCustomer,
-					CURDATE(),
+					vn.VN_CURDATE(),
 					vAddress,
 					vRefundAgencyMode,
 					a.nickname,
 					vWarehouse,
 					vCompany,
-					CURDATE(),
+					vn.VN_CURDATE(),
                     vZoneFk
 			FROM address a
 			WHERE a.id = vAddress;
diff --git a/db/changes/10451-april/00-ticket_doRefund.sql b/db/changes/10451-april/00-ticket_doRefund.sql
index 5540ff8cf..d2177e67f 100644
--- a/db/changes/10451-april/00-ticket_doRefund.sql
+++ b/db/changes/10451-april/00-ticket_doRefund.sql
@@ -58,13 +58,13 @@ BEGIN
 		)
 		SELECT
 					vCustomer,
-					CURDATE(),
+					vn.VN_CURDATE(),
 					vAddress,
 					vRefundAgencyMode,
 					a.nickname,
 					vWarehouse,
 					vCompany,
-					CURDATE(),
+					vn.VN_CURDATE(),
                     vZoneFk
 			FROM address a
 			WHERE a.id = vAddress;
diff --git a/db/tests/vn/zone_getLanded.spec.js b/db/tests/vn/zone_getLanded.spec.js
index 6673879e4..8aac75dc4 100644
--- a/db/tests/vn/zone_getLanded.spec.js
+++ b/db/tests/vn/zone_getLanded.spec.js
@@ -14,7 +14,7 @@ describe('zone zone_getLanded()', () => {
             warehouseFk: 1,
             showExpiredZones: true};
 
-        stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL -1 DAY), ?, ?, ?, ?)', [
+        stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(vn.VN_CURDATE(), INTERVAL -1 DAY), ?, ?, ?, ?)', [
             params.addressFk,
             params.agencyModeFk,
             params.warehouseFk,
@@ -47,7 +47,7 @@ describe('zone zone_getLanded()', () => {
             warehouseFk: 1,
             showExpiredZones: false};
 
-        stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL +2 DAY), ?, ?, ?, ?)', [
+        stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(vn.VN_CURDATE(), INTERVAL +2 DAY), ?, ?, ?, ?)', [
             params.addressFk,
             params.agencyModeFk,
             params.warehouseFk,