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

7525-devToTest #2542

Merged
alexm merged 231 commits from 7525-devToTest into test 2024-06-04 07:59:34 +00:00
Conversation 0 Commits 231 Files Changed 103 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e55f2d92d - Show all commits

1
modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
View File

@ -7,6 +7,7 @@ describe('ticket setDelivered()', () => {
accessToken: {userId: userId}, accessToken: {userId: userId},
__: value => value __: value => value
}; };
const ctx = {req: activeCtx};
beforeAll(async() => { beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({

2
modules/ticket/back/methods/ticket/state.js
View File

@ -92,7 +92,7 @@ module.exports = Self => {
AND st.isChecked AND st.isChecked
AND s.originalQuantity IS NOT NULL AND s.originalQuantity IS NOT NULL
AND s.originalQuantity <> s.quantity AND s.originalQuantity <> s.quantity
AND s2.\`order\` < (SELECT \`order\` FROM vn.state WHERE code = 'PACKING') AND s2.\`order\` < (SELECT \`order\` FROM vn.state WHERE code = 'CHECKED')
ORDER BY st.created DESC ORDER BY st.created DESC
`, [params.ticketFk], myOptions); `, [params.ticketFk], myOptions);