Merge pull request '#2458 - Removed states from pending tickets' (#387) from 2458-ticket_index_pending into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #387 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
This commit is contained in:
commit
a5ec5d0d6c
|
@ -161,8 +161,13 @@ module.exports = Self => {
|
||||||
if (value) {
|
if (value) {
|
||||||
return {and: [
|
return {and: [
|
||||||
{'st.alertLevel': 0},
|
{'st.alertLevel': 0},
|
||||||
{'st.code': {neq: 'OK'}},
|
{'st.code': {nin: [
|
||||||
{'st.code': {neq: 'BOARDING'}}
|
'OK',
|
||||||
|
'BOARDING',
|
||||||
|
'PRINTED',
|
||||||
|
'PRINTED_AUTO',
|
||||||
|
'PICKER_DESIGNED'
|
||||||
|
]}}
|
||||||
]};
|
]};
|
||||||
} else {
|
} else {
|
||||||
return {and: [
|
return {and: [
|
||||||
|
|
|
@ -161,7 +161,8 @@
|
||||||
</div>
|
</div>
|
||||||
<vn-popup vn-id="summary">
|
<vn-popup vn-id="summary">
|
||||||
<vn-ticket-summary
|
<vn-ticket-summary
|
||||||
ticket="$ctrl.selectedTicket">
|
ticket="$ctrl.selectedTicket"
|
||||||
|
model="model">
|
||||||
</vn-ticket-summary>
|
</vn-ticket-summary>
|
||||||
</vn-popup>
|
</vn-popup>
|
||||||
<vn-client-descriptor-popover
|
<vn-client-descriptor-popover
|
||||||
|
|
|
@ -57,8 +57,12 @@ class Controller extends Section {
|
||||||
this.vnApp.showSuccess(this.$t('Data saved!'));
|
this.vnApp.showSuccess(this.$t('Data saved!'));
|
||||||
if (this.card)
|
if (this.card)
|
||||||
this.card.reload();
|
this.card.reload();
|
||||||
else
|
else {
|
||||||
this.getSummary();
|
this.getSummary();
|
||||||
|
// Refresh index model
|
||||||
|
if (this.model)
|
||||||
|
this.model.refresh();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,7 +82,8 @@ ngModule.vnComponent('vnTicketSummary', {
|
||||||
template: require('./index.html'),
|
template: require('./index.html'),
|
||||||
controller: Controller,
|
controller: Controller,
|
||||||
bindings: {
|
bindings: {
|
||||||
ticket: '<'
|
ticket: '<',
|
||||||
|
model: '<?'
|
||||||
},
|
},
|
||||||
require: {
|
require: {
|
||||||
card: '?^vnTicketCard'
|
card: '?^vnTicketCard'
|
||||||
|
|
Loading…
Reference in New Issue