Merge pull request '7596-devToTest_2426' (!2600) from 7596-devToTest_2426 into test

Reviewed-on: #2600
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

back/methods/vn-user/acls.js

@@ -0,0 +1,72 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('acls', {
+        description: 'Get all of the current user acls',
+        returns: {
+            type: 'Object',
+            root: true
+        },
+        http: {
+            path: '/acls',
+            verb: 'GET'
+        }
+    });
+
+    const staticAcls = new Map();
+    const app = require('vn-loopback/server/server');
+    app.on('started', function() {
+        for (const model of app.models()) {
+            for (const acl of model.settings.acls) {
+                if (acl.principalType == 'ROLE' && acl.permission == 'ALLOW') {
+                    const staticAcl = {
+                        model: model.name,
+                        property: '*',
+                        accessType: acl.accessType,
+                        permission: acl.permission,
+                        principalType: acl.principalType,
+                        principalId: acl.principalId,
+                    };
+                    if (staticAcls.has(acl.principalId))
+                        staticAcls.get(acl.principalId).push(staticAcl);
+                    else
+                        staticAcls.set(acl.principalId, [staticAcl]);
+                }
+            }
+        }
+    });
+
+    Self.acls = async function(ctx) {
+        const models = Self.app.models;
+        const acls = [];
+        const userId = ctx.req.accessToken.userId;
+        if (userId) {
+            const roleMapping = await models.RoleMapping.find({
+                where: {
+                    principalId: userId
+                },
+                include: [
+                    {
+                        relation: 'role',
+                        scope: {
+                            fields: [
+                                'name'
+                            ]
+                        }
+                    }
+                ]
+            });
+            const dynamicAcls = await models.ACL.find({
+                where: {
+                    principalId: {
+                        inq: roleMapping.map(rm => rm.role().name)
+                    }
+                }
+            });
+            dynamicAcls.forEach(acl => acls.push(acl));
+            staticAcls.get('$authenticated').forEach(acl => acls.push(acl));
+        } else
+            staticAcls.get('$unauthenticated').forEach(acl => acls.push(acl));
+
+        staticAcls.get('$everyone').forEach(acl => acls.push(acl));
+        return acls;
+    };
+};

back/methods/vn-user/specs/acls.spec.js

@@ -0,0 +1,27 @@
+const {models} = require('vn-loopback/server/server');
+const id = {administrative: 5, employee: 1, productionBoss: 50};
+
+describe('VnUser acls()', () => {
+    it('should get its owns acls', async() => {
+        expect(await hasAcl('administrative', id.administrative)).toBeTruthy();
+        expect(await hasAcl('productionBoss', id.productionBoss)).toBeTruthy();
+    });
+
+    it('should not get administrative acls', async() => {
+        expect(await hasAcl('administrative', id.employee)).toBeFalsy();
+    });
+
+    it('should get the $authenticated acls', async() => {
+        expect(await hasAcl('$authenticated', id.employee)).toBeTruthy();
+    });
+
+    it('should get the $everyone acls', async() => {
+        expect(await hasAcl('$everyone', id.employee)).toBeTruthy();
+    });
+});
+
+const hasAcl = async(role, userId) => {
+    const ctx = {req: {accessToken: {userId}, headers: {origin: 'http://localhost'}}};
+    const acls = await models.VnUser.acls(ctx);
+    return Object.values(acls).some(acl => acl.principalId === role);
+};

back/models/vn-user.js

@@ -16,6 +16,7 @@ module.exports = function(Self) {
     require('../methods/vn-user/share-token')(Self);
     require('../methods/vn-user/update-user')(Self);
     require('../methods/vn-user/validate-token')(Self);
+    require('../methods/vn-user/acls')(Self);
 
     Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
 

back/models/vn-user.json

@@ -140,6 +140,13 @@
             "principalType": "ROLE",
             "principalId": "$authenticated",
             "permission": "ALLOW"
+        },
+        {
+			"property": "acls",
+			"accessType": "*",
+			"principalType": "ROLE",
+			"principalId": "$everyone",
+			"permission": "ALLOW"
         }
     ],
     "scopes": {

back/tests-helper.js

@@ -17,6 +17,7 @@ async function init() {
             err => err ? reject(err) : resolve());
     });
     // FIXME: Workaround to wait for loopback to be ready
+    app.emit('started');
     await app.models.Application.status();
 }
 

db/.pullinfo.json

@@ -9,7 +9,7 @@
     },
     "vn": {
       "view": {
-        "expeditionPallet_Print": "06613719475fcdba8309607c38cc78efc2e348cca7bc96b48dc3ae3c12426f54"
+        "expeditionPallet_Print": "ced2b84a114fcb99fce05f0c34f4fc03f3fa387bef92621be1bc306608a84345"
       }
     }
   }

db/dump/.dump/data.sql

