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

fixes bug#13674 

dev:thiago
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@90365 d1611594-4594-4d17-8e1d-87c2c4800839
master
aristides 2019-02-28 00:09:39 +00:00
parent cfe256130b
commit 1dc1fec8fd
1 changed files with 139 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
View File

@ -242,8 +242,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
private CKeditor messageConteudoEmailFiscal;
private CKeditor messageCupomEmbarque;
private static final String EMAIL_PATTERN =
"^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
+ "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
private static final Pattern pattern = Pattern.compile(EditarEmpresaController.EMAIL_PATTERN, Pattern.CASE_INSENSITIVE);
@ -272,10 +271,25 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
if (empresa.getEmpresaId() == null) {
btnAdicionarEstadoImposto.setVisible(false);
btnAdicionarInscEstadual.setVisible(false);
} else {
btnAdicionarEstadoImposto.setVisible(true);
btnAdicionarInscEstadual.setVisible(true);
}
if (empresaEmailConfig != null) {
if(empresaEmailConfig.getIndAutenticacao()){
chkAutenticacao.setChecked(true);
}else{
chkAutenticacao.setChecked(false);
textEmail.setDisabled(true);
textSenhaEmail.setDisabled(true);
}
} else {
chkAutenticacao.setChecked(true);
}
if (empresa.getIndfechatarifa() == null) {
rdgFechaSalida.setChecked(Boolean.TRUE);
@ -409,6 +423,17 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
carrergarParametrosComissao();
}
public void onClick$chkAutenticacao(Event ev) {
if(chkAutenticacao.isChecked()){
textEmail.setDisabled(false);
textSenhaEmail.setDisabled(false);
}else{
textEmail.setDisabled(true);
textSenhaEmail.setDisabled(true);
}
}
private void carrergarParametrosComissao() {
if (empresa.getComEmpConferencias() != null && !empresa.getComEmpConferencias().isEmpty()) {
comEmpConferencia = empresa.getComEmpConferencias().iterator().next();
@ -439,8 +464,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
rdgTipoDCTodos.setSelected(Boolean.FALSE);
rdgTipoDCDebito.setSelected(Boolean.FALSE);
rdgTipoDCCredito.setSelected(Boolean.FALSE);
}
else if(comEmpConferencia.getTipoDebitoCredito().equals(Integer.valueOf(1))){
} else if (comEmpConferencia.getTipoDebitoCredito().equals(Integer.valueOf(1))) {
rdgTipoDCNenhum.setSelected(Boolean.FALSE);
rdgTipoDCTodos.setSelected(Boolean.TRUE);
rdgTipoDCDebito.setSelected(Boolean.FALSE);
@ -514,8 +538,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
return;
}
boolean isBPe = false;
if (empresa.getInscricoesEstaduais() != null) {
@ -630,6 +652,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
empresaEmailConfig.setSenha(textSenhaEmail.getValue());
empresaEmailConfig.setSmtp(textSMTPHost.getValue());
empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
empresaEmailConfig.setIndAutenticacao(chkAutenticacao.isChecked());
empresaEmailConfigService.actualizacion(empresaEmailConfig);
}
@ -728,6 +751,8 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
}
public void onChange$cmbEstado(Event ev) {
Comboitem cbiEstado = cmbEstado.getSelectedItem();
if (cbiEstado != null) {
@ -1074,6 +1099,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
Messagebox.OK, Messagebox.ERROR);
}
}
public Combobox getCmbEstadoInscEstadual() {
return cmbEstadoInscEstadual;
}
@ -1383,12 +1409,10 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
}
}
public Boolean isPermissaoVendaSemReducaoZ() {
return !UsuarioLogado.getUsuarioLogado().isPermisoClave(ConstantesFuncionSistema.CLAVE_EDITAR_VENDA_SEM_REDUCAO_Z);
}
public Radio getUtilizaProjetoFidelidadeSim() {
return utilizaProjetoFidelidadeSim;
}