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

Merge pull request 'AL-4271' (!541) from AL-4271 into master 

Reviewed-on: adm/VentaBoletosAdm#541
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.80.3
Lucas Taiã 2024-06-10 20:40:56 +00:00
parent 1711e7be5c 6cc8924bd2
commit 54f3fe4cdc
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.80.2</version> <version>1.80.3</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.60.1</modelWeb.version> <modelWeb.version>1.60.2</modelWeb.version>
<flyway.version>1.45.3</flyway.version> <flyway.version>1.45.3</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

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

@ -1680,7 +1680,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
private void salvaValoresSicfe(String chave, Object valor, Map<String, String> mapConfigSicfe) { 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, EmpresaSicfeConfig empresaSicfeConfig = empresaSicfeConfigService.buscarChave(chave,
empresa.getEmpresaId()); empresa.getEmpresaId());
empresaSicfeConfig.setValor(valor != null ? valor.toString() : null); empresaSicfeConfig.setValor(valor != null ? valor.toString() : null);

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

@ -6,6 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
@ -820,7 +822,14 @@ public class EditarEstacionController extends MyGenericForwardComposer {
} }
public List<TipoIntegracaoTEF> getLsIntegracaoTef() { 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) { public void onChange$cmbEmpresa(Event ev) {
@ -840,7 +849,8 @@ public class EditarEstacionController extends MyGenericForwardComposer {
public void onChange$cmbIntegracaoTef(Event ev) { public void onChange$cmbIntegracaoTef(Event ev) {
TipoIntegracaoTEF tipoIntegracaoTEF = (TipoIntegracaoTEF) cmbIntegracaoTef.getSelectedItem().getValue(); 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); rowDescricao.setVisible(true);
rowNumeroDeSerie.setVisible(true); rowNumeroDeSerie.setVisible(true);
colunmNumeroDeSerie.setVisible(true); colunmNumeroDeSerie.setVisible(true);