@@ -1793,8 +1793,8 @@ INSERT INTO `ACL` VALUES (688,'ClientSms','create','WRITE','ALLOW','ROLE','emplo
 INSERT INTO `ACL` VALUES (689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss');
 INSERT INTO `ACL` VALUES (691,'Roadmap','*','*','ALLOW','ROLE','productionBoss');
-INSERT INTO `ACL` VALUES (692,'ExpeditionTruck','*','*','ALLOW','ROLE','production');
+INSERT INTO `ACL` VALUES (692,'RoadmapStop','*','*','ALLOW','ROLE','production');
-INSERT INTO `ACL` VALUES (693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss');
+INSERT INTO `ACL` VALUES (693,'RoadmapStop','*','*','ALLOW','ROLE','productionBoss');
 INSERT INTO `ACL` VALUES (695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative');

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

@@ -2687,13 +2687,20 @@ INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`)
         (3,  6,  5),
         (4,  7,  1);
 
+INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
+    VALUES
+        (1),
+        (2),
+        (3),
+        (4);
+
 INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `userFk`, `price`, `driverName`)
     VALUES
-        (1, 'val-algemesi', 'RE-001', 'PO-001', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
+        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
-        (2, 'alg-valencia', 'RE-002', 'PO-002', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
+        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', 'RE-003', 'PO-003', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
 
-INSERT INTO `vn`.`expeditionTruck` (`id`, `roadmapFk`, `warehouseFk`, `eta`, `description`, `userFk`)
+INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `addressFk`, `eta`, `description`, `userFk`)
     VALUES
         (1, 1, 1, DATE_ADD(util.VN_NOW(), INTERVAL 1 DAY),          'Best truck in fleet',      1),
         (2, 1, 2, DATE_ADD(util.VN_NOW(), INTERVAL '1 2' DAY_HOUR), 'Second truck in fleet',    1),

db/routines/bi/procedures/claim_ratio_routine.sql

@@ -65,11 +65,12 @@ BEGIN
 				JOIN vn.ticketLastState ts ON ts.ticketFk = t.id
 				JOIN vn.ticketTracking tt ON tt.id = ts.ticketTrackingFk
 				JOIN vn.state st ON st.id = tt.stateFk
+				JOIN vn.alertLevel al ON al.code = 'DELIVERED'
 			WHERE sc.componentFk = 17
 				AND sc.isGreuge = 0
 				AND t.shipped >= '2016-10-01'
 				AND t.shipped < util.VN_CURDATE()
-				AND st.alertLevel >= 3;
+				AND st.alertLevel >= al.id;
 
 	DELETE g.*
 			FROM vn.greuge g

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/hedera/procedures/item_getVisible.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `hedera`.`item_getVisible
     vType INT,
     vPrefix VARCHAR(255))
 BEGIN
-	
+
 /**
  * Gets visible items of the specified type at specified date.
  *
@@ -14,7 +14,7 @@ BEGIN
  * @param vType The type id
  * @param vPrefix The article prefix to filter or %NULL for all
  * @return tmp.itemVisible Visible items
- */ 
+ */
 	DECLARE vPrefixLen SMALLINT;
 	DECLARE vFilter VARCHAR(255) DEFAULT NULL;
 	DECLARE vDateInv DATE DEFAULT vn.getInventoryDate();
@@ -23,13 +23,13 @@ BEGIN
 			GET DIAGNOSTICS CONDITION 1
         		@message = MESSAGE_TEXT;
 			CALL vn.mail_insert(
-				'cau@verdnatura.es', 
+				'cau@verdnatura.es',
-				NULL, 
+				NULL,
 			    CONCAT('hedera.item_getVisible error: ', @message),
 			    CONCAT(
-			    	'warehouse: ', IFNULL(vWarehouse, ''), 
+			    	'warehouse: ', IFNULL(vWarehouse, ''),
-			    	', Fecha:', IFNULL(vDate, ''), 
+			    	', Fecha:', IFNULL(vDate, ''),
-			    	', tipo: ', IFNULL(vType,''), 
+			    	', tipo: ', IFNULL(vType,''),
 			    	', prefijo: ', IFNULL(vPrefix,'')));
 			RESIGNAL;
 		END;
@@ -74,9 +74,10 @@ BEGIN
 					FROM vn.sale m
 						JOIN vn.ticket t ON t.id = m.ticketFk
 						JOIN vn.ticketState s ON s.ticketFk = t.id
+						JOIN vn.alertLevel al ON al.code = 'DELIVERED'
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseFk = vWarehouse
-						AND s.alertLevel = 3
+						AND s.alertLevel = al.id
 			) t
 			GROUP BY itemFk
 				HAVING quantity > 0;
@@ -108,7 +109,7 @@ BEGIN
 				IF(p.depth > 0, p.depth, 0) depth, p.width, p.height,
 				CEIL(s.quantity / t.packing) etiquetas
 			FROM vn.item i
-				JOIN `filter` f ON f.itemFk = i.id 
+				JOIN `filter` f ON f.itemFk = i.id
 				JOIN currentStock s ON s.itemFk = i.id
 				LEFT JOIN tmp t ON t.itemFk = i.id
 				LEFT JOIN vn.packaging p ON p.id = t.packagingFk

db/routines/hedera/procedures/order_confirmWithUser.sql

@@ -62,7 +62,7 @@ BEGIN
 	END;
 
 	-- Carga los datos del pedido
-	SELECT o.date_send, o.address_id, o.note, a.clientFk, 
+	SELECT o.date_send, o.address_id, o.note, a.clientFk,
 			o.company_id, o.agency_id, c.isTaxDataChecked
 		INTO vDelivery, vAddress, vNotes, vClientId,
 			vCompanyId, vAgencyModeId, vIsTaxDataChecked
@@ -121,6 +121,7 @@ BEGIN
 			)
 		SELECT t.id INTO vTicket
 			FROM vn.ticket t
+				JOIN vn.alertLevel al ON al.code = 'FREE'
 				LEFT JOIN tPrevia tp ON tp.ticketFk = t.id
 				LEFT JOIN vn.ticketState tls on tls.ticketFk = t.id
 				JOIN hedera.`order` o
@@ -131,7 +132,7 @@ BEGIN
 			WHERE o.id = vSelf
 				AND t.refFk IS NULL
 				AND tp.ticketFk IS NULL
-				AND IFNULL(tls.alertLevel,0) = 0				
+				AND (tls.alertLevel IS NULL OR tls.alertLevel = al.id)
 			LIMIT 1;
 
 		-- Crea el ticket en el caso de no existir uno adecuado

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/stock/procedures/log_refreshSale.sql

@@ -16,12 +16,13 @@ BEGIN
 				m.created,
 				TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
 				m.quantity < 0 isIn,
-				m.isPicked OR s.alertLevel > 1 isPicked
+				m.isPicked OR s.alertLevel > al.id isPicked
 			FROM vn.sale m
 				JOIN vn.ticket t ON t.id = m.ticketFk
 				JOIN vn.ticketState s ON s.ticketFk = t.id
 				JOIN vn.item i ON i.id = m.itemFk
 				JOIN vn.itemType tp ON tp.id = i.typeFk
+				JOIN vn.alertLevel al ON al.code = 'ON_PREPARATION'
 			WHERE (
 					vTableId IS NULL
 					OR (vTableName = 'ticket' AND t.id = vTableId)

db/routines/vn/procedures/buy_afterUpsert.sql

@@ -1,5 +1,7 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_afterUpsert`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_afterUpsert`(
+	vSelf INT
+)
 BEGIN
 /**
  * Triggered actions when a buy is updated or inserted.
@@ -16,7 +18,7 @@ BEGIN
 	DECLARE vIsFeedStock BOOL;
 	DECLARE vWeight DECIMAL(10,2);
 	DECLARE vPacking INT;
-   
+
 	SELECT b.entryFk, 
 			b.itemFk, 
 			i.packingOut, 
@@ -47,8 +49,11 @@ BEGIN
 		WHERE e.id = vEntryFk;
 
 	IF vIsMerchandise THEN
+		IF vWarehouse IS NULL THEN
+			CALL util.throw('The entry does not have travel');
+		END IF;
 
-    	REPLACE itemCost SET
+		REPLACE itemCost SET
 			itemFk = vItemFk,
 			warehouseFk = vWarehouse,
 			cm3 = buy_getUnitVolume(vSelf),
@@ -74,7 +79,7 @@ BEGIN
 				WHERE b.id = vSelf;
 
 	END IF;
-    CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+	CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
 		SELECT vSelf id;
 	CALL buy_checkItem();
 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/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/expeditionTruck_Add.sql

@@ -1,9 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionTruck_Add`(vHour VARCHAR(5), vDescription VARCHAR(45))
-BEGIN
-
-	INSERT INTO vn.roadmapStop(eta,description)
-		VALUES(CONCAT(util.VN_CURDATE(), ' ', vHour), vDescription);
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/expeditionTruck_List.sql

@@ -1,12 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionTruck_List`()
-BEGIN
-
-	SELECT 	id truckFk, 
-			eta, 
-			description Destino
-		FROM roadmapStop
-		WHERE eta BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-		ORDER BY eta;
-END$$
-DELIMITER ;

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_getFromRoute.sql

@@ -15,7 +15,8 @@ BEGIN
 			t.addressFk,
 			a.nickname,
 			sub2.itemPackingTypeConcat,
-			est.code
+			est.code,
+			es.isScanned
 		FROM expedition e
 			JOIN ticket t ON t.id = e.ticketFk
 			JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@@ -33,6 +34,10 @@ BEGIN
 						GROUP BY sub.ticketFk
 						) sub2 ON sub2.ticketFk = t.id
 			LEFT JOIN expeditionStateType est ON est.id  = e.stateTypeFk
+			LEFT JOIN expeditionState es ON es.id = (
+				    SELECT MAX(id)
+				    	FROM expeditionState es
+				    	WHERE expeditionFk = e.id)
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 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/invoiceOut_new.sql

@@ -80,8 +80,8 @@ BEGIN
 			OR t.isDeleted
 			OR c.hasToInvoice = FALSE
 			OR itc.id IS NULL
-			OR a.id IS NULL 
+			OR a.id IS NULL
-			OR (vTaxArea = 'WORLD' 
+			OR (vTaxArea = 'WORLD'
 				AND (a.customsAgentFk IS NULL OR a.incotermsFk IS NULL));
 
 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
@@ -153,7 +153,9 @@ BEGIN
 				FROM tmp.ticketToInvoice ti
 					LEFT JOIN ticketState ts ON ti.id = ts.ticketFk
 					JOIN state s
-				WHERE IFNULL(ts.alertLevel, 0) < 3 and s.`code` = getAlert3State(ti.id);
+					JOIN alertLevel al ON al.code = 'DELIVERED'
+				WHERE (ts.alertLevel IS NULL OR ts.alertLevel < al.id)
+					AND s.`code` = getAlert3State(ti.id);
 
 		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 			SELECT * FROM tmp.updateInter;

db/routines/vn/procedures/itemShelvingRadar.sql

@@ -49,7 +49,7 @@ BEGIN
 							ish.isChecked,
 							sub.isAllChecked
 						FROM itemShelvingStock iss
-							JOIN itemShelving ish ON ish.shelvingFk = iss.shelvingFk
+							JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
 							LEFT JOIN (
 								SELECT itemFk,
 										IF(

db/routines/vn/procedures/prepareTicketList.sql

@@ -6,14 +6,16 @@ BEGIN
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk, t.clientFk
-			FROM vn.ticket t
+			FROM ticket t
-				LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
+				JOIN alertLevel al ON al.code = 'DELIVERED'
-				JOIN vn.client c ON c.id = t.clientFk
+				LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+				JOIN client c ON c.id = t.clientFk
+
 			WHERE c.typeFk IN ('normal','handMaking','internalUse')
 				AND (
 					t.shipped BETWEEN util.VN_CURDATE() AND vEndingDate
 					OR (
-						ts.alertLevel < 3
+						ts.alertLevel < al.id
 						AND t.shipped >= vStartingDate
 						AND t.shipped < util.VN_CURDATE()
 					)

db/routines/vn/procedures/productionControl.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`productionControl`(
-	vWarehouseFk INT, 
+	vWarehouseFk INT,
 	vScopeDays INT
 )
 proc: BEGIN
@@ -67,7 +67,7 @@ proc: BEGIN
 				wk.code salesPersonCode,
 				p.id provinceFk,
 				tls.productionOrder,
-				IFNULL(tls.alertLevel, 0) alertLevel,
+				IFNULL(tls.alertLevel, al.id) alertLevel,
 				t.isBoxed palletized,
 				IF(rm.isPickingAllowed, rm.bufferFk, NULL) ubicacion,
 				tlu.lastUpdated,
@@ -81,6 +81,7 @@ proc: BEGIN
 				rm.bufferFk
 			FROM tmp.productionTicket tt
 				JOIN ticket t ON tt.ticketFk = t.id
+				JOIN alertLevel al ON al.code = 'FREE'
 				LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
 				LEFT JOIN `state` st ON st.id = tst.state
 				LEFT JOIN client c ON c.id = t.clientFk
@@ -101,7 +102,7 @@ proc: BEGIN
 				LEFT JOIN parking pk ON pk.id = tp.parkingFk
 			WHERE t.warehouseFk = vWarehouseFk
 				AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
-		
+
 	 UPDATE tmp.productionBuffer pb
 			JOIN (
 				SELECT pb.ticketFk, GROUP_CONCAT(p.code) previaParking
@@ -109,12 +110,12 @@ proc: BEGIN
 						JOIN sale s ON s.ticketFk = pb.ticketFk
 						JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
 						JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
-						JOIN parking p ON p.id = sg.parkingFk 
+						JOIN parking p ON p.id = sg.parkingFk
 					GROUP BY pb.ticketFk
 			) t ON t.ticketFk = pb.ticketFk
 		SET pb.previaParking = t.previaParking;
 
-	-- Problemas por ticket 
+	-- Problemas por ticket
 	ALTER TABLE tmp.productionBuffer
 		CHANGE COLUMN `problem` `problem` VARCHAR(255),
 		ADD COLUMN `collectionH` INT,

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/ticketGetVisibleAvailable.sql

@@ -7,13 +7,16 @@ BEGIN
     DECLARE vShipped DATE;
     DECLARE vWarehouse TINYINT;
     DECLARE vAlertLevel INT;
+	DECLARE vAlertLevelFree INT;
 
-    SELECT t.warehouseFk, t.shipped, ts.alertLevel INTO vWarehouse, vShipped, vAlertLevel
+    SELECT t.warehouseFk, t.shipped, ts.alertLevel, al.id
+			INTO vWarehouse, vShipped, vAlertLevel, vAlertLevelFree
         FROM ticket t
+			JOIN alertLevel al ON al.code = 'FREE'
             LEFT JOIN ticketState ts ON ts.ticketFk = vTicket
        WHERE t.id = vTicket;
 
-    IF vAlertLevel IS NULL OR vAlertLevel = 0 THEN
+    IF vAlertLevel IS NULL OR vAlertLevel = vAlertLevelFree THEN
         IF vShipped >= util.VN_CURDATE() THEN
             CALL cache.available_refresh(vAvailableCalc, FALSE, vWarehouse, vShipped);
         END IF;

db/routines/vn/procedures/ticketMissed_List.sql

@@ -1,49 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketMissed_List`(vTicketFk INT)
-BEGIN
-
-    DECLARE vParkingFk INT;
-    DECLARE vParked DATETIME;
-    DECLARE vLevel INT;
-    DECLARE vCollectionFk INT;
-    
-    SELECT IFNULL(`level`,0), IFNULL(collectionFk,0) 
-		INTO vLevel, vCollectionFk
-		FROM vn.ticketCollection
-        WHERE ticketFk = vTicketFk
-        LIMIT 1;
-        
-	SELECT created, parkingFk 
-		INTO vParked, vParkingFk
-		FROM vn.ticketParking
-        WHERE ticketFk = vTicketFk;
-        
-    SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
-		FROM vn.ticketParking tp
-        JOIN vn.parking p ON p.id = tp.parkingFk
-        JOIN vn.sector sc ON sc.id = p.sectorFk
-        LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
-        JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
-        JOIN vn.ticket t ON t.id = tp.ticketFk
-        JOIN vn.zone z ON z.id = t.zoneFk
-        JOIN vn.agencyMode am ON am.id = z.agencyModeFk
-        JOIN vn.state s ON s.id = tst.state
-        WHERE (s.alertLevel < 2
-			AND tp.parkingFk = vParkingFk
-            AND sc.isPackagingArea
-            AND (
-					(
-						( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
-					OR
-						( tc.collectionFk = vCollectionFk AND LEFT(tc.level,1) < LEFT(vLevel,1) )
-					)
-                )) -- Etiquetas que no se han escaneado y ya estamos con una posterior
-			OR
-            (s.alertLevel > 1
-				AND tp.parkingFk = vParkingFk
-                AND sc.isPackagingArea
-                AND tp.created < vParked
-                AND t.packages <=> 0);
-        
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticketParking_findSkipped.sql

@@ -1,64 +1,66 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketParking_findSkipped`(vTicketFk INT, vItemPackingTypeFk VARCHAR(1))
 BEGIN
-	
+
 /**
  * Averigua los tickets que se han saltado por un error en el proceso encajado
  * @param vTicketFk Ticket
  * @param vItemPackingTypeFk Modo de encajado
  * @return un select con los tickets afectados
- */  
+ */
 
    	DECLARE vParkingFk INT;
     DECLARE vParked DATETIME;
     DECLARE vLevel INT;
     DECLARE vWagon INT;
     DECLARE vCollectionFk INT;
-    
+
-    SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0) 
+    SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0)
 		INTO vLevel, vWagon, vCollectionFk
 		FROM vn.ticketCollection tc
 			JOIN vn.collection c ON c.id = tc.collectionFk AND c.itemPackingTypeFk = vItemPackingTypeFk
         WHERE ticketFk = vTicketFk
         ORDER BY c.id DESC
         LIMIT 1;
