Merge pull request 'ticket filter pending uses isNotValidated now' (#1016) from 4262-ticket_state_notValidated into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1016 Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
commit
f15c37d5e1
|
@ -200,22 +200,7 @@ module.exports = Self => {
|
||||||
return {'t.routeFk': {neq: null}};
|
return {'t.routeFk': {neq: null}};
|
||||||
return {'t.routeFk': null};
|
return {'t.routeFk': null};
|
||||||
case 'pending':
|
case 'pending':
|
||||||
if (value) {
|
return {'st.isNotValidated': value};
|
||||||
return {and: [
|
|
||||||
{'st.alertLevel': 0},
|
|
||||||
{'st.code': {nin: [
|
|
||||||
'OK',
|
|
||||||
'BOARDING',
|
|
||||||
'PRINTED',
|
|
||||||
'PRINTED_AUTO',
|
|
||||||
'PICKER_DESIGNED'
|
|
||||||
]}}
|
|
||||||
]};
|
|
||||||
} else {
|
|
||||||
return {and: [
|
|
||||||
{'st.alertLevel': {gt: 0}}
|
|
||||||
]};
|
|
||||||
}
|
|
||||||
case 'id':
|
case 'id':
|
||||||
case 'clientFk':
|
case 'clientFk':
|
||||||
case 'agencyModeFk':
|
case 'agencyModeFk':
|
||||||
|
|
|
@ -153,7 +153,7 @@ describe('ticket filter()', () => {
|
||||||
const secondRow = result[1];
|
const secondRow = result[1];
|
||||||
const thirdRow = result[2];
|
const thirdRow = result[2];
|
||||||
|
|
||||||
expect(result.length).toEqual(12);
|
expect(result.length).toEqual(17);
|
||||||
expect(firstRow.state).toEqual('Entregado');
|
expect(firstRow.state).toEqual('Entregado');
|
||||||
expect(secondRow.state).toEqual('Entregado');
|
expect(secondRow.state).toEqual('Entregado');
|
||||||
expect(thirdRow.state).toEqual('Entregado');
|
expect(thirdRow.state).toEqual('Entregado');
|
||||||
|
|
Loading…
Reference in New Issue