db/routines/vn/functions/address_getGeo.sql

@@ -14,10 +14,9 @@ BEGIN
 	SELECT p.geoFk INTO vGeoFk
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id
+			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
-			(p.code = a.postalCode) DESC
+		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;

db/routines/vn/functions/client_getGeo.sql

@@ -1,25 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getGeo`(vSelf INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the geo for the passed client.
- *
- * @param vSelf The address id
- * @return The geo id
- */
- 	DECLARE vGeoFk INT;
-
-	SELECT p.geoFk INTO vGeoFk
-		FROM client c
-			JOIN town t ON t.provinceFk = c.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-		WHERE c.id = vSelf
-		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
-			(p.code = c.postcode) DESC
-		LIMIT 1;
-
-	RETURN vGeoFk;
-END$$
-DELIMITER ;

db/routines/vn/functions/supplier_getGeo.sql

@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`supplier_getGeo`(vSelf INT)
-	RETURNS int(11)
-	DETERMINISTIC
-BEGIN
-/**
- * Returns the geo for the passed supplier.
- *
- * @param vSelf The address id
- * @return The geo id
- */
- 	DECLARE vGeoFk INT;
-
-	SELECT p.geoFk INTO vGeoFk
-		FROM supplier s
-			JOIN town t ON t.provinceFk = s.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
-		WHERE s.id = vSelf
-		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
-			(p.code = s.postCode) DESC,
-			(p.code = sad.postalCode) DESC
-		LIMIT 1;
-
-	RETURN vGeoFk;
-END$$
-DELIMITER ;

db/routines/vn/triggers/address_beforeInsert.sql

@@ -6,7 +6,6 @@ BEGIN
 	DECLARE vIsEqualizated BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = address_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);

db/routines/vn/triggers/address_beforeUpdate.sql

@@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`address_beforeUpdate`
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
+	
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@@ -13,10 +14,5 @@ BEGIN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
 
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postalCode <=> OLD.postalCode) THEN
-
-		SET NEW.geoFk = address_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeInsert.sql

@@ -3,10 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`client_beforeInsert`
 	BEFORE INSERT ON `client`
 	FOR EACH ROW
 BEGIN
+
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
-	SET NEW.geoFk = client_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@@ -15,5 +13,9 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
+
+	SET NEW.accountingAccount = 4300000000 + NEW.id;
+    
+    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_beforeUpdate.sql

@@ -72,11 +72,5 @@ BEGIN
 	IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
 		SET NEW.isTaxDataChecked = 0;
 	END IF;
-
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postcode <=> OLD.postcode) THEN
-
-		SET NEW.geoFk = client_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/supplier_beforeInsert.sql

@@ -4,6 +4,5 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`supplier_beforeInsert`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.geoFk = supplier_getGeo(NEW.id);
 END$$
 DELIMITER ;

db/routines/vn/triggers/supplier_beforeUpdate.sql

@@ -40,10 +40,5 @@ BEGIN
 		SET NEW.isPayMethodChecked = FALSE;
 	END IF;
 
-	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
-		OR (NEW.postCode <=> OLD.postCode) THEN
-
-		SET NEW.geoFk = supplier_getGeo(NEW.id);
-	END IF;
 END$$
 DELIMITER ;

db/versions/11346-yellowPhormium/00-address.sql

@@ -1,21 +0,0 @@
-ALTER TABLE vn.address
-	ADD geoFk int(11) DEFAULT NULL NULL AFTER isLogifloraAllowed,
-	ADD CONSTRAINT address_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-CREATE OR REPLACE TEMPORARY TABLE tAddressGeo
-	(PRIMARY KEY (id))
-	ENGINE = MEMORY
-	SELECT a.id, p.geoFk
-		FROM address a
-			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-		GROUP BY a.id
-		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC,
-			(p.code = a.postalCode) DESC;
-
-UPDATE address a
-		JOIN tAddressGeo tag ON tag.id = a.id
-	SET a.geoFk = tag.geoFk;
-
-DROP TEMPORARY TABLE tAddressGeo;

db/versions/11346-yellowPhormium/01-client.sql

@@ -1,24 +0,0 @@
-ALTER TABLE vn.client
-	CHANGE hasDailyInvoice hasDailyInvoice tinyint(1) DEFAULT 0 NOT NULL
-		COMMENT 'Indica si el cliente requiere facturación diaria por defecto se copiará lo que tenga country.hasDailyInvoice'
-		AFTER recommendedCredit,
-	ADD geoFk int(11) DEFAULT NULL NULL AFTER hasDailyInvoice,
-	ADD CONSTRAINT client_zoneGeo_FK FOREIGN KEY (geoFk)
-		REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-CREATE OR REPLACE TEMPORARY TABLE tClientGeo
-	(PRIMARY KEY (id))
-	ENGINE = MEMORY
-	SELECT c.id, p.geoFk
-		FROM client c
-			JOIN town t ON t.provinceFk = c.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-		GROUP BY c.id
-		ORDER BY (c.city SOUNDS LIKE t.`name`) DESC,
-			(p.code = c.postcode) DESC;
-
-UPDATE client c
-		JOIN tClientGeo tcg ON tcg.id = c.id
-	SET c.geoFk = tcg.geoFk;
-
-DROP TEMPORARY TABLE tClientGeo;

db/versions/11346-yellowPhormium/02-supplier.sql

@@ -1,25 +0,0 @@
-ALTER TABLE vn.supplier
-	CHANGE companySize companySize enum('small','medium','big') CHARACTER SET utf8mb3
-		COLLATE utf8mb3_general_ci DEFAULT NULL NULL AFTER stamp,
-	ADD geoFk int(11) DEFAULT NULL NULL AFTER companySize,
-	ADD CONSTRAINT supplier_zoneGeo_FK FOREIGN KEY (geoFk)
-			REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-CREATE OR REPLACE TEMPORARY TABLE tSupplierGeo
-	(PRIMARY KEY (id))
-	ENGINE = MEMORY
-	SELECT s.id, p.geoFk
-		FROM supplier s
-			JOIN town t ON t.provinceFk = s.provinceFk
-			JOIN postCode p ON p.townFk = t.id
-			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
-		GROUP BY s.id
-		ORDER BY (s.city SOUNDS LIKE t.`name`) DESC,
-			(p.code = s.postCode) DESC,
-			(p.code = sad.postalCode) DESC;
-
-UPDATE supplier s
-		JOIN tSupplierGeo tsg ON tsg.id = s.id
-	SET s.geoFk = tsg.geoFk;
-
-DROP TEMPORARY TABLE tSupplierGeo;