diff --git a/front/core/services/auth.js b/front/core/services/auth.js index 61f64b3d6..5b3e445c3 100644 --- a/front/core/services/auth.js +++ b/front/core/services/auth.js @@ -35,10 +35,12 @@ export default class Auth { return true; let redirectToLogin = () => { - return transition.router.stateService.target('login'); + return transition.router.stateService.target('login', { + continue: this.$window.location.hash + }); }; - if (this.vnToken.token || this) { + if (this.vnToken.token) { return this.loadAcls() .then(() => true) .catch(redirectToLogin); diff --git a/front/core/services/interceptor.js b/front/core/services/interceptor.js index d3039e9b5..3f3d9912b 100644 --- a/front/core/services/interceptor.js +++ b/front/core/services/interceptor.js @@ -11,6 +11,7 @@ function interceptor($q, vnApp, vnToken, $translate) { }, request(config) { vnApp.pushLoader(); + if (config.url.charAt(0) !== '/' && apiPath) config.url = `${apiPath}${config.url}`; if (vnToken.token) diff --git a/loopback/locale/es.json b/loopback/locale/es.json index ec60c89c0..36403a1ed 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -237,5 +237,7 @@ "Recover password": "Recuperar contraseña", "Click on the following link to change your password.": "Pulsa en el siguiente link para cambiar tu contraseña.", "Verify email": "Verificar correo", - "Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Pulsa en el siguiente link para verificar este correo. Si no has pedido este correo, simplemente ignóralo." -} + "Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Pulsa en el siguiente link para verificar este correo. Si no has pedido este correo, simplemente ignóralo.", + "Click on the following link to change your password": "Click on the following link to change your password", + "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment" +} \ No newline at end of file diff --git a/modules/account/front/basic-data/index.js b/modules/account/front/basic-data/index.js index 1d27477b7..915357138 100644 --- a/modules/account/front/basic-data/index.js +++ b/modules/account/front/basic-data/index.js @@ -9,7 +9,7 @@ export default class Controller extends Section { }; return this.$http.patch(`Accounts/${this.$params.id}`, params) .then(() => { - this.vnApp.showSuccess(this.$t('Data saved!')); + this.vnApp.showSuccess(this.$t('Email verified successfully!')); }); } } diff --git a/modules/account/front/basic-data/locale/es.yml b/modules/account/front/basic-data/locale/es.yml new file mode 100644 index 000000000..2ca7bf698 --- /dev/null +++ b/modules/account/front/basic-data/locale/es.yml @@ -0,0 +1 @@ +Email verified successfully!: Correo verificado correctamente!