db/dump/fixtures.before.sql

@@ -317,7 +317,7 @@ UPDATE `vn`.`agencyMode` SET `description` = 'Gotham247Expensive' WHERE `id` = 8
 UPDATE `vn`.`agencyMode` SET `description` = 'Other agency' WHERE `id` = 10;
 UPDATE `vn`.`agencyMode` SET `description` = 'Refund' WHERE `id` = 23;
 
-UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com';
+UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail__` = 'no-reply@gothamcity.com';
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 

db/routines/vn2008/views/Agencias.sql

@@ -10,7 +10,7 @@ AS SELECT `am`.`id` AS `Id_Agencia`,
 	`am`.`agencyFk` AS `agency_id`,
 	`am`.`inflation` AS `inflacion`,
 	`am`.`isVolumetric` AS `is_volumetric`,
-	`am`.`reportMail` AS `send_mail`,
+	`am`.`reportMail__` AS `send_mail`,
 	`am`.`isActive` AS `tpv`,
 	`am`.`code` AS `code`,
 	`am`.`isRiskFree` AS `isRiskFree`

db/versions/11370-orangeRoebelini/00-firstScript.sql

@@ -0,0 +1,3 @@
+
+
+ALTER TABLE vn.agencyMode CHANGE reportMail reportMail__ varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT '@deprecated 2024-11-28';

loopback/locale/en.json

@@ -244,7 +244,9 @@
 	"You do not have permission to modify the booked field": "You do not have permission to modify the booked field",
 	"Invalid or expired verification code": "Invalid or expired verification code",
 	"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"
+	"The raid information is not correct": "The raid information is not correct",
+	"Sales already moved": "Sales already moved",
+	"This route does not have a worker": "This route does not have a worker",
+	"This user is not active": "This user is not active"
 }

loopback/locale/es.json

@@ -389,6 +389,7 @@
 	"ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
 	"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"
+	"The raid information is not correct": "La información de la redada no es correcta",
+	"This route does not have a worker": "La ruta no tiene trabajador",
+	"This user is not active": "El usuario no está activo"
 }
-

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à",
+	"This route does not have a worker": "Cet itinéraire n'a pas de travailleur.",
+	"This user is not active": "Cet utilisateur n'est pas actif"
 }

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.",
+	"This route does not have a worker": "Esta rota não tem trabalhador.",
+	"This user is not active": "Este utilizador não está ativo"
 }

modules/route/back/methods/route/driverRouteEmail.js

@@ -8,16 +8,8 @@ module.exports = Self => {
                 arg: 'id',
                 type: 'number',
                 required: true,
-                description: 'The client id',
+                description: 'The route id',
                 http: {source: 'path'}
-            }, {
-                arg: 'replyTo',
-                type: 'string',
-                description: 'The sender email to reply to',
-            }, {
-                arg: 'recipientId',
-                type: 'number',
-                description: 'The recipient id to send to the recipient preferred language',
             }
         ],
         returns: {
@@ -32,26 +24,20 @@ module.exports = Self => {
 
     Self.driverRouteEmail = async(ctx, id) => {
         const models = Self.app.models;
-        const {workerFk, agencyMode} = await Self.findById(id, {
+        const route = await models.Route.findById(id, {
-            fields: ['workerFk', 'agencyModeFk'],
+            fields: ['id', 'workerFk']
-            include: {relation: 'agencyMode'}
         });
-        const {reportMail} = agencyMode();
+        if (!route.workerFk) throw new UserError('This route does not have a worker');
-        let user;
-        let account;
 
-        if (workerFk) {
+        const user = await models.VnUser.findById(route.workerFk, {
-            user = await models.VnUser.findById(workerFk, {
             fields: ['active', 'id'],
             include: {relation: 'emailUser'}
         });
-            account = await models.Account.findById(workerFk);
-        }
 
-        if (user?.active && account) ctx.args.recipient = user.emailUser().email;
+        if (!user?.active) throw new UserError('The user is not active');
-        else ctx.args.recipient = reportMail;
+        ctx.args.recipient = user.emailUser().email;
+        ctx.args.recipientId = route.workerFk;
 
-        if (!ctx.args.recipient) throw new UserError('An email is necessary');
         return Self.sendTemplate(ctx, 'driver-route');
     };
 };

modules/zone/back/models/agency-mode.json

@@ -29,7 +29,7 @@
         "inflation": {
             "type": "number"
         },
-        "reportMail": {
+        "reportMail__": {
             "type": "string"
         },
         "isActive": {