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

Merge pull request '7569_sendEmail' (!3387) from 7569_sendEmail into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3387
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
This commit is contained in:
Sergio De la torre 2025-01-28 10:26:48 +00:00
parent a29de13ab3 1575c509d1
commit 8ed9e864a2
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,20 +161,21 @@ module.exports = Self => {
if (stateCode == 'DELIVERED' && ticket.priority) {
const orderState = await models.State.findOne({
where: {code: 'DELIVERED'},
fields: ['id']
fields: ['order']
}, myOptions);
const ticketIncorrect = await Self.rawSql(`
SELECT t.id
FROM ticket t
JOIN ticketState ts ON ts.ticketFk = t.id
JOIN state s ON s.code = ts.code
SELECT tls.ticketFk
FROM ticketLastState tls
JOIN ticketTracking tt ON tt.id = tls.ticketTrackingFk
JOIN ticket t ON t.id = tt.ticketFk
JOIN state s ON s.id = tt.stateFk
WHERE t.routeFk = ?
AND s.\`order\` < ?
AND priority <(SELECT t.priority
FROM ticket t
WHERE t.id = ?)`
, [ticket.routeFk, orderState.id, ticket.id], myOptions);
AND priority < (SELECT priority
FROM ticket
WHERE id = ?)
`, [ticket.routeFk, orderState.order, ticket.id], myOptions);
if (ticketIncorrect?.length > 0)
await sendMail(ticket.routeFk, ticket.id, ticket.zone().name);