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

Merge pull request 'fixes bug #AL-4474' (!538) from AL-4474 into master 

Reviewed-on: adm/VentaBoletosAdm#538
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.80.0
pinheiro 2024-06-04 21:20:23 +00:00
parent c917f78cbe 9968991111
commit a0c4bef376
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.79.5</version>
<version>1.80.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.59.0</modelWeb.version>
<flyway.version>1.45.1</flyway.version>
<modelWeb.version>1.60.0</modelWeb.version>
<flyway.version>1.45.2</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

14
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
View File

@ -143,6 +143,7 @@ import com.rjconsultores.ventaboletos.service.InstiFinanceiraService;
import com.rjconsultores.ventaboletos.service.MonedaService;
import com.rjconsultores.ventaboletos.service.NodoService;
import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService;
import com.rjconsultores.ventaboletos.service.PerfilFuncionService;
import com.rjconsultores.ventaboletos.service.PtoVtaCheckinService;
import com.rjconsultores.ventaboletos.service.PtoVtaSeguroService;
import com.rjconsultores.ventaboletos.service.PtoVtaUsuarioBancarioService;
@ -221,6 +222,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
public static final String TITULO = "editarPuntoVentaController.window.title";
@Autowired
private PuntoVentaService puntoVentaService;
@Autowired
@ -276,6 +278,9 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
@Autowired
private OrgaoConcedenteService orgaoConcedenteService;
@Autowired
private PerfilFuncionService perfilFuncionService;
private PuntoVenta puntoVenta;
private Textbox txtCP;
private MyListbox categoriaList;
@ -534,6 +539,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
private Tab tabAnrifraude;
private Tab tabExcecaoMultaCancelamento;
private Tab tabHistorico;
private Tab tabRecollecion;
private Paging pagingHistoricoFormaPago;
private Paging pagingFormaPago;
private Textbox txtLatitudeLongitude;
@ -592,7 +598,6 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
private Checkbox checkIndBloqueioDescontoAPI;
private Checkbox checkIndBloqueioDescontoWEB;
private Checkbox checkIndTaxaConvenienciaOrgaoConcedente;
private final String constanteIndMotivoBloqueio= "IND_MOTIVO_BLOQUEIO";
@Autowired
@ -1197,6 +1202,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
tabAnrifraude.setVisible(false);
tabExcecaoMultaCancelamento.setVisible(false);
tabHistorico.setVisible(false);
tabRecollecion.setVisible(isPerfilFuncionRecollecion());
//Campos
txtNome.setDisabled(true);
txtIdEquivalencia.setDisabled(true);
@ -1265,6 +1271,12 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
return false;
}
public boolean isPerfilFuncionRecollecion() {
return perfilFuncionService.usuarioPossuiPermissaoFuncionalidade(UsuarioLogado.getUsuarioLogado().getUsuarioId(), ConstantesFuncionSistema.FUNCION_RECOLECCION);
}
private List<Empresa> obterEmpresasUsuarioLogadoComOpcaoTodas() {
List<Empresa> listaEmpresas = new ArrayList<Empresa>();
listaEmpresas.add(empresaService.obtenerID(-1));