verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 71 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9626b6c0ff - Show all commits

6
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -53,8 +53,8 @@ module.exports = Self => {
s.quantity, s.quantity,
ag.name, ag.name,
ag.id agencyFk, ag.id agencyFk,
IF(ISNULL(tls.alertLevel),0,tls.alertLevel) alertLevel, tls.alertLevel alertLevel,
IF(ISNULL(st.name),'Libre',st.name) stateName, st.name stateName,
s.id saleFk, s.id saleFk,
s.itemFk, s.itemFk,
s.price price, s.price price,
@ -68,7 +68,7 @@ module.exports = Self => {
DATE_FORMAT(IF(HOUR(t.shipped), t.shipped, IF(zc.hour, zc.hour, z.hour)),'%H:%i') minTimed, DATE_FORMAT(IF(HOUR(t.shipped), t.shipped, IF(zc.hour, zc.hour, z.hour)),'%H:%i') minTimed,
FALSE isBasket, FALSE isBasket,
substitution.hasObservation, substitution.hasObservation,
d.code = 'spainTeamVip' hasToIgnore (d.code = 'spainTeamVip') hasToIgnore
FROM sale s FROM sale s
LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
JOIN ticket t ON t.id = s.ticketFk JOIN ticket t ON t.id = s.ticketFk