verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

8355-testToMaster #3336

Merged
alexm merged 241 commits from 8355-testToMaster into master 2025-01-07 06:44:57 +00:00
Conversation 0 Commits 241 Files Changed 87 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit efcf4d225b - Show all commits

3
loopback/locale/es.json
View File

@ -392,6 +392,7 @@
"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",
"There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero", "There are tickets to be invoiced": "Hay tickets para esta zona, borralos primero",
"An item type with the same code already exists": "Un tipo con el mismo código ya existe", "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" "Holidays to past days not available": "Las vacaciones a días pasados no están disponibles",
"Worker not found": "Trabajador no encontrado"
} }

4
modules/ticket/back/methods/ticket-request/deny.js
View File

@ -42,7 +42,7 @@ module.exports = Self => {
try { try {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const worker = await models.Worker.findOne({where: {id: userId}}, myOptions); const worker = await models.Worker.findById({where: {id: userId}}, myOptions);
if (!worker) throw new Error('Worker not found'); if (!worker) throw new Error('Worker not found');
const params = { const params = {
@ -76,7 +76,7 @@ module.exports = Self => {
observation: params.response observation: params.response
}); });
await models.Chat.sendCheckingPresence(ctx, requesterId, message); await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
await request.updateAttributes(params, myOptions); await request.updateAttributes(params, myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();