Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
This commit is contained in:
commit
788a8ade47
|
@ -146,9 +146,10 @@ class Controller {
|
|||
};
|
||||
let query = `/api/Agencies/getLanded`;
|
||||
this.$http.get(query, {params}).then(res => {
|
||||
if (res.data && res.data.landed)
|
||||
if (res.data && res.data.landed) {
|
||||
this.ticket.zoneFk = res.data.zoneFk;
|
||||
this.ticket.landed = res.data.landed;
|
||||
else {
|
||||
} else {
|
||||
return this.vnApp.showError(
|
||||
this.$translate.instant(`No delivery zone available for this shipping date`)
|
||||
);
|
||||
|
@ -165,9 +166,10 @@ class Controller {
|
|||
};
|
||||
let query = `/api/Agencies/getShipped`;
|
||||
this.$http.get(query, {params}).then(res => {
|
||||
if (res.data)
|
||||
if (res.data) {
|
||||
this.ticket.zoneFk = res.data.id;
|
||||
this.ticket.shipped = res.data.shipped;
|
||||
else {
|
||||
} else {
|
||||
return this.vnApp.showError(
|
||||
this.$translate.instant(`No delivery zone available for this landing date`)
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue