test de zone_getLanded y zone_getFromGeo

db/changes/10180-holyWeek/02-catalog_calculate.sql

@@ -0,0 +1,147 @@
+USE `vn`;
+DROP procedure IF EXISTS `catalog_calculate`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `catalog_calculate`(
+    vLanded DATE,
+    vAddressFk INT,
+    vAgencyModeFk INT)
+proc: BEGIN
+/**
+ * Calcula los articulos disponibles y sus precios
+ * 
+ * @table tmp.item(itemFk) Listado de artículos a calcular
+ * @param vLanded Fecha de recepcion de mercancia
+ * @param vAddressFk Id del consignatario
+ * @param vAgencyModeFk Id de la agencia
+ * @return tmp.ticketCalculateItem(itemFk, available, producer, 
+ *			item, size, stems, category, inkFk, image, origin, price)
+ * @return tmp.ticketLot(warehouseFk, itemFk, available, buyFk)
+ * @return tmp.ticketComponent
+ * @return tmp.ticketComponentPrice
+ * @return tmp.zoneGetShipped
+ */
+ 
+    DECLARE vAvailableCalc INT;
+    DECLARE vShipped DATE;
+    DECLARE vWarehouseFk SMALLINT;
+    DECLARE vZoneFk INT;
+    DECLARE vDone BOOL;
+    DECLARE cTravelTree CURSOR FOR
+        SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+    
+    -- Establece los almacenes y las fechas que van a entrar al disponible
+        
+	CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, FALSE);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot(
+      `warehouseFk` smallint(5) unsigned NOT NULL,
+      `itemFk` int(11) NOT NULL,
+      `available` double DEFAULT NULL,
+      `buyFk` int(11) DEFAULT NULL,
+      `fix` tinyint(3) unsigned DEFAULT '0',
+      `zoneFk` int(11) NOT NULL,
+      KEY `itemFk` (`itemFk`),
+      KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH
+    ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+                
+	CALL catalog_componentPrepare();
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
+	CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
+		itemFk INT(11) NOT NULL, 
+		available INT(11),
+		producer VARCHAR(50), 
+		item VARCHAR(50), 
+		size INT(10) UNSIGNED,  
+		stems INT(11),  
+		category VARCHAR(3), 
+		inkFk VARCHAR(3),  
+		image VARCHAR(50),
+		origin VARCHAR(3), 
+		price DECIMAL(10,2),
+		priceKg DECIMAL(10,2),
+    KEY `itemFk` (`itemFk`)
+    ) ENGINE = MEMORY DEFAULT CHARSET=utf8;
+		            
+    OPEN cTravelTree;
+
+    l: LOOP
+        SET vDone = FALSE;
+        FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
+
+        IF vDone THEN
+            LEAVE l;
+        END IF;
+
+        CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
+        CALL buyUltimate (vWarehouseFk, vShipped);
+                    
+        INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
+			SELECT vWarehouseFk,
+					i.item_id,
+					IFNULL(i.available, 0),
+					bu.buyFk,
+                    vZoneFk
+				FROM `cache`.available i
+					JOIN tmp.item br ON br.itemFk = i.item_id
+					LEFT JOIN item it ON it.id = i.item_id
+					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.item_id
+				WHERE i.calc_id = vAvailableCalc
+					AND i.available > 0;
+                    
+        DROP TEMPORARY TABLE tmp.buyUltimate;
+        
+        CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+        INSERT INTO tmp.ticketCalculateItem (
+					itemFk, 
+					available, 
+                    producer, 
+                    item, 
+                    size, 
+                    stems, 
+                    category, 
+                    inkFk,
+                    image,
+                    origin,
+                    price,
+                    priceKg)
+        SELECT 
+				tl.itemFk, 
+				SUM(tl.available) available,
+				p.name producer, 
+				i.name item, 
+				i.size size,  
+				i.stems,  
+				i.category, 
+				i.inkFk,  
+				i.image,
+				o.code origin, 
+                bl.price,
+                bl.priceKg
+			FROM tmp.ticketLot tl
+				JOIN item i ON tl.itemFk = i.id
+				LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
+				JOIN origin o ON o.id = i.originFk
+				JOIN (
+					SELECT MIN(price) price, itemFk, priceKg
+						FROM tmp.ticketComponentPrice
+						GROUP BY itemFk
+				) bl ON bl.itemFk = tl.itemFk
+			WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
+			GROUP BY tl.itemFk;
+            -- on duplicatekey update
+
+    END LOOP;
+
+    CLOSE cTravelTree;
+        
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-catalog_componentCalculate.sql

