7383-testToMaster #2445

Merged
alexm merged 233 commits from 7383-testToMaster into master 2024-05-14 05:44:13 +00:00
2 changed files with 5 additions and 2 deletions
Showing only changes of commit 7ced8dc54a - Show all commits

View File

@ -277,7 +277,7 @@
"Collection does not exist": "La colección no existe",
"Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
"Insert a date range": "Inserte un rango de fechas",
"Added observation": "{{user}} añadió esta observacion: {{text}}",
"Added observation": "{{user}} añadió esta observacion: {{text}} {{defaulterId}} ({{{defaulterUrl}}})",
"Comment added to client": "Observación añadida al cliente {{clientFk}}",
"Invalid auth code": "Código de verificación incorrecto",
"Invalid or expired verification code": "Código de verificación incorrecto o expirado",

View File

@ -29,6 +29,7 @@ module.exports = Self => {
const $t = ctx.req.__; // $translate
const myOptions = {};
const userId = ctx.req.accessToken.userId;
const url = await Self.app.models.Url.getUrl();
if (typeof options == 'object')
Object.assign(myOptions, options);
@ -38,7 +39,9 @@ module.exports = Self => {
const body = $t('Added observation', {
user: user.name,
text: observation
text: observation,
defaulterId: defaulter.clientFk,
defaulterUrl: `${url}client/${defaulter.clientFk}/summary`
});
await models.Mail.create({