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

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

Reviewed-on: adm/VentaBoletosAdm#539
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master 1.80.1
pinheiro 2024-06-04 22:15:00 +00:00
parent a0c4bef376 0e702913dc
commit 881152be76
3 changed files with 7542 additions and 7540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.80.0</version>
<version>1.80.1</version>
<packaging>war</packaging>
<properties>

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

@ -539,7 +539,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
private Tab tabAnrifraude;
private Tab tabExcecaoMultaCancelamento;
private Tab tabHistorico;
private Tab tabRecollecion;
private Tab tabRecoleccion;
private Paging pagingHistoricoFormaPago;
private Paging pagingFormaPago;
private Textbox txtLatitudeLongitude;
@ -1148,6 +1148,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
ptovtaExcecaoMultaCancList.setItemRenderer(new RenderPtovtaExcecaoMultaCanc());
ptovtaExcecaoMultaCancList.setData(puntoVenta.getPtovtaExcecaoMultaCancList() == null ? Collections.emptyList() : puntoVenta.getPtovtaExcecaoMultaCancList());
tabRecoleccion.setVisible(isPerfilFuncionRecollecion());
validaPerfilFuncionBloqueiaDesbloqueiaPontoVenda();
txtLatitudeLongitude.addEventListener("onChanging", new EventListener() {
@ -1202,7 +1203,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
tabAnrifraude.setVisible(false);
tabExcecaoMultaCancelamento.setVisible(false);
tabHistorico.setVisible(false);
tabRecollecion.setVisible(isPerfilFuncionRecollecion());
tabRecoleccion.setVisible(false);
//Campos
txtNome.setDisabled(true);
txtIdEquivalencia.setDisabled(true);

1
web/gui/catalogos/editarPuntoVenta.zul
View File

@ -61,6 +61,7 @@
id="tabFormaPago"
label="${c:l('indexController.mniFormaPago.label')}" />
<tab
id="tabRecoleccion"
label="${c:l('editarPuntoVentaController.tab.label.recoleccion')}"
visible="false" />
<tab