@@ -0,0 +1,262 @@
+USE `vn`;
+DROP procedure IF EXISTS `catalog_componentCalculate`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentCalculate`(
+    vZoneFk INT,
+    vAddressFk INT,
+    vShipped DATE,
+    vWarehouseFk INT)
+proc: BEGIN
+/**
+ * Calcula los componentes de los articulos de tmp.ticketLot
+ *
+ * @param vZoneFk para calcular el transporte
+ * @param vAddressFk Consignatario 
+ * @param vShipped dia de salida del pedido
+ * @param tmp.ticketLot (warehouseFk, available, itemFk, buyFk, zoneFk)
+ *
+ * @return tmp.ticketComponent(itemFk, warehouseFk, available, rate2, rate3, minPrice,
+ *		packing, grouping, groupingMode, buyFk, typeFk)
+ * @return tmp.ticketComponentPrice (warehouseFk, itemFk, rate, grouping, price)
+ */
+	DECLARE vClientFk INT;
+    DECLARE vGeneralInflationCoefficient INT DEFAULT 1;
+    DECLARE vMinimumDensityWeight INT DEFAULT 167;
+    DECLARE vBoxVolume BIGINT; -- DEFAULT 138000;
+	DECLARE vSpecialPriceComponent INT DEFAULT 10;
+	DECLARE vDeliveryComponent INT DEFAULT 15;
+	DECLARE vRecoveryComponent INT DEFAULT 17;
+	DECLARE vSellByPacketComponent INT DEFAULT 22;
+	DECLARE vBuyValueComponent INT DEFAULT 28;
+	DECLARE vMarginComponent INT DEFAULT 29;
+	DECLARE vDiscountLastItemComponent INT DEFAULT 32;
+	DECLARE vExtraBaggedComponent INT DEFAULT 38;
+	DECLARE vManaAutoComponent INT DEFAULT 39;
+
+    SELECT volume INTO vBoxVolume
+		FROM vn.packaging
+        WHERE id = '94';
+        
+    SELECT clientFk INTO vClientFK 
+		FROM address 
+        WHERE id = vAddressFk;
+
+    SET @rate2 := 0;
+    SET @rate3 := 0;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCalculate;
+	CREATE TEMPORARY TABLE tmp.ticketComponentCalculate
+	(PRIMARY KEY (itemFk, warehouseFk))
+	ENGINE = MEMORY
+		SELECT 
+			tl.itemFk, tl.warehouseFk, tl.available,
+			IF((@rate2 := IFNULL(pf.rate2, b.price2)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate2) * 1.0 rate2,
+			IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
+            IFNULL(pf.rate3, 0) AS minPrice,
+			IFNULL(pf.packing, b.packing) packing,
+			IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
+			ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
+            tl.buyFk, 
+            i.typeFk,
+            IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
+        FROM tmp.ticketLot tl
+		JOIN buy b ON b.id = tl.buyFk
+		JOIN item i ON i.id = tl.itemFk
+        JOIN itemType it ON it.id = i.typeFk
+        LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
+		LEFT JOIN specialPrice sp ON sp.itemFk = i.id AND sp.clientFk = vClientFk
+		LEFT JOIN (
+			SELECT * FROM (
+				SELECT pf.itemFk, pf.`grouping`, pf.packing, pf.box, pf.rate2, pf.rate3, zw.warehouseFk
+					FROM priceFixed pf
+					JOIN zoneWarehouse zw ON zw.zoneFk = vZoneFk AND (zw.warehouseFk = pf.warehouseFk OR pf.warehouseFk = 0)
+						WHERE vShipped BETWEEN pf.started AND pf.ended ORDER BY pf.itemFk, pf.warehouseFk DESC
+			) tpf
+			GROUP BY tpf.itemFk, tpf.warehouseFk
+		) pf ON pf.itemFk = tl.itemFk AND pf.warehouseFk = tl.warehouseFk
+        WHERE b.buyingValue + b.freightValue + b.packageValue + b.comissionValue > 0.01 AND ic.display <> 0
+			AND tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk;
+
+	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+		SELECT 
+				tcc.warehouseFk, 
+				tcc.itemFk, 
+				vBuyValueComponent, 
+				b.buyingValue + b.freightValue + b.packageValue + b.comissionValue
+			FROM tmp.ticketComponentCalculate tcc 
+				JOIN buy b ON b.id = tcc.buyFk;
+                
+	INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+		SELECT 
+				tcc.warehouseFk, 
+				tcc.itemFk, 
+				vMarginComponent, 
+				tcc.rate3 - b.buyingValue - b.freightValue - b.packageValue - b.comissionValue
+			FROM tmp.ticketComponentCalculate tcc 
+				JOIN buy b ON b.id = tcc.buyFk;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentBase;
+	CREATE TEMPORARY TABLE tmp.ticketComponentBase ENGINE = MEMORY
+		SELECT tc.itemFk, ROUND(SUM(tc.cost), 4) AS base, tc.warehouseFk
+			FROM tmp.ticketComponent tc
+				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
+			GROUP BY tc.itemFk, warehouseFk;
+                
+	INSERT INTO tmp.ticketComponent
+		SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.priceIncreasing, 0.25), 3)
+			FROM tmp.ticketComponentBase tcb
+			JOIN claimRatio cr ON cr.clientFk = vClientFk
+				WHERE cr.priceIncreasing > 0.009;
+            
+    INSERT INTO tmp.ticketComponent
+		SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
+			FROM tmp.ticketComponentBase tcb
+				JOIN `client` c on c.id = vClientFk
+				JOIN workerMana wm ON c.salesPersonFk = wm.workerFk 
+			WHERE wm.isPricesModifierActivated
+			HAVING manaAuto <> 0;
+	
+	INSERT INTO tmp.ticketComponent
+		SELECT tcb.warehouseFk, 
+                tcb.itemFk, 
+                c.id, 
+                GREATEST(IFNULL(ROUND(tcb.base * c.tax, 4), 0), tcc.minPrice - tcc.rate3)
+			FROM tmp.ticketComponentBase tcb
+				JOIN component c
+				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tcb.itemFk AND tcc.warehouseFk = tcb.warehouseFk 
+				LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
+			WHERE c.id = vDiscountLastItemComponent AND c.tax <> 0 AND tcc.minPrice < tcc.rate3 AND sp.value IS NULL;
+	
+	INSERT INTO tmp.ticketComponent
+		SELECT tcc.warehouseFk, tcc.itemFk, vSellByPacketComponent, tcc.rate2 - tcc.rate3 
+			FROM tmp.ticketComponentCalculate tcc
+				JOIN buy b ON b.id = tcc.buyFk
+			LEFT JOIN specialPrice sp ON sp.clientFk = vClientFk AND sp.itemFk = tcc.itemFk
+		WHERE sp.value IS NULL;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp.zone (INDEX (id))
+			ENGINE = MEMORY
+        SELECT vZoneFk id;
+        
+	CALL zone_getOptionsForShipment(vShipped, TRUE);
+        
+	INSERT INTO tmp.ticketComponent
+		SELECT tcc.warehouseFK, 
+				tcc.itemFk,
+				vDeliveryComponent, 
+				vGeneralInflationCoefficient
+				* ROUND((
+					i.compression
+					* ic.cm3 
+					* IF(am.deliveryMethodFk = 1, (GREATEST(i.density, vMinimumDensityWeight) / vMinimumDensityWeight), 1)
+					* IFNULL((zo.price - zo.bonus)
+					* 1/*amz.inflation*/ , 50)) / vBoxVolume, 4
+				) cost
+		FROM tmp.ticketComponentCalculate tcc
+			JOIN item i ON i.id = tcc.itemFk
+            JOIN tmp.zoneOption zo ON zo.zoneFk = vZoneFk
+            JOIN zone z ON z.id = vZoneFk
+			JOIN agencyMode am ON am.id = z.agencyModeFk
+			LEFT JOIN itemCost ic ON ic.warehouseFk = tcc.warehouseFk 
+				AND ic.itemFk = tcc.itemFk
+			HAVING cost <> 0; 
+    
+    DROP TEMPORARY TABLE tmp.zoneOption;
+    
+    IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = vAddressFk) THEN
+		INSERT INTO tmp.ticketComponent
+			SELECT tcc.warehouseFk, b.itemFk, vExtraBaggedComponent, ap.packagingValue cost
+				FROM tmp.ticketComponentCalculate tcc
+					JOIN vn.addressForPackaging ap
+				WHERE ap.addressFk = vAddressFk;
+    END IF;
+	
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentCopy;
+    CREATE TEMPORARY TABLE tmp.ticketComponentCopy ENGINE = MEMORY
+		SELECT * FROM tmp.ticketComponent;
+        
+	INSERT INTO tmp.ticketComponent
+		SELECT tcc.warehouseFk, 
+				tcc.itemFk, 
+				vSpecialPriceComponent, 
+				sp.value - SUM(tcc.cost) sumCost
+			FROM tmp.ticketComponentCopy tcc
+				JOIN component c ON c.id = tcc.componentFk
+				JOIN specialPrice sp ON sp.clientFk = vClientFK AND sp.itemFk = tcc.itemFk
+			WHERE c.classRate IS NULL
+			GROUP BY tcc.itemFk, tcc.warehouseFk
+			HAVING ABS(sumCost) > 0.001;
+	
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentSum;
+	CREATE TEMPORARY TABLE tmp.ticketComponentSum
+		(INDEX (itemFk, warehouseFk))
+		ENGINE = MEMORY
+		SELECT SUM(cost) sumCost, tc.itemFk, tc.warehouseFk, c.classRate
+			FROM tmp.ticketComponent tc
+				JOIN component c ON c.id = tc.componentFk
+			GROUP BY tc.itemFk, tc.warehouseFk, c.classRate;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentRate;
+	CREATE TEMPORARY TABLE tmp.ticketComponentRate ENGINE = MEMORY
+		SELECT tcc.warehouseFk,  
+				tcc.itemFk, 
+				1 rate,
+				IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, 
+				CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
+                CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg                
+			FROM tmp.ticketComponentCalculate tcc
+				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
+					AND tcs.warehouseFk = tcc.warehouseFk
+			WHERE IFNULL(tcs.classRate, 1) = 1 
+				AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
+			GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+        SELECT 
+				tcc.warehouseFk, 
+				tcc.itemFk, 
+				2 rate, 
+				tcc.packing `grouping`, 
+				SUM(tcs.sumCost) price,
+                SUM(tcs.sumCost) / weightGrouping priceKg   
+			FROM tmp.ticketComponentCalculate tcc
+				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
+					AND tcs.warehouseFk = tcc.warehouseFk
+			WHERE tcc.available IS NULL OR (IFNULL(tcs.classRate, 2) = 2 
+				AND tcc.packing > 0 AND tcc.available >= tcc.packing)
+			GROUP BY tcs.warehouseFk, tcs.itemFk;
+
+	INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+		 SELECT 				
+		 		tcc.warehouseFk, 
+				tcc.itemFk, 
+				3 rate, 
+				tcc.available `grouping`, 
+				SUM(tcs.sumCost) price,
+                SUM(tcs.sumCost) / weightGrouping priceKg   
+			FROM tmp.ticketComponentCalculate tcc
+				JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk 
+					AND tcs.warehouseFk = tcc.warehouseFk
+			WHERE IFNULL(tcs.classRate, 3) = 3 
+			GROUP BY tcs.warehouseFk, tcs.itemFk;
+        
+	INSERT INTO tmp.ticketComponentPrice (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
+		SELECT * FROM (
+			SELECT * FROM tmp.ticketComponentRate ORDER BY price
+		) t
+		GROUP BY itemFk, warehouseFk, `grouping`;
+
+    DROP TEMPORARY TABLE 
+		tmp.ticketComponentCalculate,
+		tmp.ticketComponentSum,
+		tmp.ticketComponentBase,
+		tmp.ticketComponentRate,
+    	tmp.ticketComponentCopy;
+        
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-catalog_componentPrepare.sql

@@ -0,0 +1,33 @@
+USE `vn`;
+DROP procedure IF EXISTS `catalog_componentPrepare`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE PROCEDURE `catalog_componentPrepare` ()
+BEGIN
+              
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
+    CREATE TEMPORARY TABLE tmp.ticketComponent (
+		`warehouseFk` INT UNSIGNED NOT NULL,
+		`itemFk` INT NOT NULL,
+		`componentFk` INT UNSIGNED NOT NULL,
+		`cost` DECIMAL(10,4) NOT NULL,
+		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
+		UNIQUE `fkItemWarehouseComponent` (`itemFk` ASC, `warehouseFk` ASC, `componentFk` ASC)
+	)ENGINE=MEMORY DEFAULT CHARSET=utf8;
+        
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPrice;
+    CREATE TEMPORARY TABLE tmp.ticketComponentPrice (  
+		`warehouseFk` INT UNSIGNED NOT NULL,
+		`itemFk` INT NOT NULL,
+		`rate` INT NOT NULL,
+		`grouping` INT UNSIGNED NOT NULL,
+		`price` DECIMAL(10,4) NOT NULL,
+        `priceKg` DECIMAL(10,4),
+		INDEX `itemWarehouse` USING BTREE (`itemFk` ASC, `warehouseFk` ASC),
+		UNIQUE `fkItemWarehouseRate` (`itemFk` ASC, `warehouseFk` ASC, `rate` ASC)
+	)ENGINE=MEMORY DEFAULT CHARSET=utf8;    
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-catalog_componentPurge.sql

@@ -0,0 +1,16 @@
+
+USE `vn`;
+DROP procedure IF EXISTS `vn`.`catalog_componentPurge`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `catalog_componentPurge`()
+BEGIN
+	DROP TEMPORARY TABLE 
+        tmp.ticketComponentPrice,
+        tmp.ticketComponent,
+        tmp.ticketLot;
+END$$
+
+DELIMITER ;
+;

db/changes/10180-holyWeek/02-order_confirmWithUser.sql

@@ -0,0 +1,250 @@
+USE `hedera`;
+DROP procedure IF EXISTS `order_confirmWithUser`;
+
+DELIMITER $$
+USE `hedera`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `order_confirmWithUser`(IN `vOrder` INT, IN `vUserId` INT)
+BEGIN
+/**
+ * Confirms an order, creating each of its tickets on the corresponding
+ * date, store and user.
+ *
+ * @param vOrder The order identifier
+ * @param vUser The user identifier
+ */
+	DECLARE vOk BOOL;
+	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vWarehouse INT;
+	DECLARE vShipment DATETIME;
+	DECLARE vTicket INT;
+	DECLARE vNotes VARCHAR(255);
+	DECLARE vItem INT;
+	DECLARE vConcept VARCHAR(30);
+	DECLARE vAmount INT;
+	DECLARE vPrice DECIMAL(10,2);
+	DECLARE vSale INT;
+	DECLARE vRate INT;
+	DECLARE vRowId INT;
+	DECLARE vDelivery DATE;
+	DECLARE vAddress INT;
+	DECLARE vIsConfirmed BOOL;
+	DECLARE vClientId INT;
+	DECLARE vCompanyId INT;
+	DECLARE vAgencyModeId INT;
+	DECLARE TICKET_FREE INT DEFAULT 2;
+
+	DECLARE cDates CURSOR FOR
+		SELECT zgs.shipped, r.warehouse_id
+			FROM `order` o
+				JOIN order_row r ON r.order_id = o.id
+				LEFT JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = r.warehouse_id
+			WHERE o.id = vOrder AND r.amount != 0
+			GROUP BY r.warehouse_id;
+
+	DECLARE cRows CURSOR FOR 
+		SELECT r.id, r.item_id, i.name, r.amount, r.price, r.rate
+			FROM order_row r
+				JOIN vn.item i ON i.id = r.item_id
+			WHERE r.amount != 0
+				AND r.warehouse_id = vWarehouse
+				AND r.order_id = vOrder
+			ORDER BY r.rate DESC;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET vDone = TRUE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	-- Carga los datos del pedido
+
+	SELECT o.date_send, o.address_id, o.note,
+			o.confirmed, a.clientFk, o.company_id, o.agency_id
+		INTO vDelivery, vAddress, vNotes, 
+			vIsConfirmed, vClientId, vCompanyId, vAgencyModeId
+		FROM hedera.`order` o
+			JOIN vn.address a ON a.id = o.address_id
+		WHERE o.id = vOrder;
+			
+	-- Comprueba que el pedido no está confirmado
+
+	IF vIsConfirmed THEN
+		CALL util.throw ('ORDER_ALREADY_CONFIRMED');
+	END IF;
+
+	-- Comprueba que el pedido no está vacío
+
+	SELECT COUNT(*) > 0 INTO vOk
+		FROM order_row WHERE order_id = vOrder AND amount > 0;
+
+	IF NOT vOk THEN
+		CALL util.throw ('ORDER_EMPTY');
+	END IF;
+
+	-- Carga las fechas de salida de cada almacén
+
+	CALL vn.zone_getShipped (vDelivery, vAddress, vAgencyModeId, FALSE);
+
+	-- Trabajador que realiza la acción
+
+	IF vUserId IS NULL THEN
+		SELECT employeeFk INTO vUserId FROM orderConfig;
+	END IF;
+
+	-- Crea los tickets del pedido
+
+	START TRANSACTION;
+
+	OPEN cDates;
+
+	lDates:
+	LOOP
+		SET vTicket = NULL;
+		SET vDone = FALSE;
+		FETCH cDates INTO vShipment, vWarehouse;
+		
+		IF vDone THEN
+			LEAVE lDates;
+		END IF;
+
+		-- Busca un ticket existente que coincida con los parametros
+
+		SELECT t.id INTO vTicket
+			FROM vn.ticket t
+				LEFT JOIN vn.ticketState tls on tls.ticket = t.id
+				JOIN `order` o
+					ON o.address_id = t.addressFk
+						AND vWarehouse = t.warehouseFk
+						AND o.agency_id = t.agencyModeFk
+						AND o.date_send = t.landed 
+						AND vShipment = DATE(t.shipped)
+			WHERE o.id = vOrder
+				AND t.invoiceOutFk IS NULL
+				AND IFNULL(tls.alertLevel,0) = 0
+                AND t.clientFk <> 1118
+			LIMIT 1;
+		
+		-- Crea el ticket en el caso de no existir uno adecuado
+
+		IF vTicket IS NULL
+		THEN
+			CALL vn.ticketCreateWithUser(
+				vClientId,
+				IFNULL(vShipment, CURDATE()),
+				vWarehouse,
+				vCompanyId,
+				vAddress,
+				vAgencyModeId,
+				NULL,
+				vDelivery,
+				vUserId,
+				vTicket
+			);
+		ELSE
+			INSERT INTO vncontrol.inter
+				SET Id_Ticket = vTicket,
+					Id_Trabajador = vUserId,
+					state_id = TICKET_FREE;
+		END IF;
+		
+		INSERT IGNORE INTO vn.orderTicket
+			SET orderFk = vOrder,
+				ticketFk = vTicket;
+
+		-- Añade las notas
+
+		IF vNotes IS NOT NULL AND vNotes != ''
+		THEN
+			INSERT INTO vn.ticketObservation SET
+					ticketFk = vTicket,
+					observationTypeFk = 4 /* salesperson */ ,
+					`description` = vNotes
+				ON DUPLICATE KEY UPDATE
+					`description` = CONCAT(VALUES(`description`),'. ', `description`);
+		END IF;
+
+		-- Añade los movimientos y sus componentes
+
+		OPEN cRows;
+
+		lRows:
+		LOOP
+			SET vDone = FALSE;
+			FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate;
+
+			IF vDone THEN
+				LEAVE lRows;
+			END IF;
+			SET vSale = NULL;
+			SELECT s.id INTO vSale
+				FROM vn.sale s
+				WHERE ticketFk = vTicket
+					AND price = vPrice
+					AND itemFk = vItem
+				LIMIT 1;
+			IF vSale THEN
+				UPDATE vn.sale
+					SET quantity = quantity + vAmount
+					WHERE id = vSale;
+			ELSE
+				INSERT INTO vn.sale 
+				SET
+					itemFk = vItem,
+					ticketFk = vTicket,
+					concept = vConcept,
+					quantity = vAmount,
+					price = vPrice,
+					priceFixed = 0,
+					isPriceFixed = TRUE;
+
+				SET vSale = LAST_INSERT_ID();
+
+				INSERT INTO vn.saleComponent
+					(saleFk, componentFk, `value`)
+					SELECT vSale, cm.component_id, cm.price
+						FROM order_component cm
+							JOIN vn.component c ON c.id = cm.component_id
+						WHERE cm.order_row_id = vRowId
+						GROUP BY vSale, cm.component_id;
+			END IF;
+			UPDATE order_row SET Id_Movimiento = vSale 
+				WHERE id = vRowId;
+
+		END LOOP;
+
+		CLOSE cRows;
+
+		-- Fija el coste
+
+		DROP TEMPORARY TABLE IF EXISTS tComponents;
+		CREATE TEMPORARY TABLE tComponents
+			(INDEX (saleFk))
+			ENGINE = MEMORY
+			SELECT SUM(sc.`value`) valueSum, sc.saleFk
+				FROM vn.saleComponent sc
+					JOIN vn.component c ON c.id = sc.componentFk
+					JOIN vn.componentType ct ON ct.id = c.typeFk AND ct.isBase
+					JOIN vn.sale s ON s.id = sc.saleFk
+				WHERE s.ticketFk = vTicket
+				GROUP BY sc.saleFk;
+
+		UPDATE vn.sale s
+			JOIN tComponents mc ON mc.saleFk = s.id
+			SET s.priceFixed = valueSum;
+
+		DROP TEMPORARY TABLE tComponents;
+	END LOOP;
+
+	CLOSE cDates;
+
+	DELETE FROM basketOrder WHERE orderFk = vOrder;
+	UPDATE `order` SET confirmed = TRUE, confirm_date = NOW() 
+		WHERE id = vOrder;
+
+	COMMIT;
+END$$
+
+DELIMITER ;

db/changes/10180-holyWeek/02-sale_calculateComponent.sql

@@ -0,0 +1,77 @@
+USE `vn`;
+DROP procedure IF EXISTS `sale_calculateComponent`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `sale_calculateComponent`(vSale INT, vOption INT)
+proc: BEGIN
+/**
+ * Actualiza los componentes
+ *
+ * @param vSale Delivery date
+ * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
+ * @return tmp.ticketLot(warehouseFk, available, itemFk, buyFk)
+ * @return tmp.sale(saleFk, warehouseFk)
+ */  
+	DECLARE vShipped DATE; 
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAgencyModeFk INT;
+    DECLARE vAddressFk INT;
+    DECLARE vTicket BIGINT;
+    DECLARE vItem BIGINT;
+    DECLARE vLanded DATE; 
+    DECLARE vTicketFree BOOLEAN DEFAULT TRUE;
+    DECLARE vZoneFk INTEGER;
+    
+	SELECT  NOT (t.refFk IS NOT NULL OR ts.alertLevel > 0) OR s.price = 0, s.ticketFk, s.itemFk , t.zoneFk
+			INTO vTicketFree, vTicket, vItem, vZoneFk
+		FROM vn.ticket t
+			JOIN vn.sale s ON s.ticketFk = t.id
+			LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
+		WHERE s.id = vSale
+		LIMIT 1;
+    	
+	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.agencyModeFk, t.landed
+			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
+		FROM agencyMode a 
+			JOIN ticket t ON t.agencyModeFk = a.id
+		WHERE t.id = vTicket;
+
+    IF IFNULL(vZoneFk,0) = 0 THEN
+		CALL util.throw('ticket dont have zone');
+    END IF;
+    
+    CALL buyUltimate (vWarehouseFk, vShipped);  
+    
+	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
+				FROM tmp.buyUltimate
+				WHERE itemFk = vItem;
+                    
+	CALL catalog_componentPrepare();           
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+		SELECT vSale saleFk,vWarehouseFk warehouseFk;
+    
+    IF vOption IS NULL THEN
+		SET vOption = IF(vTicketFree, 1, 6);
+    END IF;
+    
+	CALL ticketComponentUpdateSale(vOption); 
+
+	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
+		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
+	
+    CALL catalog_componentPurge();
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+    DROP TEMPORARY TABLE tmp.sale;
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticketCalculateClon.sql

@@ -0,0 +1,91 @@
+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;
+    DECLARE vZoneFk 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, t.zoneFk
+		INTO vClient, vWarehouse, vShipped, vAddress, vAgencyMode, vLanded, vAgency, vZoneFk
+    FROM vn.agencyMode a
+		JOIN vn.ticket t ON t.agencyModeFk = a.id
+    WHERE t.id = vTicketNew;
+
+	IF vLanded IS NULL THEN
+		CALL zone_getLanded(vShipped, vAddress, vAgency, vWarehouse);
+        UPDATE ticket t
+				JOIN tmp.zoneGetLanded zgl ON t.warehouseFk = zgl.warehouseFk 
+			SET t.landed = zgl.landed,
+				t.zone = zgl.zoneFk
+			WHERE t.id = vTicketNew;
+		
+        SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
+		DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
+    END IF;
+    
+    -- rellena la tabla tmp.buyUltimate con la ultima compra
+    CALL buyUltimate(vWarehouse, vShipped);  
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+		SELECT vWarehouse warehouseFk, NULL available, s.itemFk, bu.buyFk, vZoneFk zoneFk
+			FROM sale s
+				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+			WHERE s.ticketFk = vTicketOld GROUP BY s.itemFk;
+                    
+	CALL catalog_componentPrepare();            
+	CALL catalog_componentCalculate(vZoneFk, vAddress, vAgencyMode, vWarehouse);
+    
+    -- 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);
+	
+	-- Log
+    CALL `logAdd`(vTicketNew, 'update', ' ticket' , 'Bioniza Ticket');
+
+	-- Limpieza
+    CALL catalog_componentPurge();
+	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimate;
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
+    
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticketCalculateSale.sql

@@ -0,0 +1,67 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketCalculateSale`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSale`(IN vSale BIGINT)
+proc: BEGIN
+-- OBSOLETO USAR: sale_calculateComponent(vSale, NULL)
+	DECLARE vShipped DATE; 
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAgencyModeFk INT;
+    DECLARE vAddressFk INT;
+    DECLARE vTicket BIGINT;
+    DECLARE vItem BIGINT;
+    DECLARE vLanded DATE; 
+    DECLARE vTicketFree BOOLEAN DEFAULT TRUE;
+    DECLARE vZoneFk INTEGER;
+    
+	SELECT  NOT (t.refFk IS NOT NULL OR ts.alertLevel > 0) OR s.price = 0, s.ticketFk, s.itemFk , t.zoneFk
+			INTO vTicketFree, vTicket, vItem, vZoneFk
+		FROM vn.ticket t
+			JOIN vn.sale s ON s.ticketFk = t.id
+			LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
+		WHERE s.id = vSale
+		LIMIT 1;
+    	
+	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.agencyModeFk, t.landed
+			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
+		FROM agencyMode a 
+			JOIN ticket t ON t.agencyModeFk = a.id
+		WHERE t.id = vTicket;
+
+    IF IFNULL(vZoneFk,0) = 0 THEN
+		CALL util.throw('ticket dont have zone');
+    END IF;
+    
+    CALL buyUltimate (vWarehouseFk, vShipped);  
+    
+	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
+				FROM tmp.buyUltimate
+				WHERE itemFk = vItem;
+                
+    CALL vn.catalog_componentCalculate;            
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+		SELECT vSale saleFk,vWarehouseFk warehouseFk;
+                
+	CALL ticketComponentUpdateSale(IF(vTicketFree,1,6)); 
+
+	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
+		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
+	
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+    CALL catalog_componentPurge();
+    
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticketCalculateSaleForcePrice.sql

@@ -0,0 +1,61 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketCalculateSaleForcePrice`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSaleForcePrice`(IN vSale BIGINT)
+proc: BEGIN
+
+	DECLARE vShipped DATE; 
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAddressFk INT;
+    DECLARE vTicket BIGINT;
+    DECLARE vItem BIGINT;
+    DECLARE vZoneFk INT;    
+    
+    SELECT ticketFk, itemFk 
+			INTO vTicket, vItem 
+		FROM sale 
+        WHERE id = vSale;
+    	
+	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.zoneFk
+			INTO vWarehouseFk, vShipped, vAddressFk, vZoneFk
+		FROM agencyMode a 
+			JOIN ticket t ON t.agencyModeFk = a.id
+		WHERE t.id = vTicket;
+  
+    IF vZoneFk IS NULL THEN
+		CALL util.throw('ticket without zone');
+    END IF;
+    
+    CALL buyUltimate (vWarehouseFk, vShipped);  
+    
+	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
+				FROM tmp.buyUltimate
+				WHERE itemFk = vItem;
+                    
+	CALL catalog_componentPrepare();
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+		SELECT vSale saleFk,vWarehouseFk warehouseFk;
+                
+	CALL ticketComponentUpdateSale(1); 
+
+	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
+		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
+	
+    CALL catalog_componentPurge();
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+    DROP TEMPORARY TABLE tmp.sale;
+    
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticketCalculateSaleForcePrice2.sql

@@ -0,0 +1,61 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketCalculateSaleForcePrice2`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSaleForcePrice2`(IN vSale BIGINT)
+proc: BEGIN
+
+	DECLARE vShipped DATE; 
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAddressFk INT;
+    DECLARE vTicket BIGINT;
+    DECLARE vItem BIGINT;
+    DECLARE vZoneFk INT;
+        
+    SELECT ticketFk, itemFk 
+			INTO vTicket, vItem 
+		FROM sale 
+        WHERE id = vSale;
+    	
+	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.zoneFk
+			INTO vWarehouseFk, vShipped, vAddressFk, vZoneFk
+		FROM agencyMode a 
+			JOIN ticket t ON t.agencyModeFk = a.id
+		WHERE t.id = vTicket;
+  
+    IF vZoneFk IS NULL THEN
+		CALL util.throw('ticket without zone');
+    END IF;
+    
+    CALL buyUltimate (vWarehouseFk, vShipped);  
+    
+	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
+				FROM tmp.buyUltimate
+				WHERE itemFk = vItem;
+                
+    CALL vn.catalog_componentCalculate;            
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+		SELECT vSale saleFk,vWarehouseFk warehouseFk;
+                
+	CALL ticketComponentUpdateSale(1); 
+
+	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
+		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
+	
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+	DROP TEMPORARY TABLE tmp.sale;
+	CALL catalog_componentPurge();
+	
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticket_componentPreview.sql

@@ -0,0 +1,113 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_componentPreview`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentPreview`(
+	vTicketFk INT,
+    vLanded DATE, 
+    vAddressFk INT,
+    vZoneFk INT,
+    vWarehouseFk SMALLINT)
+BEGIN
+/**
+ * Calcula los componentes de los articulos de un ticket
+ *
+ * @param vTicketFk id del ticket
+ * @param vLanded nueva fecha de entrega
+ * @param vAddressFk nuevo consignatario
+ * @param vZoneFk nueva zona
+ * @param vWarehouseFk nuevo warehouse
+ *
+ * @return tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ */
+	DECLARE vShipped DATE;
+	DECLARE vBuyOrderItem INT DEFAULT 100;
+
+    DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
+    DECLARE vHasAddressChanged BOOL;
+    DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
+    DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
+    
+	DECLARE vAddressTypeRateFk INT DEFAULT NULL;
+	DECLARE vAgencyModeTypeRateFk INT DEFAULT NULL;
+    
+    DECLARE vHasChangeAll BOOL DEFAULT FALSE;
+  
+	SELECT DATE(landed) <> vLanded, 
+			addressFk <> vAddressFk, 
+			zoneFk <> vZoneFk,
+            warehouseFk <> vWarehouseFk
+		INTO
+			vHasDataChanged,
+            vHasAddressChanged,
+            vHasZoneChanged,
+            vHasWarehouseChanged
+		FROM vn.ticket t
+        WHERE t.id = vTicketFk;
+
+    IF vHasDataChanged OR vHasWarehouseChanged THEN
+		SET vHasChangeAll = TRUE;
+	END IF;
+    
+	IF vHasAddressChanged THEN
+		SET vAddressTypeRateFk = 5;
+    END IF;
+    
+	IF vHasZoneChanged THEN
+		SET vAgencyModeTypeRateFk = 6;
+    END IF;
+
+	SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped 
+		FROM zone
+		WHERE id = vZoneFk;
+        
+	CALL buyUltimate(vWarehouseFk, vShipped);
+        
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
+	SELECT 
+			vWarehouseFk AS warehouseFk,
+			NULL AS available,
+			s.itemFk,
+			bu.buyFk,
+            vZoneFk zoneFk
+		FROM sale s
+			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+		WHERE s.ticketFk = vTicketFk
+			AND s.itemFk != vBuyOrderItem
+		GROUP BY bu.warehouseFk, bu.itemFk);
+
+	CALL catalog_componentPrepare();
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
+	REPLACE INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+		SELECT t.warehouseFk, s.itemFk, sc.componentFk, sc.value
+			FROM saleComponent sc
+				JOIN sale s ON s.id = sc.saleFk
+				JOIN ticket t ON t.id = s.ticketFk
+				JOIN `component` c ON c.id = sc.componentFk
+			WHERE s.ticketFk = vTicketFk 
+				AND (c.isRenewable = FALSE 
+					OR 
+					(NOT vHasChangeAll
+						AND (NOT (c.typeFk <=> vAddressTypeRateFk
+                        OR c.typeFk <=> vAgencyModeTypeRateFk))));
+
+    SET @shipped = vShipped;
+
+	DROP TEMPORARY TABLE
+        tmp.buyUltimate,
+		tmp.ticketLot;
+
+	IF vShipped IS NULL THEN
+		CALL util.throw('NO_ZONE_AVAILABLE');
+    END IF;
+    
+	IF vShipped < CURDATE() THEN
+		CALL util.throw('ERROR_PAST_SHIPMENT');
+    END IF;
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticket_recalcComponents.sql

@@ -0,0 +1,78 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_recalcComponents`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT )
+proc: BEGIN
+
+/**
+ * Este procedimiento trata de "rebionizar" un ticket, 
+ * eliminando los componentes existentes e insertandolos de nuevo
+ *
+ * @param vTicketFk Id del ticket
+ * @return tmp.buyUltimate
+ */
+	DECLARE vShipped DATE;
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAgencyModeFk INT;
+    DECLARE vAddressFk INT;
+    DECLARE vLanded DATE;
+    DECLARE vIsTicketEditable BOOLEAN;
+    DECLARE vZoneFk INTEGER;
+        
+	SELECT (IFNULL(ts.alertLevel,0) >0 or IFNULL(t.refFk,"") != "") = FALSE, t.zoneFk
+		INTO vIsTicketEditable, vZoneFk
+		FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
+		WHERE id = vTicketFk;
+	
+	SELECT warehouseFk, date(shipped), addressFk, agencyModeFk, landed
+			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
+		FROM ticket
+		WHERE id = vTicketFk;
+		
+    CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
+	
+    CALL vn.buyUltimate (vWarehouseFk, vShipped);  -- rellena la tabla buyUltimate con la ultima compra
+	
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+	SELECT vWarehouseFk warehouseFk, NULL available,
+		s.itemFk, bu.buyFk, vZoneFk zoneFk
+			FROM sale s
+				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+			WHERE s.ticketFk = vTicketFk 
+			GROUP BY s.itemFk;
+	                
+	CALL catalog_componentPrepare();
+	CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+   
+	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+			  SELECT id saleFk, vWarehouseFk warehouseFk
+                  FROM sale s
+                  WHERE s.ticketFk = vTicketFk;  
+                                    
+	CALL vn.ticketComponentUpdateSale(IF(vIsTicketEditable,1,6)); -- si el ticket esta facturado, respeta los precios
+    
+	IF vLanded IS NULL THEN
+
+		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
+        
+        UPDATE vn2008.Tickets t
+			SET t.landing = (SELECT landed FROM tmp.zoneGetLanded) 
+			WHERE Id_Ticket = vTicketFk;
+            
+		DROP TEMPORARY TABLE tmp.zoneGetLanded;
+
+    END IF;
+    
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+    DROP TEMPORARY TABLE tmp.ticketComponentPrice;
+    DROP TEMPORARY TABLE tmp.ticketComponent;
+    DROP TEMPORARY TABLE tmp.sale;
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticket_recalcComponentsForcePrice.sql

