verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

Merge pull request '5331-monitor.tickets_actualizarFiltro' (!1410) from 5331-monitor.tickets_actualizarFiltro into dev
gitea/salix/pipeline/head There was a failure building this commit Details 

Reviewed-on: #1410
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
This commit is contained in:
Vicent Llopis 2023-03-29 07:52:14 +00:00
parent ec4b76a0f8 b8da868095
commit 8f2735e126
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia - (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
### Changed ### Changed
- (Monitor tickets) Cuando se filtra por 'Pendiente' ya no muestra los estados de 'Previa'
- (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe. - (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
### Fixed ### Fixed

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

@ -367,20 +367,37 @@ module.exports = Self => {
return {'t.alertLevel': value}; return {'t.alertLevel': value};
case 'pending': case 'pending':
if (value) { if (value) {
return {and: [ return {'t.alertLevelCode': {inq: [
{'t.alertLevel': 0}, 'FIXING',
{'t.alertLevelCode': {nin: [ 'FREE',
'OK', 'NOT_READY',
'BOARDING', 'BLOCKED',
'PRINTED', 'EXPANDABLE',
'PRINTED_AUTO', 'CHAINED',
'PICKER_DESIGNED' 'WAITING_FOR_PAYMENT'
]}} ]}};
]};
} else { } else {
return {and: [ return {'t.alertLevelCode': {inq: [
{'t.alertLevel': {gt: 0}} 'ON_PREPARATION',
]}; 'ON_CHECKING',
'CHECKED',
'PACKING',
'PACKED',
'INVOICED',
'ON_DELIVERY',
'PREPARED',
'WAITING_FOR_PICKUP',
'DELIVERED',
'PRINTED_BACK',
'LAST_CALL',
'PREVIOUS_PREPARATION',
'ASSISTED_PREPARATION',
'BOARD',
'PRINTED STOWAWAY',
'OK STOWAWAY',
'HALF_PACKED',
'COOLER_PREPARATION'
]}};
} }
case 'agencyModeFk': case 'agencyModeFk':
case 'warehouseFk': case 'warehouseFk':