-        
+
-	SELECT created, parkingFk 
+	SELECT created, parkingFk
 		INTO vParked, vParkingFk
 		FROM vn.ticketParking tp
-			JOIN vn.parking p ON p.id = tp.parkingFk 
+			JOIN vn.parking p ON p.id = tp.parkingFk
-			JOIN vn.sector s ON s.id = p.sectorFk 
+			JOIN vn.sector s ON s.id = p.sectorFk
         WHERE ticketFk = vTicketFk
        		AND s.itemPackingTypeFk = vItemPackingTypeFk
        		AND s.isPackagingArea ;
-        
+
     SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' ', tc.wagon, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
 		FROM vn.ticketParking tp
-        JOIN vn.parking p ON p.id = tp.parkingFk
+			JOIN vn.parking p ON p.id = tp.parkingFk
-        JOIN vn.sector sc ON sc.id = p.sectorFk
+			JOIN vn.sector sc ON sc.id = p.sectorFk
-        LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
+			LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
-        JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
+			JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
-        JOIN vn.ticket t ON t.id = tp.ticketFk
+			JOIN vn.ticket t ON t.id = tp.ticketFk
-        JOIN vn.zone z ON z.id = t.zoneFk
+			JOIN vn.zone z ON z.id = t.zoneFk
-        JOIN vn.agencyMode am ON am.id = z.agencyModeFk
+			JOIN vn.agencyMode am ON am.id = z.agencyModeFk
-        JOIN vn.state s ON s.id = tst.state
+			JOIN vn.state s ON s.id = tst.state
-        WHERE (s.alertLevel < 2
+			JOIN vn.alertLevel alPacked ON alPacked.code = 'PACKED'
+			JOIN vn.alertLevel alOnPreparation ON alOnPreparation.code = 'ON_PREPARATION'
+        WHERE (s.alertLevel < alPacked.id
 				AND tp.parkingFk = vParkingFk
 	            AND sc.isPackagingArea
 	            AND 	(
 						( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
 					OR
-						( tc.collectionFk = vCollectionFk 
+						( tc.collectionFk = vCollectionFk
 							AND (LEFT(tc.wagon,1) < LEFT(vWagon,1)
-							OR  (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))	
+							OR  (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))
 						)
 					)
 				) -- Etiquetas que no se han escaneado y ya estamos con una posterior
 				OR
-	            (s.alertLevel > 1
+	            (s.alertLevel > alOnPreparation.id
 					AND tp.parkingFk = vParkingFk
 	                AND sc.isPackagingArea
-	                AND tp.created < vParked              
+	                AND tp.created < vParked
 	                AND t.packages <=> 0);
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticketStateToday_setState.sql

@@ -1,26 +1,29 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketStateToday_setState`(vTicketFk INT, vStateCode VARCHAR(45))
 BEGIN
-	
+
 	/* Modifica el estado de un ticket de hoy
-	 * 
+	 *
 	 * @param vTicketFk el id del ticket
 	 * @param vStateCode estado a modificar del ticket
-	 * 
+	 *
 	 */
-	
+
 	DECLARE vAlertLevel INT;
-	
+	DECLARE vAlertLevelPacked INT;
-	SELECT s.alertLevel INTO vAlertLevel 
+
-		FROM state s 
+	SELECT s.alertLevel, al.id
-			JOIN ticketStateToday tst ON tst.state = s.id 
+			INTO vAlertLevel, vAlertLevelPacked
+		FROM state s
+			JOIN ticketStateToday tst ON tst.state = s.id
+			JOIN alertLevel al ON al.code = 'PACKED'
 		WHERE tst.ticketFk = vTicketFk
 		LIMIT 1;
-	
+
-	IF vAlertLevel < 2 THEN
+	IF vAlertLevel < vAlertLevelPacked THEN
-	
+
 		CALL vn.ticket_setState(vTicketFk, vStateCode);
-	
+
 	END IF;
 
 END$$

db/routines/vn/procedures/ticketStateUpdate.sql

@@ -1,26 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45))
-BEGIN
-	
-	/*
-	 * @deprecated:utilizar ticket_setState
-	 */
-	
-	DECLARE vAlertLevel INT;
-
-	SELECT s.alertLevel INTO vAlertLevel 
-		FROM vn.state s
-			JOIN vn.ticketState ts ON ts.stateFk = s.id
-			WHERE ts.ticketFk = vTicketFk;
-	
-	IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN 
-	
-		INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
-			SELECT id, vTicketFk, account.myUser_getId()
-				FROM vn.state 
-			WHERE `code` = vStateCode collate utf8_unicode_ci;
-
-	END IF;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruck.sql

@@ -13,10 +13,11 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.ticket
 		SELECT ticketFk
 		FROM tmp.productionBuffer
+			JOIN alertLevel al ON al.code = 'FREE'
 		WHERE shipped = util.VN_CURDATE()
 			AND problem LIKE '%I:%'
 			AND (HH <= vHour OR HH = vHour AND mm < vMinute)
-			AND alertLevel = 0;
+			AND alertLevel = al.id;
 
 	OPEN cur1;
 

db/routines/vn/procedures/ticket_doCmr.sql

@@ -18,7 +18,7 @@ BEGIN
 				com.id companyFk,
 				a.id addressFk,
 				c2.defaultAddressFk,
-				su.id supplierFk,
+				IFNULL(sat.supplierFk, su.id) supplierFk,
 				t.landed
 			FROM ticket t
 				JOIN ticketState ts ON ts.ticketFk = t.id
@@ -28,15 +28,18 @@ BEGIN
 				JOIN `address` a ON a.id = t.addressFk
 				JOIN province p ON p.id = a.provinceFk
 				JOIN country co ON co.id = p.countryFk
-				JOIN agencyMode am ON am.id = t.agencyModeFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 				JOIN company com ON com.id = t.companyFk
 				JOIN client c2 ON c2.id = com.clientFk
-				JOIN supplierAccount sa ON sa.id  = com.supplierAccountFk
+				JOIN supplierAccount sa ON sa.id = com.supplierAccountFk
 				JOIN supplier su ON su.id = sa.supplierFk
 				LEFT JOIN route r ON r.id = t.routeFk
 				LEFT JOIN worker wo ON wo.id = r.workerFk
 				LEFT JOIN vehicle v ON v.id = r.vehicleFk
+				LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+				LEFT JOIN agency ag ON ag.id = am.agencyFk
+				LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
+					AND wo.isFreelance
 			WHERE al.code IN ('PACKED', 'DELIVERED')
 				AND co.code <> 'ES'
 				AND am.name <> 'ABONO'

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/claimRatio_afterUpdate.sql

@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimRatio_afterUpdate`
+	AFTER UPDATE 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/deviceProductionConfig_afterUpdate.sql

@@ -1,13 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionConfig_afterUpdate`
-	AFTER UPDATE ON `deviceProductionConfig`
-	FOR EACH ROW
-BEGIN
-	IF NEW.isAllUsersAllowed = 1 OR NEW.isAllUsersAllowed = -1 THEN
-		SET @username := (SELECT account.myUser_getName());
-		INSERT INTO vn.mail (receiver, subject, body)
-		VALUES ('cau@verdnatura.es', 'Se ha activado la autenticación sin restricciones en la app',
-		CONCAT('El usuario ', @username,' ha habilitado la opción para que todos los usuarios puedan acceder a la app sin restricciones'));
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/expedition_beforeInsert.sql

@@ -3,25 +3,25 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_beforeInse
 	BEFORE INSERT ON `expedition`
 	FOR EACH ROW
 BEGIN
-	DECLARE intcounter INT;
+	DECLARE vMaxCounter INT;
-	DECLARE vShipFk INT;
 
 	SET NEW.editorFk = account.myUser_getId();
 
-	IF NEW.freightItemFk IS NOT NULL THEN 
+	IF NEW.freightItemFk IS NOT NULL THEN
 
 		UPDATE ticket SET packages = IFNULL(packages, 0) + 1 WHERE id = NEW.ticketFk;
 
-		SELECT IFNULL(MAX(counter),0) +1 INTO intcounter 
+		SELECT IFNULL(MAX(counter),0) + 1 INTO vMaxCounter
-			FROM expedition e 
+			FROM expedition e
-				INNER JOIN ticket t1 ON e.ticketFk = t1.id 
+				JOIN alertLevel al ON al.code = 'DELIVERED'
+				JOIN ticket t1 ON e.ticketFk = t1.id
 				LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
-				INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped) 
+				JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
 					AND t1.warehouseFk = t2.warehouseFk
-			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk 
+			WHERE t2.id = NEW.ticketFk AND ts.alertLevel < al.id AND t1.companyFk = t2.companyFk
 				AND t1.agencyModeFk = t2.agencyModeFk;
 
-		SET NEW.`counter` = intcounter;
+		SET NEW.`counter` = vMaxCounter;
 	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

@@ -1,19 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`expeditionTruck_Control`
-AS SELECT `e`.`truckFk` AS `id`,
-	`e`.`eta` AS `ETD`,
-	`e`.`description` AS `description`,
-	COUNT(
-		DISTINCT IF(`e`.`expeditionFk` IS NULL, `e`.`ticketFk`, NULL)
-	) AS `ticketsSinBultos`,
-	COUNT(DISTINCT `e`.`palletFk`) AS `pallets`,
-	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`,
-	max(`e`.`lastPacked`) AS `lastPacked`
-FROM `vn`.`expeditionCommon` `e`
-GROUP BY `e`.`truckFk`
-ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC,
-	`e`.`eta`

db/routines/vn/views/expeditionTruck_Control_Detail.sql

@@ -1,18 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`expeditionTruck_Control_Detail`
-AS SELECT `e`.`truckFk` AS `id`,
-	`e`.`eta` AS `eta`,
-	`e`.`description` AS `destino`,
-	`e`.`palletFk` AS `pallet`,
-	COUNT(DISTINCT `e`.`routeFk`) AS `routes`,
-	COUNT(DISTINCT `e`.`scanFk`) AS `scans`,
-	COUNT(DISTINCT `e`.`expeditionTruckFk`) AS `destinos`,
-	sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) 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,
-	`e`.`eta`,
-	`e`.`truckFk`

db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql

@@ -1,22 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`expeditionTruck_Control_Detail_Pallet`
-AS SELECT `e`.`truckFk` AS `id`,
-	`e`.`eta` AS `eta`,
-	`e`.`description` AS `destino`,
-	`e`.`palletFk` AS `pallet`,
-	`e`.`routeFk` AS `route`,
-	COUNT(DISTINCT `e`.`scanFk`) AS `scans`,
-	`rs`.`description` AS `destinos`,
-	sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`,
-	`e`.`expeditionTruckFk` AS `expeditionTruckFk`,
-	max(`e`.`lastPacked`) AS `lastPacked`
-FROM (
-		`vn`.`expeditionCommon` `e`
-		LEFT JOIN `vn`.`roadmapStop` `rs` ON(`rs`.`id` = `e`.`expeditionTruckFk`)
-	)
-GROUP BY `e`.`truckFk`,
-	`e`.`palletFk`,
-	`e`.`routeFk`
-ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC,
-	`e`.`palletFk`

db/routines/vn2008/views/Saldos_Prevision.sql

@@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Saldos_Prevision`
-AS SELECT `fb`.`id` AS `Saldos_Prevision_id`,
-	`fb`.`description` AS `Descripcion`,
-	`fb`.`amount` AS `Importe`,
-	`fb`.`dated` AS `Fecha`,
-	`fb`.`accountingFk` AS `Id_Banco`,
-	`fb`.`companyFk` AS `empresa_id`
-FROM `vn`.`forecastedBalance` `fb`

db/routines/vn2008/views/Tickets.sql

@@ -21,7 +21,6 @@ AS SELECT `t`.`id` AS `Id_Ticket`,
 	`t`.`workerFk` AS `Id_Trabajador`,
 	`t`.`observations` AS `Observaciones`,
 	`t`.`isSigned` AS `Firmado`,
-	`t`.`isLabeled` AS `Etiquetasemitidas`,
 	`t`.`isPrinted` AS `PedidoImpreso`,
 	`t`.`hour` AS `Hora`,
 	`t`.`isBlocked` AS `blocked`,

db/versions/11063-purpleAnthurium/00-roadmapAddress.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `vn`.`roadmapAddress` (
+	addressFk int(11) NULL,
+	isActive TINYINT DEFAULT 1 NULL,
+	PRIMARY KEY (addressFk)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Direcciones de los troncales';
+
+ALTER TABLE vn.roadmapAddress
+	ADD CONSTRAINT roadmapAddress_address_FK FOREIGN KEY (addressFk) REFERENCES vn.address(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11063-purpleAnthurium/01-roadmapStop.sql

@@ -0,0 +1,7 @@
+ALTER TABLE vn.roadmapStop DROP FOREIGN KEY expeditionTruck_FK_1;
+ALTER TABLE vn.roadmapStop DROP COLUMN warehouseFk;
+ALTER TABLE vn.roadmapStop ADD addressFk int(11) NULL;
+ALTER TABLE vn.roadmapStop CHANGE addressFk addressFk int(11) DEFAULT NULL NULL AFTER roadmapFk;
+
+ALTER TABLE vn.roadmapStop
+	ADD CONSTRAINT roadmapStop_roadmapAddress_FK FOREIGN KEY (addressFk) REFERENCES vn.roadmapAddress(addressFk) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11063-purpleAnthurium/02-roadmapStopGrants.sql

@@ -0,0 +1,11 @@
+DELETE FROM salix.ACL
+	WHERE model in ('expeditionTruck', 'Roadmap', 'roadmapStop', 'roadmapAddress');
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+	VALUES
+		('RoadmapAddress', '*', 'WRITE', 'ALLOW', 'ROLE', 'palletizerBoss'),
+		('RoadmapAddress', '*', 'READ', 'ALLOW', 'ROLE', 'production'),
+		('Roadmap', '*', 'WRITE', 'ALLOW', 'ROLE', 'palletizerBoss'),
+		('Roadmap', '*', 'READ', 'ALLOW', 'ROLE', 'production'),
+		('RoadmapStop', '*', 'WRITE', 'ALLOW', 'ROLE', 'palletizerBoss'),
+		('RoadmapStop', '*', 'READ', 'ALLOW', 'ROLE', 'production');

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/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;

db/versions/11087-aquaDendro/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.ticket MODIFY COLUMN IF EXISTS isLabeled__ tinyint(1) DEFAULT 0 NOT NULL COMMENT 'refs #7496 deprecated 2024-06-20';
+
+ALTER TABLE IF EXISTS vn.forecastedBalance RENAME vn.forecastedBalance__ ;
+ALTER TABLE IF EXISTS vn.forecastedBalance__ COMMENT='@deprecated 2024-05-21';

db/versions/11089-blueMastic/00-firstScript.sql

@@ -0,0 +1,5 @@
+-- Place your SQL code here
+
+USE vn;
+
+ALTER TABLE vn.expeditionState ADD isScanned tinyint(1) DEFAULT false NOT NULL;

db/versions/11093-purpleGerbera/00-firstScript.sql

@@ -0,0 +1,4 @@
+UPDATE salix.ACL
+	SET property = 'cmrs'
+	WHERE property = 'getExternalCmrs'
+		AND model = 'Route';

loopback/locale/es.json

@@ -359,10 +359,11 @@
 	"Select ticket or client": "Elija un ticket o un client",
 	"It was not able to create the invoice": "No se pudo crear la factura",
 	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
-    "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
+	"Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
 	"You can not use the same password": "No puedes usar la misma contraseña",
 	"This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",
 	"You can only have one PDA": "Solo puedes tener un PDA",
 	"It has been invoiced but the PDF could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
-	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono"
+	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
-}
+	"Payment method is required": "El método de pago es obligatorio"
+}

modules/account/back/models/role-inherit.json

@@ -1,6 +1,9 @@
 {
 	"name": "RoleInherit",
 	"base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
 	"options": {
 		"mysql": {
 			"table": "account.roleInherit"

modules/entry/back/methods/entry/getBuys.js

@@ -48,7 +48,8 @@ module.exports = Self => {
                 'weight',
                 'buyingValue',
                 'price2',
-                'price3'
+                'price3',
+                'printedStickers'
             ],
             include: {
                 relation: 'item',

modules/route/back/locale/routesMonitor/en.yml

@@ -13,7 +13,6 @@ columns:
     m3: m3
     priority: priority
     etd: etd
-    expeditionTruckFk: truck
     m3boxes: m3 boxes
     bufferFk: buffer
-    isPickingAllowed: is picking allowed
+    isPickingAllowed: is picking allowed

modules/route/back/locale/routesMonitor/es.yml

@@ -13,7 +13,6 @@ columns:
     m3: m3
     priority: prioridad
     etd: etd
-    expeditionTruckFk: camión
     m3boxes: m3 cajas
     bufferFk: buffer
-    isPickingAllowed: está permitido recoger
+    isPickingAllowed: está permitido recoger

modules/route/back/methods/roadmap/clone.js

@@ -37,17 +37,12 @@ module.exports = Self => {
                 fields: [
                     'id',
                     'name',
-                    'tractorPlate',
-                    'trailerPlate',
-                    'phone',
                     'supplierFk',
-                    'etd',
+                    'etd'],
-                    'observations',
-                    'price'],
                 include: [{
-                    relation: 'expeditionTruck',
+                    relation: 'roadmapStop',
                     scope: {
-                        fields: ['roadmapFk', 'warehouseFk', 'eta', 'description']
+                        fields: ['roadmapFk', 'addressFk', 'eta', 'description']
                     }
                 }]
 

modules/route/back/methods/route/cmrs.js

@@ -3,8 +3,8 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
 
 module.exports = Self => {
-    Self.remoteMethod('getExternalCmrs', {
+    Self.remoteMethod('cmrs', {
-        description: 'Returns an array of external cmrs',
+        description: 'Returns an array of cmrs',
         accessType: 'READ',
         accepts: [
             {
@@ -47,37 +47,25 @@ module.exports = Self => {
                 type: 'date',
                 description: 'The to date filter',
             },
+            {
+                arg: 'warehouseFk',
+                type: 'integer',
+            }
         ],
         returns: {
             type: ['object'],
             root: true
         },
         http: {
-            path: `/getExternalCmrs`,
+            path: `/cmrs`,
             verb: 'GET'
         }
     });
 
-    Self.getExternalCmrs = async(
+    Self.cmrs = async(
-        filter,
+        filter, cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, shipped, warehouseFk, options
-        cmrFk,
-        ticketFk,
-        routeFk,
-        country,
-        clientFk,
-        hasCmrDms,
-        shipped,
-        options
     ) => {
-        const params = {
+        const params = {cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, warehouseFk, shipped};
-            cmrFk,
-            ticketFk,
-            routeFk,
-            country,
-            clientFk,
-            hasCmrDms,
-            shipped,
-        };
         const conn = Self.dataSource.connector;
 
         let where = buildFilter(params, (param, value) => {
@@ -106,7 +94,8 @@ module.exports = Self => {
                             co.name country,
                             t.clientFk,
                             IF(sub.id, TRUE, FALSE) hasCmrDms,
-                            DATE(t.shipped) shipped
+                            DATE(t.shipped) shipped,
+                            t.warehouseFk
                         FROM ticket t
                             JOIN ticketState ts ON ts.ticketFk = t.id
                             JOIN state s ON s.id = ts.stateFk
@@ -124,8 +113,7 @@ module.exports = Self => {
                                         JOIN dmsType dt ON dt.id = d.dmsTypeFk
                                     WHERE dt.name = 'cmr'
                             ) sub ON sub.ticketFk = t.id
-                        WHERE co.code <> 'ES'
+                        WHERE am.name <> 'ABONO'
-                            AND am.name <> 'ABONO'
                             AND w.code = 'ALG'
                             AND t.cmrFk
                 ) sub

modules/route/back/methods/route/downloadCmrsZip.js

@@ -41,14 +41,16 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        ids = ids.split(',');
+        const downloadAddZip = async id => {
-
-        for (const id of ids) {
             ctx.args = ctx.args || {};
             ctx.args.id = Number(id);
             const [data] = await models.Route.cmr(ctx, myOptions);
             zip.file(`${id}.pdf`, data, {binary: true});
-        }
+        };
+
+        ids = ids.split(',');
+        const promises = ids.map(id => downloadAddZip(id));
+        await Promise.all(promises);
         const zipStream = zip.generateNodeStream({streamFiles: true});
         return [zipStream, 'application/zip', `filename="cmrs.zip"`];
     };

modules/route/back/model-config.json

@@ -8,6 +8,9 @@
     "DeliveryPoint": {
         "dataSource": "vn"
     },
+    "RoadmapAddress": {
+        "dataSource": "vn"
+    },
     "RoadmapStop": {
         "dataSource": "vn"
     },
@@ -25,8 +28,5 @@
     },
     "RoutesMonitor": {
         "dataSource": "vn"
-    },
-    "ExpeditionTruck": {
-        "dataSource": "vn"
     }
 }

modules/route/back/models/expedition-truck.json

@@ -1,9 +0,0 @@
-{
-    "name": "ExpeditionTruck",
-    "base": "RoadmapStop",
-    "options": {
-        "mysql": {
-        "table": "expeditionTruck"
-        }
-    }
-}

modules/route/back/models/roadmapAddress.json

@@ -0,0 +1,26 @@
+{
+    "name": "RoadmapAddress",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "roadmapAddress"
+        }
+    },
+    "properties": {
+        "addressFk": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "isActive": {
+            "type": "number"
+        }
+    },
+	"relations": {
+		"address": {
+            "type": "belongsTo",
+            "model": "Address",
+            "foreignKey": "addressFk"
+        }
+	}
+}

modules/route/back/models/roadmapStop.json

@@ -15,7 +15,7 @@
         "roadmapFk": {
             "type": "number"
         },
-        "warehouseFk": {
+        "addressFk": {
             "type": "number"
         },
         "eta": {
@@ -34,10 +34,10 @@
             "model": "Roadmap",
             "foreignKey": "roadmapFk"
         },
-        "warehouse": {
+        "address": {
             "type": "belongsTo",
-            "model": "Warehouse",
+            "model": "Address",
-            "foreignKey": "warehouseFk"
+            "foreignKey": "addressFk"
         }
 	}
 }

modules/route/back/models/route.js

@@ -15,7 +15,7 @@ module.exports = Self => {
     require('../methods/route/sendSms')(Self);
     require('../methods/route/downloadZip')(Self);
     require('../methods/route/cmr')(Self);
-    require('../methods/route/getExternalCmrs')(Self);
+    require('../methods/route/cmrs')(Self);
     require('../methods/route/downloadCmrsZip')(Self);
     require('../methods/route/cmrEmail')(Self);
     require('../methods/route/getExpeditionSummary')(Self);

modules/route/back/models/routesMonitor.json

@@ -48,7 +48,7 @@
         "priority": {
             "type": "number"
         },
-        "expeditionTruckFk": {
+        "roadmapStopFk": {
             "type": "number"
         },
         "m3boxes": {

modules/ticket/back/methods/expedition-state/addExpeditionState.js

@@ -44,11 +44,13 @@ module.exports = Self => {
 
                 const typeFk = expeditionStateType.id;
                 expeditionId = expedition.expeditionFk;
+                const isScannedExpedition = expedition.isScanned ?? false;
 
                 await models.ExpeditionState.create({
                     expeditionFk: expedition.expeditionFk,
                     typeFk,
                     userFk: userId,
+                    isScanned: isScannedExpedition,
                 }, myOptions);
             }
 

modules/ticket/back/methods/ticket/saveSign.js

@@ -140,14 +140,7 @@ module.exports = Self => {
                     await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
-                const deliveryState = await models.State.findOne({
+                await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [params.ticketFk, params.code], myOptions);
-                    where: {code: 'DELIVERED'}
-                }, myOptions);
-
-                await models.Ticket.state(ctx, {
-                    ticketFk: ticketId,
-                    stateFk: deliveryState.id
-                }, myOptions);
 
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.cmrFk) {
                     await models.Ticket.saveCmr(ctx, [ticketId], myOptions);

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/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/methods/ticket/summary.js

@@ -56,6 +56,7 @@ module.exports = Self => {
         const filter = {
             include: [
                 {relation: 'warehouse', scope: {fields: ['name']}},
+                {relation: 'ticketCollections', scope: {fields: ['collectionFk']}},
                 {relation: 'agencyMode', scope: {fields: ['name']}},
                 {relation: 'zone', scope: {fields: ['name']}},
                 {relation: 'client',

modules/ticket/back/models/expedition-state.json

@@ -3,7 +3,7 @@
     "base": "VnModel",
     "options": {
         "mysql": {
-        "table": "expeditionState"
+            "table": "expeditionState"
         }
     },
     "properties": {
@@ -23,13 +23,16 @@
         },
         "userFk": {
             "type": "number"
+        },
+        "isScanned": {
+            "type": "boolean"
         }
     },
     "relations": {
-      "expeditionStateType": {
+        "expeditionStateType": {
-        "type": "belongsTo",
+            "type": "belongsTo",
-        "model": "ExpeditionStateType",
+            "model": "ExpeditionStateType",
-        "foreignKey": "typeFk"
+            "foreignKey": "typeFk"
-      }
+        }
     }
-}
+}

modules/ticket/back/models/ticket.json

@@ -152,6 +152,11 @@
             "type": "belongsTo",
             "model": "Cmr",
             "foreignKey": "cmrFk"
+        },
+        "ticketCollections": {
+            "type": "hasMany",
+            "model": "TicketCollection",
+            "foreignKey": "ticketFk"
         }
     }
 }

modules/worker/back/methods/worker/new.js

@@ -5,108 +5,80 @@ module.exports = Self => {
     Self.remoteMethodCtx('new', {
         description: 'Creates a new worker and returns the id',
         accessType: 'WRITE',
-        accepts: [
+        accepts: [{
-            {
+            arg: 'fi',
-                arg: 'fi',
+            type: 'string',
-                type: 'string',
+            description: `The worker fi`,
-                description: `The worker fi`,
+        }, {
-                required: true,
+            arg: 'name',
-            },
+            type: 'string',
-            {
+            description: `The user name`,
-                arg: 'name',
+        }, {
-                type: 'string',
+            arg: 'firstName',
-                description: `The user name`,
+            type: 'string',
-                required: true,
+            description: `The worker firstname`,
-            },
+        }, {
-            {
+            arg: 'lastNames',
-                arg: 'firstName',
+            type: 'string',
-                type: 'string',
+            description: `The worker lastnames`,
-                description: `The worker firstname`,
+        }, {
-                required: true,
+            arg: 'email',
-            },
+            type: 'string',
-            {
+            description: `The worker email`,
-                arg: 'lastNames',
+            required: true,
-                type: 'string',
+        }, {
-                description: `The worker lastnames`,
+            arg: 'street',
-                required: true,
+            type: 'string',
-            },
+            description: `The worker address`,
-            {
+        }, {
-                arg: 'email',
+            arg: 'city',
-                type: 'string',
+            type: 'string',
-                description: `The worker email`,
+            description: `The worker city`,
-                required: true,
+        }, {
-            },
+            arg: 'provinceFk',
-            {
+            type: 'number',
-                arg: 'street',
+            description: `The worker province`,
-                type: 'string',
+        }, {
-                description: `The worker address`,
+            arg: 'companyFk',
-                required: true,
+            type: 'number',
-            },
+            description: `The worker company`,
-            {
+        }, {
-                arg: 'city',
+            arg: 'postcode',
-                type: 'string',
+            type: 'string',
-                description: `The worker city`,
+            description: `The worker postcode`,
-                required: true,
+        }, {
-            },
+            arg: 'phone',
-            {
+            type: 'string',
-                arg: 'provinceFk',
+            description: `The worker phone`,
-                type: 'number',
+        }, {
-                description: `The worker province`,
+            arg: 'code',
-                required: true,
+            type: 'string',
-            },
+            description: `The worker code`,
-            {
+        }, {
-                arg: 'companyFk',
+            arg: 'bossFk',
-                type: 'number',
+            type: 'number',
-                description: `The worker company`,
+            description: `The worker boss`,
-                required: true,
+            required: true,
-            },
+        }, {
-            {
+            arg: 'birth',
-                arg: 'postcode',
+            type: 'date',
-                type: 'string',
+            description: `The worker birth`,
-                description: `The worker postcode`,
+        }, {
-                required: true,
+            arg: 'payMethodFk',
-            },
+            type: 'number',
-            {
+            description: `The client payMethod`,
-                arg: 'phone',
+        }, {
-                type: 'string',
+            arg: 'iban',
-                description: `The worker phone`,
+            type: 'string',
-                required: true,
+            description: `The client iban`,
-            },
+        }, {
-            {
+            arg: 'bankEntityFk',
-                arg: 'code',
+            type: 'number',
-                type: 'string',
+            description: `The client bank entity`,
-                description: `The worker code`,
+        }, {
-                required: true,
+            arg: 'isFreelance',
-            },
+            type: 'boolean',
-            {
+        }],
-                arg: 'bossFk',
-                type: 'number',
-                description: `The worker boss`,
-                required: true,
-            },
-            {
-                arg: 'birth',
-                type: 'date',
-                description: `The worker birth`,
-                required: true,
-            },
-            {
-                arg: 'payMethodFk',
-                type: 'number',
-                description: `The client payMethod`,
-                required: true,
-            },
-            {
-                arg: 'iban',
-                type: 'string',
-                description: `The client iban`,
-            },
-            {
-                arg: 'bankEntityFk',
-                type: 'number',
-                description: `The client bank entity`,
-            }
-        ],
         returns: {
             type: 'number',
             root: true,
@@ -117,11 +89,30 @@ module.exports = Self => {
         },
     });
 
-    Self.new = async(ctx, options) => {
+    Self.new = async(
+        ctx,
+        fi,
+        name,
+        firstName,
+        lastNames,
+        email,
+        street,
+        city,
+        provinceFk,
+        companyFk,
+        postcode,
+        phone,
+        code,
+        bossFk,
+        birth,
+        payMethodFk,
+        iban,
+        bankEntityFk,
+        isFreelance,
+        options
+    ) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
-        const args = ctx.args;
-
         let tx;
 
         if (typeof options == 'object') Object.assign(myOptions, options);
@@ -132,132 +123,105 @@ module.exports = Self => {
         }
 
         let client;
-
+        let user;
         try {
-            client = await models.Client.findOne(
+            client = await models.Client.findOne({where: {fi}}, myOptions);
-                {
+            const nickname = firstName.concat(' ', lastNames);
-                    where: {fi: args.fi},
+            const {roleFk, businessTypeFk} = await models.WorkerConfig.findOne({fields: ['roleFk', 'businessTypeFk']});
-                },
-                myOptions
-            );
 
-            if (!client) {
+            if (!isFreelance && !payMethodFk) throw new UserError('Payment method is required');
-                const nickname = args.firstName.concat(' ', args.lastNames);
-                const workerConfig = await models.WorkerConfig.findOne({fields: ['roleFk', 'businessTypeFk']});
-                const [randomPassword] = await models.Worker.rawSql(
-                    'SELECT account.passwordGenerate() as password;'
-                );
 
-                const user = await models.VnUser.create(
+            if (isFreelance || !client) {
-                    {
+                const [{password}] = await models.Worker.rawSql('SELECT account.passwordGenerate() as password;');
-                        name: args.name,
+                const freelancer = isFreelance && await models.VnRole.findOne({fields: ['id'], where: {name: 'freelancer'}});
-                        nickname,
-                        password: randomPassword.password,
-                        email: args.email,
-                        roleFk: workerConfig.roleFk,
-                    },
-                    myOptions
-                );
 
-                await models.Account.create(
+                user = await models.VnUser.create({
-                    {
+                    name,
-                        id: user.id,
+                    nickname,
-                    },
+                    password,
-                    myOptions
+                    email,
-                );
+                    roleFk: freelancer ? freelancer.id : roleFk,
+                }, myOptions);
 
-                const payMethod = await models.PayMethod.findById(args.payMethodFk, {fields: ['isIbanRequiredForClients']});
+                await models.Account.create({
-                if (payMethod.isIbanRequiredForClients && !args.iban)
+                    id: user.id
-                    throw new UserError(`That payment method requires an IBAN`);
+                }, myOptions);
+            } else if (client) user = await models.VnUser.findById(client.id, null, myOptions);
 
-                await models.Worker.rawSql(
+            if (!client && !isFreelance) {
-                    'CALL vn.client_create(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+                const payMethod = await models.PayMethod.findById(payMethodFk, {fields: ['isIbanRequiredForClients']});
+                if (payMethod.isIbanRequiredForClients && !iban) throw new UserError('That payment method requires an IBAN');
+
+                await models.Worker.rawSql('CALL vn.client_create(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
                     [
-                        args.firstName,
+                        firstName,
-                        args.lastNames,
+                        lastNames,
-                        args.fi,
+                        fi,
-                        args.street,
+                        street,
-                        args.postcode,
+                        postcode,
-                        args.city,
+                        city,
-                        args.provinceFk,
+                        provinceFk,
-                        args.companyFk,
+                        companyFk,
-                        args.phone,
+                        phone,
-                        args.email,
+                        email,
                         user.id,
                     ],
-                    myOptions
+                    myOptions);
-                );
 
-                const address = await models.Address.create(
+                const address = await models.Address.create({
-                    {
+                    clientFk: user.id,
-                        clientFk: user.id,
+                    street: street,
-                        street: args.street,
+                    city: city,
-                        city: args.city,
+                    provinceFk: provinceFk,
-                        provinceFk: args.provinceFk,
+                    postalCode: postcode,
-                        postalCode: args.postcode,
+                    mobile: phone,
-                        mobile: args.phone,
+                    nickname: nickname,
-                        nickname: nickname,
+                    isDefaultAddress: true,
-                        isDefaultAddress: true,
+                }, myOptions);
-                    },
-                    myOptions
-                );
 
-                client = await models.Client.findById(
+                client = await models.Client.findById(user.id, {
-                    user.id,
+                    fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'businessTypeFk', 'fi']
-                    {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'businessTypeFk', 'fi']},
+                }, myOptions);
-                    myOptions
-                );
 
-                await client.updateAttributes(
+                await client.updateAttributes({
-                    {
+                    payMethod: payMethodFk,
-                        payMethod: args.payMethod,
+                    iban,
-                        iban: args.iban,
+                    bankEntityFk,
-                        bankEntityFk: args.bankEntityFk,
+                    defaultAddressFk: address.id,
-                        defaultAddressFk: address.id,
+                    businessTypeFk,
-                        businessTypeFk: workerConfig.businessTypeFk,
+                }, myOptions);
-                    },
-                    myOptions
-                );
             }
 
-            const user = await models.VnUser.findById(client.id, null, myOptions);
+            await user.updateAttribute('email', email, myOptions);
-            await user.updateAttribute('email', args.email, myOptions);
 
             await models.Worker.create({
-                id: client.id,
+                id: user.id,
-                code: args.code,
+                firstName,
-                firstName: args.firstName,
+                lastName: lastNames,
-                lastName: args.lastNames,
+                code,
-                bossFk: args.bossFk,
+                bossFk,
-                fi: args.fi,
+                fi,
-                birth: args.birth,
+                birth,
 
             }, myOptions);
 
             if (tx) await tx.commit();
-        } catch (error) {
+        } catch (e) {
             if (tx) await tx.rollback();
-            const code = error.code;
+            const code = e.code;
-            const message = error.sqlMessage;
+            const message = e.sqlMessage;
 
-            if (error.message && error.message.includes(`Email already exists`))
+            if (e.message && e.message.includes(`Email already exists`)) throw new UserError(`This personal mail already exists`);
-                throw new UserError(`This personal mail already exists`);
 
-            if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`))
+            if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`)) throw new UserError(`This worker code already exists`);
-                throw new UserError(`This worker code already exists`);
 
-            if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`))
+            if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`)) throw new UserError(`This worker already exists`);
-                throw new UserError(`This worker already exists`);
 
-            throw error;
+            throw e;
         }
 
-        await models.VnUser.resetPassword({
+        await models.VnUser.resetPassword({email, emailTemplate: 'worker-welcome', id: user.id});
-            email: args.email,
-            emailTemplate: 'worker-welcome',
-            id: client.id
-        });
 
-        return {id: client.id};
+        return {id: user.id};
     };
 };

modules/worker/back/methods/worker/specs/new.spec.js

@@ -1,189 +1,114 @@
-const models = require('vn-loopback/server/server').models;
+const {models} = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');
 
 describe('Worker new', () => {
-    beforeAll(async() => {
+    const developerId = 9;
-        const activeCtx = {
-            accessToken: {userId: 9},
-            http: {
-                req: {
-                    headers: {origin: 'http://localhost'}
-                }
-            }
-        };
-
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
-
     const employeeId = 1;
-    const defaultWorker = {
+    const bruceWayneId = 1101;
-        fi: '78457139E',
+    const accessToken = {accessToken: {userId: developerId}};
-        name: 'defaulterworker',
+    const ctx = {req: accessToken};
-        firstName: 'DEFAULT',
+    let tx;
-        lastNames: 'WORKER',
+    let opts;
-        email: 'defaultWorker@mydomain.com',
-        street: 'S/ DEFAULTWORKERSTREET',
-        city: 'defaultWorkerCity',
-        provinceFk: 1,
-        companyFk: 442,
-        postcode: '46680',
-        phone: '123456789',
-        code: 'DWW',
-        bossFk: 9,
-        birth: '2022-12-11T23:00:00.000Z',
-        payMethodFk: 1,
-        roleFk: 1
-    };
 
-    const req = {accessToken: {userId: 9}};
+    beforeAll(async() => {
-
+        const activeCtx = {accessToken, http: {req: {headers: {origin: 'http://localhost'}}}};
-    it('should return error if personal mail already exists', async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({active: activeCtx});
-        const user = await models.VnUser.findById(employeeId, {fields: ['email']});
-
-        const tx = await models.Worker.beginTransaction({});
-
-        let error;
-        try {
-            const options = {transaction: tx};
-            const ctx = {
-                args: Object.assign({}, defaultWorker, {email: user.email}),
-                req
-            };
-
-            await models.Worker.new(ctx, options);
-
-            await tx.rollback();
-        } catch (e) {
-            error = e;
-            await tx.rollback();
-        }
-
-        expect(error.message).toEqual('This personal mail already exists');
     });
 
-    it('should return error if worker code already exists', async() => {
+    describe('should return error', () => {
-        const worker = await models.Worker.findById(employeeId, {fields: ['code']});
+        beforeEach(async() => {
-
+            tx = await models.Worker.beginTransaction({});
-        const tx = await models.Worker.beginTransaction({});
+            opts = {transaction: tx};
-
-        let error;
-        try {
-            const options = {transaction: tx};
-            const ctx = {
-                args: Object.assign({}, defaultWorker, {code: worker.code}),
-                req
-            };
-
-            await models.Worker.new(ctx, options);
-
-            await tx.rollback();
-        } catch (e) {
-            error = e;
-            await tx.rollback();
-        }
-
-        expect(error.message).toEqual('This worker code already exists');
-    });
-
-    it('should return error if worker already exists', async() => {
-        const worker = await models.Client.findById(employeeId, {fields: ['fi']});
-
-        const tx = await models.Worker.beginTransaction({});
-
-        let error;
-        try {
-            const options = {transaction: tx};
-            const ctx = {
-                args: Object.assign({}, defaultWorker, {fi: worker.fi}),
-                req
-            };
-            await models.Worker.new(ctx, options);
-
-            await tx.rollback();
-        } catch (e) {
-            error = e;
-            await tx.rollback();
-        }
-
-        expect(error.message).toEqual('This worker already exists');
-    });
-
-    it('should return error if payMethod require iban', async() => {
-        const payMethodIbanRequired = await models.PayMethod.findOne({
-            where: {
-                isIbanRequiredForClients: true
-            },
-            fields: ['id']
         });
 
-        const tx = await models.Worker.beginTransaction({});
+        afterEach(async() => await tx.rollback());
 
-        let error;
+        it('if personal mail already exists', async() => {
-        try {
+            const user = await models.VnUser.findById(employeeId, {fields: ['email']});
-            const options = {transaction: tx};
+            try {
-            const ctx = {
+                await createWorker(ctx, opts, {email: user.email});
-                args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id}),
+            } catch (e) {
-                req
+                expect(e.message).toEqual('This personal mail already exists');
-            };
+            }
-            await models.Worker.new(ctx, options);
+        });
 
-            await tx.rollback();
+        it('if worker code already exists', async() => {
-        } catch (e) {
+            const worker = await models.Worker.findById(employeeId, {fields: ['code']});
-            error = e;
+            try {
-            await tx.rollback();
+                await createWorker(ctx, opts, {code: worker.code});
-        }
+            } catch (e) {
+                expect(e.message).toEqual('This worker code already exists');
+            }
+        });
 
-        expect(error.message).toEqual('That payment method requires an IBAN');
+        it('if worker already exists', async() => {
+            const worker = await models.Client.findById(employeeId, {fields: ['fi']});
+            try {
+                await createWorker(ctx, opts, {fi: worker.fi});
+            } catch (e) {
+                expect(e.message).toEqual('This worker already exists');
+            }
+        });
+
+        it('if payMethod require iban', async() => {
+            const payMethodIbanRequired = await models.PayMethod.findOne({
+                fields: ['id'], where: {isIbanRequiredForClients: true}
+            });
+
+            try {
+                await createWorker(ctx, opts, {payMethodFk: payMethodIbanRequired.id});
+            } catch (e) {
+                expect(e.message).toEqual('That payment method requires an IBAN');
+            }
+        });
     });
 
     it('should create a new worker', async() => {
         let newWorker;
         try {
-            newWorker = await models.Worker.new({args: defaultWorker, req});
+            newWorker = await createWorker(ctx);
+
+            expect(newWorker.id).toBeDefined();
         } finally {
             await removeWorker(newWorker.id);
         }
-
-        expect(newWorker.id).toBeDefined();
     });
 
     it('should create a new client', async() => {
         let newWorker;
-        let client;
         try {
-            newWorker = await models.Worker.new({args: defaultWorker, req});
+            newWorker = await createWorker(ctx);
-            client = await models.Client.findById(newWorker.id);
+            let client = await models.Client.findById(newWorker.id);
+
+            expect(client).toBeDefined();
         } finally {
             await removeWorker(newWorker.id);
         }
-
-        expect(client).toBeDefined();
     });
 
     it('should create a new worker in client', async() => {
-        const bruceWayneId = 1101;
         const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
-
-        const newWorkerData = {
-            args: Object.assign(
-                {},
-                defaultWorker,
-                {
-                    fi: client.fi,
-                    email: client.email
-                }),
-            req
-        };
         let newWorker;
         try {
-            newWorker = await models.Worker.new(newWorkerData);
+            newWorker = await createWorker(ctx, undefined, {fi: client.fi, email: client.email});
+
+            expect(newWorker.id).toEqual(bruceWayneId);
         } finally {
             await models.Worker.destroyById(newWorker.id);
         }
+    });
 
-        expect(newWorker.id).toEqual(bruceWayneId);
+    it('should create a new external worker', async() => {
+        let newWorker;
+        try {
+            newWorker = await createWorker(ctx, undefined, {isFreelance: true});
+            const client = await models.Client.findById(newWorker.id);
+
+            expect(newWorker.id).toBeDefined();
+            expect(client).toBeNull();
+        } finally {
+            await removeWorker(newWorker.id);
+        }
     });
 });
 
@@ -194,3 +119,28 @@ async function removeWorker(id) {
     await models.Client.destroyById(id);
     await models.VnUser.destroyById(id);
 }
+
+async function createWorker(ctx, opts = undefined, params = {}) {
+    return models.Worker.new(
+        ctx,
+        params.fi ?? '78457139E',
+        params.name ?? 'defaulterworker',
+        params.firstName ?? 'DEFAULT',
+        params.lastNames ?? 'WORKER',
+        params.email ?? 'defaultWorker@mydomain.com',
+        params.street ?? 'S/ DEFAULTWORKERSTREET',
+        params.city ?? 'defaultWorkerCity',
+        params.provinceFk ?? 1,
+        params.companyFk ?? 442,
+        params.postcode ?? '46680',
+        params.phone ?? '123456789',
+        params.code ?? 'DWW',
+        params.bossFk ?? 9,
+        params.birth ?? '2022-12-11T23:00:00.000Z',
+        params.payMethodFk ?? 1,
+        undefined,
+        undefined,
+        params.isFreelance ?? false,
+        opts
+    );
+}

modules/worker/back/models/worker.json

@@ -25,43 +25,44 @@
             "required": true
         },
         "phone": {
-            "type" : "string"
+            "type": "string"
         },
         "bossFk": {
-            "type" : "number"
+            "type": "number"
         },
         "maritalStatus": {
-            "type" : "string"
+            "type": "string"
         },
         "originCountryFk": {
-            "type" : "number"
+            "type": "number"
         },
         "educationLevelFk": {
-            "type" : "number"
+            "type": "number"
         },
         "SSN": {
-            "type" : "string"
+            "type": "string"
         },
         "mobileExtension": {
-            "type" : "number"
+            "type": "number"
         },
         "code": {
-            "type" : "string"
+            "type": "string",
+            "required": true
         },
         "fi": {
-            "type" : "string"
+            "type": "string"
         },
         "birth": {
-            "type" : "date"
+            "type": "date"
         },
         "isF11Allowed": {
-            "type" : "boolean"
+            "type": "boolean"
         },
         "sex": {
-            "type" : "string"
+            "type": "string"
         },
         "isFreelance": {
-            "type" : "boolean"
+            "type": "boolean"
         },
         "fiDueDate": {
             "type": "date"
@@ -78,7 +79,6 @@
         "isSsDiscounted": {
             "type": "boolean"
         }
-
     },
     "relations": {
         "user": {
@@ -117,7 +117,7 @@
             "foreignKey": "workerFk"
         }
     },
-    "acls":[
+    "acls": [
         {
             "property": "__get__locker",
             "accessType": "READ",
@@ -126,4 +126,4 @@
             "principalId": "$owner"
         }
     ]
-}
+}

package.json

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

print/templates/reports/cmr/sql/data.sql

@@ -39,8 +39,7 @@ SELECT c.id cmrFk,
 		LEFT JOIN supplier s ON s.id = c.supplierFk
 		LEFT JOIN country cou ON cou.id = s.countryFk
 		LEFT JOIN company co ON co.id = c.companyFk
-		LEFT JOIN supplierAccount sa ON sa.id = co.supplierAccountFk
+		LEFT JOIN supplier s2 ON s2.id = c.companyFk
-		LEFT JOIN supplier s2 ON s2.id = sa.supplierFk
 		LEFT JOIN country cou2 ON cou2.id = s2.countryFk
 		LEFT JOIN `address` a ON a.id = c.addressToFk
 		LEFT JOIN province p ON p.id = a.provinceFk

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