13339: cadastro de empresa

fixed bug#13339
dev:thiago
qua:bruno

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@89048 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2019-01-18 16:39:46 +00:00
parent a69c1459ba
commit a5d5751f69
1 changed files with 37 additions and 35 deletions

View File

@ -510,41 +510,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
return;
}
if (empresaEmail == null) {
empresaEmail = new EmpresaEmail();
empresaEmail.setEmpresa(empresa);
empresaEmail.setEmailDe(textEmailDe.getValue());
empresaEmail.setAssunto(textAssunto.getValue());
empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
empresaEmail = empresaEmailService.suscribir(empresaEmail);
} else {
empresaEmail.setEmailDe(textEmailDe.getValue());
empresaEmail.setAssunto(textAssunto.getValue());
empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
empresaEmailService.actualizacion(empresaEmail);
}
if (empresaEmailConfig == null) {
empresaEmailConfig = new EmpresaEmailConfig();
empresaEmailConfig.setEmpresa(empresa);
empresaEmailConfig.setSmtpEmail(textEmail.getValue());
empresaEmailConfig.setSenha(textSenhaEmail.getValue());
empresaEmailConfig.setSmtp(textSMTPHost.getValue());
empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
empresaEmailConfig = empresaEmailConfigService.suscribir(empresaEmailConfig);
} else {
empresaEmailConfig.setSmtpEmail(textEmail.getValue());
empresaEmailConfig.setSenha(textSenhaEmail.getValue());
empresaEmailConfig.setSmtp(textSMTPHost.getValue());
empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
empresaEmailConfigService.actualizacion(empresaEmailConfig);
}
boolean isBPe = false;
@ -624,6 +590,42 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
empresaService.suscribirActualizacion(empresa);
empresaList.updateItem(empresa);
if (empresaEmail == null) {
empresaEmail = new EmpresaEmail();
empresaEmail.setEmpresa(empresa);
empresaEmail.setEmailDe(textEmailDe.getValue());
empresaEmail.setAssunto(textAssunto.getValue());
empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
empresaEmail = empresaEmailService.suscribir(empresaEmail);
} else {
empresaEmail.setEmailDe(textEmailDe.getValue());
empresaEmail.setAssunto(textAssunto.getValue());
empresaEmail.setAssuntoFiscal(textAssuntoFiscal.getValue());
empresaEmail.setTextoCupomEmbarque(messageCupomEmbarque.getValue());
empresaEmail.setTextoEmail(messageConteudoEmail.getValue());
empresaEmail.setTextoEmailFiscal(messageConteudoEmailFiscal.getValue());
empresaEmailService.actualizacion(empresaEmail);
}
if (empresaEmailConfig == null) {
empresaEmailConfig = new EmpresaEmailConfig();
empresaEmailConfig.setEmpresa(empresa);
empresaEmailConfig.setSmtpEmail(textEmail.getValue());
empresaEmailConfig.setSenha(textSenhaEmail.getValue());
empresaEmailConfig.setSmtp(textSMTPHost.getValue());
empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
empresaEmailConfig = empresaEmailConfigService.suscribir(empresaEmailConfig);
} else {
empresaEmailConfig.setSmtpEmail(textEmail.getValue());
empresaEmailConfig.setSenha(textSenhaEmail.getValue());
empresaEmailConfig.setSmtp(textSMTPHost.getValue());
empresaEmailConfig.setSmtpPorta(textSMTPPorta.getValue());
empresaEmailConfigService.actualizacion(empresaEmailConfig);
}
Messagebox.show(Labels.getLabel("editarEmpresaController.MSG.suscribirOK"),
Labels.getLabel("editarEmpresaController.window.title"),