From 2a24b8fe3290aad48cedc04d95f0a5b2f45f05af Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 20 Apr 2023 14:19:45 +0200
Subject: [PATCH] refs #5153

---
 .../{230601 => 231601}/00-clientWorkerName.sql  | 17 +++++++----------
 .../{230402 => 231601}/00-createWorker.sql      |  2 +-
 .../{230601 => 231601}/00-newClientType.sql     |  0
 3 files changed, 8 insertions(+), 11 deletions(-)
 rename db/changes/{230601 => 231601}/00-clientWorkerName.sql (88%)
 rename db/changes/{230402 => 231601}/00-createWorker.sql (83%)
 rename db/changes/{230601 => 231601}/00-newClientType.sql (100%)

diff --git a/db/changes/230601/00-clientWorkerName.sql b/db/changes/231601/00-clientWorkerName.sql
similarity index 88%
rename from db/changes/230601/00-clientWorkerName.sql
rename to db/changes/231601/00-clientWorkerName.sql
index 02ce503efa..cf61addc32 100644
--- a/db/changes/230601/00-clientWorkerName.sql
+++ b/db/changes/231601/00-clientWorkerName.sql
@@ -1,12 +1,9 @@
-DROP PROCEDURE IF EXISTS vn.clientCreate;
-USE vn;
 DELIMITER $$
-$$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clientCreate`(
 	vFirstname VARCHAR(50),
-    vSurnames VARCHAR(50),
-    vFi VARCHAR(9),
-    vAddress TEXT,
+    vSurnames VARCHAR(50), 
+    vFi VARCHAR(9), 
+    vAddress TEXT, 
     vPostcode CHAR(5),
     vCity VARCHAR(25),
     vProvinceFk SMALLINT(5),
@@ -25,7 +22,7 @@ BEGIN
     DECLARE vIsTaxDataChecked TINYINT(1) DEFAULT 1;
 	DECLARE vHasCoreVnl BOOLEAN DEFAULT TRUE;
     DECLARE vMandateTypeFk INT DEFAULT 2;
-
+    
 	INSERT INTO `client` (
 			id,
 			name,
@@ -53,21 +50,21 @@ BEGIN
 			vProvinceFk,
 			vCity,
 			vPostcode,
-			CONCAT(vSurnames, ' ', vFirstname),
+			CONCAT(vSurnames, ' ', vFirstname), 
 			vPayMethodFk,
 			vDueDay,
 			vDefaultCredit,
 			vIsTaxDataChecked,
 			vHasCoreVnl,
 			FALSE
-		) ON duplicate key update
+		) ON duplicate key update  
             payMethodFk = vPayMethodFk,
 			dueDay = vDueDay,
 			credit = vDefaultCredit,
 			isTaxDataChecked = vIsTaxDataChecked,
 			hasCoreVnl = vHasCoreVnl,
             isActive = TRUE;
-
+	
     IF (SELECT COUNT(*) FROM mandate WHERE clientFk = vUserFk AND companyFk = vCompanyFk AND mandateTypeFk = vMandateTypeFk) = 0 THEN
 		INSERT INTO mandate (clientFk, companyFk, mandateTypeFk)
 			VALUES (vUserFk, vCompanyFk, vMandateTypeFk);
diff --git a/db/changes/230402/00-createWorker.sql b/db/changes/231601/00-createWorker.sql
similarity index 83%
rename from db/changes/230402/00-createWorker.sql
rename to db/changes/231601/00-createWorker.sql
index bd3be8cc2c..10d19f4c0b 100644
--- a/db/changes/230402/00-createWorker.sql
+++ b/db/changes/231601/00-createWorker.sql
@@ -1,5 +1,5 @@
 ALTER TABLE `vn`.`workerConfig` ADD businessTypeFk varchar(100) NULL COMMENT 'Tipo de negocio por defecto al dar de alta un trabajador nuevo';
 
 UPDATE `vn`.`workerConfig`
-    SET businessTypeFk = 'individual'
+    SET businessTypeFk = 'worker'
     WHERE id = 1;
diff --git a/db/changes/230601/00-newClientType.sql b/db/changes/231601/00-newClientType.sql
similarity index 100%
rename from db/changes/230601/00-newClientType.sql
rename to db/changes/231601/00-newClientType.sql