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

6995-testToMaster_2410 #2139

Merged
alexm merged 236 commits from 6995-testToMaster_2410 into master 2024-03-07 07:09:08 +00:00
Conversation 0 Commits 236 Files Changed 116 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4419a2542 - Show all commits

2
modules/route/back/methods/route/cmrEmail.js
View File

@ -57,7 +57,7 @@ module.exports = Self => {
AND dt.code = 'cmr' AND dt.code = 'cmr'
`, [ticketId]); `, [ticketId]);
if (!dms.lenght) throw new UserError('Cmr file does not exist'); if (!dms.length) throw new UserError('Cmr file does not exist');
const response = await models.Dms.downloadFile(ctx, dms[0].id); const response = await models.Dms.downloadFile(ctx, dms[0].id);

3
modules/ticket/back/methods/ticket/saveSign.js
View File

@ -134,7 +134,8 @@ module.exports = Self => {
if (location) await setLocation(ticketId); if (location) await setLocation(ticketId);
if (!await hasSignDms(ticketId) && !isSignUploaded) if (!await hasSignDms(ticketId) && !isSignUploaded)
await createGestDoc(ticketId); await createGestDoc(ticketId);
await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions); if (isSignUploaded)
await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
await ticket.updateAttribute('isSigned', true, myOptions); await ticket.updateAttribute('isSigned', true, myOptions);
const deliveryState = await models.State.findOne({ const deliveryState = await models.State.findOne({