From 29b21b1ac9ec28a383946b8702003704531e3e10 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 28 Nov 2023 20:34:48 -0300 Subject: [PATCH] bug#AL-3374 --- pom.xml | 2 +- .../BusquedaConfTotemController.java | 6 +++--- web/WEB-INF/i3-label_en.label | 2 ++ web/WEB-INF/i3-label_es_MX.label | 2 ++ web/WEB-INF/i3-label_pt_BR.label | 2 ++ web/gui/catalogos/busquedaConfTotem.zul | 19 +++++++++++++++++++ 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f4f17890d..67d23d7a2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.35.14 + 1.35.15 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java index 2352137c6..4398aee7e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java @@ -13,8 +13,7 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; - +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -96,6 +95,7 @@ public class BusquedaConfTotemController extends MyGenericForwardComposer { private Checkbox chkIndExibeTelefone; private Checkbox chkIndEmailObrigatorio; private Checkbox chkIndTelefoneObrigatorio; + private Checkbox chkIndMostrarInfoCorrida; @Override public void doAfterCompose(Component comp) throws Exception { @@ -145,7 +145,7 @@ public class BusquedaConfTotemController extends MyGenericForwardComposer { map.put("exibeTelefone", chkIndExibeTelefone); map.put("telefoneObrigatorio", chkIndTelefoneObrigatorio); map.put("exibeEmail", chkIndExibeEmail); - map.put("emailObrigatorio", chkIndEmailObrigatorio); + map.put("isMostrarInfoCorrida", chkIndMostrarInfoCorrida); return map; diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 6de8ae6b4..b6fd231aa 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -10144,6 +10144,8 @@ busquedaConfTotemController.permiteVendaRapida.ajuda=Permitir que o totem habili busquedaConfTotemController.lbPermitirProximasPartidas.value = Permitir Venda Rápida (Próximas Partidas ) busquedaConfTotemController.valorParcelaMinima.value = Valor mínimo para parcelamento busquedaConfTotemController.valorParcelaMinima.ajuda=Valor mínimo para parcelar no cartão de crédito. +busquedaConfTotemController.mostrarInfoCorrida =Show Info Service +busquedaConfTotemController.mostrarInfoCorrida.ajuda=Show collumn InfoService (Route) in service query screen. diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index dd1bf0a05..bd2f69af2 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -9535,6 +9535,8 @@ busquedaConfTotemController.exibeEmail.value=Exibir Email(Dados do passageiro) busquedaConfTotemController.exibeEmail.ajuda=Exibe o campo email na tela de passageiro. busquedaConfTotemController.emailObrigatorio.ajuda=Validar se o campo email seja obrigatório(Exibir Email(Dados do passageiro)tem que estar marcado) busquedaConfTotemController.emailObrigatorio=Email obrigatório. +busquedaConfTotemController.mostrarInfoCorrida =Mostrar InfoCorrida +busquedaConfTotemController.mostrarInfoCorrida.ajuda=Muestra la columna Información de carrera (Ruta) en la pantalla de consulta de carrera.. relatorioVendasCartoesController.window.title = Relatório Vendas Cartões diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index dcbde291a..38b4fce8e 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -10209,6 +10209,8 @@ busquedaConfTotemController.exibeEmail.value=Exibir Email(Dados do passageiro) busquedaConfTotemController.exibeEmail.ajuda=Exibe o campo email na tela de passageiro. busquedaConfTotemController.emailObrigatorio.ajuda=Validar se o campo email seja obrigatório(Exibir Email(Dados do passageiro)tem que estar marcado) busquedaConfTotemController.emailObrigatorio=Email obrigatório. +busquedaConfTotemController.mostrarInfoCorrida =Mostrar InfoCorrida +busquedaConfTotemController.mostrarInfoCorrida.ajuda=Mostrar a coluna InfoCorrida (Percurso) na tela de consulta de corridas. diff --git a/web/gui/catalogos/busquedaConfTotem.zul b/web/gui/catalogos/busquedaConfTotem.zul index a5dd9d121..4467c3a59 100644 --- a/web/gui/catalogos/busquedaConfTotem.zul +++ b/web/gui/catalogos/busquedaConfTotem.zul @@ -301,6 +301,25 @@ + + + + +                 + +               + + +              + + + +