From 9a9df7cb99b9a2514bc79eb7d2020449d9652cf9 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 13 Jan 2023 15:06:00 -0300 Subject: [PATCH 1/2] =?UTF-8?q?fixes=20bug#AL-2048=20Ao=20salvar=20o=20tel?= =?UTF-8?q?efone=20no=20ponto=20de=20venda=20estava=20considerando=20somen?= =?UTF-8?q?te=20com=20mascara.=20Alterado=20para=20que=20ao=20salvar=20con?= =?UTF-8?q?siderar=20qualquer=20numero=20de=20telefone.=20O=20tratamento?= =?UTF-8?q?=20da=20mascara=20ira=20continuar=20valendo,=20caso=20o=20usu?= =?UTF-8?q?=C3=A1rio=20use.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../controladores/catalogos/EditarPuntoVentaController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 005e73649..f0d5bbe0e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.36 + 1.0.37 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index 367135ca3..f9ddaaf22 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -2092,7 +2092,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { puntoVenta.setNumtelefonouno(null); if (!numtelefonouno.getValue().equals("")) { getString = this.replaceTextbox(numtelefonouno); - if (getString.length() >= 11) { + if (getString.length() >= 1) { puntoVenta.setNumtelefonouno(numtelefonouno.getValue().replace("_", "")); } } @@ -2100,7 +2100,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { puntoVenta.setNumtelefonodos(null); if (!numtelefonodos.getValue().equals("")) { getString = this.replaceTextbox(numtelefonodos); - if (getString.length() >= 11) { + if (getString.length() >= 1) { puntoVenta.setNumtelefonodos(numtelefonodos.getValue().replace("_", "")); } } From 8075a14d6cf61c738b82d75caad61e2843e43f19 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Mon, 16 Jan 2023 18:40:34 -0300 Subject: [PATCH 2/2] fixes bug#AL-2048 --- .../catalogos/EditarPuntoVentaController.java | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index f9ddaaf22..61195ec3e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -183,7 +183,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCategoriaBloque import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCobrancaAdcPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCobrancaAdcicionalHistorico; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEmpresaBloquear; -import com.rjconsultores.ventaboletos.web.utilerias.render.RenderFormaPago; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderHistoricoFormaPago; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderHistoricoFormaPagoSelecao; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParadaPtoVtaCheckin; @@ -200,6 +199,9 @@ import com.rjconsultores.wsag.GeradorTitulosAG; //import com.rjconsultores.wsag.WSAGLog; import com.rjconsultores.wsag.WSAGLog; + + + /** * * @author Rafius @@ -594,7 +596,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { this.btnApagar = btnApagar; } - public void aplicarMascara() { + public void aplicarMascaratxt() { Clients.evalJavaScript( "jQuery('#" + txtNumFax.getUuid() + "').mask('(999)9999-9999?9');" + "jQuery('#" + numtelefonodos.getUuid() + "').mask('(999)9999-9999?9');" + @@ -669,7 +671,38 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { utilizaCobrancaAdicional = utilizaCobrancaAdicional(); - aplicarMascara(); + aplicarMascaratxt(); + + + numtelefonodos.addEventListener(Events.ON_CHANGING, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + Clients.evalJavaScript( + "jQuery('#" + numtelefonodos.getUuid() + "').mask('(999)9999-9999?9');"); + + } + }); + + numtelefonouno.addEventListener(Events.ON_CHANGING, new EventListener() { + @Override + public void onEvent(Event event) throws Exception { + Clients.evalJavaScript( + "jQuery('#" + numtelefonouno.getUuid() + "').mask('(999)9999-9999?9');"); + + } + }); + + txtNumFax.addEventListener(Events.ON_CHANGING, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + Clients.evalJavaScript( + "jQuery('#" + txtNumFax.getUuid() + "').mask('(999)9999-9999?9');"); + + } + }); + popularCombobox(cmbTipoConta, cmbPessoa, cmbForm, cmbLote, cmbPosicao, cmbReceita, cmbEmpresas, cmbUsuarioEmpresa, cmbEmpresaCobranca, cmbCobrancasPuntoVenta, cmbTipoSocio); @@ -2084,7 +2117,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { puntoVenta.setNumfax(null); if (!txtNumFax.getValue().equals("")) { getString = this.replaceTextbox(txtNumFax); - if (getString.length() >= 11) { + if (getString.length() >= 1) { puntoVenta.setNumfax(txtNumFax.getValue().replace("_", "")); } }