db/dump/fixtures.before.sql

@@ -115,6 +115,9 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
     VALUES
         (1,	978, 1, 0, 2000, 9, 0);
 
+INSERT INTO hedera.orderConfig (`id`, `employeeFk`, `defaultAgencyFk`, `guestMethod`, `guestAgencyFk`, `reserveTime`, `defaultCompanyFk`)
+	VALUES (1, 1, 2, 'PICKUP', 1, '00:20:00', 442);
+
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
         (1101, 'brucewayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
@@ -301,6 +304,17 @@ UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 8;
 UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 4 WHERE `id` = 23;
 UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 10;
 
+UPDATE `vn`.`agencyMode` SET `description` = 'inhouse pickup' WHERE `id` = 1;
+UPDATE `vn`.`agencyMode` SET `description` = 'Super-Man delivery' WHERE `id` = 2;
+UPDATE `vn`.`agencyMode` SET `description` = 'Teleportation device' WHERE `id` = 3;
+UPDATE `vn`.`agencyMode` SET `description` = 'Entanglement' WHERE `id` = 4;
+UPDATE `vn`.`agencyMode` SET `description` = 'Quantum break device' WHERE `id` = 5;
+UPDATE `vn`.`agencyMode` SET `description` = 'Walking' WHERE `id` = 6;
+UPDATE `vn`.`agencyMode` SET `description` = 'Gotham247' WHERE `id` = 7;
+UPDATE `vn`.`agencyMode` SET `description` = 'Gotham247Expensive' WHERE `id` = 8;
+UPDATE `vn`.`agencyMode` SET `description` = 'Other agency' WHERE `id` = 10;
+UPDATE `vn`.`agencyMode` SET `description` = 'Refund' WHERE `id` = 23;
+
 UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com';
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
@@ -979,6 +993,14 @@ INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`
         (2, 3, 10,  10, 10,     10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 0, 1, util.VN_CURDATE()),
         (3, 13, 8.5, 10, 7.5,    6,  util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 1, 2, util.VN_CURDATE());
 
+INSERT INTO `vn`.`itemMinimumQuantity`(`itemFk`, `quantity`, `started`, `ended`, `warehouseFk`)
+    VALUES
+        (1, 5,  util.VN_CURDATE() - INTERVAL 2 MONTH, util.VN_CURDATE() + INTERVAL 1 MONTH,   1),
+        (2, 10, util.VN_CURDATE() - INTERVAL 2 DAY, NULL,                                   2),
+        (3, 15, util.VN_CURDATE() + INTERVAL 3 DAY, util.VN_CURDATE() + INTERVAL 2 WEEK,    3),
+        (2, 10, util.VN_CURDATE() + INTERVAL 2 MONTH, NULL,                                 5),
+        (4, 8, util.VN_CURDATE() - INTERVAL 3 MONTH, NULL,                                 NULL);
+
 INSERT INTO `vn`.`expeditionBoxVol`(`boxFk`, `m3`, `ratio`)
     VALUES
         (71,0.141,1);

db/routines/hedera/procedures/item_calcCatalog.sql

@@ -25,12 +25,7 @@ BEGIN
 			JOIN vn.warehouse w ON w.id = p.warehouseFk
 		ORDER BY warehouseFk, `grouping`;
 
-	DROP TEMPORARY TABLE
+	CALL vn.ticketCalculatePurge();
-		tmp.ticketCalculateItem,
+	DROP TEMPORARY TABLE tmp.item;
-		tmp.ticketComponentPrice,
-		tmp.ticketComponent,
-		tmp.ticketLot,
-		tmp.zoneGetShipped,
-		tmp.item;
 END$$
 DELIMITER ;

db/routines/hedera/procedures/order_addItem.sql

@@ -56,11 +56,15 @@ BEGIN
 		CALL util.throw ('ORDER_ROW_UNAVAILABLE');
 	END IF;
 
-	SELECT IFNULL(minQuantity, 0) INTO vMinQuantity
+	SELECT quantity INTO vMinQuantity
-		FROM vn.item 
+		FROM vn.itemMinimumQuantity
-		WHERE id = vItem;
+		WHERE itemFk = vItem
+			AND `started` <= vShipment
+			AND (`ended` >= vShipment OR `ended` IS NULL)
+			AND (warehouseFk = vWarehouse OR warehouseFk IS NULL)
+		LIMIT 1;
 
-	IF vAmount < LEAST(vMinQuantity, vAvailable)  THEN
+	IF vAmount < LEAST(IFNULL(vMinQuantity, 0), vAvailable)  THEN
 		CALL util.throw ('quantityLessThanMin');
 	END IF;
 

db/routines/vn/procedures/address_updateCoordinates.sql

@@ -0,0 +1,25 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`address_updateCoordinates`(
+	vTicketFk INT,
+	vLongitude INT,
+	vLatitude INT)
+BEGIN
+/**
+ * Actualiza las coordenadas de una dirección.
+ *
+ * @param vTicketFk Id del ticket
+ * @param vLongitude Longitud de la dirección
+ * @param vLatitude Latitud de la dirección
+ */
+	DECLARE vAddressFK INT;
+
+	SELECT addressFK INTO vAddressFK
+		FROM ticket
+		WHERE id = vTicketFk;
+
+	UPDATE address
+		SET longitude = vLongitude,
+			latitude = vLatitude
+		WHERE id = vAddressFK;
+END$$
+DELIMITER ;

db/routines/vn/procedures/catalog_calculate.sql

@@ -45,8 +45,7 @@ BEGIN
 
 	CALL catalog_componentPrepare();
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem(
-	CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
 		itemFk INT(11) NOT NULL, 
 		available INT(11),
 		producer VARCHAR(50), 
@@ -60,11 +59,11 @@ BEGIN
 		price DECIMAL(10,2),
 		priceKg DECIMAL(10,2),
 		`grouping` INT(10) UNSIGNED,
+		minQuantity INT(10) UNSIGNED,
 		PRIMARY KEY `itemFk` (`itemFk`)
 	) ENGINE = MEMORY DEFAULT CHARSET=utf8;
 	
 	OPEN cTravelTree;
-
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
@@ -136,7 +135,7 @@ BEGIN
 
 		CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
 
-		INSERT INTO tmp.ticketCalculateItem (
+		INSERT INTO tmp.ticketCalculateItem(
 					itemFk,
 					available,
 					producer,
@@ -149,9 +148,9 @@ BEGIN
 					origin,
 					price,
 					priceKg,
-					`grouping`)
+					`grouping`,
-		SELECT
+					minQuantity)
-				tl.itemFk,
+		SELECT tl.itemFk,
 				SUM(tl.available) available,
 				p.name producer,
 				i.name item,
@@ -163,7 +162,8 @@ BEGIN
 				o.code origin,
 				bl.price,
 				bl.priceKg,
-				bl.`grouping`
+				bl.`grouping`,
+				mq.quantity
 			FROM tmp.ticketLot tl
 				JOIN item i ON tl.itemFk = i.id
 				LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
@@ -179,12 +179,19 @@ BEGIN
 						) sub
 						GROUP BY itemFk
 				) bl ON bl.itemFk = tl.itemFk
+				LEFT JOIN (
+					SELECT itemFk, quantity, warehouseFk
+						FROM itemMinimumQuantity
+						WHERE `started` <= vShipped
+							AND (`ended` >= vShipped OR `ended` IS NULL)
+						GROUP BY itemFk, warehouseFk
+						ORDER BY warehouseFk DESC
+				) mq ON mq.itemFk = tl.itemFk
+					AND (mq.warehouseFk = tl.warehouseFk OR mq.warehouseFk IS NULL)
 			WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
 			GROUP BY tl.itemFk
 			ON DUPLICATE KEY UPDATE available = available + VALUES(available);
-
 	END LOOP;
-
 	CLOSE cTravelTree;
 END$$
 DELIMITER ;

db/routines/vn/procedures/collection_setParking.sql

@@ -1,15 +1,18 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_setParking`(IN `vCollectionFk` VARCHAR(8), IN `vParkingFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_setParking`(
-proc: BEGIN
+	vSelf INT,
+	vParkingFk INT
+)
+BEGIN
 /**
  * Aparca una colección en un parking.
  *
- * @param vCollectionFk Id de la colección
+ * @param vSelf Id colección
- * @param vParkingFk Id del parking
+ * @param vParkingFk Id parking
  */
-	REPLACE vn.ticketParking(ticketFk, parkingFk)
+	REPLACE ticketParking(ticketFk, parkingFk)
 		SELECT tc.ticketFk, vParkingFk
-			FROM vn.ticketCollection tc
+			FROM ticketCollection tc
-			WHERE tc.collectionFk = vCollectionFk;
+			WHERE tc.collectionFk = vSelf;
 END$$
 DELIMITER ;

db/routines/vn/procedures/item_getBalance.sql

@@ -2,94 +2,84 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getBalance`(
 	vItemFk INT,
 	vWarehouseFk INT,
-	vDate DATETIME
+	vDated DATETIME
 )
 BEGIN
 /**
- * @vItemFk item a buscar
+ * Calcula el balance de un artículo.
- * @vWarehouseFk almacen donde buscar
+ *
- * @vDate Si la fecha es null, muestra el histórico desde el inventario. 
+ * @vItemFk Id de artículo
- * Si la fecha no es null, muestra histórico desde la fecha de vDate.
+ * @vWarehouseFk Id de almacén
+ * @vDated Fecha a calcular, si es NULL muestra el histórico desde el inventario
  */
-	DECLARE vDateInventory DATETIME;
+	DECLARE vDateInventory DATETIME
+		DEFAULT (
+			SELECT IF(vDated, uc.mockUtcTime, c.inventoried)
+				FROM config c
+					JOIN util.config uc
+		);
+	DECLARE vSupplierInventoryFk INT
+		DEFAULT (SELECT supplierFk FROM inventoryConfig);
 
-	IF vDate IS NULL THEN
+	IF NOT vSupplierInventoryFk OR NOT vDateInventory THEN
-		SELECT inventoried INTO vDateInventory 
+		CALL util.throw('Config variables are not set');
-			FROM config;
-	ELSE
-		SELECT mockUtcTime INTO vDateInventory
-			FROM util.config;
 	END IF;
 
-	CREATE OR REPLACE TEMPORARY TABLE tItemDiary(
+	CREATE OR REPLACE TEMPORARY TABLE tItemDiary
-		shipped DATE,
+		ENGINE = MEMORY
-		`in` INT(11),
-		`out` INT(11),
-		alertLevel INT(11),
-		stateName VARCHAR(20),
-		`name` VARCHAR(50),
-		reference VARCHAR(50),
-		origin INT(11),
-		clientFk INT(11),
-		isPicked INT(11),
-		isTicket TINYINT(1),
-		lineFk INT(11),
-		`order` TINYINT(3) UNSIGNED,
-		clientType VARCHAR(20),
-		claimFk INT(10) UNSIGNED,
-		inventorySupplierFk INT(10)
-	);
-
-	INSERT INTO tItemDiary
 		WITH entriesIn AS (
-			SELECT tr.landed shipped,
+			SELECT 'entry' originType,
+					e.id originId,
+					tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
 					st.alertLevel ,
 					st.name stateName,
-					s.name `name`,
 					e.invoiceNumber reference,
-					e.id origin,
+					'supplier' entityType,
-					s.id clientFk,
+					s.id entityId,
+					s.name entityName,
 					IF(st.`code` = 'DELIVERED', TRUE, FALSE) isPicked,
 					FALSE isTicket,
 					b.id lineFk,
 					NULL `order`,
 					NULL clientType,
 					NULL claimFk,
-					ec.inventorySupplierFk
+					vSupplierInventoryFk inventorySupplierFk
 				FROM vn.buy b
 					JOIN vn.entry e ON e.id = b.entryFk
 					JOIN vn.travel tr ON tr.id = e.travelFk
 					JOIN vn.supplier s ON s.id = e.supplierFk
-					JOIN vn.state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF(tr.landed < util.VN_CURDATE() 
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-					JOIN vn.entryConfig ec
 				WHERE tr.landed >= vDateInventory
-					AND vWarehouseFk = tr.warehouseInFk
+					AND tr.warehouseInFk = vWarehouseFk
-					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
+					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL) 
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
 					AND NOT e.isRaid
-		), entriesOut AS (
+		),
-			SELECT tr.shipped,
+		entriesOut AS (
+			SELECT 'entry',
+					e.id originType,
+					tr.shipped,
 					NULL,
 					b.quantity,
 					st.alertLevel,
 					st.name stateName,
-					s.name ,
 					e.invoiceNumber,
-					e.id entryFk,
+					'supplier' entityType,
-					s.id supplierFk,
+					s.id entityId,
+					s.name,
 					IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
 					FALSE isTicket,
 					b.id,
 					NULL `order`,
 					NULL clientType,
 					NULL claimFk,
-					ec.inventorySupplierFk
+					vSupplierInventoryFk
 				FROM vn.buy b
 					JOIN vn.entry e ON e.id = b.entryFk
 					JOIN vn.travel tr ON tr.id = e.travelFk
@@ -99,86 +89,108 @@ BEGIN
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-					JOIN vn.entryConfig ec
 				WHERE tr.shipped >= vDateInventory
-					AND vWarehouseFk = tr.warehouseOutFk
+					AND tr.warehouseOutFk = vWarehouseFk
-					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
+					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
 						AND NOT e.isRaid
-		), sales AS (
+		),
-			SELECT DATE(t.shipped) shipped,
+		sales AS (
-					s.quantity,
+			WITH itemSales AS (
-					st2.alertLevel,
+				SELECT DATE(t.shipped) shipped,
-					st2.name,
+						s.quantity,
-					t.nickname,
+						st2.alertLevel,
-					t.refFk,
+						st2.name,
-					t.id ticketFk,
+						t.refFk,
-					t.clientFk,
+						t.id ticketFk,
-					s.id saleFk,
+						'client' entityType,
-					st.`order`,
+						t.clientFk entityId,
-					c.typeFk,
+						t.nickname,
-					cb.claimFk
+						s.id saleFk,
-				FROM vn.sale s
+						st.`order`,
-					JOIN vn.ticket t ON t.id = s.ticketFk
+						c.typeFk,
-					LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
+						cb.claimFk
-					LEFT JOIN vn.state st ON st.`code` = ts.`code`
+					FROM vn.sale s
-					JOIN vn.client c ON c.id = t.clientFk
+						JOIN vn.ticket t ON t.id = s.ticketFk
-					JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
+						LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-						'DELIVERED',
+						LEFT JOIN vn.state st ON st.code = ts.code
-						IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
+						JOIN vn.client c ON c.id = t.clientFk
-							'FREE',
+						JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
-							IFNULL(ts.code, 'FREE')))
+							'DELIVERED',
-					LEFT JOIN vn.claimBeginning cb ON s.id = cb.saleFk
+							IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
-				WHERE t.shipped >= vDateInventory
+								'FREE',
-					AND s.itemFk = vItemFk
+								IFNULL(st.code, 'FREE')))
-					AND vWarehouseFk = t.warehouseFk
+						LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
-		),sale AS (
+					WHERE t.shipped >= vDateInventory
-			SELECT s.shipped,
+						AND s.itemFk = vItemFk
+						AND t.warehouseFk = vWarehouseFk
+			)
+			SELECT 'ticket',
+					s.ticketFk,
+					s.shipped,
 					NULL `in`,
 					s.quantity,
 					s.alertLevel,
 					s.name,
-					s.nickname,
 					s.refFk,
-					s.ticketFk,
+					s.entityType,
-					s.clientFk,
+					s.entityId,
-					IF(stk.saleFk, TRUE, NULL),
+					s.nickname,
+					IF(stk.saleFk, TRUE, FALSE),
 					TRUE,
 					s.saleFk,
 					s.`order`,
 					s.typeFk,
 					s.claimFk,
 					NULL
-				FROM sales s
+				FROM itemSales s
 					LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
 					LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk 
 						AND stk.stateFk = stPrep.id
 				GROUP BY s.saleFk
-		)	SELECT shipped,
+		), 
-				`in`,
+		orders AS (
-				`out`,
+			SELECT 'order' originType,
-				alertLevel,
+					o.id originId,
-				stateName,
+					r.shipment,
-				`name`,
+					NULL 'in',
-				reference,
+					r.amount,
-				origin,
+					NULL alertLevel,
-				clientFk,
+					NULL stateName,
-				isPicked,
+					NULL invoiceNumber,
-				isTicket,
+					'client' entityType,
-				lineFk,
+					c.id,
-				`order`,
+					c.name,
-				clientType,
+					FALSE,
-				claimFk,
+					FALSE isTicket,
-				inventorySupplierFk
+					NULL buyFk,
-				FROM entriesIn
+					NULL 'order',
+					c.typeFk,
+					NULL claimFk,
+					NULL
+				FROM hedera.orderRow r
+					JOIN hedera.`order` o ON o.id = r.orderFk
+					JOIN vn.client c ON c.id = o.customer_id
+				WHERE r.shipment >= vDateInventory
+					AND r.warehouseFk = vWarehouseFk
+					AND r.created >= (
+						SELECT SUBTIME(util.VN_NOW(), reserveTime)
+							FROM hedera.orderConfig
+					)
+					AND NOT o.confirmed
+					AND r.itemFk = vItemFk
+		)
+		SELECT * FROM entriesIn
 			UNION ALL
 			SELECT * FROM entriesOut
 			UNION ALL
-			SELECT * FROM sale
+			SELECT * FROM sales
+			UNION ALL
+			SELECT * FROM orders
 			ORDER BY shipped,
-				(inventorySupplierFk = clientFk) DESC,
+				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
@@ -186,19 +198,20 @@ BEGIN
 				`in` DESC,
 				`out` DESC;
 
-	IF vDate IS NULL THEN
+	IF vDated IS NULL THEN
-
 		SET @a := 0;
 		SET @currentLineFk := 0;
 		SET @shipped := '';
 
-		SELECT DATE(@shipped:= t.shipped) shipped,
+		SELECT t.originType,
+			t.originId,
+			DATE(@shipped:= t.shipped) shipped,
 			t.alertLevel,
 			t.stateName,
-			t.origin,
 			t.reference,
-			t.clientFk,
+			t.entityType,
-			t.name,
+			t.entityId,
+			t.entityName,
 			t.`in` invalue,
 			t.`out`,
 			@a := @a + IFNULL(t.`in`, 0) - IFNULL(t.`out`, 0) balance,
@@ -214,37 +227,41 @@ BEGIN
 			t.`order`
 			FROM tItemDiary t
 				LEFT JOIN alertLevel a ON a.id = t.alertLevel;
-
 	ELSE
 		SELECT IFNULL(SUM(IFNULL(`in`, 0)) - SUM(IFNULL(`out`, 0)), 0) INTO @a
 			FROM tItemDiary
-			WHERE shipped < vDate;
+			WHERE shipped < vDated;
 
-		SELECT vDate shipped,
+		SELECT NULL originType,
-			0 alertLevel,
+			NULL originId,
-			0 stateName,
+			vDated shipped,
-			0 origin,
+			NULL alertLevel,
-			'' reference,
+			NULL stateName,
-			0 clientFk,
+			NULL reference,
+			NULL entityType,
+			NULL entityId,
 			'Inventario calculado',
 			@a invalue,
 			NULL `out`,
 			@a balance,
-			0 lastPreparedLineFk,
+			NULL lastPreparedLineFk,
-			0 isTicket,
+			NULL isTicket,
-			0 lineFk,
+			NULL lineFk,
-			0 isPicked,
+			NULL isPicked,
-			0 clientType,
+			NULL clientType,
-			0 claimFk,
+			NULL claimFk,
 			NULL `order`
 		UNION ALL
-		SELECT shipped, 
+		SELECT originType,
+				originId,
+				shipped, 
 				alertlevel, 
 				stateName, 
-				origin, 
 				reference,
-				clientFk, 
+				entityType,
-				name, `in`, 
+				entityId, 
+				entityName,
+				`in`, 
 				`out`, 
 				@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0), 
 				0, 
@@ -255,7 +272,7 @@ BEGIN
 				claimFk,
 				`order`
 			FROM tItemDiary
-				WHERE shipped >= vDate;
+				WHERE shipped >= vDated;
 	END IF;
 
 	DROP TEMPORARY TABLE tItemDiary;

db/routines/vn/procedures/item_getSimilar.sql

@@ -63,7 +63,7 @@ BEGIN
 				WHEN b.groupingMode = 'grouping' THEN b.grouping
 				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
-			END AS minQuantity,
+			END minQuantity,
 			v.visible located,
 			b.price2
 		FROM vn.item i

db/routines/vn/procedures/saleGroup_setParking.sql

@@ -1,17 +1,25 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleGroup_setParking`(IN `vSaleGroupFk` VARCHAR(8), IN `vParkingFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleGroup_setParking`(
-proc: BEGIN
+	vSaleGroupFk VARCHAR(8),
+	vParkingFk INT
+)
+BEGIN
 /**
- * Aparca una preparación previa en un parking
+ * Aparca una preparación previa en un parking.
  *
  * @param vSaleGroupFk id de la preparación previa
  * @param vParkingFk id del parking
  */
-	UPDATE vn.saleGroup sg
+ 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
+	UPDATE saleGroup sg
 		SET sg.parkingFk = vParkingFk
 			WHERE sg.id = vSaleGroupFk
-				AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+				AND sg.created >= util.VN_CURDATE() - INTERVAL 1 WEEK;
 
-	CALL vn.ticket_setNextState(vn.ticket_get(vSaleGroupFk));
+	CALL ticket_setNextState(ticket_get(vSaleGroupFk));
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_setProblem.sql

@@ -5,14 +5,32 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblem`(
 BEGIN
 /**
  * Update column sale.problem with a problem code
+ *
  * @param vProblemCode Code to set or unset
  * @table tmp.sale(saleFk, hasProblem)
  */
-	UPDATE sale s
+ 	DECLARE vSaleFk INT;
-			JOIN tmp.sale ts ON ts.saleFk = s.id 
+	DECLARE vHasProblem INT;
-		SET s.problem = CONCAT(
+	DECLARE vDone BOOL;
-			IF(ts.hasProblem,
+	DECLARE vSaleList CURSOR FOR SELECT saleFk, hasProblem FROM tmp.sale;
-				CONCAT(s.problem, ',', vProblemCode),
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-				REPLACE(s.problem, vProblemCode , '')));
+
+	OPEN vSaleList;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vSaleList INTO vSaleFk, vHasProblem;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+	UPDATE sale
+		SET problem = CONCAT(
+			IF(vHasProblem,
+				CONCAT(problem, ',', vProblemCode),
+				REPLACE(problem, vProblemCode , '')))
+		WHERE id = vSaleFk;
+	END LOOP;
+	CLOSE vSaleList;
 END$$
 DELIMITER ;

db/routines/vn/procedures/setParking.sql

@@ -1,6 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`setParking`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`setParking`(
-proc: BEGIN
+	vParam VARCHAR(8),
+	vParkingCode VARCHAR(8)
+)
+BEGIN
 /**
  * Aparca una colección, un ticket, un saleGroup o un shelving en un parking
  *
@@ -8,56 +11,41 @@ proc: BEGIN
  * @param vParkingCode código del parking
  */
 	DECLARE vParkingFk INT;
-	DECLARE vIsSaleGroup BOOL;
+	DECLARE vLastWeek DATE;
-	DECLARE vIsTicket BOOL;
-	DECLARE vIsCollection BOOL;
 
-	SET vParkingCode = replace(vParkingCode,' ','');
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SET vParkingCode = REPLACE(vParkingCode, ' ', '');
 
 	SELECT id INTO vParkingFk
-		FROM vn.parking
+		FROM parking
 		WHERE code = vParkingCode COLLATE utf8_unicode_ci;
 
 	IF vParkingFk IS NULL THEN
 		CALL util.throw('parkingNotExist');
-		LEAVE proc;
 	END IF;
 
-	IF  vParam REGEXP '^[0-9]+$' THEN
+	START TRANSACTION;
-		-- Se comprueba si es una preparación previa
-		SELECT COUNT(*) INTO vIsSaleGroup
-			FROM vn.saleGroup sg
-			WHERE sg.id = vParam;
 
-		IF vIsSaleGroup THEN
+	SET vLastWeek = util.VN_CURDATE() - INTERVAL 1 WEEK;
-			CALL vn.saleGroup_setParking(vParam, vParkingFk);
-			LEAVE proc;
-		END IF;
 
-		-- Se comprueba si es un ticket
+	-- Comprobamos si es una prep. previa, ticket, colección o shelving
-		SELECT COUNT(*) INTO vIsTicket
+	IF (SELECT TRUE FROM saleGroup WHERE id = vParam) THEN
-			FROM vn.ticket t
+		CALL saleGroup_setParking(vParam, vParkingFk);
-			WHERE t.id = vParam
+	ELSEIF (SELECT TRUE FROM ticket	WHERE id = vParam AND shipped >= vLastWeek) THEN
-				AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+		CALL ticket_setParking(vParam, vParkingFk);
-
+	ELSEIF (SELECT TRUE	FROM `collection` WHERE id = vParam AND created >= vLastWeek) THEN
-		IF vIsTicket THEN
+		CALL collection_setParking(vParam, vParkingFk);
-			CALL vn.ticket_setParking(vParam, vParkingFk);
+	ELSEIF (SELECT TRUE	FROM shelving WHERE code = vParam COLLATE utf8_unicode_ci) THEN
-			LEAVE proc;
+		CALL shelving_setParking(vParam, vParkingFk);
-		END IF;
-
-		-- Se comprueba si es una coleccion de tickets
-		SELECT COUNT(*) INTO vIsCollection
-			FROM vn.collection c
-			WHERE c.id = vParam
-				AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-		IF vIsCollection THEN
-			CALL vn.collection_setParking(vParam, vParkingFk);
-			LEAVE proc;
-		END IF;
 	ELSE
-		-- Por descarte, se considera una matrícula
+		CALL util.throw('paramNotExist');
-		CALL vn.shelving_setParking(vParam, vParkingFk);
 	END IF;
+
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_setNextState.sql

@@ -1,14 +1,21 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setNextState`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setNextState`(
+	vSelf INT
+)
 BEGIN
 /**
- * Cambia el estado del ticket al siguiente estado según la tabla state
+ * Cambia el estado del ticket al siguiente estado según la tabla state.
  *
- * @param vSelf id dle ticket
+ * @param vSelf Id ticket
  */
 	DECLARE vStateFk INT;
 	DECLARE vNewStateFk INT;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	SELECT stateFk INTO vStateFk
 		FROM ticketState
 		WHERE ticketFk = vSelf;
@@ -17,6 +24,10 @@ BEGIN
 		FROM state
 		WHERE id = vStateFk;
 
+	IF vNewStateFk IS NULL THEN
+		CALL util.throw('The ticket not have next state');
+	END IF;
+
 	INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 		VALUES (vNewStateFk, vSelf, account.myUser_getId());
 END$$

db/routines/vn/procedures/ticket_setParking.sql

@@ -1,11 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setParking`(IN `vTicketFk` VARCHAR(8), IN `vParkingFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setParking`(
-proc: BEGIN
+	vSelf INT,
+	vParkingFk INT
+)
+BEGIN
 /**
- * Aparca un ticket en un parking
+ * Aparca un ticket en un parking.
  *
- * @param vTicketFk id del ticket
+ * @param vSelf Id ticket
- * @param vParkingFk id del parking
+ * @param vParkingFk Id parking
  */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vCollectionTicketFk INT;
@@ -14,16 +17,21 @@ proc: BEGIN
 			FROM ticket t
 				LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
 				LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
-			WHERE t.id = vTicketFk;
+			WHERE t.id = vSelf;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	INSERT INTO vn.ticketParking(ticketFk, parkingFk)
 		SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
 			FROM ticket t
 				LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
 				LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
-			WHERE t.id = vTicketFk
+			WHERE t.id = vSelf
 		ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
 
 	OPEN vCursor;

db/routines/vn/procedures/ticket_setProblem.sql

@@ -9,11 +9,28 @@ BEGIN
  * @param vProblemCode Code to set or unset
  * @table tmp.ticket(ticketFk, hasProblem)
  */
-	UPDATE ticket t
+ 	DECLARE vTicketFk INT;
-			JOIN tmp.ticket tt ON tt.ticketFk = t.id 
+	DECLARE vHasProblem INT;
-		SET t.problem = CONCAT(
+	DECLARE vDone BOOL;
-			IF(tt.hasProblem,
+	DECLARE vTicketList CURSOR FOR SELECT ticketFk, hasProblem FROM tmp.ticket;
-				CONCAT(problem, ',', vProblemCode),
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-				REPLACE(problem, vProblemCode , '')));
+
+	OPEN vTicketList;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vTicketList INTO vTicketFk, vHasProblem;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		UPDATE ticket
+			SET problem = CONCAT(
+				IF(vHasProblem,
+					CONCAT(problem, ',', vProblemCode),
+					REPLACE(problem, vProblemCode , '')))
+			WHERE id = vTicketFk;
+	END LOOP;
+	CLOSE vTicketList;
 END$$
 DELIMITER ;

db/routines/vn/triggers/delivery_beforeInsert.sql

@@ -3,18 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeInsert
 	BEFORE INSERT ON `delivery`
 	FOR EACH ROW
 BEGIN
-
+	IF (NEW.longitude IS NOT NULL 
-	IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+		AND NEW.latitude IS NOT NULL 
+		AND NEW.ticketFK IS NOT NULL) 
 	THEN
-		UPDATE address
+		CALL address_updateCoordinates(NEW.ticketFk, NEW.longitude, NEW.latitude);
-		SET longitude = NEW.longitude,
-			latitude = NEW.latitude
-		WHERE id IN (
-					SELECT addressFK
-						FROM ticket
-						WHERE id = NEW.ticketFk
-					);
 	END IF;
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/delivery_beforeUpdate.sql

@@ -3,18 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeUpdate
 	BEFORE UPDATE ON `delivery`
 	FOR EACH ROW
 BEGIN
-
+	IF (NEW.longitude IS NOT NULL 
-IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+		AND NEW.latitude IS NOT NULL 
+		AND NEW.ticketFK IS NOT NULL) 
 	THEN
-		UPDATE address
+		CALL address_updateCoordinates(NEW.ticketFk, NEW.longitude, NEW.latitude);
-		SET longitude = NEW.longitude,
-			latitude = NEW.latitude
-		WHERE id IN (
-					SELECT addressFK
-						FROM ticket
-						WHERE id = NEW.ticketFk
-					);
 	END IF;
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/itemMinimumQuantity_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemMinimumQuantity_afterDelete`
+	AFTER DELETE ON `itemMinimumQuantity`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO itemLog
+		SET `action` = 'delete',
+			`changedModel` = 'ItemMinimumQuantity',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemMinimumQuantity_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemMinimumQuantity_beforeInsert`
+	BEFORE INSERT ON `itemMinimumQuantity`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemMinimumQuantity_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemMinimumQuantity_beforeUpdate`
+	BEFORE UPDATE ON `itemMinimumQuantity`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemShelving _afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving _afterDelete`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_afterDelete`
 	AFTER DELETE ON `itemShelving`
 	FOR EACH ROW
 BEGIN

db/routines/vn2008/views/buySource.sql

@@ -54,8 +54,7 @@ AS SELECT `b`.`entryFk` AS `Id_Entrada`,
 	`i`.`packingOut` AS `packingOut`,
 	`b`.`itemOriginalFk` AS `itemOriginalFk`,
 	`io`.`longName` AS `itemOriginalName`,
-	`it`.`gramsMax` AS `gramsMax`,
+	`it`.`gramsMax` AS `gramsMax`
-	`i`.`minQuantity` AS `minQuantity`
 FROM (
 		(
 			(

db/versions/11135-whiteErica/00-firstScript.sql

@@ -0,0 +1 @@
+CREATE INDEX travel_landed_IDX USING BTREE ON vn.travel (landed DESC,warehouseInFk,warehouseOutFk);

db/versions/11149-silverSalal/00-firstScript.sql

@@ -0,0 +1,30 @@
+ALTER TABLE vn.item CHANGE minQuantity minQuantity__ int(10) unsigned DEFAULT
+	NULL NULL COMMENT '@deprecated 2024-07-11 refs #7704 Cantidad mínima para una línea de venta';
+
+CREATE TABLE `vn`.`itemMinimumQuantity` (
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`itemFk` int(10) NOT NULL,
+	`quantity` int(10) NOT NULL,
+	`started` date NOT NULL,
+	`ended` date DEFAULT NULL,
+	`warehouseFk` smallint(5) unsigned DEFAULT NULL,
+	`created` timestamp NOT NULL DEFAULT current_timestamp(),
+	`editorFk` int(10) unsigned DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `itemMinimumQuantity_UNIQUE` (`itemFk`, `started`, `ended`, `warehouseFk`),
+    KEY `itemFk` (`itemFk`),
+    KEY `started` (`started`),
+    KEY `ended` (`ended`),
+    KEY `warehouseFk` (`warehouseFk`),
+	KEY `editorFk` (`editorFk`),
+	CONSTRAINT `itemMinimumQuantity_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	CONSTRAINT `itemMinimumQuantity_ibfk_2` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
+	CONSTRAINT `itemMinimumQuantity_ibfk_3` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
+	CONSTRAINT `itemMinimumQuantity_check_1` CHECK (`started` <= `ended`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+GRANT SELECT, UPDATE, DELETE, INSERT ON TABLE vn.itemMinimumQuantity TO buyer;
+GRANT EXECUTE ON PROCEDURE vn.ticketCalculatePurge TO guest;
+
+ALTER TABLE vn.itemLog MODIFY COLUMN changedModel enum('Item','ItemBarcode','ItemBotanical','ItemNiche','ItemTag','ItemTaxCountry','ItemMinimumQuantity')
+	CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Item' NOT NULL;

modules/item/back/methods/item/specs/getBalance.spec.js

@@ -61,7 +61,7 @@ describe('item getBalance()', () => {
             const secondItemBalance = await models.Item.getBalance(ctx, secondFilter, options);
 
             expect(firstItemBalance[9].claimFk).toEqual(null);
-            expect(secondItemBalance[7].claimFk).toEqual(2);
+            expect(secondItemBalance[7].claimFk).toEqual(1);
 
             await tx.rollback();
         } catch (e) {

modules/item/back/model-config.json

@@ -32,6 +32,9 @@
     "ItemLog": {
         "dataSource": "vn"
     },
+    "ItemMinimumQuantity": {
+        "dataSource": "vn"
+    },
     "ItemPackingType": {
         "dataSource": "vn"
     },

modules/item/back/models/item-minimum-quantity.json

@@ -0,0 +1,63 @@
+{
+    "name": "ItemMinimumQuantity",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "itemMinimumQuantity"
+        }
+    },
+    "mixins": {
+        "Loggable": true
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Id"
+        },
+        "itemFk": {
+            "type": "number",
+            "required": true
+        },
+        "quantity": {
+            "type": "number",
+            "required": true
+        },
+        "started": {
+            "type": "date",
+            "required": true
+        },
+        "ended": {
+            "type": "date"
+        },
+        "warehouseFk": {
+            "type": "number"
+        },
+        "created": {
+            "type": "date"
+        },
+        "editorFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "item": {
+            "type": "belongsTo",
+            "model": "Item",
+            "foreignKey": "itemFk"
+        },
+        "warehouse": {
+            "type": "belongsTo",
+            "model": "Warehouse",
+            "foreignKey": "warehouseFk"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "buyer",
+            "permission": "ALLOW"
+        }
+    ]
+}

modules/item/back/models/item.json

@@ -152,10 +152,6 @@
                 "columnName": "doPhoto"
             }
         },
-        "minQuantity": {
-            "type": "number",
-            "description": "Min quantity"
-        },
         "photoMotivation": {
             "type": "string"
         }

modules/item/back/models/specs/itemMinimumQuantity.spec.js

@@ -0,0 +1,101 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('itemMinimumQuantity model', () => {
+    const itemFk = 5;
+    const warehouseFk = 60;
+
+    beforeAll(async() => {
+        await models.ItemMinimumQuantity.destroyAll({where: {itemFk: itemFk}});
+    });
+
+    describe('CRUD operations', () => {
+        it('should create a new itemMinimumQuantity record', async() => {
+            const newRecord = {
+                itemFk: itemFk,
+                quantity: 100,
+                started: Date.vnNew(),
+                ended: new Date(Date.vnNew().setFullYear(Date.vnNew().getFullYear() + 1)),
+                warehouseFk: warehouseFk
+            };
+
+            const createdRecord = await models.ItemMinimumQuantity.create(newRecord);
+
+            expect(createdRecord).toBeDefined();
+            expect(createdRecord.quantity).toEqual(newRecord.quantity);
+        });
+
+        it('should read an existing itemMinimumQuantity record', async() => {
+            const newRecord = {
+                itemFk: itemFk,
+                quantity: 100,
+                started: Date.vnNew(),
+                ended: new Date(Date.vnNew().setFullYear(Date.vnNew().getFullYear() + 2)),
+                warehouseFk: warehouseFk
+            };
+
+            await models.ItemMinimumQuantity.create(newRecord);
+
+            const existingRecord = await models.ItemMinimumQuantity.findOne({where: {itemFk: itemFk}});
+
+            expect(existingRecord).toBeDefined();
+            expect(existingRecord.itemFk).toEqual(itemFk);
+        });
+
+        it('should update an existing itemMinimumQuantity record', async() => {
+            const newRecord = {
+                itemFk: itemFk,
+                quantity: 100,
+                started: Date.vnNew(),
+                ended: new Date(Date.vnNew().setFullYear(Date.vnNew().getFullYear() + 3)),
+                warehouseFk: warehouseFk
+            };
+
+            await models.ItemMinimumQuantity.create(newRecord);
+
+            const newQuantity = 150;
+            const existingRecord = await models.ItemMinimumQuantity.findOne({where: {itemFk: itemFk}});
+            existingRecord.quantity = newQuantity;
+
+            await existingRecord.save();
+            const updatedRecord = await models.ItemMinimumQuantity.findOne({where: {itemFk: itemFk}});
+
+            expect(updatedRecord.quantity).toEqual(newQuantity);
+        });
+    });
+
+    describe('validation and constraints', () => {
+        it('should enforce unique constraint on itemFk, started, ended, and warehouseFk', async() => {
+            const newRecord = {
+                itemFk: itemFk,
+                quantity: 100,
+                started: Date.vnNew(),
+                ended: Date.vnNew().setFullYear(Date.vnNew().getFullYear() + 5),
+                warehouseFk: warehouseFk
+            };
+
+            try {
+                await models.ItemMinimumQuantity.create(newRecord);
+                await models.ItemMinimumQuantity.create(newRecord);
+            } catch (e) {
+                expect(e).toBeDefined();
+                expect(e.code).toContain('ER_DUP_ENTRY');
+            }
+        });
+
+        it('should allow null values for ended and warehouseFk', async() => {
+            const newRecord = {
+                itemFk: itemFk,
+                quantity: 100,
+                started: Date.vnNew(),
+                ended: null,
+                warehouseFk: null
+            };
+
+            const createdRecord = await models.ItemMinimumQuantity.create(newRecord);
+
+            expect(createdRecord).toBeDefined();
+            expect(createdRecord.ended).toBeNull();
+            expect(createdRecord.warehouseFk).toBeNull();
+        });
+    });
+});

modules/item/front/summary/index.html

@@ -128,9 +128,6 @@
             <vn-label-value label="Non recycled plastic"
                 value="{{$ctrl.summary.item.nonRecycledPlastic}}">
             </vn-label-value>
-            <vn-label-value label="Minimum sales quantity"
-                value="{{$ctrl.summary.item.minQuantity}}">
-            </vn-label-value>
         </vn-one>
         <vn-one name="tags">
             <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">

modules/order/back/methods/order/catalogFilter.js

@@ -119,7 +119,7 @@ module.exports = Self => {
                     w.firstName,
                     tci.priceKg,
                     ink.hex,
-                    i.minQuantity
+                    tci.minQuantity
             FROM tmp.ticketCalculateItem tci
                 JOIN vn.item i ON i.id = tci.itemFk
                 JOIN vn.itemType it ON it.id = i.typeFk
@@ -158,21 +158,19 @@ module.exports = Self => {
 
         // Apply item prices
         const pricesIndex = stmts.push(
-            `SELECT
+            `SELECT tcp.itemFk,
-                    tcp.itemFk,
                     tcp.grouping,
                     tcp.price,
                     tcp.rate,
                     tcp.warehouseFk,
                     tcp.priceKg,
-                    w.name AS warehouse
+                    w.name warehouse
                 FROM tmp.ticketComponentPrice tcp
                     JOIN vn.warehouse w ON w.id = tcp.warehouseFk`) - 1;
 
         // Get tags from all items
         const itemTagsIndex = stmts.push(
-            `SELECT
+            `SELECT t.id,
-                    t.id,
                     t.name,
                     t.isFree,
                     t.sourceTable,

modules/order/front/catalog-view/index.html

@@ -37,18 +37,18 @@
                         value="{{::item.value7}}">
                     </vn-label-value>
                 </div>
-                    <vn-horizontal
+                <vn-horizontal
-                        class="text-right text-caption alert vn-mr-xs"
+                class="text-right text-caption alert vn-mr-xs"
-                        ng-if="::item.minQuantity">
+                ng-if="::item.minQuantity">
-                        <vn-one>
+                <vn-one>
-                            <vn-icon
+                    <vn-icon
-                                icon="production_quantity_limits"
+                        icon="production_quantity_limits"
-                                translate-attr="{title: 'Minimal quantity'}"
+                        translate-attr="{title: 'Minimal quantity'}"
-                                class="text-subtitle1">
+                        class="text-subtitle1">
-                            </vn-icon>
+                    </vn-icon>
-                        </vn-one>
+                </vn-one>
-                        {{::item.minQuantity}}
+                {{::item.minQuantity}}
-                    </vn-horizontal>
+            </vn-horizontal>
                 <div class="footer">
                     <div class="price">
                         <vn-one>

modules/order/front/catalog-view/locale/es.yml

@@ -1,2 +1 @@
 Order created: Orden creada
-Minimal quantity: Cantidad mínima

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

@@ -70,7 +70,7 @@ module.exports = Self => {
                 quantity: quantity
             }, myOptions);
 
-            await Self.rawSql('CALL vn.sale_calculateComponent(?, NULL)', [newSale.id], myOptions);
+            await Self.rawSql('CALL vn.sale_calculateComponent(?, ?)', [newSale.id, 'renewPrices'], myOptions);
             await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [id], myOptions);
 
             const sale = await models.Sale.findById(newSale.id, {

modules/ticket/back/models/sale.js

@@ -65,7 +65,7 @@ module.exports = Self => {
             throw new UserError('You can only add negative amounts in refund tickets');
 
         const item = await models.Item.findOne({
-            fields: ['family', 'minQuantity'],
+            fields: ['family'],
             where: {id: itemId},
         }, ctx.options);
         if (item.family == 'EMB') return;
@@ -88,7 +88,25 @@ module.exports = Self => {
 
         if (await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*')) return;
 
-        if (newQuantity < item.minQuantity && newQuantity != available)
+        const minQuantity = await models.ItemMinimumQuantity.findOne({
+            fields: ['quantity'],
+            where: {
+                itemFk: itemId,
+                started: {lte: ticket.shipped},
+                or: [
+                    {ended: {gte: ticket.shipped}},
+                    {ended: null}
+                ],
+                // eslint-disable-next-line no-dupe-keys
+                or: [
+                    {warehouseFk: ticket.warehouseFk},
+                    {warehouseFk: null}
+                ]
+            },
+            limit: 1
+        }, ctx.options);
+
+        if (newQuantity < minQuantity?.quantity && newQuantity != available)
             throw new UserError('The amount cannot be less than the minimum');
 
         if (ctx.isNewInstance || isReduction) return;
@@ -114,4 +132,3 @@ module.exports = Self => {
             throw new UserError('The price of the item changed');
     });
 };
-

modules/ticket/back/models/specs/sale.spec.js

@@ -112,14 +112,10 @@ describe('sale model ', () => {
         it('should throw an error if the quantity is less than the minimum quantity of the item', async() => {
             spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
 
-            const itemId = 2;
             const saleId = 17;
-            const minQuantity = 30;
+            const newQuantity = 1;
-            const newQuantity = minQuantity - 1;
 
             try {
-                const item = await models.Item.findById(itemId, null, opts);
-                await item.updateAttribute('minQuantity', minQuantity, opts);
                 spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
                     if (sqlStatement.includes('catalog_calcFromItem')) {
                         sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
@@ -138,13 +134,8 @@ describe('sale model ', () => {
         it('should change quantity if has minimum quantity and new quantity is equal than item available', async() => {
             spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
 
-            const itemId = 2;
             const saleId = 17;
-            const minQuantity = 30;
+            const newQuantity = 8;
-            const newQuantity = minQuantity - 1;
-
-            const item = await models.Item.findById(itemId, null, opts);
-            await item.updateAttribute('minQuantity', minQuantity, opts);
 
             spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
                 if (sqlStatement.includes('catalog_calcFromItem')) {
@@ -162,13 +153,9 @@ describe('sale model ', () => {
             it('should increase quantity if you have enough available and the new price is the same as the previous one', async() => {
                 spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
 
-                const itemId = 2;
                 const saleId = 17;
-                const minQuantity = 30;
                 const newQuantity = 31;
 
-                const item = await models.Item.findById(itemId, null, opts);
-                await item.updateAttribute('minQuantity', minQuantity, opts);
                 spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
                     if (sqlStatement.includes('catalog_calcFromItem')) {
                         sqlStatement = `
@@ -185,13 +172,9 @@ describe('sale model ', () => {
             it('should increase quantity when the new price is lower than the previous one', async() => {
                 spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
 
-                const itemId = 2;
                 const saleId = 17;
-                const minQuantity = 30;
                 const newQuantity = 31;
 
-                const item = await models.Item.findById(itemId, null, opts);
-                await item.updateAttribute('minQuantity', minQuantity, opts);
                 spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
                     if (sqlStatement.includes('catalog_calcFromItem')) {
                         sqlStatement = `
@@ -208,14 +191,10 @@ describe('sale model ', () => {
             it('should throw error when increase quantity and the new price is higher than the previous one', async() => {
                 spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
 
-                const itemId = 2;
                 const saleId = 17;
-                const minQuantity = 30;
                 const newQuantity = 31;
 
                 try {
-                    const item = await models.Item.findById(itemId, null, opts);
-                    await item.updateAttribute('minQuantity', minQuantity, opts);
                     spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
                         if (sqlStatement.includes('catalog_calcFromItem')) {
                             sqlStatement = `
@@ -231,6 +210,48 @@ describe('sale model ', () => {
                     expect(e).toEqual(new Error('The price of the item changed'));
                 }
             });
+
+            it('should throw an error if the quantity is lower than the minimum quantity of the item and is in range', async() => {
+                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
+
+                const saleId = 25;
+                const newQuantity = 5;
+
+                try {
+                    spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
+                        if (sqlStatement.includes('catalog_calcFromItem')) {
+                            sqlStatement = `
+                        CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
+                        CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 100000 as price;`;
+                            params = null;
+                        }
+                        return models.Ticket.rawSql(sqlStatement, params, opts);
+                    });
+
+                    await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
+                } catch (e) {
+                    expect(e).toEqual(new Error('The amount cannot be less than the minimum'));
+                }
+            });
+
+            it('should update the quantity if the quantity is lower than the minimum quantity of the item and is out of the range', async() => {
+                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
+
+                const saleId = 17;
+                const newQuantity = 8;
+
+                spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
+                    if (sqlStatement.includes('catalog_calcFromItem')) {
+                        sqlStatement = `
+                    CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
+                    CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 100000 as price;`;
+                        params = null;
+                    }
+                    return models.Ticket.rawSql(sqlStatement, params, opts);
+                });
+
+                await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
+            });
         });
     });
 

print/templates/reports/collection-label/collection-label.html

@@ -19,7 +19,7 @@
                     <td id="outline" class="ellipsize">{{dashIfEmpty(labelData.workerCode)}}</td>
                 </tr>
                 <tr>
-                    <td id="outline" class="ellipsize">{{labelData.labelCount || 0}}</td>
+                    <td id="outline" class="ellipsize">{{labelCount || labelData.labelCount || 0}}</td>
                 </tr>
                 <tr>
                     <td id="outline" class="ellipsize">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td>