verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 65 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 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd214b3526 - Show all commits

4
loopback/locale/es.json
View File

@ -394,5 +394,7 @@
"Price cannot be blank": "Price cannot be blank", "Price cannot be blank": "Price cannot be blank",
"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" "Worker not found": "Trabajador no encontrado",
"Invalid request or related ticket/client data": "Solicitud no válida o datos de ticket/cliente relacionados"
} }

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

@ -1,3 +1,4 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => { module.exports = Self => {
Self.remoteMethodCtx('deny', { Self.remoteMethodCtx('deny', {
description: 'Sets a ticket request to denied and returns the changes', description: 'Sets a ticket request to denied and returns the changes',
@ -43,7 +44,7 @@ module.exports = Self => {
try { try {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const worker = await models.Worker.findById(userId, myOptions); const worker = await models.Worker.findById(userId, myOptions);
if (!worker) throw new Error('Worker not found'); if (!worker) throw new UserError('Worker not found');
const params = { const params = {
isOk: false, isOk: false,
@ -66,7 +67,7 @@ module.exports = Self => {
}, myOptions); }, myOptions);
if (!request || !request.ticket() || !request.ticket().client()) if (!request || !request.ticket() || !request.ticket().client())
throw new Error('Invalid request or related ticket/client data'); throw new UserError('Invalid request or related ticket/client data');
const url = await models.Url.getUrl(); const url = await models.Url.getUrl();
const requesterId = request.ticket().client().salesPersonFk; const requesterId = request.ticket().client().salesPersonFk;