From c758c0838d936a8b9d65e926a12e83d3b827c3ef Mon Sep 17 00:00:00 2001 From: valdir Date: Thu, 6 Aug 2020 13:15:23 +0000 Subject: [PATCH] =?UTF-8?q?0019804:=20GAP01=5FMetamorfose=20-=20Relat?= =?UTF-8?q?=C3=B3rio=20de=20Solicita=C3=A7=C3=A3o=20de=20Cancelamento=2000?= =?UTF-8?q?19805:=20GAP02.1=5FMetamorfose=20-=20Forma=20de=20Pagamento=20b?= =?UTF-8?q?ug#19805=20bug#19804=20dev:valdevir=20qua:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@102798 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEstornoCartao.java | 40 +- .../RelatorioEstornoCartaoController.java | 41 +- .../RelatorioEstornoCartao_es.properties | 7 +- .../RelatorioEstornoCartao_pt_BR.properties | 7 +- .../templates/RelatorioEstornoCartao.jasper | Bin 45216 -> 48805 bytes .../templates/RelatorioEstornoCartao.jrxml | 356 ++++++++++-------- .../catalogos/EditarFormaPagoController.java | 25 +- web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 8 +- web/gui/catalogos/editarFormaPago.zul | 7 +- .../filtroRelatorioEstornoCartao.zul | 35 +- 11 files changed, 344 insertions(+), 183 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java index 2d0579871..fc0555828 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java @@ -35,7 +35,15 @@ public class RelatorioEstornoCartao extends Relatorio { stmt.setTimestamp("data_inicial", new java.sql.Timestamp(sdfDiaMesAnoHora.parse(sdfDiaMesAno.format(parametros.get("DATA_INICIAL")) + " 00:00:00").getTime())); stmt.setTimestamp("data_final", new java.sql.Timestamp(sdfDiaMesAnoHora.parse(sdfDiaMesAno.format(parametros.get("DATA_FINAL")) + " 23:59:59").getTime())); - stmt.setInt("empresaId", Integer.valueOf(parametros.get("EMPRESA_ID") + "")); + + if (parametros.get("EMPRESA_ID") != null && !parametros.get("EMPRESA_ID").equals("-1")) { + stmt.setInt("empresaId", Integer.valueOf(parametros.get("EMPRESA_ID") + "")); + } + + if (parametros.get("FORMA_PAGO") != null && !parametros.get("FORMA_PAGO").equals("-1")) { + stmt.setInt("formapagoId", Integer.valueOf(parametros.get("FORMA_PAGO") + "")); + } + if (parametros.get("DOCUMENTO_CPF") != null && parametros.get("DOCUMENTO_CPF") != "") { stmt.setString("documentoCPF", parametros.get("DOCUMENTO_CPF").toString()); } @@ -67,6 +75,10 @@ public class RelatorioEstornoCartao extends Relatorio { dataResult.put("bilhete", rset.getString("bilhete")); dataResult.put("valorTransacao", rset.getBigDecimal("valorTransacao")); + dataResult.put("agenciaVenda", rset.getString("agenciaVenda")); + dataResult.put("formaPago", rset.getString("formaPago")); + dataResult.put("nombempresa", rset.getString("nombempresa")); + this.dados.add(dataResult); } @@ -82,14 +94,14 @@ public class RelatorioEstornoCartao extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append(" SELECT "); - sql.append(" pv.NUMPUNTOVENTA agencia, "); + sql.append(" pv.NUMPUNTOVENTA agencia, "); sql.append(" u.CVEUSUARIO bilheteiro, "); sql.append(" DEC.FECREGISTRO data, "); sql.append(" DEC.NOMBTITULAR cliente, "); sql.append(" DEC.DOCUMENTOCPF cpf, "); sql.append(" DEC.EMAIL email, "); sql.append(" DEC.TELEFONO telefone, "); - sql.append(" dec.TIPOCARTAO cartao, "); + sql.append(" dec.TIPOCARTAO cartao, "); sql.append(" DEC.NUMCARTAO numeroCartao, "); sql.append(" DEC.NSU nsu, "); sql.append(" DEC.NUMAUTORIZACAO autorizacao, "); @@ -100,12 +112,19 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" dec.CORRIDA_ID servico, "); sql.append(" dec.FECCORRIDA dataServico, "); sql.append(" DEC.NUMFOLIOSISTEMA bilhete, "); - sql.append(" DEC.IMPORTETOTAL valorTransacao "); + sql.append(" DEC.IMPORTETOTAL valorTransacao, "); + sql.append(" pvBoleto.NUMPUNTOVENTA agenciaVenda, "); + sql.append(" fp.descpago formaPago, "); + sql.append(" e.nombempresa "); sql.append(" FROM "); sql.append(" DADOS_ESTORNO_CARTAO DEC "); sql.append(" JOIN punto_venta pv "); sql.append(" ON "); sql.append(" pv.PUNTOVENTA_ID = dec.PUNTOVENTA_ID "); + sql.append(" JOIN punto_venta pvBoleto ON "); + sql.append(" pvBoleto.PUNTOVENTA_ID = dec.PONTO_VENDA_BOLETO_ID "); + sql.append(" JOIN forma_pago fp ON "); + sql.append(" fp.formapago_id = dec.formapago_id "); sql.append(" JOIN usuario u "); sql.append(" ON "); sql.append(" u.USUARIO_ID = DEC.USUARIO_ID "); @@ -123,16 +142,27 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" e.EMPRESA_ID = m.EMPRESA_ID "); sql.append(" WHERE "); sql.append(" dec.activo = 1 "); + if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) { sql.append(" AND dec.PUNTOVENTA_ID IN(" + parametros.get("NUMPUNTOVENTA") + ") "); } - sql.append(" AND e.EMPRESA_ID = :empresaId "); + + if (parametros.get("EMPRESA_ID") != null && !parametros.get("EMPRESA_ID").equals("-1")) { + sql.append(" AND e.EMPRESA_ID = :empresaId "); + } + + if (parametros.get("FORMA_PAGO") != null && !parametros.get("FORMA_PAGO").equals("-1")) { + sql.append(" AND DEC.FORMAPAGO_ID = :formapagoId "); + } + if (parametros.get("DOCUMENTO_CPF") != null && parametros.get("DOCUMENTO_CPF") != "") { sql.append(" AND LOWER(DEC.DOCUMENTOCPF) like LOWER(:documentoCPF) ||'%' "); } + if (parametros.get("CARTAO") != null && parametros.get("CARTAO") != "") { sql.append(" AND LOWER(dec.TIPOCARTAO) like '%' || LOWER(:cartao)||'%' "); } + sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final "); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartaoController.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartaoController.java index 89f2a04b0..0fb6b7f97 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartaoController.java @@ -19,14 +19,17 @@ import org.zkoss.util.resource.Labels; import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.FormaPago; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.FormaPagoService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @@ -60,7 +63,13 @@ public class RelatorioEstornoCartaoController extends MyGenericForwardComposer { private MyTextbox txtNombrePuntoVenta; private MyListbox puntoVentaList; private MyListbox puntoVentaSelList; - + + private Combobox cmbFormaPago; + private List lsFormaPago; + + @Autowired + private FormaPagoService formaPagoService; + @Autowired private EmpresaService empresaService; @Autowired @@ -71,6 +80,9 @@ public class RelatorioEstornoCartaoController extends MyGenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresa = empresaService.obtenerTodos(); + + lsFormaPago = formaPagoService.obtenerTodos(); + super.doAfterCompose(comp); puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro()); puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSelecionados()); @@ -152,6 +164,18 @@ public class RelatorioEstornoCartaoController extends MyGenericForwardComposer { parametros.put("NUMPUNTOVENTA", puntoVentaIds.toString()); } filtro.append(puntoVentas).append(";"); + + FormaPago formaPago = cmbFormaPago.getSelectedItem() != null ? (FormaPago) cmbFormaPago.getSelectedItem().getValue() : null; + + filtro.append(" Forma de Pagamento: "); + if(formaPago != null) { + parametros.put("FORMA_PAGO", formaPago.getFormapagoId()); + filtro.append(formaPago.getDescpago()).append(";"); + } else { + filtro.append(" Todos;"); + } + + parametros.put("FILTROS", filtro.toString()); relatorio = new RelatorioEstornoCartao(parametros, dataSourceRead.getConnection()); @@ -355,5 +379,20 @@ public class RelatorioEstornoCartaoController extends MyGenericForwardComposer { public void setTxtCartao(MyTextbox txtCartao) { this.txtCartao = txtCartao; } + + public List getLsFormaPago() { + return lsFormaPago; + } + public void setLsFormaPago(List lsFormaPago) { + this.lsFormaPago = lsFormaPago; + } + + public Combobox getCmbFormaPago() { + return cmbFormaPago; + } + + public void setCmbFormaPago(Combobox cmbFormaPago) { + this.cmbFormaPago = cmbFormaPago; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties index 10509478c..efab3c65f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties @@ -19,7 +19,7 @@ cliente.label=Cliente cpf.label=CPF email.label=E-mail telefone.label=Telefone -cartao.label=Cartão +cartao.label=Tipo de Cartão/Produto numeroCartao.label=Número Cartão nsu.label=NSU autorizacao.label=Autorização @@ -30,4 +30,7 @@ destino.label=Destino servico.label=Serviço dataServico.label=Data Serviço bilhete.label=Bilhete -valorTransacao.label=Valor Transação \ No newline at end of file +valorTransacao.label=Valor Transação +empresa.label=Empresa +formaPago.label=Forma de Pagamento +pontoDeventa.label=Ponto de Venda \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties index 10509478c..efab3c65f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties @@ -19,7 +19,7 @@ cliente.label=Cliente cpf.label=CPF email.label=E-mail telefone.label=Telefone -cartao.label=Cartão +cartao.label=Tipo de Cartão/Produto numeroCartao.label=Número Cartão nsu.label=NSU autorizacao.label=Autorização @@ -30,4 +30,7 @@ destino.label=Destino servico.label=Serviço dataServico.label=Data Serviço bilhete.label=Bilhete -valorTransacao.label=Valor Transação \ No newline at end of file +valorTransacao.label=Valor Transação +empresa.label=Empresa +formaPago.label=Forma de Pagamento +pontoDeventa.label=Ponto de Venda \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper index b12b3caf577353dfbef1e84bb5233d0b2e83abcb..0314dbae24499afcec67c8f039ea814a55deff64 100644 GIT binary patch literal 48805 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 E0kl^iW&i*H literal 45216 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 - - - + + + @@ -34,6 +34,9 @@ + + + @@ -135,279 +138,322 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java index eb4a2d66b..fc1b81bf8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java @@ -52,7 +52,6 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { private MyTextbox txtCvePago; private Button btnApagar; private BusquedaFormaPagoController busquedaFormaPagoController; - private Button btnSalvar; private Checkbox chkIndRestricaoFormaPago; private Checkbox chkCompoeTarifaETaxa; private Checkbox chkCompoeTarifa; @@ -66,6 +65,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { private Row rowTarifaTaxa; private Row rowSomenteTarifa; private boolean exibeTipoRestricaoFormaPago; + + private Checkbox chkIndEstorno; private MyComboboxEstandar cmbTipoFormapago; @@ -122,6 +123,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { } else if (formaPago.getIndoperacion() == 3) { rd3.setChecked(true); } + + chkIndEstorno.setChecked(formaPago.getIndProcessoEstorno()); if (formaPago.getFormapagoId() == 1) { cmbTipoFormapago.setDisabled(Boolean.TRUE); @@ -164,6 +167,16 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { chkCompoeTarifaETaxa.setChecked(true); chkCompoeTarifa.setChecked(false); } + + public void onChange$cmbTipoFormapago(Event event) { + TipoFormapago tipoFormaPagoEscolhido = ((TipoFormapago) cmbTipoFormapago.getSelectedItem().getValue()); + + if(tipoFormaPagoEscolhido.equals(TipoFormapago.CREDITO) || tipoFormaPagoEscolhido.equals(TipoFormapago.DEBITO)) { + chkIndEstorno.setChecked(true); + } else { + chkIndEstorno.setChecked(false); + } + } public void onCheck$chkCompoeTarifaETaxa(Event event) { chkCompoeTarifa.setChecked(!chkCompoeTarifaETaxa.isChecked()); @@ -207,6 +220,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { } } + formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked()); + if (formaPago.getFormapagoId() == null) { List lsFP = formaPagoService.buscarPorDescricao(formaPago.getDescpago()); @@ -364,4 +379,12 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { this.rowSomenteTarifa = rowSomenteTarifa; } + public Checkbox getChkIndEstorno() { + return chkIndEstorno; + } + + public void setChkIndEstorno(Checkbox chkIndEstorno) { + this.chkIndEstorno = chkIndEstorno; + } + } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 9bd5b17db..81fb0035f 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1075,6 +1075,7 @@ editarFormaPagoController.lblRestricaoFormaPago.label=Ativa Restricción de Form editarFormaPagoController.lblTarifaTaxa.label=Compone Tarifa y Taxas editarFormaPagoController.lblSomenteTarifa.label=Compone Tarifa editarFormaPagoController.lblCarteiraDigital.label=Billetera digital +editarFormaPagoController.lblAtivaProcessoEstorno.label=Activa el proceso de contracargo # Muestra o tipo de Búsqueda Punto de venta busquedaTipoPuntoVentaController.window.title = Canal de venta diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 606d8c194..93e904ba4 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -327,7 +327,7 @@ indexController.mniRelatorioDemandas.label = Demandas indexController.mniRelatorioReceitaServico.label = Receita por Serviço indexController.mniRelatorioReceitaEmbarcadaServico.label =Receita Embarcada indexController.mniRelatorioCancelamentoVendaCartao.label = Cancelamento Venda a Cartão -indexController.mniRelatorioEstornoCartao.label=Estorno Cartão +indexController.mniRelatorioEstornoCartao.label=Solicitação de Cancelamento indexController.mniRelatorioVendasCartoes.label=Vendas Cartões indexController.mniRelatorioCancelamentoTransacao.label = Cancelamento J3 indexController.mniRelatorioTabelaPreco.label = Tabela de Preços @@ -922,7 +922,7 @@ relatorioCancelamentoVendaCartaoController.lbNumero.value = Número Agência relatorioCancelamentoVendaCartaoController.lbBilheteiro.value = Bilheteiro #Relatorio de Estorno Cartão -relatorioEstornoCartaoController.window.title = Relatório de Estorno por Cartão +relatorioEstornoCartaoController.window.title = Relatório de Solicitação de Cancelamento relatorioEstornoCartaoController.datainicial.value = Data Inicial relatorioEstornoCartaoController.dataFinal.value = Data Final relatorioEstornoCartaoController.lbPuntoVenta.value = Agência @@ -932,7 +932,8 @@ relatorioEstornoCartaoController.btnLimpar.label = Limpar relatorioEstornoCartaoController.lbNumero.value = Número Agência relatorioEstornoCartaoController.lbBilheteiro.value = Bilheteiro relatorioEstornoCartaoController.lbCpf.value = CPF -relatorioEstornoCartaoController.lbCartao.value = Tipo Cartão +relatorioEstornoCartaoController.lbCartao.value = Tipo Cartão/Produto +relatorioEstornoCartaoController.lbFormaPago.value=Forma de Pagamento #Relatorio Aidf relatorioAidfController.window.title = Relatório Aidf @@ -1160,6 +1161,7 @@ editarFormaPagoController.lblRestricaoFormaPago.label=Ativa Restrição de Forma editarFormaPagoController.lblTarifaTaxa.label=Compõe Tarifa e Taxas editarFormaPagoController.lblSomenteTarifa.label=Compõe Tarifa editarFormaPagoController.lblCarteiraDigital.label=Carteira Digital +editarFormaPagoController.lblAtivaProcessoEstorno.label=Ativa processo de estorno # Muestra o tipo de Pesquisa Ponto Venda busquedaTipoPuntoVentaController.window.title = Canal de Venda diff --git a/web/gui/catalogos/editarFormaPago.zul b/web/gui/catalogos/editarFormaPago.zul index 4e7929a30..b39c97776 100644 --- a/web/gui/catalogos/editarFormaPago.zul +++ b/web/gui/catalogos/editarFormaPago.zul @@ -6,7 +6,7 @@ @@ -79,6 +79,11 @@ mold="rounded" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" /> + + @@ -34,28 +34,37 @@