From 557c29982a24868be2b236938c7eaa323f141669 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Thu, 28 Nov 2024 16:23:37 +0100 Subject: [PATCH] feat: refs #7273 refs#7273 driverRouteEmail --- loopback/locale/en.json | 8 +++-- loopback/locale/es.json | 9 ++--- loopback/locale/fr.json | 12 ++++--- loopback/locale/pt.json | 6 ++-- .../back/methods/route/driverRouteEmail.js | 36 ++++++------------- 5 files changed, 32 insertions(+), 39 deletions(-) diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 6756db37d9..c692de22f0 100644 --- a/loopback/locale/en.json +++ b/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" +} \ No newline at end of file diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 0b10d47025..92db51288c 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -388,7 +388,8 @@ "You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada", "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" -} - + "Sales already moved": "Ya han sido transferidas", + "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" +} \ No newline at end of file diff --git a/loopback/locale/fr.json b/loopback/locale/fr.json index 9941358be6..36f094a03c 100644 --- a/loopback/locale/fr.json +++ b/loopback/locale/fr.json @@ -362,9 +362,11 @@ "The invoices have been created but the PDFs could not be generated": "La facture a été émise mais le PDF n'a pas pu être généré", "It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré", "Cannot send mail": "Impossible d'envoyer le mail", - "Original invoice not found": "Facture originale introuvable", - "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é", + "Original invoice not found": "Facture originale introuvable", + "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" +} \ No newline at end of file diff --git a/loopback/locale/pt.json b/loopback/locale/pt.json index e84b30f3d1..6489a47dcb 100644 --- a/loopback/locale/pt.json +++ b/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" +} \ No newline at end of file diff --git a/modules/route/back/methods/route/driverRouteEmail.js b/modules/route/back/methods/route/driverRouteEmail.js index bbac2b0e8d..9811da448d 100644 --- a/modules/route/back/methods/route/driverRouteEmail.js +++ b/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, { - fields: ['workerFk', 'agencyModeFk'], - include: {relation: 'agencyMode'} + const route = await models.Route.findById(id, { + fields: ['id', 'workerFk'] }); - const {reportMail} = agencyMode(); - let user; - let account; + if (!route.workerFk) throw new UserError('This route does not have a worker'); - if (workerFk) { - user = await models.VnUser.findById(workerFk, { - fields: ['active', 'id'], - include: {relation: 'emailUser'} - }); - account = await models.Account.findById(workerFk); - } + const user = await models.VnUser.findById(route.workerFk, { + fields: ['active', 'id'], + include: {relation: 'emailUser'} + }); - if (user?.active && account) ctx.args.recipient = user.emailUser().email; - else ctx.args.recipient = reportMail; + if (!user?.active) throw new UserError('The user is not active'); + 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'); }; };