@@ -0,0 +1,78 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_recalcComponentsForcePrice`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponentsForcePrice`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN )
+proc: BEGIN
+
+/**
+ * Este procedimiento trata de "rebionizar" un ticket, 
+ * eliminando los componentes existentes e insertandolos de nuevo
+ *
+ * @param vTicketFk Id del ticket
+ * @return tmp.buyUltimate
+ */
+	DECLARE vShipped DATE;
+	DECLARE vWarehouseFk SMALLINT;
+    DECLARE vAgencyModeFk INT;
+    DECLARE vAddressFk INT;
+    DECLARE vLanded DATE;
+    DECLARE vZoneFk INTEGER;
+    
+    IF vIsTicketEditable IS NULL THEN
+		SELECT (IFNULL(ts.alertLevel,0) >0 or IFNULL(t.refFk,"") != "") = FALSE, t.zoneFk
+			INTO vIsTicketEditable, vZoneFk
+			FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
+			WHERE id = vTicketFk;
+	END IF;
+	SELECT warehouseFk, date(shipped), addressFk, agencyModeFk, landed
+			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
+		FROM ticket
+		WHERE id = vTicketFk;
+	
+    CALL zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, TRUE);
+	
+    CALL buyUltimate (vWarehouseFk, vShipped);  -- rellena la tabla buyUltimate con la ultima compra
+	
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+    CREATE TEMPORARY TABLE tmp.ticketLot 
+	SELECT vWarehouseFk warehouseFk, NULL available,
+		s.itemFk, bu.buyFk, vZoneFk zoneFk
+			FROM sale s
+				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
+			WHERE s.ticketFk = vTicketFk 
+			GROUP BY s.itemFk;
+	
+	CALL catalog_componentPrepare();
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+   
+	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+	CREATE TEMPORARY TABLE tmp.sale
+				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
+			  SELECT id saleFk, vWarehouseFk warehouseFk
+                  FROM sale s
+                  WHERE s.ticketFk = vTicketFk;  
+                                    
+	CALL ticketComponentUpdateSale(IF(vIsTicketEditable,1,6)); -- si el ticket esta facturado, respeta los precios
+    
+	IF vLanded IS NULL THEN
+
+		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
+        
+        UPDATE vn2008.Tickets t
+			SET t.landing = (SELECT landed FROM tmp.zoneGetLanded) 
+			WHERE Id_Ticket = vTicketFk;
+            
+		DROP TEMPORARY TABLE tmp.zoneGetLanded;
+
+    END IF;
+    
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+    DROP TEMPORARY TABLE tmp.ticketComponentPrice;
+    DROP TEMPORARY TABLE tmp.ticketComponent;
+    DROP TEMPORARY TABLE tmp.sale;
+END$$
+
+DELIMITER ;
+

