refs #6408 - rocketChat #2520

Merged
jgallego merged 4 commits from 6408-rocketChat into dev 2024-05-31 10:43:53 +00:00
2 changed files with 2 additions and 1 deletions
Showing only changes of commit 5e55f2d92d - Show all commits

View File

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

View File

@ -92,7 +92,7 @@ module.exports = Self => {
AND st.isChecked
AND s.originalQuantity IS NOT NULL
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
`, [params.ticketFk], myOptions);