verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Bernat 2019-07-30 14:07:16 +02:00
parent 4bc7d88162 82d3ac27cf
commit 788a8ade47
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ticket/front/basic-data/step-one/index.js
View File

@ -146,9 +146,10 @@ class Controller {
}; };
let query = `/api/Agencies/getLanded`; let query = `/api/Agencies/getLanded`;
this.$http.get(query, {params}).then(res => { 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; this.ticket.landed = res.data.landed;
else { } else {
return this.vnApp.showError( return this.vnApp.showError(
this.$translate.instant(`No delivery zone available for this shipping date`) this.$translate.instant(`No delivery zone available for this shipping date`)
); );
@ -165,9 +166,10 @@ class Controller {
}; };
let query = `/api/Agencies/getShipped`; let query = `/api/Agencies/getShipped`;
this.$http.get(query, {params}).then(res => { 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; this.ticket.shipped = res.data.shipped;
else { } else {
return this.vnApp.showError( return this.vnApp.showError(
this.$translate.instant(`No delivery zone available for this landing date`) this.$translate.instant(`No delivery zone available for this landing date`)
); );