Merge pull request 'AL-2048' (#50) from AL-2048 into master

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/50
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
master 1.0.38
Gleison da Cruz 2023-01-17 12:16:34 +00:00
commit 976195256e
1 changed files with 39 additions and 6 deletions

View File

@ -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("_", ""));
}
}
@ -2092,7 +2125,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 +2133,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("_", ""));
}
}