build: init version

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

db/dump/fixtures.before.sql

@@ -2749,13 +2749,13 @@ INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
         (3),
         (4);
 
-INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `editorFk`, `price`, `driverName`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `userFk`, `price`, `driverName`)
     VALUES
         (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
         (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), 'test observation',         1, 20, 'Robin'),
         (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY), 'observations...',          2, 25, 'Driverman');
 
-INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `addressFk`, `eta`, `description`, `editorFk`)
+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/vn/procedures/vehicle_checkNumberPlate.sql

@@ -1,30 +1,17 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`vehicle_checkNumberPlate`(vNumberPlate VARCHAR(10), vCountryCodeFk VARCHAR(2))
-	vNumberPlate VARCHAR(10),
-	vCountryCodeFk VARCHAR(2)
-)
 BEGIN
 /**
- * Comprueba si la matricula pasada tiene el formato
+ * Comprueba si la matricula pasada tiene el formato correcto dependiendo del pais del vehiculo
- * correcto dependiendo del pais del vehiculo.
- *
- * @param vNumberPlate Número de matricula
- * @param vCountryCodeFk Código de pais
  */
 	DECLARE vRegex VARCHAR(45);
 
-	IF vCountryCodeFk IS NULL THEN
+	SELECT vp.regex INTO vRegex
-		SET vRegex = '^[A-Z0-9 -]{6,12}$';
+		FROM vehiclePlateRegex vp
-	ELSE
+		WHERE vp.countryCodeFk = vCountryCodeFk;
-		SELECT regex INTO vRegex
-			FROM vehiclePlateRegex
-			WHERE countryCodeFk = vCountryCodeFk;
-	END IF;
 	
 	IF NOT vNumberPlate REGEXP BINARY (vRegex)THEN
-		CALL util.throw(CONCAT('La matricula ', vNumberPlate,
+		CALL util.throw(CONCAT('Error: la matricula ', vNumberPlate, ' no es valida para ',vCountryCodeFk));
-			' no es valida', IF(vCountryCodeFk IS NOT NULL,
-			CONCAT(' para ', vCountryCodeFk), '')));
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,12 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
+
 	SET NEW.description = UCASE(NEW.description);
-	IF NEW.roadmapFk IS NOT NULL THEN
+
-		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
-			CALL util.throw('Departure time can not be after arrival time');
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,14 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
-	SET NEW.description = UCASE(NEW.description);
-	IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
-		OR (NOT (NEW.eta <=> OLD.eta) AND NEW.eta IS NOT NULL) THEN
 
-		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
+	SET NEW.description = UCASE(NEW.description);
-			CALL util.throw('Departure time can not be after arrival time');
+
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeInsert.sql

@@ -3,12 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
+	IF NEW.driver1Fk IS NOT NULL THEN
-	IF NEW.tractorPlate IS NOT NULL THEN
+		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-		CALL vehicle_checkNumberPlate(NEW.tractorPlate, NULL);
+	ELSE
-	END IF;
+		SET NEW.driverName = NULL;
-	IF NEW.trailerPlate IS NOT NULL THEN
-		CALL vehicle_checkNumberPlate(NEW.trailerPlate, NULL);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,12 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	SET NEW.editorFk = account.myUser_getId();
+	IF NEW.driver1Fk IS NOT NULL THEN
-	IF NEW.tractorPlate IS NOT NULL THEN
+		SET NEW.driverName = (SELECT firstName FROM worker WHERE id = NEW.driver1Fk);
-		CALL vehicle_checkNumberPlate(NEW.tractorPlate, NULL);
+	ELSE
-	END IF;
+		SET NEW.driverName = NULL;
-	IF NEW.trailerPlate IS NOT NULL THEN
-		CALL vehicle_checkNumberPlate(NEW.trailerPlate, NULL);
 	END IF;
 END$$
 DELIMITER ;

db/versions/11416-goldenTulip/00-firstScript.sql

@@ -1,5 +0,0 @@
-ALTER TABLE vn.roadmap
-	MODIFY COLUMN m3 int(10) unsigned DEFAULT NULL NULL COMMENT 'Capacidad máxima del remolque',
-	CHANGE driver1Fk driverFk int(10) unsigned DEFAULT NULL NULL COMMENT 'Conductor principal' AFTER driverName,
-	CHANGE driver2Fk codriverFk int(10) unsigned DEFAULT NULL NULL COMMENT 'Copiloto' AFTER driverFk,
-	CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER m3;

