From 6c2fe1d4a389711610aa1333cf3fc07696045344 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Feb 2019 09:27:01 +0100 Subject: [PATCH 1/2] #1036 order.line --- loopback/locale/es.json | 3 ++- modules/order/front/line/index.html | 2 +- modules/order/front/line/index.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 648989cb69..da4100a5ac 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -65,5 +65,6 @@ "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no esta permitido el uso de la letra ñ", "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado", "You can't create a ticket for a inactive client": "No puedes crear un ticket para un cliente inactivo", - "Tag value cannot be blank": "El valor del tag no puede quedar en blanco" + "Tag value cannot be blank": "El valor del tag no puede quedar en blanco", + "ORDER_EMPTY": "Cesta vacía" } \ No newline at end of file diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html index 4bb1dc4cee..a2e28ac2f1 100644 --- a/modules/order/front/line/index.html +++ b/modules/order/front/line/index.html @@ -70,7 +70,7 @@ diff --git a/modules/order/front/line/index.js b/modules/order/front/line/index.js index e25d505323..84067b5ec8 100644 --- a/modules/order/front/line/index.js +++ b/modules/order/front/line/index.js @@ -92,6 +92,7 @@ class Controller { this.$http.post(query).then(() => { this.vnApp.showSuccess(this.$translate.instant('Order confirmed')); + this.$state.go(`ticket.index`, {clientFk: this.order.clientFk}); }); } } From 8f575fbc45a58931d500b2bde6e0f9aa29c422fa Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Feb 2019 09:37:01 +0100 Subject: [PATCH 2/2] strings added to the locale --- modules/order/front/line/locale/es.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/order/front/line/locale/es.yml b/modules/order/front/line/locale/es.yml index ba3a3fee62..6887785619 100644 --- a/modules/order/front/line/locale/es.yml +++ b/modules/order/front/line/locale/es.yml @@ -1,2 +1,3 @@ -Remove item: Eliminar articulo -Order confirmed: Pedido confirmado \ No newline at end of file +Delete row: Eliminar linea +Order confirmed: Pedido confirmado +Are you sure you want to delete this row?: ¿Estas seguro de que quieres borrar esta línea? \ No newline at end of file