db/tests/vn/zone_getFromGeo.spec.js

@@ -0,0 +1,28 @@
+const app = require('vn-loopback/server/server');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+describe('zone zone_getFromGeo()', () => {
+    it(`should check that there are some results in table zone`, async() => {
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+        let geoFk = 17;
+
+        stmt = new ParameterizedSQL('CALL zone_getFromGeo(?)', [
+            geoFk,
+        ]);
+        stmts.push(stmt);
+
+        let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zone WHERE id IN (1, 2, 3, 4, 5, 6, 7, 8)') - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let [zoneTable] = result[tableIndex];
+
+        expect(zoneTable.countZone).toBe(8);
+    });
+});

db/tests/vn/zone_getLanded.spec.js

@@ -0,0 +1,66 @@
+const app = require('vn-loopback/server/server');
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+describe('zone zone_getLanded()', () => {
+    it(`should return data for a shipped in the past`, async() => {
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+
+        let params = {
+            addressFk: 121,
+            agencyModeFk: 7,
+            warehouseFk: 1};
+
+        stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL -1 DAY), ?, ?, ?)', [
+            params.addressFk,
+            params.agencyModeFk,
+            params.warehouseFk
+
+        ]);
+        stmts.push(stmt);
+
+        let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zoneGetLanded') - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let [zoneTable] = result[tableIndex];
+
+        expect(zoneTable.countZone).toBe(1);
+    });
+
+    it(`should return data for a shipped tomorrow`, async() => {
+        let stmts = [];
+        let stmt;
+
+        stmts.push('START TRANSACTION');
+
+        let params = {
+            addressFk: 121,
+            agencyModeFk: 7,
+            warehouseFk: 1};
+
+        stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL +2 DAY), ?, ?, ?)', [
+            params.addressFk,
+            params.agencyModeFk,
+            params.warehouseFk
+
+        ]);
+        stmts.push(stmt);
+
+        let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zoneGetLanded') - 1;
+
+        stmts.push('ROLLBACK');
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await app.models.Ticket.rawStmt(sql);
+
+        let [zoneTable] = result[tableIndex];
+
+        expect(zoneTable.countZone).toBe(1);
+    });
+});

