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

fix: refs #7965 UnifyProblems
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Carlos Andrés 2024-09-30 14:30:15 +02:00
parent 712bfe7368
commit 69cafd5a04
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,7 +289,7 @@ module.exports = Self => {
{'tp.hasTicketRequest': true}, {'tp.hasTicketRequest': true},
{'tp.hasComponentLack': true}, {'tp.hasComponentLack': true},
{'tp.isTaxDataChecked': false}, {'tp.isTaxDataChecked': false},
{'tp.itemShortage': {neq: null}}, {'tp.hasItemShortage': true},
{'tp.isTooLittle': true} {'tp.isTooLittle': true}
]}; ]};
} else if (hasProblems === false) { } else if (hasProblems === false) {
@ -299,7 +299,7 @@ module.exports = Self => {
{'tp.hasTicketRequest': false}, {'tp.hasTicketRequest': false},
{'tp.hasComponentLack': false}, {'tp.hasComponentLack': false},
{'tp.isTaxDataChecked': true}, {'tp.isTaxDataChecked': true},
{'tp.itemShortage': null}, {'tp.hasItemShortage': false},
{'tp.isTooLittle': false} {'tp.isTooLittle': false}
]}; ]};
} }

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

@ -345,7 +345,7 @@ module.exports = Self => {
{'tp.isFreezed': hasProblem}, {'tp.isFreezed': hasProblem},
{'tp.hasRisk': hasProblem}, {'tp.hasRisk': hasProblem},
{'tp.hasTicketRequest': hasProblem}, {'tp.hasTicketRequest': hasProblem},
{'tp.itemShortage': range}, {'tp.hasItemShortage': range},
{'tp.hasRounding': hasProblem} {'tp.hasRounding': hasProblem}
]}; ]};

5
modules/ticket/back/methods/ticket/getTicketsFuture.js
View File

@ -175,20 +175,17 @@ module.exports = Self => {
let condition; let condition;
let hasProblem; let hasProblem;
let range;
let hasWhere; let hasWhere;
switch (args.problems) { switch (args.problems) {
case true: case true:
condition = `or`; condition = `or`;
hasProblem = true; hasProblem = true;
range = {neq: null};
hasWhere = true; hasWhere = true;
break; break;
case false: case false:
condition = `and`; condition = `and`;
hasProblem = null; hasProblem = null;
range = null;
hasWhere = true; hasWhere = true;
break; break;
} }
@ -198,7 +195,7 @@ module.exports = Self => {
{'tp.isFreezed': hasProblem}, {'tp.isFreezed': hasProblem},
{'tp.hasRisk': hasProblem}, {'tp.hasRisk': hasProblem},
{'tp.hasTicketRequest': hasProblem}, {'tp.hasTicketRequest': hasProblem},
{'tp.itemShortage': range}, {'tp.hasItemShortage': hasProblem},
{'tp.hasComponentLack': hasProblem}, {'tp.hasComponentLack': hasProblem},
{'tp.isTooLittle': hasProblem}, {'tp.isTooLittle': hasProblem},
{'tp.hasRounding': hasProblem} {'tp.hasRounding': hasProblem}