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

#7197 filter by correcting & supplierActivity #2641

Merged
jorgep merged 13 commits from 7197-fixInvoiceIn into dev 2024-07-29 07:43:57 +00:00
Conversation 0 Commits 13 Files Changed 1 +19 -1
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/invoiceIn/back/methods/invoice-in/filter.js
View File

@ -82,7 +82,15 @@ module.exports = Self => {
{
arg: 'correctedFk',
type: 'number',
description: 'The corrected invoice',
description: 'The rectified invoice',
},
{
arg: 'correctingFk',
type: 'Boolean',
},
{
arg: 'supplierActivityFk',
type: 'string',
}
],
returns: {
@ -111,6 +119,7 @@ module.exports = Self => {
}
let correctings;
let correcteds;
if (args.correctedFk) {
correctings = await models.InvoiceInCorrection.find({
fields: ['correctingFk'],
@ -118,6 +127,9 @@ module.exports = Self => {
});
}
if (args.correctingFk || args.correctingFk === false)
correcteds = await models.InvoiceInCorrection.find();
const where = buildFilter(ctx.args, (param, value) => {
switch (param) {
case 'search':
@ -141,8 +153,14 @@ module.exports = Self => {
return {[`ii.${param}`]: value};
case 'awbCode':
return {'sub.code': value};
case 'correctingFk':
return args.correctingFk
jorgep commented 2024-07-05 14:40:52 +00:00
Review
Copy Link

alterna entre solo rectificativas y las no rectificativas.

alterna entre solo rectificativas y las no rectificativas.
? {'ii.id': {inq: correcteds.map(x => x.correctingFk)}}
: {'ii.id': {nin: correcteds.map(x => x.correctingFk)}};
case 'correctedFk':
return {'ii.id': {inq: correctings.map(x => x.correctingFk)}};
case 'supplierActivityFk':
return {'s.supplierActivityFk': value};
}
});