fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#21091 

fixes bug#21087
dev:valdir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104536 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2020-11-26 21:23:12 +00:00
parent f92f05501c
commit 890f6a91b9
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
View File

@ -92,7 +92,7 @@ public class EditarEstacionController extends MyGenericForwardComposer {
private Longbox txtNumCaja; private Longbox txtNumCaja;
private Estacion estacion; private Estacion estacion;
private MyComboboxPuntoVenta cmbPuntoVenta; private MyComboboxPuntoVenta cmbPuntoVenta;
private Intbox txtNumEmpresa; private Textbox txtNumEmpresa;
private Intbox txtNumFilial; private Intbox txtNumFilial;
private Textbox txtCnpjTef; private Textbox txtCnpjTef;
private Textbox txtNumPdv; private Textbox txtNumPdv;
@ -400,7 +400,7 @@ public class EditarEstacionController extends MyGenericForwardComposer {
} }
} }
public void onClick$btnAddConfSitef(Event e) { public void onClick$btnAddConfSitef(Event e) throws InterruptedException {
if(!validarCampos()) { if(!validarCampos()) {
return; return;
@ -451,7 +451,7 @@ public class EditarEstacionController extends MyGenericForwardComposer {
} }
private boolean validarCampos() { private boolean validarCampos() throws InterruptedException {
if (cmbIntegracaoTef.getSelectedItem() == null) { if (cmbIntegracaoTef.getSelectedItem() == null) {
Clients.alert(Labels.getLabel("editarEstacionController.MSG.integracaoTef"), Labels.getLabel("editarEstacionController.window.title"), Messagebox.INFORMATION); Clients.alert(Labels.getLabel("editarEstacionController.MSG.integracaoTef"), Labels.getLabel("editarEstacionController.window.title"), Messagebox.INFORMATION);
return false; return false;
@ -466,6 +466,13 @@ public class EditarEstacionController extends MyGenericForwardComposer {
TipoIntegracaoTEF tipoIntegracaoTEF = (TipoIntegracaoTEF) cmbIntegracaoTef.getSelectedItem().getValue(); TipoIntegracaoTEF tipoIntegracaoTEF = (TipoIntegracaoTEF) cmbIntegracaoTef.getSelectedItem().getValue();
if(StringUtils.isNotBlank(txtNumEmpresa.getValue()) && StringUtils.isNotBlank(txtNumEmpresa.getValue().replaceAll("\\d", ""))) {
Messagebox.show(Labels.getLabel("editarEstacionController.MSG.numEmpresa", new Object[] {Labels.getLabel("editarEstacionController.lbNumEmpresa.value")}),
Labels.getLabel("editarEstacionController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
return false;
}
if(TipoIntegracaoTEF.SITEF.equals(tipoIntegracaoTEF)) { if(TipoIntegracaoTEF.SITEF.equals(tipoIntegracaoTEF)) {
if ((cmbEmpresa.getSelectedItem() == null) || (txtNumEmpresa.getValue() == null) || (txtNumFilial.getValue() == null) || (txtNumPdv.getValue() == null) || (txtIpServidor.getValue() == null)) { if ((cmbEmpresa.getSelectedItem() == null) || (txtNumEmpresa.getValue() == null) || (txtNumFilial.getValue() == null) || (txtNumPdv.getValue() == null) || (txtIpServidor.getValue() == null)) {
Clients.alert(Labels.getLabel("editarEstacionController.MSG.sitef"), Labels.getLabel("editarEstacionController.window.title"), Messagebox.INFORMATION); Clients.alert(Labels.getLabel("editarEstacionController.MSG.sitef"), Labels.getLabel("editarEstacionController.window.title"), Messagebox.INFORMATION);

4
web/gui/seguridad/editarEstacion.zul
View File

@ -233,8 +233,8 @@
<row> <row>
<label <label
value="${c:l('editarEstacionController.lbNumEmpresa.value')}" /> value="${c:l('editarEstacionController.lbNumEmpresa.value')}" />
<intbox id="txtNumEmpresa" width="90%" <textbox id="txtNumEmpresa" width="90%"
maxlength="12" /> maxlength="30" />
</row> </row>
<row> <row>
<label <label