From 6cc8924bd20a1a9954377dac8b4c1b40cada2695 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Mon, 10 Jun 2024 17:15:10 -0300
Subject: [PATCH] AL-4271

---
 pom.xml                                            |  4 ++--
 .../catalogos/EditarEmpresaController.java         |  2 +-
 .../seguridad/EditarEstacionController.java        | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 976610f60..89f4fa2ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.80.2</version> 
+	<version>1.80.3</version> 
 	 <packaging>war</packaging> 
   
 	<properties>
-		<modelWeb.version>1.60.1</modelWeb.version>
+		<modelWeb.version>1.60.2</modelWeb.version>
 		<flyway.version>1.45.3</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
index 9be30c51d..8aa53007c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
@@ -1680,7 +1680,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
 	
 	private void salvaValoresSicfe(String chave, Object valor, Map<String, String> mapConfigSicfe) {
 
-		if (mapConfigSicfe.get(chave) != null) {
+		if (mapConfigSicfe.containsKey(chave)) {
 			EmpresaSicfeConfig empresaSicfeConfig = empresaSicfeConfigService.buscarChave(chave,
 					empresa.getEmpresaId());
 			empresaSicfeConfig.setValor(valor != null ? valor.toString() : null);
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
index 9a3711dab..d316a75b9 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java
@@ -6,6 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -820,7 +822,14 @@ public class EditarEstacionController extends MyGenericForwardComposer {
 	}
 	
 	public List<TipoIntegracaoTEF> getLsIntegracaoTef() {
-		return TipoIntegracaoTEF.list();
+		List<TipoIntegracaoTEF> lsIntegracao = TipoIntegracaoTEF.list();
+		Collections.sort(lsIntegracao, new Comparator<TipoIntegracaoTEF>() {
+			@Override
+			public int compare(TipoIntegracaoTEF o1, TipoIntegracaoTEF o2) {
+				return o1.toString().compareTo(o2.toString());
+			}
+		});
+		return lsIntegracao;
 	}
 	
 	public void onChange$cmbEmpresa(Event ev) {
@@ -840,7 +849,8 @@ public class EditarEstacionController extends MyGenericForwardComposer {
 	
 	public void onChange$cmbIntegracaoTef(Event ev) {
 		TipoIntegracaoTEF tipoIntegracaoTEF = (TipoIntegracaoTEF) cmbIntegracaoTef.getSelectedItem().getValue();
-		if (tipoIntegracaoTEF != null && tipoIntegracaoTEF.equals(TipoIntegracaoTEF.ADYEN)) {
+		if (tipoIntegracaoTEF != null && (tipoIntegracaoTEF.equals(TipoIntegracaoTEF.ADYEN)
+				|| tipoIntegracaoTEF.equals(TipoIntegracaoTEF.CREDIBANCO))) {
 			rowDescricao.setVisible(true);
 			rowNumeroDeSerie.setVisible(true);
 			colunmNumeroDeSerie.setVisible(true);