verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

7569_sendEmail #3387

Merged
sergiodt merged 3 commits from 7569_sendEmail into master 2025-01-28 10:26:50 +00:00
Conversation 0 Commits 3 Files Changed 1 +12 -11
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,20 +161,21 @@ module.exports = Self => {
if (stateCode == 'DELIVERED' && ticket.priority) { if (stateCode == 'DELIVERED' && ticket.priority) {
const orderState = await models.State.findOne({ const orderState = await models.State.findOne({
where: {code: 'DELIVERED'}, where: {code: 'DELIVERED'},
fields: ['id'] fields: ['order']
}, myOptions); }, myOptions);
const ticketIncorrect = await Self.rawSql(` const ticketIncorrect = await Self.rawSql(`
SELECT t.id SELECT tls.ticketFk
FROM ticket t FROM ticketLastState tls
sergiodt marked this conversation as resolved Outdated
guillermo commented 2025-01-28 10:16:36 +00:00
Outdated
Review
Copy Link

TAB

TAB
JOIN ticketState ts ON ts.ticketFk = t.id JOIN ticketTracking tt ON tt.id = tls.ticketTrackingFk
JOIN state s ON s.code = ts.code JOIN ticket t ON t.id = tt.ticketFk
WHERE t.routeFk = ? JOIN state s ON s.id = tt.stateFk
AND s.\`order\` < ? WHERE t.routeFk = ?
AND priority <(SELECT t.priority AND s.\`order\` < ?
FROM ticket t AND priority < (SELECT priority
WHERE t.id = ?)` FROM ticket
, [ticket.routeFk, orderState.id, ticket.id], myOptions); WHERE id = ?)
`, [ticket.routeFk, orderState.order, ticket.id], myOptions);
if (ticketIncorrect?.length > 0) if (ticketIncorrect?.length > 0)
await sendMail(ticket.routeFk, ticket.id, ticket.zone().name); await sendMail(ticket.routeFk, ticket.id, ticket.zone().name);