Merge pull request 'feat: add country id filter to sales monitor' (!3273) from hotfix-setUserParams into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3273 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
ff2f4f94f4
|
@ -88,6 +88,11 @@ module.exports = Self => {
|
||||||
arg: 'alertLevel',
|
arg: 'alertLevel',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
description: `The alert level of the tickets`
|
description: `The alert level of the tickets`
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'countryFk',
|
||||||
|
type: 'number',
|
||||||
|
description: 'The country id filter'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
returns: {
|
returns: {
|
||||||
|
@ -182,6 +187,7 @@ module.exports = Self => {
|
||||||
t.totalWithVat,
|
t.totalWithVat,
|
||||||
io.id invoiceOutId,
|
io.id invoiceOutId,
|
||||||
a.provinceFk,
|
a.provinceFk,
|
||||||
|
p.countryFk,
|
||||||
p.name province,
|
p.name province,
|
||||||
w.name warehouse,
|
w.name warehouse,
|
||||||
am.name agencyMode,
|
am.name agencyMode,
|
||||||
|
@ -360,6 +366,7 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
case 'agencyModeFk':
|
case 'agencyModeFk':
|
||||||
case 'warehouseFk':
|
case 'warehouseFk':
|
||||||
|
case 'countryFk':
|
||||||
param = `f.${param}`;
|
param = `f.${param}`;
|
||||||
return {[param]: value};
|
return {[param]: value};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue