From aea861f75b0de6ef36b39f20c7064003a86f59fe Mon Sep 17 00:00:00 2001 From: wilian Date: Tue, 8 Jan 2019 19:59:42 +0000 Subject: [PATCH] bug#12840 dev:valdevir qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@88633 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioIntegracaoAntiFraude.java | 28 +- ...elatorioIntegracaoAntiFraude_es.properties | 12 +- ...elatorioIntegracaoAntiFraude_pt.properties | 12 +- .../RelatorioIntegracaoAntiFraude.jasper | Bin 47211 -> 56473 bytes .../RelatorioIntegracaoAntiFraude.jrxml | 243 ++++++++++++++---- .../EditarPtovtaAntifraudeController.java | 131 ++++++++++ .../catalogos/EditarPuntoVentaController.java | 19 ++ web/WEB-INF/i3-label_es_MX.label | 4 +- web/WEB-INF/i3-label_pt_BR.label | 6 +- web/gui/catalogos/editarPtovtaAntifraude.zul | 55 ++++ 10 files changed, 445 insertions(+), 65 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java create mode 100644 web/gui/catalogos/editarPtovtaAntifraude.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java index adcf4ac61..71724de70 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java @@ -42,12 +42,14 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio { instrucaoSql.append("WHEN CLI.TIPOIDENTIFICADOS_ID = 2 THEN "); instrucaoSql.append(" NUMIDENTIFICADOS "); instrucaoSql.append("END, 11, '0') CPF_COMPRADOR, CLI.NOMBCLIENTE NOME_COMPRADOR, "); - instrucaoSql.append("TO_CHAR(COALESCE(B.FECHORVENTA_H,B.FECHORVENTA), 'DD/MM/YYYY HH24:MI') DATA_HORA_COMPRA, "); + instrucaoSql.append("TO_CHAR(COALESCE(B.FECHORVENTA_H,B.FECHORVENTA), 'DD/MM/YYYY') DATA_COMPRA, "); + instrucaoSql.append("TO_CHAR(COALESCE(B.FECHORVENTA_H,B.FECHORVENTA), 'HH24:MI') HORA_COMPRA, "); instrucaoSql.append("TK.NSU, TK.NUMAUTORIZACION AUTORIZACAO, "); instrucaoSql.append("COALESCE(B.PRECIOPAGADO,0) + COALESCE(B.IMPORTETAXAEMBARQUE,0) + "); instrucaoSql.append("COALESCE(B.IMPORTESEGURO,0) + COALESCE(B.IMPORTEPEDAGIO,0) + COALESCE(B.IMPORTEOUTROS,0) AS VALOR_TOTAL, "); instrucaoSql.append("B.CORRIDA_ID SERVICO, "); - instrucaoSql.append("TO_CHAR(B.FECHORVIAJE, 'DD/MM/YYYY HH24:MI') DATA_HORA_VIAGEM, "); + instrucaoSql.append("TO_CHAR(B.FECHORVIAJE, 'DD/MM/YYYY') DATA_VIAGEM, "); + instrucaoSql.append("TO_CHAR(B.FECHORVIAJE, 'HH24:MI') HORA_VIAGEM, "); instrucaoSql.append("PO.DESCPARADA ORIGEM, PD.DESCPARADA DESTINO, "); instrucaoSql.append("B.NUMFOLIOSISTEMA BILHETE, "); instrucaoSql.append("B.NUMASIENTO POLTRONA, "); @@ -55,10 +57,18 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio { instrucaoSql.append("TK.STATUSTRANSACAOKONDUTO STATUSTRANSACAOKONDUTO, "); instrucaoSql.append("TK.STATUSTRANSACAO STATUSTRANSACAO, "); instrucaoSql.append("TK.TENTATIVAENVIO TENTATIVAENVIO, "); - instrucaoSql.append("TK.STATUSENVIO STATUSENVIO "); + instrucaoSql.append("TK.STATUSENVIO STATUSENVIO, "); + instrucaoSql.append("E.NOMBEMPRESA NOMBEMPRESA, "); + instrucaoSql.append("PV.NOMBPUNTOVENTA NOMBPUNTOVENTA, "); + instrucaoSql.append("TO_CHAR(TK.DATA_ENVIO, 'DD/MM/YYYY') DATA_ENVIO, "); + instrucaoSql.append("TO_CHAR(TK.DATA_ENVIO, 'HH24:MI') HORA_ENVIO, "); + instrucaoSql.append("TK.VALOR VALOR, "); + instrucaoSql.append("TK.CODIGO_HTTP CODIGO_HTTP "); instrucaoSql.append("FROM BOLETO B "); instrucaoSql.append("INNER JOIN TRANSACAO_KONDUTO TK ON B.BOLETO_ID = TK.BOLETO_ID "); instrucaoSql.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID "); + instrucaoSql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID "); + instrucaoSql.append("INNER JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = TK.PUNTOVENTA_ID "); instrucaoSql.append("LEFT JOIN CLIENTE CLI ON B.CLIENTECOMPRADOR_ID = CLI.CLIENTE_ID "); instrucaoSql.append("LEFT JOIN PARADA PO ON B.ORIGEN_ID = PO.PARADA_ID "); instrucaoSql.append("LEFT JOIN PARADA PD ON B.DESTINO_ID = PD.PARADA_ID "); @@ -87,18 +97,26 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio { dataResult.put("ID_KONDUTO", resultSet.getString("ID_KONDUTO")); dataResult.put("CPF_COMPRADOR", resultSet.getString("CPF_COMPRADOR")); dataResult.put("NOME_COMPRADOR", resultSet.getString("NOME_COMPRADOR")); - dataResult.put("DATA_COMPRA", resultSet.getString("DATA_HORA_COMPRA")); + dataResult.put("DATA_COMPRA", resultSet.getString("DATA_COMPRA")); + dataResult.put("HORA_COMPRA", resultSet.getString("HORA_COMPRA")); dataResult.put("NSU", resultSet.getString("NSU")); dataResult.put("AUTORIZACAO", resultSet.getString("AUTORIZACAO")); dataResult.put("VALOR_TOTAL", resultSet.getBigDecimal("VALOR_TOTAL")); + dataResult.put("VALOR", resultSet.getBigDecimal("VALOR")); dataResult.put("SERVICO", resultSet.getString("SERVICO")); - dataResult.put("DATA_VIAGEM", resultSet.getString("DATA_HORA_VIAGEM")); + dataResult.put("DATA_VIAGEM", resultSet.getString("DATA_VIAGEM")); + dataResult.put("HORA_VIAGEM", resultSet.getString("HORA_VIAGEM")); dataResult.put("ORIGEM", resultSet.getString("ORIGEM")); dataResult.put("DESTINO", resultSet.getString("DESTINO")); dataResult.put("BILHETE", resultSet.getString("BILHETE")); dataResult.put("POLTRONA", resultSet.getString("POLTRONA")); dataResult.put("PASSAGEIRO", resultSet.getString("PASSAGEIRO")); dataResult.put("TENTATIVAENVIO", resultSet.getInt("TENTATIVAENVIO")); + dataResult.put("NOMBEMPRESA", resultSet.getString("NOMBEMPRESA")); + dataResult.put("NOMBPUNTOVENTA", resultSet.getString("NOMBPUNTOVENTA")); + dataResult.put("DATA_ENVIO", resultSet.getString("DATA_ENVIO")); + dataResult.put("HORA_ENVIO", resultSet.getString("HORA_ENVIO")); + dataResult.put("CODIGO_HTTP", resultSet.getString("CODIGO_HTTP")); String statustransacao = resultSet.getString("STATUSTRANSACAO"); if(StringUtils.isNotBlank(statustransacao)) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_es.properties index b2283679b..0cb71011c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_es.properties @@ -20,11 +20,14 @@ label.idKonduto=ID Konduto label.cpfComprador=CPF Comprador label.nomeComprador=Nome Comprador label.dataCompra=Data Compra +label.horaCompra=Hora Compra label.nsu=NSU label.autorizacao=Autorização label.valor=Valor +label.valorTotal=Valor Total label.servico=Serviço label.dataViagem=Data Viagem +label.horaViagem=Hora Viagem label.origem=Origem label.destino=Destino label.bilhete=Bilhete @@ -32,6 +35,11 @@ label.poltrona=Poltrona label.passageiro=Passageiro label.tentativasEnvio=Tentativas Envio label.statusTotalBus=Status totalBus -label.statusKonduto=Status Konduto +label.statusKonduto=Recomendação label.total=Total -label.statusEnvio=Status Envio \ No newline at end of file +label.statusEnvio=Status Envio +label.empresa=Empresa +label.puntoventa=Ponto de Venda +label.dataEnvio=Data Envio +label.horaEnvio=Hora Envio +label.codigoHttp=Código Respostas HTTP \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_pt.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_pt.properties index 01a315209..0ad124307 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_pt.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioIntegracaoAntiFraude_pt.properties @@ -20,11 +20,14 @@ label.idKonduto=ID Konduto label.cpfComprador=CPF Comprador label.nomeComprador=Nome Comprador label.dataCompra=Data Compra +label.horaCompra=Hora Compra label.nsu=NSU label.autorizacao=Autorização label.valor=Valor +label.valorTotal=Valor Total label.servico=Serviço label.dataViagem=Data Viagem +label.horaViagem=Hora Viagem label.origem=Origem label.destino=Destino label.bilhete=Bilhete @@ -32,6 +35,11 @@ label.poltrona=Poltrona label.passageiro=Passageiro label.tentativasEnvio=Tentativas Envio label.statusTotalBus=Status totalBus -label.statusKonduto=Status Konduto +label.statusKonduto=Recomendação label.total=Total -label.statusEnvio=Status Envio \ No newline at end of file +label.statusEnvio=Status Envio +label.empresa=Empresa +label.puntoventa=Ponto de Venda +label.dataEnvio=Data Envio +label.horaEnvio=Hora Envio +label.codigoHttp=Código Respostas HTTP \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper index 87462019799eb2c77c4532e677f049c7dda44c42..e0e71088fc5f67803338719e25f979ab621a28af 100644 GIT binary patch literal 56473 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 literal 47211 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 - - - - + + + + + + + + @@ -30,9 +34,18 @@ + + + + + + + + + @@ -88,7 +101,7 @@ - + @@ -133,7 +146,7 @@ - + @@ -151,106 +164,107 @@ - + - + - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -258,77 +272,135 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + + - + - + - + - + @@ -336,56 +408,56 @@ - + - + - + - + - + - + - + - + @@ -393,32 +465,92 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + @@ -426,15 +558,20 @@ - + - - - + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java new file mode 100644 index 000000000..4d29a7940 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java @@ -0,0 +1,131 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; + +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Messagebox; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PtovtaAntifraude; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.PtovtaAntifraudeService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + +/** + * + * @author wilian + * + */ +@Controller("editarPtovtaAntifraudeController") +@Scope("prototype") +public class EditarPtovtaAntifraudeController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private static Logger log = Logger.getLogger(EditarPtovtaAntifraudeController.class); + + @Autowired + private PtovtaAntifraudeService ptovtaAntifraudeService; + + private Combobox cmbEmpresaPtoVtaAntifraude; + private Textbox txtChaveAntifraude; + private PtovtaAntifraude ptovtaAntifraude; + private List lsEmpresas; + private PuntoVenta puntoVenta; + private MyListbox ptovtaAntifraudeList; + private Empresa empresa; + + @Override + public void doAfterCompose(Component comp) throws Exception { + + super.doAfterCompose(comp); + ptovtaAntifraude = (PtovtaAntifraude) Executions.getCurrent().getArg().get("ptovtaComissao"); + this.puntoVenta = (PuntoVenta) Executions.getCurrent().getArg().get("puntoVenta"); + this.ptovtaAntifraudeList = (MyListbox) Executions.getCurrent().getArg().get("ptovtaAntifraudeList"); + lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa(); + empresa = ptovtaAntifraude.getEmpresa(); + txtChaveAntifraude.setValue(ptovtaAntifraude.getChave()); + + } + + public void onClick$btnSalvarPtovtaAntifraude(Event ev) throws InterruptedException { + try { + if(verificarCamposAddChaveAntifraude()) { + if (cmbEmpresaPtoVtaAntifraude.getSelectedItem() == null) { + return; + } + txtChaveAntifraude.getValue(); + + ptovtaAntifraude.setEmpresa(getEmpresa()); + ptovtaAntifraude.setChave(txtChaveAntifraude.getValue()); + ptovtaAntifraude.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + ptovtaAntifraude = ptovtaAntifraudeService.actualizacion(ptovtaAntifraude); + puntoVenta.getPtovtaAntifraudes().set(puntoVenta.getPtovtaAntifraudes().indexOf(ptovtaAntifraude), ptovtaAntifraude); + ptovtaAntifraudeList.setData(puntoVenta.getPtovtaAntifraudes()); + closeWindow(); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + } + + public List getLsEmpresas() { + return lsEmpresas; + } + + private boolean verificarCamposAddChaveAntifraude() throws InterruptedException { + if (cmbEmpresaPtoVtaAntifraude.getSelectedItem() == null) { + Messagebox.show( + Labels.getLabel("editarPuntoVentaController.MSG.empresaAntifraudeNaoInformada"), + Labels.getLabel("editarPuntoVentaController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + return false; + } + + txtChaveAntifraude.getValue(); + if(StringUtils.isBlank(txtChaveAntifraude.getValue())) { + Messagebox.show( + Labels.getLabel("editarPuntoVentaController.MSG.chaveAntifraudeNaoInformada"), + Labels.getLabel("editarPuntoVentaController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + return false; + } + + if(ptovtaAntifraudeList.getListData() != null) { + Empresa empresa = (Empresa) cmbEmpresaPtoVtaAntifraude.getSelectedItem().getValue(); + for (Object obj : ptovtaAntifraudeList.getListData()) { + PtovtaAntifraude ptovtaAntifraude = (PtovtaAntifraude) obj; + if(empresa.equals(ptovtaAntifraude.getEmpresa()) && !ptovtaAntifraude.equals(this.ptovtaAntifraude)) { + Messagebox.show( + Labels.getLabel("editarPuntoVentaController.MSG.empresaAntifraudeJaCadastrada"), + Labels.getLabel("editarPuntoVentaController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + return false; + } + } + } + return true; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index a28a4c95a..49b10af1b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -849,6 +849,14 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { ptovtaAntifraudeList.setItemRenderer(new RenderPtovtaAntifraude()); ptovtaAntifraudeList.setData(puntoVenta.getPtovtaAntifraudes()); + ptovtaAntifraudeList.addEventListener("onDoubleClick", new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + PtovtaAntifraude a = (PtovtaAntifraude) ptovtaAntifraudeList.getSelected(); + verPtovtaAntifraude(a); + } + }); } private void downloadLogIntegracao(Combobox cmb){ @@ -3506,6 +3514,17 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { } } + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void verPtovtaAntifraude(PtovtaAntifraude ptovtaAntifraude) { + Map args = new HashMap(); + args.put("ptovtaComissao", ptovtaAntifraude); + args.put("puntoVenta", puntoVenta); + args.put("ptovtaAntifraudeList", ptovtaAntifraudeList); + + openWindow("/gui/catalogos/editarPtovtaAntifraude.zul", + Labels.getLabel("editarPtovtaAntifraudeController.window.title"), args, MODAL); + } + public void onClick$radIndvendsegtabelaNo(Event event) { if (radIndvendsegtabelaNo.isChecked()) { radIndestansegtabelaSi.setDisabled(true); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 4d4a71c5e..9688c9794 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -279,7 +279,7 @@ indexController.mniRelatorioGratuidadeIdosoDeficiente.label = Gratuidades Idoso/ indexController.mniRelatorioVendasBilheteiro.label = Ventas por agente de pasajes indexController.mniRelatorioVendasBilheteiroSintetico.label = Ventas por agentes sintético indexController.mniRelatorioAgenciasNaoImportadas.label = Reporte puntos venta no importados -indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Anti-Fraude +indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Antifraude indexController.mniRelatorioCheckin.label = Checkin's indexController.mniFechamentoParamgeral.label = Cierre cuenta indexController.mniFechamentoParamptovta.label = Cierre cuenta contábil punto de venta @@ -7793,3 +7793,5 @@ relatorioGratuidadeARTESPController.lbDataIni.value = Fecha Inicio relatorioGratuidadeARTESPController.lbDataFin.value = Fecha Final relatorioGratuidadeARTESPController.lbOrgao.value = Instituición concedente editarEmpresaController.usarAliasMapaViagemVenda.ajuda = En la pantalla de Venta o botón de Tarjeta de Viagem deve usar Alias para as Ubicaciones. + +editarPtovtaAntifraudeController.window.title=Editar Chave Antifraude \ No newline at end of file diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 1dbddb671..1e284204f 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -288,7 +288,7 @@ indexController.mniRelatorioVendasBilheteiro.label = Vendas por Bilheteiro indexController.mniRelatorioVendasBilheteiroSintetico.label = Vendas por Bilheteiro Sintético indexController.mniRelatorioCancelamentoAutomaticoECF.label = Relatório de Cancelamento Automatico ECF indexController.mniRelatorioAgenciasNaoImportadas.label = Relatório de Agências não Importadas -indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Anti-Fraude +indexController.mniRelatorioIntegracaoAntiFraude.label = Relatório de Integração com Antifraude indexController.mniRelatorioCheckin.label = Checkin's indexController.mniFechamentoParamgeral.label = Configuração de Boleto indexController.mniFechamentoParamptovta.label = Fechamento Conta Corrente Agência @@ -8261,4 +8261,6 @@ relatorioGratuidadeARTESPController.lbPrefixo.value = Prefixo relatorioGratuidadeARTESPController.lvVenda = Venda relatorioGratuidadeARTESPController.lbOrgao.value = Orgão Concedente editarEmpresaController.usarAliasMapaViagemVenda.ajuda = Na tela de Venda o botão de Mapa de Viagem deve usar Alias para as Localidades. -editarClienteController.MSG.validacaoCPFInvalido = CPF inválido \ No newline at end of file +editarClienteController.MSG.validacaoCPFInvalido = CPF inválido + +editarPtovtaAntifraudeController.window.title=Editar Chave Antifraude \ No newline at end of file diff --git a/web/gui/catalogos/editarPtovtaAntifraude.zul b/web/gui/catalogos/editarPtovtaAntifraude.zul new file mode 100644 index 000000000..597553cec --- /dev/null +++ b/web/gui/catalogos/editarPtovtaAntifraude.zul @@ -0,0 +1,55 @@ + + + + + + + + + + + +