Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

services/db/install/changes/1.2-CHECK/01-ticketCalculateClon.sql

@@ -0,0 +1,89 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketCalculateClon`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
+BEGIN
+	/*
+	* @vTicketNew id del nuevo ticket clonado
+    * @vTicketOld id ticket original, a partir del qual se clonara el nuevo
+	* Este procedimiento "rebioniza" una linea, eliminando los componentes existentes e insertandolos de nuevo
+	*/
+	DECLARE vShipped DATE;
+	DECLARE vClient INT;
+	DECLARE vWarehouse SMALLINT;
+    DECLARE vAgencyMode INT;
+    DECLARE vAddress INT;
+	DECLARE vLanded DATE;
+    DECLARE vAgency INT;
+
+
+    REPLACE INTO orderTicket(orderFk,ticketFk)
+		SELECT orderFk, vTicketNew 
+			FROM orderTicket 
+            WHERE ticketFk = vTicketOld;
+    	
+	SELECT t.clientFk , t.warehouseFk, date(t.shipped), t.addressFk, t.agencyModeFk, t.landed, a.agencyFk
+		INTO vClient, vWarehouse, vShipped, vAddress, vAgencyMode, vLanded, vAgency
+    FROM vn.agencyMode a
+		JOIN vn.ticket t ON t.agencyModeFk = a.id
+    WHERE t.id = vTicketNew;
+    
+	DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped;
+	CREATE TEMPORARY TABLE tmp.agencyHourGetShipped ENGINE = MEMORY
+		SELECT vWarehouse warehouseFk, vShipped shipped, vLanded landed;
+    
+    CALL buyUltimate(vWarehouse, vShipped);  -- rellena la tabla tmp.buyUltimate con la ultima compra
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+	SELECT vWarehouse warehouseFk,NULL available,s.itemFk, bu.buyFka
+		FROM sale s
+			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+		WHERE s.ticketFk = vTicketOld GROUP BY s.itemFk;
+                
+	CALL ticketComponentCalculate(vAddress,vAgencyMode);
+    
+    -- Bionizamos lineas con Preu = 0
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+			SELECT s.id saleFk, vWarehouse warehouseFk 
+				FROM sale s
+					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew AND s.price = 0;
+                
+	CALL ticketComponentUpdateSale(1);
+    
+    -- Bionizamos lineas con Preu > 0
+	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+			SELECT s.id saleFk, vWarehouse warehouseFk 
+				FROM sale s 
+					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew
+                    AND s.price > 0;
+                
+	CALL ticketComponentUpdateSale(6);
+
+	IF vLanded IS NULL THEN
+		CALL agencyHourGetLanded(vShipped, vAddress, vAgency,vWarehouse);
+        
+        UPDATE ticket t
+				JOIN tmp.agencyHourGetLanded ah ON t.warehouseFk = ah.warehouseFk 
+			SET t.landed = ah.landed 
+			WHERE t.id = vTicketNew;
+    END IF;
+	
+	-- Log
+    CALL `logAdd`(vTicketNew, 'update', ' ticket' , 'Bioniza Ticket');
+
+	-- Limpieza
+	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimate;
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetShipped;
+END$$
+
+DELIMITER ;
+

services/db/install/changes/1.2-CHECK/10-ACL.sql

@@ -1,15 +1,4 @@
-/* INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (118, 'WorkerTeam', '*', '*', 'ALLOW', 'role', 'salesPerson');
-INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (119, 'Travel', '*', 'READ', 'ALLOW', 'role', 'employee');
-INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (120, 'Travel', '*', 'WRITE', 'ALLOW', 'role', 'buyer');
-INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (121, 'Item', 'regularize', '*', 'ALLOW', 'role', 'employee');
-INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (122, 'TicketRequest', '*', '*', 'ALLOW', 'role', 'employee');
-INSERT INTO `salix`.`fieldAcl` (`model`, `property`, `actionType`, `role`) VALUES('TicketRequest', '*', '*', 'salesPerson');
-UPDATE `salix`.`ACL` SET model='TicketRequest', property='*', accessType='*', permission='ALLOW', principalType='ROLE', principalId='salesPerson' WHERE id=122;
-INSERT INTO `salix`.`fieldAcl` (`model`, `property`, `actionType`,`role`) VALUES ('ClaimBeginning','*','*','salesAssistant');
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Agency', 'getAgenciesWithWarehouse', '*', 'ALLOW', 'ROLE', 'employee');
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES('Client', 'activeWorkersWithRole', '*', 'ALLOW', 'ROLE', 'employee');
 
- */
 INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES('CreditClassification', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
 
 INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES('ClientObservation', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
@@ -30,3 +19,6 @@ DELETE FROM `salix`.`ACL` WHERE `id`='74';
 DELETE FROM `salix`.`ACL` WHERE `id`='92';
 DELETE FROM `salix`.`ACL` WHERE `id`='93';
 DELETE FROM `salix`.`ACL` WHERE `id`='95';
+
+INSERT INTO `salix`.`ACL`(`id`,`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`) VALUES (133,'TicketLog',     '*','READ', 'ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL`(`id`,`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`) VALUES (134,'TicketService', '*','*',    'ALLOW','ROLE','employee');

services/db/install/dump/fixtures.sql

@@ -581,7 +581,7 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (7,     28, 5.6),
         (7,     29, -4.6),
         (7,     39, 0.01),
-        (8,     15, 0.254),
+        (8,     15, 0.044),
         (8,     21, -0.004),
         (8,     28, 20.72),
         (8,     29, -19.72),