db/versions/11416-goldenTulip/01-firstScript.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.roadmapStop CHANGE userFk editorFk int(10) unsigned DEFAULT NULL NULL;

db/versions/11416-goldenTulip/02-firstScript.sql

@@ -1,4 +0,0 @@
-ALTER TABLE vn.route
-	ADD roadmapStopFk int(11) NULL,
-	ADD CONSTRAINT route_roadmapStop_FK FOREIGN KEY (roadmapStopFk) REFERENCES vn.roadmapStop(id) ON DELETE RESTRICT ON UPDATE CASCADE,
-	CHANGE editorFk editorFk int(10) unsigned DEFAULT NULL NULL AFTER roadmapStopFk;

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

@@ -238,25 +238,11 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.globalItems.cancelButton);
     });
 
-    it('should select the third sale and create a claim of it', async() => {
+    it('should select the third sale and delete it', async() => {
-        await page.accessToSearchResult('16');
-        await page.accessToSection('ticket.card.sale');
-        await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
-        await page.waitToClick(selectors.ticketSales.moreMenu);
-        await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
-        await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitForNavigation();
-    });
-
-    it('should search for a ticket then access to the sales section', async() => {
-        await page.goBack();
-        await page.goBack();
         await page.loginAndModule('salesPerson', 'ticket');
         await page.accessToSearchResult('16');
         await page.accessToSection('ticket.card.sale');
-    });
 
-    it('should select the third sale and delete it', async() => {
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.deleteSaleButton);
         await page.waitToClick(selectors.globalItems.acceptButton);

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => {
         const result = await page
             .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
 
-        expect(result).toContain('-€228.25');
+        expect(result).toContain('-€111.75');
     });
 
     it(`should select a new reason for the changes made then click on finalize`, async() => {

loopback/locale/en.json

@@ -247,9 +247,11 @@
 	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
 	"The raid information is not correct": "The raid information is not correct",
 	"Payment method is required": "Payment method is required",
-	"Sales already moved": "Sales already moved",
-	"Holidays to past days not available": "Holidays to past days not available",
 	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "There are tickets to be invoiced",
-	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent"
+	"The address of the customer must have information about Incoterms and Customs Agent": "The address of the customer must have information about Incoterms and Customs Agent",
+	"Sales already moved": "Sales already moved",
+	"Holidays to past days not available": "Holidays to past days not available",
+	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
+	"Ticket has been delivered out of order": "The ticket {{ticket}} {{{fullUrl}}} has been delivered out of order."
 }

loopback/locale/es.json

@@ -390,14 +390,11 @@
 	"The web user's email already exists": "El correo del usuario web ya existe",
 	"Sales already moved": "Ya han sido transferidas",
 	"The raid information is not correct": "La información de la redada no es correcta",
-	"No trips found because input coordinates are not connected": "No se encontraron rutas porque las coordenadas de entrada no están conectadas",
-	"This request is not supported": "Esta solicitud no es compatible",
-	"Invalid options or too many coordinates": "Opciones invalidas o demasiadas coordenadas",
-	"No address has coordinates": "Ninguna dirección tiene coordenadas",
 	"An item type with the same code already exists": "Un tipo con el mismo código ya existe",
 	"Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
 	"All tickets have a route order": "Todos los tickets tienen orden de ruta",
-	"Price cannot be blank": "Price cannot be blank",
 	"There are tickets to be invoiced": "La zona tiene tickets por facturar",
-	"Social name should be uppercase": "La razón social debe ir en mayúscula"
+	"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
+	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
+	"Price cannot be blank": "El precio no puede estar en blanco"
 }

loopback/locale/fr.json

@@ -366,5 +366,7 @@
 	"The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne",
 	"You do not have permission to modify the booked field": "Vous n'avez pas la permission de modifier le champ comptabilisé",
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
-	"The web user's email already exists": "L'email de l'internaute existe déjà"
+	"The web user's email already exists": "L'email de l'internaute existe déjà",
+	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} {{{fullUrl}}} a été livré hors ordre."
 }

loopback/locale/pt.json

@@ -365,5 +365,7 @@
 	"Cannot send mail": "Não é possível enviar o email",
 	"The quantity claimed cannot be greater than the quantity of the line": "O valor reclamado não pode ser superior ao valor da linha",
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
-	"The web user's email already exists": "O e-mail do utilizador da web já existe."
+	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
+	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
+	"Ticket has been delivered out of order": "O ticket {{ticket}} {{{fullUrl}}} foi entregue fora de ordem."
 }

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

