Merge branch 'dev' into test
This commit is contained in:
commit
9606f039e0
|
@ -246,12 +246,11 @@ class Controller {
|
||||||
sales: this.transfer.sales
|
sales: this.transfer.sales
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.$scope.watcher.updateOriginalData();
|
||||||
|
|
||||||
const query = `/api/tickets/${this.ticket.id}/transferSales`;
|
const query = `/api/tickets/${this.ticket.id}/transferSales`;
|
||||||
this.$http.post(query, params).then(res => {
|
this.$http.post(query, params).then(res => {
|
||||||
this.$scope.watcher.updateOriginalData();
|
|
||||||
this.goToTicket(res.data.id);
|
this.goToTicket(res.data.id);
|
||||||
}).finally(() => {
|
|
||||||
this.$scope.watcher.updateOriginalData();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,6 +261,10 @@ class Controller {
|
||||||
ticketCreated: this.ticket.shipped
|
ticketCreated: this.ticket.shipped
|
||||||
};
|
};
|
||||||
const sales = this.checkedLines();
|
const sales = this.checkedLines();
|
||||||
|
|
||||||
|
if (this.newInstances().length === 0)
|
||||||
|
this.$scope.watcher.updateOriginalData();
|
||||||
|
|
||||||
this.$http.post(`/api/Claims/createFromSales`, {claim: claim, sales: sales}).then(res => {
|
this.$http.post(`/api/Claims/createFromSales`, {claim: claim, sales: sales}).then(res => {
|
||||||
this.$state.go('claim.card.basicData', {id: res.data.id});
|
this.$state.go('claim.card.basicData', {id: res.data.id});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue