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

Merge pull request 'Hotfix[MonitorSalesFilter]: Fix filtering' (!3525) from Hotfix-MonitorFilter into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3525
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jon Elias 2025-03-04 10:41:56 +00:00
parent c4c606018d d7f06b7df9
commit ff977de929
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -262,10 +262,7 @@ module.exports = Self => {
(INDEX (ticketFk))
ENGINE = MEMORY
SELECT f.id ticketFk
FROM tmp.filter f
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
AND f.shipped >= ?`, [date]);
FROM tmp.filter f`);
stmts.push(stmt);
stmts.push('CALL ticket_getProblems(FALSE)');
@ -288,7 +285,7 @@ module.exports = Self => {
stmts.push(stmt);
stmt = new ParameterizedSQL(`
SELECT *
SELECT f.*, tp.*
FROM tmp.filter f
LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id

6
modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
View File

@ -68,7 +68,7 @@ describe('SalesMonitor salesFilter()', () => {
const filter = {};
const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
expect(result.length).toEqual(5);
expect(result.length).toEqual(8);
await tx.rollback();
} catch (e) {
@ -254,8 +254,8 @@ describe('SalesMonitor salesFilter()', () => {
const firstTicket = result.shift();
const secondTicket = result.shift();
expect(firstTicket.totalProblems).toEqual(null);
expect(secondTicket.totalProblems).toEqual(null);
expect(firstTicket.totalProblems).toEqual(0);
expect(secondTicket.totalProblems).toEqual(0);
await tx.rollback();
} catch (e) {