Merge pull request 'fix: monitorPayMethodFilter' (!3315) from warmfix-monitorPayMethodFilter into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3315 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
148b82ea93
|
@ -98,6 +98,11 @@ module.exports = Self => {
|
||||||
arg: 'countryFk',
|
arg: 'countryFk',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
description: 'The country id filter'
|
description: 'The country id filter'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'payMethod',
|
||||||
|
type: 'string',
|
||||||
|
description: 'The payment method filter'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
returns: {
|
returns: {
|
||||||
|
@ -165,6 +170,8 @@ module.exports = Self => {
|
||||||
case 'clientFk':
|
case 'clientFk':
|
||||||
param = `t.${param}`;
|
param = `t.${param}`;
|
||||||
return {[param]: value};
|
return {[param]: value};
|
||||||
|
case 'payMethod':
|
||||||
|
return {'c.payMethodFk': value};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -205,6 +212,8 @@ module.exports = Self => {
|
||||||
u.name userName,
|
u.name userName,
|
||||||
c.salesPersonFk,
|
c.salesPersonFk,
|
||||||
c.credit,
|
c.credit,
|
||||||
|
c.payMethodFk payMethodFk,
|
||||||
|
pm.id payMethodId,
|
||||||
pm.name payMethod,
|
pm.name payMethod,
|
||||||
z.hour zoneLanding,
|
z.hour zoneLanding,
|
||||||
z.name zoneName,
|
z.name zoneName,
|
||||||
|
|
Loading…
Reference in New Issue