e2e/paths/05-ticket/12_descriptor.spec.js

@@ -87,7 +87,8 @@ describe('Ticket descriptor path', () => {
             expect(message.type).toBe('success');
         });
 
-        it(`should check the state of the stowaway ticket is embarked`, async() => {
+        xit(`should check the state of the stowaway ticket is embarked`, async() => {
+            await page.wait(500);
             const state = await page.waitToGetProperty(selectors.ticketDescriptor.stateLabelValue, 'innerText');
 
             expect(state).toEqual('State Embarcando');

modules/client/front/summary/index.html

@@ -93,7 +93,7 @@
             </vn-vertical>
         </vn-one>
         <vn-one>
-            <h4 translate>Pay method</h4>
+            <h4 translate>Billing data</h4>
             <vn-label-value label="Pay method" 
                 value="{{$ctrl.summary.payMethod.name}}">
             </vn-label-value>

modules/ticket/back/methods/ticket-request/confirm.js

@@ -57,7 +57,6 @@ module.exports = Self => {
             if (stock.available < 0)
                 throw new UserError(`This item is not available`);
 
-
             if (request.saleFk) {
                 sale = await models.Sale.findById(request.saleFk, null, options);
                 await sale.updateAttributes({
@@ -79,7 +78,7 @@ module.exports = Self => {
                 }, options);
             }
 
-            query = `CALL vn.ticketCalculateSale(?)`;
+            query = `CALL vn.sale_calculateComponent(?, NULL)`;
             await Self.rawSql(query, [sale.id], options);
 
             const origin = ctx.req.headers.origin;

modules/ticket/back/methods/ticket/addSale.js

@@ -60,7 +60,7 @@ module.exports = Self => {
             quantity: quantity
         });
 
-        await Self.rawSql('CALL vn.ticketCalculateSale(?)', [newSale.id]);
+        await Self.rawSql('CALL vn.sale_calculateComponent(?, NULL)', [newSale.id]);
 
         return models.Sale.findById(newSale.id, {
             include: {

modules/ticket/front/locale/es.yml

@@ -76,5 +76,5 @@ Tracking: Estados
 Sale checked: Control clientes
 Components: Componentes
 Sale tracking: Líneas preparadas
-Photos: Fotos
+Pictures: Fotos
 Log: Historial

modules/zone/front/create/index.html

@@ -50,7 +50,7 @@
             </vn-input-number>
             <vn-input-time
                 vn-two
-                label="Estimated hour (ETD)"
+                label="Closing hour"
                 ng-model="$ctrl.zone.hour"
                 rule>
             </vn-input-time>

modules/zone/front/create/locale/es.yml

@@ -1,3 +1,3 @@
 Traveling days: Días de viaje
-Closing hour (ETD): Hora de cierre (ETD)
+Closing hour: Hora de cierre
 Bonus: Bonificación

modules/zone/front/descriptor/index.html

@@ -30,7 +30,7 @@
             <vn-label-value label="Agency"
                 value="{{$ctrl.zone.agencyMode.name}}">
             </vn-label-value>
-            <vn-label-value label="Closing hour (ETD)"
+            <vn-label-value label="Closing hour"
                 value="{{$ctrl.zone.hour | date: 'HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Traveling days"

modules/zone/front/index/index.html

@@ -23,7 +23,7 @@
                 class="clickable search-result">
                 <vn-td number>{{::zone.id}}</vn-td>
                 <vn-td expand>{{::zone.name}}</vn-td>
-                <vn-td>{{::zone.agencyMode.name}}</vn-td>
+                <vn-td expand>{{::zone.agencyMode.name}}</vn-td>
                 <vn-td shrink>{{::zone.hour | date: 'HH:mm'}}</vn-td>
                 <vn-td number>{{::zone.price | currency: 'EUR':2}}</vn-td>
                 <vn-td shrink>

modules/zone/front/summary/index.html

@@ -13,7 +13,7 @@
             </vn-label-value>
         </vn-one>
         <vn-one>
-            <vn-label-value label="Closing hour (ETD)"
+            <vn-label-value label="Closing hour"
                 value="{{$ctrl.summary.hour | date: 'HH:mm'}}">
             </vn-label-value>
             <vn-label-value label="Traveling days"

package-lock.json

@@ -3244,7 +3244,7 @@
                 },
                 "util": {
                     "version": "0.10.3",
-                    "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
                     "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
                     "dev": true,
                     "requires": {
@@ -4060,7 +4060,7 @@
         "base": {
             "version": "0.11.2",
             "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-            "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+            "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
             "dev": true,
             "requires": {
                 "cache-base": "^1.0.1",
@@ -4577,7 +4577,7 @@
         "cache-base": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-            "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+            "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
             "dev": true,
             "requires": {
                 "collection-visit": "^1.0.0",
@@ -4754,7 +4754,7 @@
         "class-utils": {
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+            "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
             "dev": true,
             "requires": {
                 "arr-union": "^3.1.0",
@@ -5816,7 +5816,7 @@
         "dot-prop": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-            "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+            "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=",
             "requires": {
                 "is-obj": "^1.0.0"
             }
@@ -6751,7 +6751,7 @@
         },
         "file-loader": {
             "version": "1.1.11",
-            "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
             "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
             "dev": true,
             "requires": {
@@ -7918,7 +7918,7 @@
         "global-modules": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-            "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+            "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
             "dev": true,
             "requires": {
                 "global-prefix": "^1.0.1",
@@ -8500,7 +8500,7 @@
             "dependencies": {
                 "es6-promise": {
                     "version": "3.3.1",
-                    "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+                    "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
                     "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
                     "dev": true
                 },
@@ -9579,7 +9579,7 @@
         "is-plain-object": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
             "dev": true,
             "requires": {
                 "isobject": "^3.0.1"
@@ -9935,7 +9935,7 @@
         "jasmine-spec-reporter": {
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-            "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+            "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=",
             "dev": true,
             "requires": {
                 "colors": "1.1.2"
@@ -11932,7 +11932,7 @@
         },
         "minimist": {
             "version": "1.2.0",
-            "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
             "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         },
         "mississippi": {
@@ -12972,7 +12972,7 @@
             "dependencies": {
                 "minimist": {
                     "version": "0.0.10",
-                    "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
                     "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
                     "dev": true
                 },
@@ -14180,7 +14180,7 @@
             "dependencies": {
                 "jsesc": {
                     "version": "0.5.0",
-                    "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
                     "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
                     "dev": true
                 }
@@ -14558,7 +14558,7 @@
         },
         "safe-regex": {
             "version": "1.1.0",
-            "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
             "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
             "dev": true,
             "requires": {
@@ -14648,7 +14648,7 @@
             "dependencies": {
                 "source-map": {
                     "version": "0.4.4",
-                    "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
                     "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
                     "dev": true,
                     "requires": {
@@ -15006,7 +15006,7 @@
         "snapdragon-node": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-            "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+            "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
             "dev": true,
             "requires": {
                 "define-property": "^1.0.0",
@@ -15057,7 +15057,7 @@
         "snapdragon-util": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-            "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+            "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
             "dev": true,
             "requires": {
                 "kind-of": "^3.2.0"
@@ -15332,7 +15332,7 @@
         "split-string": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-            "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+            "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
             "dev": true,
             "requires": {
                 "extend-shallow": "^3.0.0"
@@ -16409,7 +16409,7 @@
         "touch": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-            "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+            "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=",
             "dev": true,
             "requires": {
                 "nopt": "~1.0.10"