Merge branch 'dev' into 6753-TicketsSaveSign

Jenkinsfile

@@ -103,7 +103,7 @@ pipeline {
                                 NODE_ENV = ''
                             }
                             steps {
-                                sh 'node back/tests.js --ci --junit --network jenkins'
+                                sh 'node back/tests.js --junit'
                             }
                             post {
                                 always {
@@ -121,7 +121,7 @@ pipeline {
                             steps {
                                 script {
                                     def packageJson = readJSON file: 'package.json'
-                                    env.VERSION = packageJson.version
+                                    env.VERSION = "${packageJson.version}-vn${env.BUILD_ID}"
                                 }
                                 sh 'docker-compose build back'
                             }
@@ -159,7 +159,7 @@ pipeline {
                             steps {
                                 script {
                                     def packageJson = readJSON file: 'package.json'
-                                    env.VERSION = packageJson.version
+                                    env.VERSION = "${packageJson.version}-vn${env.BUILD_ID}"
                                 }
                                 sh 'gulp build'
                                 sh 'docker-compose build front'
@@ -179,7 +179,7 @@ pipeline {
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-vn${env.BUILD_ID}"
                 }
                 sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
                 sh 'docker-compose push'
@@ -210,7 +210,7 @@ pipeline {
                     steps {
                         script {
                             def packageJson = readJSON file: 'package.json'
-                            env.VERSION = packageJson.version
+                            env.VERSION = "${packageJson.version}-vn${env.BUILD_ID}"
                         }
                         withKubeConfig([
                             serverUrl: "$KUBERNETES_API",

back/methods/mrw-config/createShipment.js

@@ -57,14 +57,14 @@ module.exports = Self => {
                 DATE_FORMAT(t.shipped, '%d/%m/%Y') created,
                 t.shipped,
                 CONCAT( e.ticketFk, LPAD(e.counter, mc.counterWidth, '0')) reference,
-                LPAD(IF(mw.params IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth,'0') serviceType,
+                LPAD(IF(mw.serviceType IS NULL, ms.serviceType, mw.serviceType), mc.serviceTypeWidth,'0') serviceType,
                 IF(mw.weekdays, 'S', 'N') weekDays,
                 oa.description deliveryObservation
             FROM expedition e
                 JOIN ticket t ON e.ticketFk = t.id
                 JOIN agencyMode am ON am.id = t.agencyModeFk
                 JOIN mrwService ms ON ms.agencyModeCodeFk = am.code
-                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays = DATE_FORMAT(t.shipped, '%a') 
+                LEFT JOIN mrwServiceWeekday mw ON mw.weekdays | 1 << WEEKDAY(t.landed)
                 JOIN client c ON t.clientFk = c.id
                 JOIN address a ON t.addressFk = a.id
                 LEFT JOIN addressObservation oa ON oa.addressFk = a.id

back/models/collection.json

@@ -1,6 +1,16 @@
 {
     "name": "Collection",
     "base": "VnModel",
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "required": true
+        },
+        "workerFk": {
+            "type": "number"
+        }
+    },
     "options": {
 		"mysql": {
 			"table": "collection"

db/dump/fixtures.after.sql

@@ -129,7 +129,7 @@ INSERT INTO vn.itemShelving (id,itemFk,visible,shelvingFk,`grouping`,packing,pac
 INSERT INTO vn.beach (code,warehouseFk) VALUES
     ('TEST',1);
 
-INSERT INTO vn.routesMonitor (routeFk,name,beachFk,m3,expeditionTruckFk) VALUES
+INSERT INTO vn.routesMonitor (routeFk,name,beachFk,m3,roadmapStopFk) VALUES
     (1,'TEST','TEST',1.0,1);
 /* #5483
 INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressFk, workerFk, observations, isSigned, isLabeled, isPrinted, packages, location, `hour`, created, isBlocked, solution, routeFk, priority, hasPriority, companyFk, agencyModeFk, landed, isBoxed, isDeleted, zoneFk, zonePrice, zoneBonus, totalWithVat, totalWithoutVat, weight)

db/dump/fixtures.before.sql

@@ -762,7 +762,12 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
-        (33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL);
+        (33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
+        (34, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1103, 'BEJAR',                                         123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
+        (35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
+        (36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
+        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL);
+        
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
         (1,  11, 1, 'ready'),
@@ -808,7 +813,10 @@ INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `userFk`, `created`)
         (21, 1,  19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
         (22, 1,  19, DATE_ADD(util.VN_NOW(), INTERVAL +1 MONTH)),
         (23, 16, 21, util.VN_NOW()),
-        (24, 16, 21, util.VN_NOW());
+        (24, 16, 21, util.VN_NOW()),
+        (34, 14, 49, util.VN_NOW()),
+        (35, 14, 18, util.VN_NOW()),
+        (36, 14, 18, util.VN_NOW());
 
 INSERT INTO `vn`.`deliveryPoint` (`id`, `name`, `ubication`)
     VALUES
@@ -1068,7 +1076,10 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (37, 4, 31, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
+        (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE()),
+        (40, 2, 34, 'Melee weapon combat fist 15cm', 10.00, 3.91, 0, 0, 0, util.VN_CURDATE()),
+        (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE()),
+        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
@@ -1247,14 +1258,20 @@ INSERT INTO `vn`.`operator` (`workerFk`, `numberOfWagons`, `trainFk`, `itemPacki
 INSERT INTO `vn`.`collection`(`id`, `workerFk`, `stateFk`, `created`, `trainFk`)
     VALUES
         (1, 1106, 5, DATE_ADD(util.VN_CURDATE(),INTERVAL +1 DAY), 1),
-        (2, 1106, 14, util.VN_CURDATE(), 1);
+        (2, 1106, 14, util.VN_CURDATE(), 1),
+        (4, 49, 5, util.VN_CURDATE(), 1),
+        (5, 18, 5, util.VN_CURDATE(), 1),
+        (6, 18, 5, util.VN_CURDATE(), 1);
 
 INSERT INTO `vn`.`ticketCollection`(`ticketFk`, `collectionFk`, `level`)
     VALUES
         (1, 1, 1),
         (2, 1, NULL),
         (3, 2, NULL),
-        (23, 1, NULL);
+        (23, 1, NULL),
+        (34, 4, 1),
+        (35, 5, 1),
+        (8, 6, 1);
 
 INSERT INTO `vn`.`genus`(`id`, `name`)
     VALUES
@@ -3705,7 +3722,8 @@ INSERT IGNORE INTO vn.saleGroup
 	SET id = 4,
 		userFk = 1,
 		parkingFk = 9,
-		sectorFk = 9992;
+		sectorFk = 9992,
+        ticketFk = 36;
 
 INSERT IGNORE INTO vn.sectorCollectionSaleGroup
 	SET id = 9999,
@@ -3807,3 +3825,27 @@ INSERT INTO `vn`.`ledgerCompany` SET
 
 INSERT INTO  `vn`.`ledgerConfig` SET
     maxTolerance = 0.01;
+
+INSERT INTO vn.sectorCollection
+	SET id = 2,
+		userFk = 18,
+		sectorFk = 1; 
+
+INSERT INTO vn.sectorCollectionSaleGroup
+	SET id = 8,
+		sectorCollectionFk = 2,
+		saleGroupFk = 4;
+
+INSERT INTO vn.saleGroup (userFk, parkingFk, sectorFk, ticketFk)
+    VALUES
+        (1, 1, 1, 37);
+
+INSERT INTO vn.sectorCollection
+	SET id = 3,
+		userFk = 18,
+		sectorFk = 1; 
+
+INSERT INTO vn.sectorCollectionSaleGroup
+	SET id = 9,
+		sectorCollectionFk = 3,
+		saleGroupFk = 6;

db/routines/dipole/procedures/expedition_add.sql

@@ -46,7 +46,7 @@ BEGIN
 					JOIN vn.address a ON a.id = t.addressFk
 					JOIN vn.province p ON p.id = a.provinceFk
 					LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-					LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
+					LEFT JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk
 					LEFT JOIN vn.beach b ON b.code = rm.beachFk
 					LEFT JOIN vn.`zone`z ON z.id = t.zoneFk
 					JOIN vn.agencyMode am ON t.agencyModeFk = am.id

db/routines/srt/functions/expedition_getDayMinute.sql

@@ -22,7 +22,7 @@ BEGIN
 			LEFT JOIN vn.route r ON r.id = t.routeFk 
 			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
 			LEFT JOIN vn.routesMonitor rm ON t.routeFk = rm.routeFk 
-			LEFT JOIN vn.roadmapStop rs ON rm.expeditionTruckFk = rs.id 
+			LEFT JOIN vn.roadmapStop rs ON rm.roadmapStopFk = rs.id 
 		WHERE e.id = vExpeditionFk;
 	
 	RETURN vDayMinute;

db/routines/srt/views/bufferDayMinute.sql

@@ -34,7 +34,7 @@ FROM (
 				)
 				LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 			)
-			LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
+			LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`roadmapStopFk` = `rs`.`id`)
 		)
 		LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`)
 	)

db/routines/srt/views/bufferStock.sql

@@ -45,7 +45,7 @@ FROM (
 					)
 					LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 				)
-				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
+				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`roadmapStopFk` = `rs`.`id`)
 			)
 			JOIN `srt`.`config` `c`
 		)

db/routines/srt/views/upperStickers.sql

@@ -32,7 +32,7 @@ FROM (
 					)
 					LEFT JOIN `vn`.`routesMonitor` `rm` ON(`t`.`routeFk` = `rm`.`routeFk`)
 				)
-				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`expeditionTruckFk` = `rs`.`id`)
+				LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rm`.`roadmapStopFk` = `rs`.`id`)
 			)
 			JOIN `dipole`.`expedition_PrintOut` `epo` ON(`epo`.`expeditionFk` = `e`.`id`)
 		)

db/routines/util/procedures/tx_commit.sql

@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(isTx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(vIsTx BOOL)
 BEGIN
 /**
  * Confirma los cambios asociados a una transacción.
  *
- * @param isTx es true si existe transacción asociada
+ * @param vIsTx es true si existe transacción asociada
 */
-    IF isTx THEN
+    IF vIsTx THEN
         COMMIT;
     END IF;
 END$$

db/routines/util/procedures/tx_rollback.sql

@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(isTx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(vIsTx BOOL)
 BEGIN
 /**
  * Deshace los cambios asociados a una transacción.
  *
- * @param isTx es true si existe transacción asociada
+ * @param vIsTx es true si existe transacción asociada
 */
-    IF isTx THEN
+    IF vIsTx THEN
         ROLLBACK;
     END IF;
 END$$

db/routines/util/procedures/tx_start.sql

@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(isTx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(vIsTx BOOL)
 BEGIN
 /**
  * Inicia una transacción.
  *
- * @param isTx es true si existe transacción asociada
+ * @param vIsTx es true si existe transacción asociada
 */
-    IF isTx THEN
+    IF vIsTx THEN
         START TRANSACTION;
     END IF;
 END$$

db/routines/vn/procedures/conveyorExpedition_Add.sql

@@ -34,7 +34,7 @@ BEGIN
             LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk
             LEFT JOIN vn.agency a ON a.id = am.agencyFk 
             LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk 
-            LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
+            LEFT JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk 
             JOIN vn.packagingConfig pc 
 		WHERE t.warehouseFk IN (60,1,44)
             AND e.created BETWEEN vStarted AND vEnded

db/routines/vn/procedures/duaInvoiceInBooking.sql

@@ -44,7 +44,7 @@ BEGIN
 				JOIN dua d ON d.id = de.duaFk
 			WHERE d.id = vDuaFk
 			LIMIT 1;
-		CALL ledger_next(vFiscalYear, FALSE, vBookEntry);
+		CALL ledger_nextTx(vFiscalYear, vBookEntry);
 	END IF; 
 
 	OPEN vInvoicesIn;

db/routines/vn/procedures/duaTaxBooking.sql

@@ -12,7 +12,7 @@ BEGIN
 		WHERE id = vDuaFk;
 
 	IF vBookNumber IS NULL OR NOT vBookNumber THEN
-		CALL ledger_next(YEAR(vBookDated), FALSE, vBookNumber);
+		CALL ledger_nextTx(YEAR(vBookDated), vBookNumber);
 	END IF;
 
 	-- Apunte de la aduana

db/routines/vn/procedures/entry_updateComission.sql

@@ -23,7 +23,8 @@ BEGIN
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
 			WHERE t.shipped >= util.VN_CURDATE()
-				AND e.currencyFk = vCurrency;
+				AND e.currencyFk = vCurrency
+				AND NOT e.isBooked;
 
 	SET vComission = currency_getCommission(vCurrency);
 

db/routines/vn/procedures/expeditionPallet_build.sql

@@ -56,13 +56,13 @@ BEGIN
 		LIMIT 1;
 
 	IF vPalletFk IS NULL THEN
-		SELECT expeditionTruckFk
+		SELECT roadmapStopFk
 			INTO vTruckFk
 				FROM (
-					SELECT rm.expeditionTruckFk, count(*) n
+					SELECT rm.roadmapStopFk, count(*) n
 						FROM vn.routesMonitor rm
 							JOIN tExpedition e ON e.routeFk = rm.routeFk
-						GROUP BY expeditionTruckFk
+						GROUP BY roadmapStopFk
 						ORDER BY n DESC
 						LIMIT 1) sub;
 

db/routines/vn/procedures/expedition_StateGet.sql

@@ -67,7 +67,7 @@ BEGIN
 			LEFT JOIN vn.route r ON r.id = t.routeFk 
 			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
 			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id 
-			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
+			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk 
 		WHERE e.id = vExpeditionFk;
 	
 END$$

db/routines/vn/procedures/expedition_getState.sql

@@ -50,7 +50,7 @@ BEGIN
 			LEFT JOIN vn.route r ON r.id = t.routeFk 
 			LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk 
 			LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id 
-			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk 
+			LEFT JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk 
 		WHERE e.id = vExpeditionFk;
 	
 END$$

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -70,7 +70,7 @@ BEGIN
 	SELECT YEAR(bookEntried) INTO vFiscalYear FROM tInvoiceIn LIMIT 1;
 
 	IF vBookNumber IS NULL THEN 
-		CALL ledger_next(vFiscalYear, FALSE, vBookNumber);
+		CALL ledger_nextTx(vFiscalYear, vBookNumber);
 	END IF;
 
 	-- Apunte del proveedor

db/routines/vn/procedures/invoiceOutBooking.sql

@@ -61,7 +61,7 @@ BEGIN
 			WHERE io.id = vInvoice;
 
 	SELECT YEAR(FECHA) INTO vFiscalYear FROM rs LIMIT 1;
-	CALL ledger_next(vFiscalYear, FALSE, vBookNumber);
+	CALL ledger_nextTx(vFiscalYear, vBookNumber);
 	-- Linea del cliente
 	INSERT INTO XDiario(
 			ASIEN,

db/routines/vn/procedures/ledger_doCompensation.sql

@@ -28,7 +28,7 @@ BEGIN
 	DECLARE vIsOriginalAClient BOOL;
 	DECLARE vPayMethodCompensation INT;
 
-	CALL ledger_next(YEAR(vDated), FALSE, vNewBookEntry);
+	CALL ledger_nextTx(YEAR(vDated), vNewBookEntry);
 
 	SELECT COUNT(id) INTO vIsOriginalAClient 
 		FROM client 

db/routines/vn/procedures/ledger_next.sql

@@ -1,38 +1,21 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_next`(
 	IN vFiscalYear INT,
-	IN vIsManageTransaction BOOLEAN,
 	OUT vLastBookEntry INT
 )
+/**
+ * Devuelve un número de asiento válido, según el contador de asientos 
+ * tabla vn.ledgerConfig, si no existe lo inicializa a 1
+ * No inicia transacción, para transaccionar usar vn.ledger_nextTx
+ *
+ * @param vFiscalYear Id del año contable
+ * @return vLastBookEntry Id del asiento
+ */
 BEGIN
-	DECLARE vHasStartTransaction BOOLEAN;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-		BEGIN
-
-		IF vHasStartTransaction THEN
-			ROLLBACK TO sp;
-			RESIGNAL;
-		ELSE
-			ROLLBACK;
-			CALL util.throw ('It has not been possible to generate a new ledger');
-		END IF;
-	END;
-
 	IF vFiscalYear IS NULL THEN
 		CALL util.throw('Fiscal year is required');
 	END IF;
 
-	IF NOT vIsManageTransaction THEN 
-		SELECT @@in_transaction INTO vHasStartTransaction;
-	
-		IF NOT vHasStartTransaction THEN
-			START TRANSACTION;
-		ELSE
-			SAVEPOINT sp;
-		END IF;
-	END IF;	
-
 	SELECT bookEntry + 1 INTO vLastBookEntry
 		FROM ledgerCompany
 		WHERE fiscalYear = vFiscalYear
@@ -48,13 +31,5 @@ BEGIN
 	UPDATE ledgerCompany
 		SET bookEntry = vLastBookEntry 
 		WHERE fiscalYear = vFiscalYear;
-
-	IF NOT vIsManageTransaction THEN 
-		IF vHasStartTransaction THEN
-			RELEASE SAVEPOINT sp;	
-		ELSE
-			COMMIT;
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ledger_nextTx.sql

@@ -0,0 +1,30 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_nextTx`(
+	IN vFiscalYear INT,
+	OUT vLastBookEntry INT
+)
+/**
+ * Devuelve un número de asiento válido, según el contador de asientos 
+ * tabla vn.ledgerConfig, si no existe lo inicializa a 1
+ * Lo hace transaccionando el proceso
+ *
+ * @param vFiscalYear Id del año contable
+ * @return vLastBookEntry Id del asiento
+ */
+BEGIN
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		CALL util.tx_rollback(vIsRequiredTx);
+		RESIGNAL;
+	END;
+
+	IF vFiscalYear IS NULL THEN
+		CALL util.throw('Fiscal year is required');
+	END IF;
+		
+	CALL util.tx_start(vIsRequiredTx);
+	CALL ledger_next(vFiscalYear, vLastBookEntry);
+	CALL util.tx_commit(vIsRequiredTx);
+END$$
+DELIMITER ;

db/routines/vn/procedures/reportLabelCollection_get.sql

@@ -47,7 +47,7 @@ BEGIN
 			LEFT JOIN ticketTrolley tt ON tt.ticket = t.id
 			LEFT JOIN zone zo ON t.zoneFk = zo.id
 			LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
-			LEFT JOIN roadmapStop rs ON rs.id = rm.expeditionTruckFk
+			LEFT JOIN roadmapStop rs ON rs.id = rm.roadmapStopFk
 		WHERE IF(vIsCollection, tc.collectionFk = vParam, tc.ticketFk = vParam)
 		GROUP BY t.id
 		ORDER BY cc.code;

db/routines/vn/procedures/routeMonitor_calculate.sql

@@ -106,7 +106,7 @@ BEGIN
 		SET rm.m3boxes = sub.m3boxes;
 
 	UPDATE routesMonitor rm
-			JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
+			JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk
 		SET rm.etd = rs.eta;
 
 	DROP TEMPORARY TABLE tmp.routesMonitor;

db/routines/vn/procedures/travel_cloneWithEntries.sql

@@ -24,7 +24,7 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
-    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
+    DECLARE vIsRequiredTx BOOLEAN DEFAULT NOT @@in_transaction;
 	DECLARE vRsEntry  CURSOR FOR
 		SELECT e.id
 			FROM entry e
@@ -35,11 +35,11 @@ BEGIN
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		CALL util.tx_rollback(vTx);
+		CALL util.tx_rollback(vIsRequiredTx);
 		RESIGNAL;
 	END;
 
-    CALL util.tx_start(vTx);
+    CALL util.tx_start(vIsRequiredTx);
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
@@ -76,6 +76,6 @@ BEGIN
 	SET @isModeInventory = FALSE;
 	CLOSE vRsEntry;
 
-    CALL util.tx_commit(vTx);
+    CALL util.tx_commit(vIsRequiredTx);
 END$$
 DELIMITER ;

db/routines/vn/procedures/xdiario_new.sql

@@ -39,7 +39,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`xdiario_new`(
  */
 BEGIN
 	IF vBookNumber IS NULL THEN
-		CALL ledger_next(YEAR(vDated), FALSE, vBookNumber);
+		CALL ledger_nextTx(YEAR(vDated), vBookNumber);
 	END IF;
 
 	INSERT INTO XDiario

db/routines/vn/triggers/claimRatio_afterInsert.sql

@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimRatio_afterInsert`
+	AFTER INSERT ON `claimRatio`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO clientRate(clientFk, `value`)
+		VALUES(NEW.clientFk, NEW.priceIncreasing)
+		ON DUPLICATE KEY UPDATE
+			`value` = VALUES(`value`);
+END$$
+DELIMITER ;

db/routines/vn/triggers/payment_beforeInsert.sql

@@ -23,7 +23,7 @@ BEGIN
 			FROM supplier
 			WHERE id = NEW.supplierFk;
 
-		CALL ledger_next(YEAR(NEW.received), TRUE, vNewBookEntry);
+		CALL ledger_next(YEAR(NEW.received), vNewBookEntry);
 
 		INSERT INTO XDiario (
 				ASIEN,

db/routines/vn/triggers/ticket_afterUpdate.sql

@@ -8,7 +8,9 @@ BEGIN
 			SET hasNewRoute = TRUE
 			WHERE ticketFk = NEW.id;
 		
+		IF NEW.cmrFk THEN 
 			CALL ticket_doCmr(NEW.id);
 		END IF;	
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/views/expeditionCommon.sql

@@ -8,7 +8,7 @@ AS SELECT `rs`.`id` AS `truckFk`,
 	`t`.`routeFk` AS `routeFk`,
 	`es`.`id` AS `scanFk`,
 	`e`.`id` AS `expeditionFk`,
-	`r`.`expeditionTruckFk` AS `expeditionTruckFk`,
+	`r`.`roadmapStopFk` AS `roadmapStopFk`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	`e`.`created` AS `lastPacked`,
 	`t`.`id` AS `ticketFk`
@@ -18,7 +18,7 @@ FROM (
 				(
 					(
 						`vn`.`roadmapStop` `rs`
-						LEFT JOIN `vn`.`routesMonitor` `r` ON(`rs`.`id` = `r`.`expeditionTruckFk`)
+						LEFT JOIN `vn`.`routesMonitor` `r` ON(`rs`.`id` = `r`.`roadmapStopFk`)
 					)
 					LEFT JOIN `vn`.`ticket` `t` ON(`r`.`routeFk` = `t`.`routeFk`)
 				)

db/routines/vn/views/expeditionPallet_Print.sql

@@ -6,7 +6,7 @@ AS SELECT `rs2`.`description` AS `truck`,
 	`r`.`description` AS `zone`,
 	COUNT(`es`.`id`) AS `eti`,
 	`ep`.`id` AS `palletFk`,
-	`rs`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`,
+	`rs`.`id` <=> `rm`.`roadmapStopFk` AS `isMatch`,
 	`t`.`warehouseFk` AS `warehouseFk`,
 	IF(
 		`r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY,
@@ -33,7 +33,7 @@ FROM (
 			)
 			LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`)
 		)
-		LEFT JOIN `vn`.`roadmapStop` `rs2` ON(`rs2`.`id` = `rm`.`expeditionTruckFk`)
+		LEFT JOIN `vn`.`roadmapStop` `rs2` ON(`rs2`.`id` = `rm`.`roadmapStopFk`)
 	)
 GROUP BY `ep`.`id`,
 	`t`.`routeFk`

db/routines/vn/views/expeditionRoute_Monitor.sql

@@ -15,7 +15,7 @@ FROM (
 						`vn`.`route` `r`
 						LEFT JOIN `vn`.`routesMonitor` `rm` ON(`r`.`id` = `rm`.`routeFk`)
 					)
-					LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
+					LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`roadmapStopFk`)
 				)
 				JOIN `vn`.`ticket` `t` ON(`t`.`routeFk` = `r`.`id`)
 			)

db/routines/vn/views/expeditionSticker.sql

@@ -45,7 +45,7 @@ FROM (
 									)
 									LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`)
 								)
-								LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
+								LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`roadmapStopFk`)
 							)
 							LEFT JOIN `vn`.`beach` `b` ON(`b`.`code` = `rm`.`beachFk`)
 						)

db/routines/vn/views/expeditionTicket_NoBoxes.sql

@@ -13,7 +13,7 @@ FROM (
 			)
 			JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`)
 		)
-		JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`expeditionTruckFk`)
+		JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `rm`.`roadmapStopFk`)
 	)
 WHERE `e`.`id` IS NULL
 	AND `rs`.`eta` > `util`.`VN_CURDATE`()

db/routines/vn/views/expeditionTruck_Control.sql

@@ -11,9 +11,9 @@ AS SELECT `e`.`truckFk` AS `id`,
 	COUNT(DISTINCT `e`.`routeFk`) AS `routes`,
 	COUNT(DISTINCT `e`.`scanFk`) AS `scans`,
 	COUNT(DISTINCT `e`.`expeditionFk`) AS `expeditions`,
-	sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,
+	sum(`e`.`truckFk` <> `e`.`roadmapStopFk`) AS `fallos`,
 	max(`e`.`lastPacked`) AS `lastPacked`
 FROM `vn`.`expeditionCommon` `e`
 GROUP BY `e`.`truckFk`
-ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC,
+ORDER BY sum(`e`.`truckFk` <> `e`.`roadmapStopFk`) DESC,
 	`e`.`eta`

db/routines/vn/views/expeditionTruck_Control_Detail.sql

@@ -7,12 +7,12 @@ AS SELECT `e`.`truckFk` AS `id`,
 	`e`.`palletFk` AS `pallet`,
 	COUNT(DISTINCT `e`.`routeFk`) AS `routes`,
 	COUNT(DISTINCT `e`.`scanFk`) AS `scans`,
-	COUNT(DISTINCT `e`.`expeditionTruckFk`) AS `destinos`,
+	COUNT(DISTINCT `e`.`roadmapStopFk`) AS `destinos`,
-	sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,
+	sum(`e`.`truckFk` <> `e`.`roadmapStopFk`) AS `fallos`,
 	max(`e`.`lastPacked`) AS `lastPacked`
 FROM `vn`.`expeditionCommon` `e`
 GROUP BY `e`.`truckFk`,
 	`e`.`palletFk`
-ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC,
+ORDER BY sum(`e`.`truckFk` <> `e`.`roadmapStopFk`) DESC,
 	`e`.`eta`,
 	`e`.`truckFk`

db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql

@@ -8,15 +8,15 @@ AS SELECT `e`.`truckFk` AS `id`,
 	`e`.`routeFk` AS `route`,
 	COUNT(DISTINCT `e`.`scanFk`) AS `scans`,
 	`rs`.`description` AS `destinos`,
-	sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,
+	SUM(`e`.`truckFk` <> `e`.`roadmapStopFk`) AS `fallos`,
-	`e`.`expeditionTruckFk` AS `expeditionTruckFk`,
+	`e`.`roadmapStopFk` AS `roadmapStopFk`,
-	max(`e`.`lastPacked`) AS `lastPacked`
+	MAX(`e`.`lastPacked`) AS `lastPacked`
 FROM (
 		`vn`.`expeditionCommon` `e`
-		LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `e`.`expeditionTruckFk`)
+		LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `e`.`roadmapStopFk`)
 	)
 GROUP BY `e`.`truckFk`,
 	`e`.`palletFk`,
 	`e`.`routeFk`
-ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC,
+ORDER BY SUM(`e`.`truckFk` <> `e`.`roadmapStopFk`) DESC,
 	`e`.`palletFk`

db/versions/11015-silverBamboo/00-photoMotivation.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.item ADD COLUMN photoMotivation VARCHAR(255);

db/versions/11060-tealGalax/00-createRoleReviewer.sql

@@ -0,0 +1,46 @@
+use account;
+
+INSERT INTO role
+ 	SET name = 'reviewer',
+		description = 'Revisor de producción',
+		hasLogin = TRUE,
+		created = util.VN_CURDATE(),
+		modified = util.VN_CURDATE(),
+		editorFk = NULL;
+
+INSERT INTO roleInherit(
+	role,
+	inheritsFrom
+)
+	SELECT r1.id,
+				r2.id 
+			FROM role r1
+				JOIN role  r2
+			WHERE r1.name = 'reviewer'
+				AND r2.name = 'production'
+	UNION
+	SELECT ri.role, 
+			r2.id
+		FROM roleInherit ri
+			JOIN role r1 ON r1.id = ri.role
+			JOIN role r2 ON r2.name = 'reviewer'
+		WHERE r1.name IN ('claimManager', 'productionBoss')
+		GROUP BY ri.role; 
+
+DELETE ri
+	FROM roleInherit ri
+		JOIN role r1 ON ri.role = r1.id
+		JOIN role r2 ON ri.inheritsFrom = r2.id
+	WHERE r1.name = 'replenisher' 
+		AND r2.name = 'buyer';
+
+UPDATE salix.ACL 
+	SET principalId = 'reviewer'
+	WHERE property = 'isInPreparing';
+
+UPDATE user u
+		JOIN vn.workerDepartment wd ON wd.workerFk = u.id
+		JOIN vn.department d ON wd.departmentFk = d.id 
+		JOIN role r ON r.name = 'reviewer'
+	SET u.role = r.id
+	WHERE d.name IN ('REVISION', 'PREVIA');

db/versions/11070-turquoiseCordyline/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.routesMonitor CHANGE expeditionTruckFk roadmapStopFk int(11) DEFAULT NULL NULL;
+
+ALTER TABLE vn.routesMonitor ADD COLUMN expeditionTruckFk int(11) AS (roadmapStopFk) VIRTUAL;

db/versions/11082-goldenCordyline/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.country DROP COLUMN country;

db/versions/11083-purpleBamboo/00-firstScript.sql

@@ -0,0 +1,3 @@
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Ticket','refund','WRITE','ALLOW','ROLE','logistic');

db/versions/11084-whitePalmetto/00-firstScript.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `vn`.`clientRate` (
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`clientFk` int(11) NOT NULL,
+	`dated` date NOT NULL DEFAULT current_timestamp(),
+	`value` decimal(10,2) DEFAULT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE KEY `clientRate_unique` (`clientFk`,`dated`),
+	CONSTRAINT `clientRate_client_FK` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -225,7 +225,7 @@ describe('Ticket Edit sale path', () => {
     });
 
     it('should show error trying to delete a ticket with a refund', async() => {
-        await page.loginAndModule('production', 'ticket');
+        await page.loginAndModule('salesPerson', 'ticket');
         await page.accessToSearchResult('8');
         await page.waitToClick(selectors.ticketDescriptor.moreMenu);
         await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);

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

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

modules/item/back/models/item.json

@@ -155,6 +155,9 @@
         "minQuantity": {
             "type": "number",
             "description": "Min quantity"
+        },
+        "photoMotivation": {
+            "type": "string"
         }
     },
     "relations": {

modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js

@@ -151,7 +151,7 @@ describe('SalesMonitor salesFilter()', () => {
             const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
             const firstRow = result[0];
 
-            expect(result.length).toEqual(12);
+            expect(result.length).toEqual(15);
             expect(firstRow.alertLevel).not.toEqual(0);
 
             await tx.rollback();

modules/shelving/back/model-config.json

@@ -11,6 +11,12 @@
     "Sector": {
         "dataSource": "vn"
     },
+    "SectorCollection": {
+        "dataSource": "vn"
+    },
+    "SectorCollectionSaleGroup": {
+        "dataSource": "vn"
+    },
     "Train": {
         "dataSource": "vn"
     }

modules/shelving/back/models/sectorCollection.json

@@ -0,0 +1,24 @@
+{
+    "name": "SectorCollection",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "sectorCollection"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "created": {
+            "type": "date"
+        },
+        "userFk": {
+            "type": "number"
+        },
+        "sectorFk": {
+            "type": "number"
+        }
+    }
+}

modules/shelving/back/models/sectorCollectionSaleGroup.json

@@ -0,0 +1,30 @@
+{
+    "name": "SectorCollectionSaleGroup",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "sectorCollectionSaleGroup"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "created": {
+            "type": "date"
+        }
+    },
+    "relations": {
+        "sectorCollection": {
+            "type": "belongsTo",
+            "model": "SectorCollection",
+            "foreignKey": "sectorCollectionFk"
+        },
+        "saleGroup": {
+            "type": "belongsTo",
+            "model": "SaleGroup",
+            "foreignKey": "saleGroupFk"
+        }
+    }
+}

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

@@ -10,8 +10,8 @@ module.exports = Self => {
             http: {source: 'path'}
         },
         {
-            arg: 'itemId',
+            arg: 'barcode',
-            type: 'number',
+            type: 'any',
             required: true
         },
         {
@@ -29,7 +29,7 @@ module.exports = Self => {
         }
     });
 
-    Self.addSale = async(ctx, id, itemId, quantity, options) => {
+    Self.addSale = async(ctx, id, barcode, quantity, options) => {
         const $t = ctx.req.__; // $translate
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
@@ -46,7 +46,9 @@ module.exports = Self => {
         try {
             await models.Ticket.isEditableOrThrow(ctx, id, myOptions);
 
+            const itemId = await models.ItemBarcode.toItem(barcode, myOptions);
             const item = await models.Item.findById(itemId, null, myOptions);
+
             const ticket = await models.Ticket.findById(id, {
                 include: {
                     relation: 'client',

modules/ticket/back/methods/ticket/addSaleByCode.js

@@ -1,56 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-module.exports = Self => {
-    Self.remoteMethodCtx('addSaleByCode', {
-        description: 'Add a collection',
-        accessType: 'WRITE',
-        accepts: [
-            {
-                arg: 'barcode',
-                type: 'string',
-                required: true
-            }, {
-                arg: 'quantity',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'ticketFk',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'warehouseFk',
-                type: 'number',
-                required: true
-            },
-
-        ],
-        http: {
-            path: `/addSaleByCode`,
-            verb: 'POST'
-        },
-    });
-
-    Self.addSaleByCode = async(ctx, barcode, quantity, ticketFk, warehouseFk, options) => {
-        const myOptions = {userId: ctx.req.accessToken.userId};
-        let tx;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const [[item]] = await Self.rawSql('CALL vn.item_getInfo(?,?)', [barcode, warehouseFk], myOptions);
-            if (!item?.available) throw new UserError('We do not have availability for the selected item');
-
-            await Self.rawSql('CALL vn.collection_addItem(?, ?, ?)', [item.id, quantity, ticketFk], myOptions);
-
-            if (tx) await tx.commit();
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/ticket/back/methods/ticket/isEditableOrThrow.js

@@ -8,18 +8,13 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const state = await models.TicketState.findOne({
+        const state = await models.TicketState.findOne({where: {ticketFk: id}}, myOptions);
-            where: {ticketFk: id}
-        }, myOptions);
-
         const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
+        const isProductionReviewer = await models.ACL.checkAccessAcl(ctx, 'Sale', 'isInPreparing', '*');
         const canEditWeeklyTicket = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'canEditWeekly', 'WRITE');
         const alertLevel = state ? state.alertLevel : null;
         const ticket = await models.Ticket.findById(id, {
-            fields: ['clientFk'],
+            fields: ['clientFk'], include: {relation: 'client'}
-            include: {
-                relation: 'client'
-            }
         }, myOptions);
 
         const isLocked = await models.Ticket.isLocked(id, myOptions);
@@ -29,10 +24,24 @@ module.exports = Self => {
         const isNormalClient = ticket && ticket.client().typeFk == 'normal';
         const isEditable = !(alertLevelGreaterThanZero && isNormalClient);
 
+        const ticketCollection = await models.TicketCollection.findOne({
+            include: {relation: 'collection'}, where: {ticketFk: id}
+        }, myOptions);
+        let isOwner = ticketCollection?.collection()?.workerFk === ctx.req.accessToken.userId;
+
+        if (!isOwner) {
+            const saleGroup = await models.SaleGroup.findOne({fields: ['id'], where: {ticketFk: id}}, myOptions);
+            const sectorCollectionSaleGroup = saleGroup && await models.SectorCollectionSaleGroup.findOne({
+                include: {relation: 'sectorCollection'}, where: {saleGroupFk: saleGroup.id}
+            }, myOptions);
+
+            isOwner = sectorCollectionSaleGroup?.sectorCollection()?.userFk === ctx.req.accessToken.userId;
+        }
+
         if (!ticket)
             throw new ForbiddenError(`The ticket doesn't exist.`);
 
-        if (!isEditable && !isRoleAdvanced)
+        if (!isEditable && !isRoleAdvanced && !isProductionReviewer && !isOwner)
             throw new ForbiddenError(`This ticket is not editable.`);
 
         if (isLocked && !isWeekly)

modules/ticket/back/methods/ticket/setDeleted.js

@@ -71,7 +71,10 @@ module.exports = Self => {
             // Check for existing purchase requests
             const hasPurchaseRequests = await models.TicketRequest.count({
                 ticketFk: id,
-                isOk: true
+                or: [
+                    {isOk: true},
+                    {isOk: null}
+                ]
             }, myOptions);
 
             if (hasPurchaseRequests)

modules/ticket/back/methods/ticket/specs/addSaleByCode.spec.js

@@ -1,39 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
-
-describe('Ticket addSaleByCode()', () => {
-    const quantity = 3;
-    const ticketFk = 13;
-    const warehouseFk = 1;
-    beforeAll(async() => {
-        activeCtx = {
-            req: {
-                accessToken: {userId: 9},
-                headers: {origin: 'http://localhost'},
-                __: value => value
-            }
-        };
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
-
-    it('should add a new sale', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-            const code = '1111111111';
-
-            const salesBefore = await models.Sale.find(null, options);
-            await models.Ticket.addSaleByCode(activeCtx, code, quantity, ticketFk, warehouseFk, options);
-            const salesAfter = await models.Sale.find(null, options);
-
-            expect(salesAfter.length).toEqual(salesBefore.length + 1);
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-});

modules/ticket/back/methods/ticket/specs/filter.spec.js

@@ -68,7 +68,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(7);
+            expect(result.length).toEqual(10);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/methods/ticket/specs/priceDifference.spec.js

@@ -42,7 +42,7 @@ describe('sale priceDifference()', () => {
         try {
             const options = {transaction: tx};
 
-            const ctx = {req: {accessToken: {userId: 1106}}};
+            const ctx = {req: {accessToken: {userId: 1105}}};
             ctx.args = {
                 id: 1,
                 landed: Date.vnNew(),
@@ -84,7 +84,7 @@ describe('sale priceDifference()', () => {
 
             const {items} = await models.Ticket.priceDifference(ctx, options);
 
-            expect(items[0].movable).toEqual(410);
+            expect(items[0].movable).toEqual(386);
             expect(items[1].movable).toEqual(1810);
 
             await tx.rollback();

modules/ticket/back/methods/ticket/specs/setDeleted.spec.js

@@ -49,7 +49,7 @@ describe('ticket setDeleted()', () => {
             ctx.req.__ = value => {
                 return value;
             };
-            const ticketId = 23;
+            const ticketId = 24;
             const [sectorCollectionBefore] = await models.Ticket.rawSql(
                 `SELECT COUNT(*) numberRows
                     FROM vn.sectorCollection`, [], options);
@@ -87,7 +87,7 @@ describe('ticket setDeleted()', () => {
             const [ticketCollectionOld] = await models.Ticket.rawSql(
                 `SELECT COUNT(*) numberRows
                     FROM vn.ticketCollection`, [], options);
-            const ticketId = 23;
+            const ticketId = 34;
 
             await models.Ticket.setDeleted(ctx, ticketId, options);
 

modules/ticket/back/models/saleGroup.json

@@ -14,6 +14,9 @@
         },
         "parkingFk": {
             "type": "number"
+        },
+        "ticketFk": {
+            "type": "number"
         }
     },
     "relations": {

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

@@ -1,361 +1,318 @@
 /* eslint max-len: ["error", { "code": 150 }]*/
-
+const {models} = require('vn-loopback/server/server');
-const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
 describe('sale model ', () => {
-    const ctx = {
+    const developerId = 9;
-        req: {
+    const buyerId = 35;
-            accessToken: {userId: 9},
+    const employeeId = 1;
-            headers: {origin: 'localhost:5000'},
+    const productionId = 49;
-            __: () => {}
+    const salesPersonId = 18;
-        }
+    const reviewerId = 130;
-    };
+
-    function getActiveCtx(userId) {
+    const barcode = '4444444444';
-        return {
+    const ticketCollectionProd = 34;
-            active: {
+    const ticketCollectionSalesPerson = 35;
-                accessToken: {userId},
+    const previaTicketSalesPerson = 36;
-                http: {
+    const previaTicketProd = 37;
-                    req: {
+    const notEditableError = 'This ticket is not editable.';
-                        headers: {origin: 'http://localhost'}
+
-                    }
+    const ctx = getCtx(developerId);
-                }
+    let tx;
-            }
+    let opts;
-        };
+
+    function getCtx(userId, active = false) {
+        const accessToken = {userId};
+        const headers = {origin: 'localhost:5000'};
+        if (!active) return {req: {accessToken, headers, __: () => {}}};
+        return {active: {accessToken, http: {req: {headers}}}};
     }
 
+    beforeEach(async() => {
+        tx = await models.Sale.beginTransaction({});
+        opts = {transaction: tx};
+    });
+
+    afterEach(async() => await tx.rollback());
+
     describe('quantity field ', () => {
         it('should add quantity if the quantity is greater than it should be and is role advanced', async() => {
             const saleId = 17;
-            const buyerId = 35;
+            const ctx = getCtx(buyerId);
-            const ctx = {
+
-                req: {
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(buyerId, true));
-                    accessToken: {userId: buyerId},
+            spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
-            const tx = await models.Sale.beginTransaction({});
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(buyerId));
-            spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
                 if (sqlStatement.includes('catalog_calcFromItem')) {
                     sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
                         SELECT 100 as available;`;
                     params = null;
                 }
-                return models.Ticket.rawSql(sqlStatement, params, options);
+                return models.Ticket.rawSql(sqlStatement, params, opts);
             });
 
-            try {
-                const options = {transaction: tx};
-
             const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
 
             expect(isRoleAdvanced).toEqual(true);
 
-                const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+            const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
 
             expect(originalLine.quantity).toEqual(30);
 
             const newQuantity = originalLine.quantity + 1;
-                await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+            await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
 
-                const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+            const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
 
             expect(modifiedLine.quantity).toEqual(newQuantity);
-
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-                throw e;
-            }
         });
 
         it('should update the quantity of a given sale current line', async() => {
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(developerId, true));
 
-            const tx = await models.Sale.beginTransaction({});
             const saleId = 25;
             const newQuantity = 4;
 
-            try {
+            const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
-                const options = {transaction: tx};
-
-                const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
 
             expect(originalLine.quantity).toEqual(20);
 
-                await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+            await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
 
-                const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+            const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
 
             expect(modifiedLine.quantity).toEqual(newQuantity);
-
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-                throw e;
-            }
         });
 
         it('should throw an error if the quantity is negative and it is not a refund ticket', async() => {
-            const ctx = {
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
-                req: {
-                    accessToken: {userId: 1},
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
 
             const saleId = 17;
             const newQuantity = -10;
 
-            const tx = await models.Sale.beginTransaction({});
-
-            let error;
             try {
-                const options = {transaction: tx};
+                await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-
-                await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
-                await tx.rollback();
             } catch (e) {
-                await tx.rollback();
+                expect(e).toEqual(new Error('You can only add negative amounts in refund tickets'));
-                error = e;
             }
-
-            expect(error).toEqual(new Error('You can only add negative amounts in refund tickets'));
         });
 
         it('should update a negative quantity when is a ticket refund', async() => {
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(developerId, true));
 
-            const tx = await models.Sale.beginTransaction({});
             const saleId = 32;
             const newQuantity = -10;
 
-            try {
+            await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-                const options = {transaction: tx};
 
-                await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+            const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
-
-                const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
 
             expect(modifiedLine.quantity).toEqual(newQuantity);
-
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-                throw e;
-            }
         });
 
         it('should throw an error if the quantity is less than the minimum quantity of the item', async() => {
-            const ctx = {
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
-                req: {
-                    accessToken: {userId: 1},
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
 
-            const tx = await models.Sale.beginTransaction({});
             const itemId = 2;
             const saleId = 17;
             const minQuantity = 30;
             const newQuantity = minQuantity - 1;
 
-            let error;
             try {
-                const options = {transaction: tx};
+                const item = await models.Item.findById(itemId, null, opts);
-
+                await item.updateAttribute('minQuantity', minQuantity, opts);
-                const item = await models.Item.findById(itemId, null, options);
+                spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
-                await item.updateAttribute('minQuantity', minQuantity, options);
-                spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
                     if (sqlStatement.includes('catalog_calcFromItem')) {
                         sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
                             SELECT 100 as available;`;
                         params = null;
                     }
-                    return models.Ticket.rawSql(sqlStatement, params, options);
+                    return models.Ticket.rawSql(sqlStatement, params, opts);
                 });
 
-                await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+                await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-
-                await tx.rollback();
             } catch (e) {
-                await tx.rollback();
+                expect(e).toEqual(new Error('The amount cannot be less than the minimum'));
-                error = e;
             }
-
-            expect(error).toEqual(new Error('The amount cannot be less than the minimum'));
         });
 
         it('should change quantity if has minimum quantity and new quantity is equal than item available', async() => {
-            const ctx = {
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
-                req: {
-                    accessToken: {userId: 1},
-                    headers: {origin: 'localhost:5000'},
-                    __: () => {}
-                }
-            };
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
 
-            const tx = await models.Sale.beginTransaction({});
             const itemId = 2;
             const saleId = 17;
             const minQuantity = 30;
             const newQuantity = minQuantity - 1;
 
-            try {
+            const item = await models.Item.findById(itemId, null, opts);
-                const options = {transaction: tx};
+            await item.updateAttribute('minQuantity', minQuantity, opts);
 
-                const item = await models.Item.findById(itemId, null, options);
+            spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
-                await item.updateAttribute('minQuantity', minQuantity, options);
-
-                spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
                 if (sqlStatement.includes('catalog_calcFromItem')) {
                     sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
                             SELECT ${newQuantity} as available;`;
                     params = null;
                 }
-                    return models.Ticket.rawSql(sqlStatement, params, options);
+                return models.Ticket.rawSql(sqlStatement, params, opts);
             });
 
-                await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+            await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-
-                await tx.rollback();
-            } catch (e) {
-                await tx.rollback();
-                throw e;
-            }
         });
 
         describe('newPrice', () => {
             it('should increase quantity if you have enough available and the new price is the same as the previous one', async() => {
-                const ctx = {
+                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
-                    req: {
-                        accessToken: {userId: 1},
-                        headers: {origin: 'localhost:5000'},
-                        __: () => {}
-                    }
-                };
-                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
 
-                const tx = await models.Sale.beginTransaction({});
                 const itemId = 2;
                 const saleId = 17;
                 const minQuantity = 30;
                 const newQuantity = 31;
 
-                try {
+                const item = await models.Item.findById(itemId, null, opts);
-                    const options = {transaction: tx};
+                await item.updateAttribute('minQuantity', minQuantity, opts);
-
+                spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
-                    const item = await models.Item.findById(itemId, null, options);
-                    await item.updateAttribute('minQuantity', minQuantity, options);
-                    spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
                     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, 7.07 as price;`;
                         params = null;
                     }
-                        return models.Ticket.rawSql(sqlStatement, params, options);
+                    return models.Ticket.rawSql(sqlStatement, params, opts);
                 });
 
-                    await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+                await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-
-                    await tx.rollback();
-                } catch (e) {
-                    await tx.rollback();
-                    throw e;
-                }
             });
 
             it('should increase quantity when the new price is lower than the previous one', async() => {
-                const ctx = {
+                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
-                    req: {
-                        accessToken: {userId: 1},
-                        headers: {origin: 'localhost:5000'},
-                        __: () => {}
-                    }
-                };
-                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
 
-                const tx = await models.Sale.beginTransaction({});
                 const itemId = 2;
                 const saleId = 17;
                 const minQuantity = 30;
                 const newQuantity = 31;
 
-                try {
+                const item = await models.Item.findById(itemId, null, opts);
-                    const options = {transaction: tx};
+                await item.updateAttribute('minQuantity', minQuantity, opts);
-
+                spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
-                    const item = await models.Item.findById(itemId, null, options);
-                    await item.updateAttribute('minQuantity', minQuantity, options);
-                    spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
                     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, 1 as price;`;
                         params = null;
                     }
-                        return models.Ticket.rawSql(sqlStatement, params, options);
+                    return models.Ticket.rawSql(sqlStatement, params, opts);
                 });
 
-                    await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+                await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-
-                    await tx.rollback();
-                } catch (e) {
-                    await tx.rollback();
-                    throw e;
-                }
             });
 
             it('should throw error when increase quantity and the new price is higher than the previous one', async() => {
-                const ctx = {
+                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
-                    req: {
-                        accessToken: {userId: 1},
-                        headers: {origin: 'localhost:5000'},
-                        __: () => {}
-                    }
-                };
-                spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
 
-                const tx = await models.Sale.beginTransaction({});
                 const itemId = 2;
                 const saleId = 17;
                 const minQuantity = 30;
                 const newQuantity = 31;
 
-                let error;
                 try {
-                    const options = {transaction: tx};
+                    const item = await models.Item.findById(itemId, null, opts);
-
+                    await item.updateAttribute('minQuantity', minQuantity, opts);
-                    const item = await models.Item.findById(itemId, null, options);
+                    spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
-                    await item.updateAttribute('minQuantity', minQuantity, options);
-                    spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
                         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, options);
+                        return models.Ticket.rawSql(sqlStatement, params, opts);
                     });
 
-                    await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+                    await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
-
-                    await tx.rollback();
                 } catch (e) {
-                    await tx.rollback();
+                    expect(e).toEqual(new Error('The price of the item changed'));
-                    error = e;
+                }
+            });
+        });
+    });
+
+    describe('add a sale from a collection or previa ticket', () => {
+        it('if is allocated to them and alert level higher than 0 as Production role', async() => {
+            const ctx = getCtx(productionId);
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(productionId, true));
+
+            const beforeSalesCollection = await models.Sale.count({ticketFk: ticketCollectionProd}, opts);
+            await models.Ticket.addSale(ctx, ticketCollectionProd, barcode, 20, opts);
+            const afterSalesCollection = await models.Sale.count({ticketFk: ticketCollectionProd}, opts);
+
+            expect(afterSalesCollection).toEqual(beforeSalesCollection + 1);
+
+            const beforeSalesPrevia = await models.Sale.count({ticketFk: previaTicketProd}, opts);
+            await models.Ticket.addSale(ctx, previaTicketProd, barcode, 20, opts);
+            const afterSalesPrevia = await models.Sale.count({ticketFk: previaTicketProd}, opts);
+
+            expect(afterSalesPrevia).toEqual(beforeSalesPrevia + 1);
+        });
+
+        it('should throw an error if is not allocated to them and alert level higher than 0 as Production role', async() => {
+            const ctx = getCtx(productionId);
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(productionId, true));
+
+            try {
+                await models.Ticket.addSale(ctx, ticketCollectionSalesPerson, barcode, 20, opts);
+            } catch ({message}) {
+                expect(message).toEqual(notEditableError);
             }
 
-                expect(error).toEqual(new Error('The price of the item changed'));
+            try {
-            });
+                await models.Ticket.addSale(ctx, previaTicketSalesPerson, barcode, 20, opts);
+            } catch ({message}) {
+                expect(message).toEqual(notEditableError);
+            }
+        });
+
+        it('if is allocated to them and alert level higher than 0 as salesPerson role', async() => {
+            const ctx = getCtx(salesPersonId);
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(salesPersonId, true));
+
+            const beforeSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+            await models.Ticket.addSale(ctx, ticketCollectionSalesPerson, barcode, 20, opts);
+            const afterSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+
+            expect(afterSalesCollection).toEqual(beforeSalesCollection + 1);
+
+            const beforeSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+            await models.Ticket.addSale(ctx, previaTicketSalesPerson, barcode, 20, opts);
+            const afterSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+
+            expect(afterSalesPrevia).toEqual(beforeSalesPrevia + 1);
+        });
+
+        it('should throw an error if is not allocated to them and alert level higher than 0 as salesPerson role', async() => {
+            const ctx = getCtx(salesPersonId);
+
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(salesPersonId, true));
+
+            try {
+                await models.Ticket.addSale(ctx, ticketCollectionProd, barcode, 20, opts);
+            } catch ({message}) {
+                expect(message).toEqual(notEditableError);
+            }
+        });
+
+        it('if is a reviewer', async() => {
+            const ctx = getCtx(reviewerId);
+            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(reviewerId, true));
+
+            const beforeSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+            await models.Ticket.addSale(ctx, ticketCollectionSalesPerson, barcode, 20, opts);
+            const afterSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+
+            expect(afterSalesCollection).toEqual(beforeSalesCollection + 1);
+
+            const beforeSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+            await models.Ticket.addSale(ctx, previaTicketSalesPerson, barcode, 20, opts);
+            const afterSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+
+            expect(afterSalesPrevia).toEqual(beforeSalesPrevia + 1);
         });
     });
 });

modules/ticket/back/models/ticket-methods.js

@@ -46,6 +46,5 @@ module.exports = function(Self) {
     require('../methods/ticket/invoiceTicketsAndPdf')(Self);
     require('../methods/ticket/docuwareDownload')(Self);
     require('../methods/ticket/myLastModified')(Self);
-    require('../methods/ticket/addSaleByCode')(Self);
     require('../methods/ticket/clone')(Self);
 };

modules/ticket/front/card/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../module';
 import ModuleCard from 'salix/components/module-card';
+import UserError from 'core/lib/user-error';
 
 class Controller extends ModuleCard {
     reload() {
@@ -59,6 +60,10 @@ class Controller extends ModuleCard {
             ],
         };
 
+        if (!this.$params.id) {
+            this.$state.go('ticket.index');
+            throw new UserError(`You must select a ticket`);
+        }
         return this.$http.get(`Tickets/${this.$params.id}`, {filter})
             .then(res => this.onData(res.data));
     }

modules/ticket/front/descriptor-menu/index.html

@@ -152,7 +152,7 @@
         </vn-item>
         <vn-item class="dropdown"
             vn-click-stop="refundMenu.show($event, 'left')"
-            vn-acl="invoicing, claimManager, salesAssistant"
+            vn-acl="invoicing, claimManager, salesAssistant, logistic"
             vn-acl-action="remove"
             vn-tooltip="Create a single ticket with all the content of the current ticket"
             translate>

modules/ticket/front/locale/es.yml

@@ -64,6 +64,7 @@ You are going to delete this ticket: Vas a eliminar este ticket
 Ticket deleted. You can undo this action within the first hour: Ticket eliminado. Puedes deshacer esta acción durante la primera hora
 Search ticket by id or alias: Buscar tickets por identificador o alias
 ticket: ticket
+You must select a ticket: Debes seleccionar un ticket
 
 #sections
 List: Listado

modules/ticket/front/sale/index.js

@@ -476,7 +476,7 @@ class Controller extends Section {
      */
     addSale(sale) {
         const data = {
-            itemId: sale.itemFk,
+            barcode: sale.itemFk,
             quantity: sale.quantity
         };
         const query = `tickets/${this.ticket.id}/addSale`;

modules/ticket/front/sale/index.spec.js

@@ -659,7 +659,7 @@ describe('Ticket', () => {
                 jest.spyOn(controller, 'resetChanges').mockReturnThis();
 
                 const newSale = {itemFk: 4, quantity: 10};
-                const expectedParams = {itemId: 4, quantity: 10};
+                const expectedParams = {barcode: 4, quantity: 10};
                 const expectedResult = {
                     id: 30,
                     quantity: 10,

modules/travel/back/methods/travel/cloneWithEntries.js

@@ -26,10 +26,9 @@ module.exports = Self => {
 
     Self.cloneWithEntries = async(ctx, id, options) => {
         const conn = Self.dataSource.connector;
+        let tx;
         const myOptions = {};
-        let tx = options?.transaction;
 
-        try {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
@@ -37,7 +36,7 @@ module.exports = Self => {
             tx = await Self.beginTransaction({});
             myOptions.transaction = tx;
         }
-
+        try {
             const travel = await Self.findById(id, {
                 fields: [
                     'id',
@@ -89,6 +88,8 @@ module.exports = Self => {
                     'ref'
                 ]
             }, myOptions);
+
+            if (tx) await tx.commit();
             return newTravel.id;
         } catch (e) {
             if (tx) await tx.rollback();

modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js

@@ -7,19 +7,22 @@ describe('Travel cloneWithEntries()', () => {
     const ctx = {req: {accessToken: {userId: currentUserId}}};
     let newTravelId;
     it(`should clone the travel and the containing entries`, async() => {
-        const tx = await models.Travel.beginTransaction({
+        const tx = await models.Travel.beginTransaction({});
-        });
         const warehouseThree = 3;
         const agencyModeOne = 1;
+        let travelRemoved;
+
         try {
             const options = {transaction: tx};
+
             newTravelId = await models.Travel.cloneWithEntries(ctx, travelId, options);
             const travelEntries = await models.Entry.find({
                 where: {
                     travelFk: newTravelId
                 }
             }, options);
-            const newTravel = await models.Travel.findById(travelId);
+            const newTravel = await models.Travel.findById(travelId, null, options);
+            travelRemoved = await models.Travel.findById(newTravelId);
 
             expect(newTravelId).not.toEqual(travelId);
             expect(newTravel.ref).toEqual('fifth travel');
@@ -27,14 +30,9 @@ describe('Travel cloneWithEntries()', () => {
             expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
             expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
             expect(travelEntries.length).toBeGreaterThan(0);
-            await models.Entry.destroyAll({
-                travelFk: newTravelId
-            }, options);
-            await models.Travel.destroyById(newTravelId, options);
-            await tx.rollback();
-            const travelRemoved = await models.Travel.findById(newTravelId, options);
-
             expect(travelRemoved).toBeNull();
+
+            await tx.rollback();
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/worker/back/models/operator.js

@@ -20,7 +20,7 @@ module.exports = Self => {
                 const notifications = await models.NotificationQueue.find(
                     {where: {created: {gte: new Date(Date.vnNow() - (backupPrinterNotificationDelay * 1000))},
                         notificationFk: notificationName,
-                        status: 'sent'
+                        status: {neq: 'error'}
                     }
                     });
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.24.1",
+    "version": "24.26.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/reports/collection-label/sql/labelsData.sql

@@ -35,7 +35,7 @@ SELECT c.itemPackingTypeFk code,
         LEFT JOIN vn.ticketTrolley tt ON tt.ticket = t.id
         LEFT JOIN vn.`zone` zo ON t.zoneFk = zo.id
         LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk
-        LEFT JOIN vn.roadmapStop rs ON rs.id = rm.expeditionTruckFk
+        LEFT JOIN vn.roadmapStop rs ON rs.id = rm.roadmapStopFk
         LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
         JOIN vn.productionConfig pc
     WHERE t.id IN (?)

print/templates/reports/expedition-pallet-label/sql/labelData.sql

@@ -5,7 +5,7 @@ SELECT ep.id palletFk,
 		COUNT(es.id) labels,
 		t.warehouseFk warehouseFk,
 		dayname(r.created) `dayName`,
-		rs.id <=> rm.expeditionTruckFk isMatch
+		rs.id <=> rm.roadmapStopFk isMatch
 	FROM vn.roadmapStop rs
 		JOIN vn.expeditionPallet ep ON ep.truckFk = rs.id
 		JOIN vn.expeditionScan es ON es.palletFk = ep.id
@@ -13,7 +13,7 @@ SELECT ep.id palletFk,
 		JOIN vn.ticket t ON t.id = e.ticketFk
 		JOIN vn.route r ON r.id = t.routeFk
 		LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
-		LEFT JOIN vn.roadmapStop rs2 ON rs2.id = rm.expeditionTruckFk
+		LEFT JOIN vn.roadmapStop rs2 ON rs2.id = rm.roadmapStopFk
 	WHERE ep.id = ?
 	GROUP BY ep.id, t.routeFk
 	ORDER BY t.routeFk