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

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

@ -59,16 +59,18 @@ module.exports = Self => {
async function hasSignDms(ticketId) { async function hasSignDms(ticketId) {
const ticketDms = await models.TicketDms.findOne({ const ticketDms = await models.TicketDms.findOne({
where: {ticketFk: ticketId}, where: {
ticketFk: ticketId
},
fields: ['dmsFk'], fields: ['dmsFk'],
include: [{ include: [{
relation: 'dms', relation: 'dms',
where: { scope: {
dmsType: dmsTypeTicket.id where: {dmsType: dmsTypeTicket.id}
} }
}] }]
}, myOptions); }, myOptions);
if (ticketDms) return true; if (ticketDms.dms().id) return true;
} }
async function createGestDoc(id) { async function createGestDoc(id) {
@ -132,7 +134,8 @@ module.exports = Self => {
throw new UserError('Ticket is already signed'); throw new UserError('Ticket is already signed');
if (location) setLocation(ticketId); if (location) setLocation(ticketId);
if (!await hasSignDms(ticketId)) createGestDoc(ticketId); if (!await hasSignDms(ticketId))
createGestDoc(ticketId);
await ticket.updateAttribute('isSigned', true, myOptions); await ticket.updateAttribute('isSigned', true, myOptions);
const deliveryState = await models.State.findOne({ const deliveryState = await models.State.findOne({