1711 update structure db

db/changes/10110-postCampaign/00-clientBeforeUpdate.sql

@@ -0,0 +1,51 @@
+DROP TRIGGER IF EXISTS `vn`.`client_beforeUpdate`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`client_beforeUpdate`
+	BEFORE UPDATE ON `client`
+    FOR EACH ROW
+BEGIN
+	DECLARE vText VARCHAR(255) DEFAULT NULL;
+	-- Comprueba que el formato de los teléfonos es válido
+
+	IF !(NEW.phone <=> OLD.phone) THEN
+		CALL pbx.phone_isValid(NEW.phone);
+	END IF;
+    
+    IF !(NEW.mobile <=> OLD.mobile) THEN
+		CALL pbx.phone_isValid(NEW.mobile);
+	END IF;
+
+    IF !(NEW.fax <=> OLD.fax) THEN
+		CALL pbx.phone_isValid(NEW.fax);
+	END IF;
+
+	IF NEW.payMethodFk = 4 AND NEW.dueDay = 0 THEN
+		SET NEW.dueDay = 5;
+    END IF;
+    
+	-- Avisar al comercial si ha llegado la documentación sepa/core
+
+	IF NEW.hasSepaVnl AND !OLD.hasSepaVnl THEN
+		SET vText = 'Sepa de VNL';
+	END IF;
+
+	IF NEW.hasCoreVnl AND !OLD.hasCoreVnl THEN
+		SET vText = 'Core de VNL';
+	END IF;
+
+	IF vText IS NOT NULL
+    THEN
+		INSERT INTO mail(sender, replyTo, `subject`, body) 
+			SELECT
+					CONCAT(IF(ac.id,u.name, 'jgallego'), '@verdnatura.es'),
+                    'administracion@verdnatura.es',
+                    CONCAT('Cliente ', NEW.id),
+					CONCAT('Recibida la documentación: ', vText)
+				FROM worker w
+					LEFT JOIN account.user u ON w.userFk = u.id AND u.active
+					LEFT JOIN account.account ac ON ac.id = u.id
+				WHERE w.id = NEW.salesPersonFk;
+	END IF;
+END$$
+DELIMITER ;

db/changes/10110-postCampaign/00-clientGetMana.sql

@@ -62,7 +62,7 @@ BEGIN
 			UNION ALL
 			SELECT  g.amount
 				FROM greuge g
-					JOIN client c ON c.id = g.clientFk
+					JOIN `client` c ON c.id = g.clientFk
 				WHERE g.greugeTypeFk = vManaGreugeType
 					AND g.shipped > vFromDated
 					AND g.shipped <= CURDATE()

db/changes/10110-postCampaign/00-clientPackagingOverstock.sql

@@ -0,0 +1,97 @@
+
+DROP procedure IF EXISTS `vn`.`clientPackagingOverstock`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`clientPackagingOverstock`(vClientFk INT, vGraceDays INT )
+BEGIN
+	DROP TEMPORARY TABLE IF EXISTS tmp.clientPackagingOverstock;
+    CREATE TEMPORARY TABLE tmp.clientPackagingOverstock
+		ENGINE = MEMORY 
+	SELECT itemFk, 
+			sum(GotfromClient) - sum(SenttoClient) as devueltos, 
+            sum(InvoicedtoClient) - sum(InvoicedfromClient) as facturados,
+            LEAST(	
+					sum(GotfromClient) - sum(SenttoClient), 
+					sum(InvoicedtoClient) - sum(InvoicedfromClient)
+				) as abonables
+		FROM
+	(
+		SELECT t.*,
+			IF(@month = month, 0, 1) monthEnd,
+			@month := month
+			FROM      
+				(
+				SELECT  x.id as ticketFk, 
+						date(x.shipped) as shipped, 
+						x.itemFk, 
+						IFNULL(cast(sum(x.InvoicedtoClient) as DECIMAL(10,0)),0) InvoicedtoClient, 
+						IFNULL(cast(sum(x.InvoicedfromClient) as DECIMAL(10,0)),0) InvoicedfromClient, 
+						IFNULL(cast(sum(x.SenttoClient) as DECIMAL(10,0)),0) SenttoClient, 
+						IFNULL(cast(sum(x.GotfromClient) as DECIMAL(10,0)),0) GotfromClient,
+						i.name as concept,
+						x.refFk as invoice,
+						month(shipped) month,
+						x.companyFk
+				FROM
+				(
+				SELECT  t.id,
+						t.shipped,
+						IFNULL(pe.equivalentFk, s.itemFk) itemFk,
+						IF(s.quantity > 0, s.quantity, NULL) InvoicedtoClient,
+						IF(s.quantity < 0, -s.quantity, NULL) InvoicedfromClient,
+						NULL SenttoClient,
+						NULL GotfromClient,
+						t.refFk,
+						@month := 0 month,
+						t.companyFk
+					FROM sale s
+						JOIN ticket t on t.id = s.ticketFk 
+						JOIN packaging p ON p.itemFk = s.itemFk 
+						LEFT JOIN packageEquivalentItem pe ON pe.itemFk = s.itemFk
+						WHERE t.clientFk = vClientFk
+						AND t.shipped > '2017-11-30' 
+						AND p.isPackageReturnable
+				UNION ALL
+				SELECT  NULL,
+						'2017-11-30',
+						IFNULL(pe.equivalentFk, tps.itemFk) itemFk,
+						tps.sent InvoicedtoClient,
+						tps.returned InvoicedfromClient,
+						NULL SenttoClient,
+						NULL GotfromClient,
+						'Histórico',
+						NULL,
+						NULL
+						
+					FROM ticketPackagingStartingStock tps
+						LEFT JOIN packageEquivalentItem pe ON pe.itemFk = tps.itemFk
+						WHERE tps.clientFk = vClientFk
+							AND tps.isForgetable = FALSE
+				UNION ALL
+				SELECT  t.id,
+					t.shipped,
+					IFNULL(pe.equivalentFk, p.itemFk) itemFk,
+					NULL,
+					NULL,
+					IF(tp.quantity > 0 AND t.shipped <= TIMESTAMPADD(DAY, - vGraceDays, CURDATE()), tp.quantity, NULL) SenttoClient,
+					IF(tp.quantity < 0, -tp.quantity, NULL) GotfromClient,
+					NULL AS refFk,
+					NULL,
+					t.companyFk
+				FROM ticketPackaging tp 
+					JOIN ticket t on t.id = tp.ticketFk 
+					JOIN packaging p ON p.id = tp.packagingFk
+					LEFT JOIN packageEquivalentItem pe ON pe.itemFk = p.itemFk
+					WHERE t.clientFk = vClientFk
+					AND t.shipped > '2017-11-21' ) x
+
+					JOIN item i ON x.itemFk = i.id
+					GROUP BY x.id, x.itemFk
+			) t
+			ORDER BY itemFk, shipped DESC
+		) t2
+		GROUP BY itemFk;
+END$$
+
+DELIMITER ;
+