@@ -28,7 +28,6 @@ module.exports = Self => {
             verb: 'POST'
         }
     });
-
     Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
         const models = Self.app.models;
         const myOptions = {userId: ctx.req.accessToken.userId};
@@ -111,6 +110,12 @@ module.exports = Self => {
                         scope: {
                             fields: ['id']
                         }
+                    },
+                    {
+                        relation: 'zone',
+                        scope: {
+                            fields: ['id', 'zoneFk,', 'name']
+                        }
                     }]
                 }, myOptions);
 
@@ -151,6 +156,28 @@ module.exports = Self => {
 
                 await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, stateCode], myOptions);
 
+                if (stateCode == 'DELIVERED' && ticket.priority) {
+                    const orderState = await models.State.findOne({
+                        where: {code: 'DELIVERED'},
+                        fields: ['id']
+                    }, myOptions);
+
+                    const ticketIncorrect = await Self.rawSql(`
+                        SELECT t.id
+                        FROM ticket t
+                            JOIN ticketState ts ON ts.ticketFk = t.id
+                            JOIN state s ON s.code = ts.code
+                        WHERE t.routeFk = ?  
+                            AND s.\`order\` < ? 
+                            AND priority <(SELECT t.priority 
+                                            FROM ticket t
+                                            WHERE t.id = ?)`
+                    , [ticket.routeFk, orderState.id, ticket.id], myOptions);
+
+                    if (ticketIncorrect?.length > 0)
+                        await sendMail(ctx, ticket.routeFk, ticket.id, ticket.zone().name);
+                }
+
                 if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.$cmrFk) {
                     await models.Ticket.saveCmr(ctx, [ticketId], myOptions);
                     externalTickets.push(ticketId);
@@ -163,4 +190,25 @@ module.exports = Self => {
         }
         await models.Ticket.sendCmrEmail(ctx, externalTickets);
     };
+
+    async function sendMail(ctx, route, ticket, zoneName) {
+        const $t = ctx.req.__;
+        const url = await Self.app.models.Url.getUrl();
+        const sendTo = 'repartos@verdnatura.es';
+        const fullUrl = `${url}route/${route}/summary`;
+        const emailSubject = $t('Incorrect delivery order alert on route', {
+            route,
+            zone: zoneName
+        });
+        const emailBody = $t('Ticket has been delivered out of order', {
+            ticket,
+            fullUrl
+        });
+
+        await Self.app.models.Mail.create({
+            receiver: sendTo,
+            subject: emailSubject,
+            body: emailBody
+        });
+    }
 };

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

@@ -1,12 +1,20 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('Ticket saveSign()', () => {
     let ctx = {req: {
         getLocale: () => {
             return 'en';
         },
+        __: () => {},
         accessToken: {userId: 9}
-    }};
+    }
+    };
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx
+        });
+    });
 
     it(`should throw error if the ticket's alert level is lower than 2`, async() => {
         const tx = await models.TicketDms.beginTransaction({});
@@ -51,4 +59,46 @@ describe('Ticket saveSign()', () => {
 
         expect(ticketTrackingAfter.name).toBe('Entregado en parte');
     });
+
+    it('should send an email to notify that the delivery order is not correct', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+        const ticketFk = 8;
+        const priority = 5;
+        const stateFk = 10;
+        const stateTicketFk = 2;
+        const expeditionFk = 11;
+        const expeditionStateFK = 2;
+
+        let mailCountBefore;
+        let mailCountAfter;
+        spyOn(models.Dms, 'uploadFile').and.returnValue([{id: 1}]);
+
+        const options = {transaction: tx};
+        const tickets = [ticketFk];
+
+        const expedition = await models.Expedition.findById(expeditionFk, null, options);
+        expedition.updateAttribute('stateTypeFk', expeditionStateFK, options);
+
+        const ticket = await models.Ticket.findById(ticketFk, null, options);
+        ticket.updateAttribute('priority', priority, options);
+
+        const filter = {where: {
+            ticketFk: ticketFk,
+            stateFk: stateTicketFk}
+        };
+        try {
+            const ticketTracking = await models.TicketTracking.findOne(filter, options);
+            ticketTracking.updateAttribute('stateFk', stateFk, options);
+            mailCountBefore = await models.Mail.count(options);
+            await models.Ticket.saveSign(ctx, tickets, null, null, options);
+            mailCountAfter = await models.Mail.count(options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+
+        expect(mailCountAfter).toBeGreaterThan(mailCountBefore);
+    });
 });

package.json

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