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

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +6 -13
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f95a4f3530 - Show all commits

19
back/methods/collection/getSales.js
View File

@ -42,7 +42,12 @@ module.exports = Self => {
const [tickets] = await Self.rawSql('CALL vn.collection_getTickets(?)', [id], myOptions); const [tickets] = await Self.rawSql('CALL vn.collection_getTickets(?)', [id], myOptions);
await setState(source, id, myOptions); if (source) {
await Self.rawSql(
'CALL vn.ticketStateToday_setState(?,?)', [id, source], options
);
}
const [sales] = await Self.rawSql('CALL vn.sale_getFromTicketOrCollection(?)', const [sales] = await Self.rawSql('CALL vn.sale_getFromTicketOrCollection(?)',
[id], myOptions); [id], myOptions);
@ -151,16 +156,4 @@ module.exports = Self => {
AND tr.landed >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)`; AND tr.landed >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)`;
return Self.rawSql(query, [ticketId], options); return Self.rawSql(query, [ticketId], options);
} }
async function setState(source, id, options) {
const states = {
'PRECHECKER': 'PREVIOUS_CONTROL',
'CHECKER': 'ON_CHECKING'
};
if (states[source]) {
await Self.rawSql(
'CALL vn.ticketStateToday_setState(?,?)', [id, states[source]], options
);
}
}
}; };