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

refs #6184 saveCmr #1788

Merged
guillermo merged 58 commits from 6184-saveCmr into dev 2024-02-13 06:47:06 +00:00
Conversation 2 Commits 58 Files Changed 27 -10
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eec36300ad - Show all commits

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

@ -137,23 +137,13 @@ module.exports = Self => {
throw new UserError('Ticket is already signed'); throw new UserError('Ticket is already signed');
if (location) await setLocation(ticketId); if (location) await setLocation(ticketId);
<<<<<<< HEAD
if (!await hasSignDms(ticketId) && !gestDocCreated) if (!await hasSignDms(ticketId) && !gestDocCreated)
await createGestDoc(ticketId); await createGestDoc(ticketId);
=======
if (!gestDocCreated) await createGestDoc(ticketId);
>>>>>>> dev
await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions); await models.TicketDms.create({ticketFk: ticketId, 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({
<<<<<<< HEAD
where: {code: 'DELIVERED'} where: {code: 'DELIVERED'}
=======
where: {
code: 'DELIVERED'
}
>>>>>>> dev
}, myOptions); }, myOptions);
await models.Ticket.state(ctx, { await models.Ticket.state(ctx, {