From 3915507299e29aaa92f54d7af5da7500cd323df3 Mon Sep 17 00:00:00 2001 From: "aristides@rjconsultores.com.br" Date: Thu, 22 Dec 2022 09:25:03 -0300 Subject: [PATCH 1/3] bug#AL-1808 --- pom.xml | 6 +++--- .../controladores/catalogos/EditarFormaPagoController.java | 4 ++++ web/WEB-INF/i3-label_en.label | 1 + web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8129678c3..3fb0a0b61 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.17 + 1.0.18 war @@ -55,13 +55,13 @@ br.com.rjconsultores ModelWeb - 1.0.13 + 1.0.14 br.com.rjconsultores Flyway - 1.0.5 + 1.0.6 diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java index 12db2d2ec..0bb8f2b46 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java @@ -74,6 +74,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { private Checkbox chkIndVoucherRodoviaria; + private Checkbox chkIndETicket; + private Row rowIdEventoExtra; private MyComboboxEstandar cmbTipoFormapago; @@ -144,6 +146,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { chkIndEstorno.setChecked(formaPago.getIndProcessoEstorno()); chkIndVoucherRodoviaria.setChecked(formaPago.getIndVoucherRodoviaria()); chkIndTransferenciaReativacao.setChecked(formaPago.getIndTransferenciaReativacao()); + chkIndETicket.setChecked(formaPago.getIndETicket()); if (formaPago.getFormapagoId() == 1) { cmbTipoFormapago.setDisabled(Boolean.TRUE); @@ -281,6 +284,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked()); formaPago.setIndVoucherRodoviaria(chkIndVoucherRodoviaria.isChecked()); formaPago.setIndTransferenciaReativacao(chkIndTransferenciaReativacao.isChecked()); + formaPago.setIndETicket(chkIndETicket.isChecked()); if (formaPago.getFormapagoId() == null) { List lsFP = diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 78704aa92..263a35270 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -1396,6 +1396,7 @@ editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples editarFormaPagoController.lblCateiraDigitalTef.label = TEF editarFormaPagoController.lblCateiraDigitalTpi.label = TPI editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link +editarFormaPagoController.lblETicket.label=E_Ticket # Muestra o tipo de Pesquisa Ponto Venda busquedaTipoPuntoVentaController.window.title = Canal de Venda diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 241551c82..9109976e9 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1218,6 +1218,7 @@ editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples editarFormaPagoController.lblCateiraDigitalTef.label = TEF editarFormaPagoController.lblCateiraDigitalTpi.label = TPI editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link +editarFormaPagoController.lblETicket.label=E_Ticket # Muestra o tipo de Búsqueda Punto de venta busquedaTipoPuntoVentaController.window.title = Canal de venta diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index ee6a7a9aa..1162d63a4 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1397,6 +1397,7 @@ editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples editarFormaPagoController.lblCateiraDigitalTef.label = TEF editarFormaPagoController.lblCateiraDigitalTpi.label = TPI editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link +editarFormaPagoController.lblETicket.label=E_Ticket # Muestra o tipo de Pesquisa Ponto Venda busquedaTipoPuntoVentaController.window.title = Canal de Venda From 2a87e8a99036cb97e920067e9906ab4638dce5a8 Mon Sep 17 00:00:00 2001 From: "aristides@rjconsultores.com.br" Date: Thu, 22 Dec 2022 11:30:29 -0300 Subject: [PATCH 2/3] bug#AL-1808 --- pom.xml | 2 +- web/gui/catalogos/editarFormaPago.zul | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fb0a0b61..48eb0ae43 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.18 + 1.0.19 war diff --git a/web/gui/catalogos/editarFormaPago.zul b/web/gui/catalogos/editarFormaPago.zul index e2528cd76..cac56cc52 100644 --- a/web/gui/catalogos/editarFormaPago.zul +++ b/web/gui/catalogos/editarFormaPago.zul @@ -126,6 +126,11 @@ value="${c:l('editarFormaPagoController.lblSomenteTarifa.label')}" /> + + From 8ae4b2bb05b21b34cf9d95194bef19ace713de35 Mon Sep 17 00:00:00 2001 From: Julio Heredia Date: Thu, 22 Dec 2022 17:26:26 -0300 Subject: [PATCH 3/3] fixes bug#AL-1936 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 48eb0ae43..51e45b884 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.19 + 1.0.20 war @@ -55,7 +55,7 @@ br.com.rjconsultores ModelWeb - 1.0.14 + 1.0.15