From f0742e296a9b5142b7c36be6e7ff541dfc054937 Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Thu, 11 May 2023 18:19:32 -0300 Subject: [PATCH 01/12] =?UTF-8?q?mudan=C3=A7a=20do=20menu=20de=20retorno?= =?UTF-8?q?=20banc=C3=A1rio=20fixes=20bug#AL-2674?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- web/WEB-INF/i3-label_pt_BR.label | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f393797f5..b8cef8ef8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ war - 1.3.2 + 1.3.3 1.3.1 UTF-8 UTF-8 diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index a54730ae5..b43ef7435 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -9306,7 +9306,7 @@ relatorioRemessaCNAB.MGS.alertaArquivoRemessaNaoGerado = Arquivo de remessa não relatorioRemessaCNAB.MGS.alertaCNABSemItens = Não há itens boletos a enviar para gerar o Arquivo de Remessa para esta empresa # Retorno Bancario -indexController.mniRelatorioRetornoBancario.label = Retorno Bancário +indexController.mniRelatorioRetornoBancario.label = Retorno Bancário Itau relatorioRetornoBancario.window.title = Processamento de Retorno Bancário relatorioRetornoBancario.fileupload.label = Selecionar Arquivo... relatorioRetornoBancario.lbEmpresa.value = Empresa From d3408b954ce59702b260edad78536ddcacfde570 Mon Sep 17 00:00:00 2001 From: fabio Date: Fri, 12 May 2023 13:19:29 +0000 Subject: [PATCH 02/12] Enviar arquivos para '' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit adiçao do arquivo .project --- .project | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 000000000..59a60a31a --- /dev/null +++ b/.project @@ -0,0 +1,50 @@ + + + ventaboletosadm + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.jboss.tools.jst.web.kb.kbbuilder + + + + + org.jboss.tools.ws.jaxrs.metamodelBuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.jboss.tools.jst.web.kb.kbnature + org.jboss.tools.jsf.jsfnature + org.jboss.tools.ws.jaxrs.nature + org.eclipse.wst.jsdt.core.jsNature + + From 50fa0925e5f0f9177dd5f5e4adc123be2e5e6a91 Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Fri, 12 May 2023 11:19:59 -0300 Subject: [PATCH 03/12] =?UTF-8?q?remo=C3=A7=C3=A3o=20do=20arquivo=20.proje?= =?UTF-8?q?ct?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .project | 50 ------------------- .../gui/controladores/IndexController.java | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 59a60a31a..000000000 --- a/.project +++ /dev/null @@ -1,50 +0,0 @@ - - - ventaboletosadm - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.jboss.tools.jst.web.kb.kbbuilder - - - - - org.jboss.tools.ws.jaxrs.metamodelBuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.jboss.tools.jst.web.kb.kbnature - org.jboss.tools.jsf.jsfnature - org.jboss.tools.ws.jaxrs.nature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/IndexController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/IndexController.java index 9ab0492a2..d5be5ad2a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/IndexController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/IndexController.java @@ -75,7 +75,7 @@ public class IndexController extends MyGenericForwardComposer { String strNombre = lblNombreAplicacion.getLabel(); strNombre = strNombre + " - " + constanteService.buscarNombreAmbiente(); if (flywayUtilService.existeErroExecucaoScript()){ - strNombre += " - FAVOR CHECAR A ATUALIZAÇÃO"; + strNombre += " - FAVOR CHECAR A ATUALIZAÇÃO"; } lblNombreAplicacion.setLabel(strNombre); From b74459185d8b87e8faed3325891d9664ffac1f56 Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Fri, 12 May 2023 14:07:46 -0300 Subject: [PATCH 04/12] =?UTF-8?q?53fbd46004mudan=C3=A7a=20do=20menu=20de?= =?UTF-8?q?=20retorno=20banc=C3=A1rio=20fixes=20bug#AL-2674?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8cef8ef8..2069c46eb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.4.5 + 1.4.6 war From bcd24bff65315530278975d5ff1a26074f216b31 Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Fri, 12 May 2023 14:32:07 -0300 Subject: [PATCH 05/12] =?UTF-8?q?corre=C3=A7=C3=A3o=20de=20msg=20do=20filt?= =?UTF-8?q?ro=20empresa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes bug#AL-2540 --- .../relatorios/RelatorioSapController.java | 32 +++++++++++-------- web/WEB-INF/i3-label_en.label | 5 +++ web/WEB-INF/i3-label_es_MX.label | 5 +++ web/WEB-INF/i3-label_pt_BR.label | 5 +++ 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java index e4653e47d..99ee1ddcd 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java @@ -38,6 +38,7 @@ import org.zkoss.zul.Messagebox; @Scope("prototype") public class RelatorioSapController extends MyGenericForwardComposer { + private static final String TITULO = "relatorioSap.window.title"; private static final long serialVersionUID = -6110350409404675022L; private static Logger log = Logger.getLogger(RelatorioSapController.class); @@ -111,7 +112,10 @@ public class RelatorioSapController extends MyGenericForwardComposer { public void onClick$btnPesquisar(Event ev) throws Exception { if(cmbEmpresa.getSelectedItem() == null){ - Messagebox.show(Labels.getLabel("relatorioSap.MGS.erroSemEmpresa"), Labels.getLabel("relatorioSap.window.title"), Messagebox.CANCEL, Messagebox.ERROR); + Messagebox.show(Labels.getLabel("relatorioSapController.MGS.erroSemEmpresa"), + Labels.getLabel(TITULO), + Messagebox.CANCEL, + Messagebox.ERROR); return; } @@ -136,7 +140,7 @@ public class RelatorioSapController extends MyGenericForwardComposer { if(this.lsFechamentoCntcorrente.isEmpty()){ Messagebox.show(Labels.getLabel("relatorioSapController.MGS.alertaCNABSemItens"), - Labels.getLabel("relatorioSap.window.title"), Messagebox.CANCEL, Messagebox.ERROR); + Labels.getLabel(TITULO), Messagebox.CANCEL, Messagebox.ERROR); } } @@ -150,18 +154,18 @@ public class RelatorioSapController extends MyGenericForwardComposer { if( integrados == 0 ){ - Messagebox.show(Labels.getLabel("Registros não integrados"), - Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR); + Messagebox.show(Labels.getLabel("relatorioSapController.MGS.erroNaoIntegrado"), + Labels.getLabel(TITULO), Messagebox.OK, Messagebox.ERROR); }else if( integrados < qtdEnviar ) { - Messagebox.show("Alguns registros não foram integrados, favor filtrar novamente para verificar", - Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR); + Messagebox.show(Labels.getLabel("relatorioSapController.MGS.erroIntegradoParcial"), + Labels.getLabel(TITULO), Messagebox.OK, Messagebox.ERROR); }else if( integrados == qtdEnviar ) { - Messagebox.show("Todos registros foram integrados com sucesso", - Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR); + Messagebox.show(Labels.getLabel("relatorioSapController.MGS.erroIntegrado"), + Labels.getLabel(TITULO), Messagebox.OK, Messagebox.ERROR); } } catch (Exception e) { Messagebox.show( e.getMessage(), - Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR); + Labels.getLabel(TITULO), Messagebox.OK, Messagebox.ERROR); } } @@ -170,7 +174,7 @@ public class RelatorioSapController extends MyGenericForwardComposer { try { Scheduler sched = new StdSchedulerFactory().getScheduler(); JobDetail jobDetail = new JobDetail("IntegracaoSap", null, IntegracaoSapJob.class); - log.info("Execução manual de integraçao com SAP "); + log.info(Labels.getLabel("relatorioSapController.MGS.erroIntegraManual")); Trigger trigger = TriggerUtils.makeImmediateTrigger("integracaoSapTrigger", 1, 1000); trigger.setName("integracaoSapTrigger"); JobDetail job = sched.getJobDetail(jobDetail.getName(), jobDetail.getGroup()); @@ -186,14 +190,14 @@ public class RelatorioSapController extends MyGenericForwardComposer { sched.start(); - Messagebox.show("Rotina de integração automática iniciada", - Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.INFORMATION); + Messagebox.show(Labels.getLabel("relatorioSapController.MGS.rotinaIniciada"), + Labels.getLabel(TITULO), Messagebox.OK, Messagebox.INFORMATION); } catch (SchedulerException ex) { log.error(ex); } catch (RuntimeException e) { Messagebox.show( e.getMessage(), - Labels.getLabel("relatorioSap.window.title"), Messagebox.OK, Messagebox.ERROR); + Labels.getLabel(TITULO), Messagebox.OK, Messagebox.ERROR); } } @@ -204,4 +208,4 @@ public class RelatorioSapController extends MyGenericForwardComposer { public void setEmpresa(Empresa empresa) { this.empresa = empresa; } -} +} \ No newline at end of file diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 15ef1b4b6..99127c01d 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -1034,6 +1034,11 @@ relatorioSapController.lbValor.value = Valor relatorioSapController.lbFechamento.value = Fechamento relatorioSapController.lbStatus.value = Situação relatorioSapController.MGS.erroSemEmpresa = Escolha uma empresa +relatorioSapController.MGS.erroNaoIntegrado = Registros não integrados +relatorioSapController.MGS.erroIntegradoParcial = Alguns registros não foram integrados, favor filtrar novamente para verificar +relatorioSapController.MGS.erroIntegrado = Todos registros foram integrados com sucesso +relatorioSapController.MGS.rotinaIniciada = Rotina de integração automática iniciada +relatorioSapController.MGS.erroIntegraManual = Execução manual de integração com SAP relatorioSapController.MGS.alertaArquivoRemessaNaoGerado = Arquivo de remessa não pôde ser criado, favor entrar em contato com o suporte. relatorioSapController.MGS.alertaCNABSemItens = Não há itens fechamento a enviar para esta empresa filtroRelatorioSap.window.title=Integração SAP diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index f8e4bdb75..d21135af1 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -905,6 +905,11 @@ relatorioSapController.lbValor.value = Valor relatorioSapController.lbFechamento.value = Fechamento relatorioSapController.lbStatus.value = Situação relatorioSapController.MGS.erroSemEmpresa = Escolha uma empresa +relatorioSapController.MGS.erroNaoIntegrado = Registros não integrados +relatorioSapController.MGS.erroIntegradoParcial = Alguns registros não foram integrados, favor filtrar novamente para verificar +relatorioSapController.MGS.erroIntegrado = Todos registros foram integrados com sucesso +relatorioSapController.MGS.rotinaIniciada = Rotina de integração automática iniciada +relatorioSapController.MGS.erroIntegraManual = Execução manual de integração com SAP relatorioSapController.MGS.alertaArquivoRemessaNaoGerado = Arquivo de remessa não pôde ser criado, favor entrar em contato com o suporte. relatorioSapController.MGS.alertaCNABSemItens = Não há itens fechamento a enviar para esta empresa filtroRelatorioSap.window.title=Integração SAP diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index b43ef7435..abb321dcc 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1036,6 +1036,11 @@ relatorioSapController.lbValor.value = Valor relatorioSapController.lbFechamento.value = Fechamento relatorioSapController.lbStatus.value = Situação relatorioSapController.MGS.erroSemEmpresa = Escolha uma empresa +relatorioSapController.MGS.erroNaoIntegrado = Registros não integrados +relatorioSapController.MGS.erroIntegradoParcial = Alguns registros não foram integrados, favor filtrar novamente para verificar +relatorioSapController.MGS.erroIntegrado = Todos registros foram integrados com sucesso +relatorioSapController.MGS.rotinaIniciada = Rotina de integração automática iniciada +relatorioSapController.MGS.erroIntegraManual = Execução manual de integração com SAP relatorioSapController.MGS.alertaArquivoRemessaNaoGerado = Arquivo de remessa não pôde ser criado, favor entrar em contato com o suporte. relatorioSapController.MGS.alertaCNABSemItens = Não há itens fechamento a enviar para esta empresa filtroRelatorioSap.window.title=Integração SAP From 702d30ec60141180228ca6c4d59afe29e0484cfa Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Fri, 12 May 2023 14:33:23 -0300 Subject: [PATCH 06/12] =?UTF-8?q?corre=C3=A7=C3=A3o=20de=20msg=20do=20filt?= =?UTF-8?q?ro=20empresa=20fixes=20bug#AL-2540?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2069c46eb..30d6e9b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.4.6 + 1.4.7 war From 637b50863e0deea120f9f4431a2c215250ef1ce8 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 12 May 2023 15:32:13 -0300 Subject: [PATCH 07/12] fixes bug#AL-2076 --- pom.xml | 2 +- .../impl/RelatorioAgenciaFechamentoNovo.java | 11 +- ...latorioAgenciaFechamentoNovo_es.properties | 4 +- ...orioAgenciaFechamentoNovo_pt_BR.properties | 5 +- .../RelatorioAgenciaFechamentoNovo.jasper | Bin 57519 -> 56817 bytes .../RelatorioAgenciaFechamentoNovo.jrxml | 119 ++++++++---------- 6 files changed, 65 insertions(+), 76 deletions(-) diff --git a/pom.xml b/pom.xml index 2069c46eb..30d6e9b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.4.6 + 1.4.7 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java index c17461307..1dfc78133 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java @@ -107,7 +107,7 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio { valorSeguro = valorSeguro.add(rset2.getBigDecimal("valorSeguro")); valorExcesso = valorExcesso.add(rset2.getBigDecimal("valorExcesso")); - difMaior = valorExcesso.add(rset2.getBigDecimal("difMaior")); + difMaior = difMaior.add(rset2.getBigDecimal("difMaior")); } @@ -122,7 +122,6 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio { total = total.add(rset1.getBigDecimal("valorInternet")); - total = total.add(difMaior); total = total.subtract(rset1.getBigDecimal("valorEstornado")); total = total.subtract(rset1.getBigDecimal("valorOCD")); @@ -282,16 +281,16 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio { sql.append(" ON m.marca_id = c.marca_id "); sql.append(" INNER JOIN EMPRESA e "); sql.append(" ON e.EMPRESA_ID = m.EMPRESA_ID "); - sql.append(" INNER JOIN BOLETO b ON b.BOLETO_ID = c.TRANSACAO_ID "); + sql.append(" INNER JOIN BOLETO b ON b.BOLETO_ID = c.TRANSACAO_ID "); sql.append(" LEFT JOIN OCD o "); - sql.append(" ON c.TRANSACAOANTERIOR_ID = o.BOLETO_ID "); + sql.append(" ON c.TRANSACAOANTERIOR_ID = o.BOLETO_ID AND O.INDPAGO = 1"); sql.append(" WHERE c.TURNO_ID IS NOT NULL "); sql.append(" AND c.FECCORTE BETWEEN :de AND :ate "); if (puntoVenta != null && !puntoVenta.equals("-1")) { sql.append(" AND c.PUNTOVENTA_ID in (" + puntoVenta + ") "); } sql.append(" AND c.TIPOVENTA_ID <> 6 "); - //sql.append(" AND c.INDREIMPRESION = 0 "); + sql.append(" AND c.INDREIMPRESION = 0 "); if (empresa != null && !empresa.equals("") && !empresa.equals("-1")) { sql.append(" AND m.empresa_id = "+empresa+" "); } @@ -301,7 +300,7 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio { sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa, o.boleto_id "); sql.append(" ORDER BY pv.nombpuntoventa "); sql.append(") GROUP BY codigo, descricao "); - + return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_es.properties index 9ebc5b5b9..96a6f1f2a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_es.properties @@ -1,5 +1,6 @@ #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) #geral +msg.noData=No se pudo obtener datos con los par\u00E1metros reportados. detail.agencia=AG\u00CANCIA detail.qtdbilhete=Cant. Boleto de entrada @@ -22,6 +23,7 @@ detail.valorseguro=Entrada de valor de seguro detail.valorvch=Valor de VCH de entrada detail.valorOCD=Dev. OCD detail.difMaior=Dif. Maior +detail.totalGeral=Total Geral detail.total=Total header.anulado=Anulados @@ -40,4 +42,4 @@ header.vendido=Vendido linhas=Líneas msg.a=a -msg.noData=No se pudo obtener datos con los par\u00E1metros reportados. + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_pt_BR.properties index 8bd720a40..a3f4b93f5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAgenciaFechamentoNovo_pt_BR.properties @@ -1,5 +1,6 @@ #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) #geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. detail.agencia=AG\u00CANCIA detail.qtdbilhete=Qtd. Bilhete Entrada @@ -22,6 +23,7 @@ detail.valorseguro=Valor Seguro Entrada detail.valorvch=Valor VCH Entrada detail.valorOCD=Dev. OCD detail.difMaior=Dif. Maior +detail.totalGeral=Total Geral detail.total=Total header.anulado=Anulados @@ -38,6 +40,3 @@ header.total=Total header.vendido=Vendido linhas=Linhas - -msg.a=a -msg.noData=No se pudo obtener datos con los par\u00E1metros reportados. diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoNovo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoNovo.jasper index 613d9ddec449ce3ef3fdb9a81083c7ef820e744b..cba2dda4837959c81ae7cce01ba11b463acdc165 100644 GIT binary patch delta 16427 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 delta 16904 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 o9(tnQQ%}<4^mIKDoD}?02JT*wLu+jNTQ~V!Z diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoNovo.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoNovo.jrxml index d1816bb46..6c3c9c2ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoNovo.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoNovo.jrxml @@ -153,7 +153,7 @@ - + @@ -162,14 +162,14 @@ - + - + @@ -183,21 +183,21 @@ - + - + - + @@ -211,14 +211,14 @@ - + - + @@ -246,28 +246,28 @@ - + - + - + - + @@ -283,128 +283,128 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -412,147 +412,136 @@ - + - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + - - + + + + From 1fc8856cb61b4200df31d1578629b99894ee0929 Mon Sep 17 00:00:00 2001 From: Lucas Date: Fri, 12 May 2023 18:09:02 -0300 Subject: [PATCH 08/12] fixes bug#AL-2525 --- pom.xml | 6 +- .../catalogos/EditarEmpresaController.java | 20 + web/WEB-INF/i3-label_en.label | 3 + web/WEB-INF/i3-label_es_MX.label | 2 + web/WEB-INF/i3-label_pt_BR.label | 2 + web/gui/catalogos/editarEmpresa.zul | 4831 +++++++++-------- web/gui/catalogos/editarPuntoVenta.zul | 11 +- 7 files changed, 2458 insertions(+), 2417 deletions(-) diff --git a/pom.xml b/pom.xml index 30d6e9b0f..292972fea 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.4.7 + 1.4.8 war - 1.3.3 - 1.3.1 + 1.3.4 + 1.3.2 UTF-8 UTF-8 diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java index fbbda3948..07536b0ae 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java @@ -205,6 +205,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer { private Checkbox chkAutenticacao; private MyTextbox txtCodContPrevidencia; private Textbox txtApiKeyAdyen; + private Textbox txtMerchantAccountAdyen; private Radio indProducaoAdyenSim; private MyComboboxEstandar cmbTipoAutorizacao; @@ -570,6 +571,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer { if (empresaAdyenConfig != null) { txtApiKeyAdyen.setText(empresaAdyenConfig.getApiKey()); + txtMerchantAccountAdyen.setText(empresaAdyenConfig.getMerchantAccountAdyen()); if (empresaAdyenConfig.getIndProducao() == null) { indProducaoAdyenSim.setChecked(Boolean.FALSE); } else if (empresaAdyenConfig.getIndProducao()) { @@ -1172,11 +1174,13 @@ public class EditarEmpresaController extends MyGenericForwardComposer { empresaAdyenConfig = new EmpresaAdyenConfig(); empresaAdyenConfig.setEmpresa(empresa); empresaAdyenConfig.setApiKey(txtApiKeyAdyen.getValue()); + empresaAdyenConfig.setMerchantAccountAdyen(txtMerchantAccountAdyen.getValue()); empresaAdyenConfig.setIndProducao(indProducaoAdyenSim.isChecked()); empresaAdyenConfig = empresaAdyenConfigService.suscribir(empresaAdyenConfig); } else { empresaAdyenConfig.setEmpresa(empresa); empresaAdyenConfig.setApiKey(txtApiKeyAdyen.getValue()); + empresaAdyenConfig.setMerchantAccountAdyen(txtMerchantAccountAdyen.getValue()); empresaAdyenConfig.setIndProducao(indProducaoAdyenSim.isChecked()); empresaAdyenConfigService.actualizacion(empresaAdyenConfig); } @@ -2759,5 +2763,21 @@ public void onClick$btnTestEmailFlexBus(Event ev) throws InterruptedException { public void setStoreVO(StoreVO storeVO) { this.storeVO = storeVO; } + + public EmpresaAdyenConfigService getEmpresaAdyenConfigService() { + return empresaAdyenConfigService; + } + + public void setEmpresaAdyenConfigService(EmpresaAdyenConfigService empresaAdyenConfigService) { + this.empresaAdyenConfigService = empresaAdyenConfigService; + } + + public EmpresaAdyenConfig getEmpresaAdyenConfig() { + return empresaAdyenConfig; + } + + public void setEmpresaAdyenConfig(EmpresaAdyenConfig empresaAdyenConfig) { + this.empresaAdyenConfig = empresaAdyenConfig; + } } diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 99127c01d..5cb2511dc 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -1739,6 +1739,7 @@ editarEmpresaController.restricaoZ.label= Restringe Venda se Red. Z não emitida editarEmpresaController.utilizaFidelidade.label= Utiliza projeto fidelidade editarEmpresaController.indProducao.label= Venda em Produção editarEmpresaController.apiKey.label= API Key +editarEmpresaController.merchantAccountAdyen.label= Merchant Account Adyen editarEmpresaController.antiFraude.label = Antifraude editarEmpresaController.antiFraude.chave.label = Chave Antifraude editarEmpresaController.restricaoZ.sim=Sim @@ -2234,6 +2235,8 @@ editarPuntoVentaController.qrcodeCatracaRodEAN13.label = Imprimir na venda o QR editarPuntoVentaController.checkBloqDevolveReativaOutroPto.label = Bloqueia Devolver e Reativar em outro Ponto de Venda editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label= Imprimir na venda o QR Code Taxa Embarque Rodoviára TTL +editarPuntoVentaController.merchantStoreAdyen.label= Merchant Store Adyen + # Editar comissão ponto de venda editarPuntoVentaComissaoController.window.title = Comissão Empresa/Ponto de Venda - {0} editarPuntoVentaComissaoController.MSG.suscribirOK = Comissão da Empresa/Ponto de Venda registrada com sucesso. diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index d21135af1..1aba1ef7f 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1537,6 +1537,7 @@ editarEmpresaController.restricaoZ.label= Restringe Venta se Red. Z no emitida editarEmpresaController.utilizaFidelidade.label= Utiliza projeto fidelidade editarEmpresaController.indProducao.label= Venda em Produção editarEmpresaController.apiKey.label= API Key +editarEmpresaController.merchantAccountAdyen.label= Merchant Account Adyen editarEmpresaController.restricaoZ.sim=Si editarEmpresaController.restricaoZ.nao=No editarEmpresaController.generaNumfoliosistemaVtaInternetImp=Genera Folio Sistema Venta Internet e Impresión Posterior @@ -1949,6 +1950,7 @@ editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label= Imprimir na venda o editarPuntoVentaController.checkIndBloqueioDescontoAPI.label = Bloquear descuento a través de api editarPuntoVentaController.checkIndBloqueioDescontoWEB.label = Bloquear descuento en internet +editarPuntoVentaController.merchantStoreAdyen.label= Merchant Store Adyen # Fechamento Conta Contábil Agencia editarPuntoVentaController.puntoventa.label = Agencia diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index abb321dcc..71043f829 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1748,6 +1748,7 @@ editarEmpresaController.restricaoZ.label= Restringe Venda se Red. Z não emitida editarEmpresaController.utilizaFidelidade.label= Utiliza projeto fidelidade editarEmpresaController.indProducao.label= Venda em Produção editarEmpresaController.apiKey.label= API Key +editarEmpresaController.merchantAccountAdyen.label= Merchant Account Adyen editarEmpresaController.antiFraude.label = Antifraude editarEmpresaController.antiFraude.chave.label = Chave Antifraude editarEmpresaController.restricaoZ.sim=Sim @@ -2242,6 +2243,7 @@ editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label= Imprimir na venda o editarPuntoVentaController.checkIndBloqueioDescontoAPI.label = Bloquear desconto via API editarPuntoVentaController.checkIndBloqueioDescontoWEB.label = Bloquear desconto via Internet +editarPuntoVentaController.merchantStoreAdyen.label= Merchant Store Adyen # Editar comissão ponto de venda editarPuntoVentaComissaoController.window.title = Comissão Empresa/Ponto de Venda - {0} diff --git a/web/gui/catalogos/editarEmpresa.zul b/web/gui/catalogos/editarEmpresa.zul index 1f77fa3ef..af56324c9 100644 --- a/web/gui/catalogos/editarEmpresa.zul +++ b/web/gui/catalogos/editarEmpresa.zul @@ -1,2413 +1,2418 @@ - - - - - - - - - - - - -