From 38b594394aed0f267269b661e0ef071ad9278972 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 28 Jun 2021 22:54:35 +0000
Subject: [PATCH] fixes bug#22441 qua: dev:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Feito mudanças no layout do relatorio

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@107551 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioVendasCartoes.java          |  49 +++-
 .../RelatorioVendasCartoes_es.properties      |  14 +-
 .../templates/RelatorioVendasCartoes.jasper   | Bin 37213 -> 42975 bytes
 .../templates/RelatorioVendasCartoes.jrxml    | 258 ++++++++++++------
 .../RelatorioVendasCartoesBean.java           |  74 ++++-
 .../filtroRelatorioVendasCartoes.zul          |   2 +-
 6 files changed, 300 insertions(+), 97 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
index e5045ad6b..608e15cf4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
@@ -86,8 +86,15 @@ public class RelatorioVendasCartoes extends Relatorio {
 						bean.setValor(rset.getBigDecimal("valor") != null ?  rset.getBigDecimal("valor") : null);
 						bean.setAutorizacao(rset.getString("autorizacao") != null ?  rset.getString("autorizacao") : null);
 						bean.setQtdParcelas(rset.getInt("qtdParcelas"));
-						
-						valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO);
+						bean.setNumeroPuntoVenta(rset.getInt("numeroPuntoVenta"));
+						bean.setNomePuntoVenta(rset.getString("nomePuntoVenta") != null ?  rset.getString("nomePuntoVenta") : null);
+						bean.setDescOperadoraCartao(rset.getString("descOperadoraCartao") != null ?  rset.getString("descOperadoraCartao") : null);
+						bean.setNSU(rset.getString("nsu") != null ?  rset.getString("nsu") : null);
+						bean.setNumeroCartao(rset.getString("numeroCartao") != null ?  rset.getString("numeroCartao") : null);
+						bean.setBandeira(rset.getString("bandeira") != null ?  rset.getString("bandeira") : null);
+						bean.setEstabelecimento(rset.getString("estabelecimento") != null ?  rset.getString("estabelecimento") : null);
+						bean.setTerminal(rset.getString("terminal") != null ?  rset.getString("terminal") : null);
+						valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO); 
 						bean.setValorTotal(valorTotal);
 						
 						list.add(bean);
@@ -123,18 +130,34 @@ public class RelatorioVendasCartoes extends Relatorio {
 		StringBuilder sb = new StringBuilder();
 		
 		sb.append("SELECT caja.descpago as descPagamento,");
-		sb.append("       to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,");
+		sb.append("       to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,"); 
 		sb.append("       caja.autorizacao as autorizacao,");
 		sb.append("       coalesce(caja.qtdparcelas, 1) as qtdParcelas ,");
-		sb.append("       trunc(caja.datavenda) as dataVenda, ");
-		sb.append("       sum(caja.preco) as valor ");
+		sb.append("       caja.datavenda as dataVenda, ");
+		sb.append("       sum(caja.preco) as valor, ");
+		sb.append(" caja.numeroPuntoVenta as numeroPuntoVenta, ");
+		sb.append(" caja.nomePuntoVenta as nomePuntoVenta, ");
+		sb.append("  caja.descoperadoracartao as descOperadoraCartao,");
+		sb.append("  caja.NSU as nsu,");
+		sb.append(" caja.numeroCartao as numeroCartao, ");
+		sb.append(" caja.bandeira as bandeira, ");
+		sb.append(" caja.estabelecimento as estabelecimento, ");
+		sb.append(" caja.terminal as terminal ");
 		sb.append("FROM");
 		sb.append("  (SELECT fp.descpago AS descpago,");
 		sb.append("          ct.fecoperacion AS dataoperacao,");
 		sb.append("          ct.numautorizacion AS autorizacao,");
 		sb.append("          ct.cantparcelas AS qtdparcelas,");
 		sb.append("          c.fechorventa AS datavenda,");
-		sb.append("          case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco");
+		sb.append("          case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco,");
+		sb.append(" pt.numpuntoventa as numeroPuntoVenta, "); 
+		sb.append("pt.nombpuntoventa as nomePuntoVenta, "); 
+		sb.append("ct.descoperadoracartao as descoperadoracartao, ");
+		sb.append("ct.nsu as NSU, ");
+		sb.append(" ct.numtarjeta as numeroCartao,  ");
+		sb.append(" ct.tipotarjeta as bandeira,  ");
+		sb.append(" est.numcaja as estabelecimento,  ");
+		sb.append(" estSitef.numpdv as terminal  ");
 		sb.append("   FROM caja c");
 		sb.append("   INNER JOIN caja_formapago cfp ON c.caja_id=cfp.caja_id AND cfp.activo = 1 ");
 		sb.append("   INNER JOIN marca ma on ma.marca_id = c.marca_id ");
@@ -142,6 +165,8 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append("   INNER JOIN caja_det_pago cdp ON (c.caja_id = cdp.caja_id and cdp.cajaformapago_id = cfp.cajaformapago_id)");
 		sb.append("   INNER JOIN caja_tarjeta ct ON (ct.cajadetpago_id = cdp.cajadetpago_id)");
 		sb.append("   INNER JOIN punto_venta pt ON (pt.puntoventa_id = c.puntoventa_id) ");
+		sb.append("   INNER JOIN estacion est ON (est.estacion_id = c.estacion_id) ");
+		sb.append("   left JOIN estacion_sitef estSitef ON (estSitef.estacion_id = c.estacion_id) ");
 		sb.append("   WHERE c.indreimpresion = 0 ");
 
 		if(empresa!= null){
@@ -182,8 +207,16 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append("         to_char(caja.dataoperacao, 'ddMMyyyy'),");
 		sb.append("         caja.autorizacao,");
 		sb.append("         caja.qtdparcelas,");
-		sb.append("         trunc(caja.datavenda) ");
-		sb.append("ORDER BY caja.descpago, trunc(caja.datavenda), caja.autorizacao");
+		sb.append("         caja.datavenda,  ");
+		sb.append(" caja.numeroPuntoVenta , ");
+		sb.append(" caja.nomePuntoVenta, ");
+		sb.append(" caja.descoperadoracartao, ");
+		sb.append("  caja.NSU, ");
+		sb.append(" caja.numeroCartao, ");
+		sb.append(" caja.bandeira, ");
+		sb.append(" caja.estabelecimento, ");
+		sb.append(" caja.terminal ");
+		sb.append("ORDER BY caja.nomePuntoVenta, caja.datavenda ");
 		
 		return sb.toString();
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoes_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoes_es.properties
index 58a8630a3..8243ea293 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoes_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoes_es.properties
@@ -20,9 +20,19 @@ header.filtro.grupo=Grupo de Linhas\:
 detail.dataOperacao=Data Operação
 detail.dataVenda=Data Venda
 detail.autorizacao=Autorização
-detail.qtdParcelas=Quantidade Parcelas
+detail.qtdParcelas=Parcelas
 detail.valorTotal=Valor Total
-detail.valor=Valor R$
+detail.numeroAgencia=Número Agência
+detail.nomeAgencia=Nome Agência
+detail.horaVenda= Hora Venda
+detail.bandeira = Bandeira
+detail.nsu = NSU
+detail.numeroCartao =Cartão
+detail.estabelecimento=Estabelecimento
+detail.valor = Valor
+detail.descFormaPagamento=Forma Pago
+detail.terminal = Terminal
+
 
 #Group
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jasper
index 01384e0ddb83ce2d6bf2afd21103903e27410727..b6c500832dd25ca9aed268c0899a35f5e3aa55f3 100644
GIT binary patch
literal 42975
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

literal 37213
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
UVhi2><9dy@;>@sD`F5uN7kHjqRsaA1

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml
index e352c78d0..d8233ff81 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasCartoes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
-	<property name="ireport.zoom" value="4.177248169415656"/>
-	<property name="ireport.x" value="2573"/>
-	<property name="ireport.y" value="78"/>
+	<property name="ireport.zoom" value="3.138428376721015"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="212"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
 	<parameter name="DATA_INICIAL" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -26,6 +26,13 @@
 	<field name="qtdParcelas" class="java.lang.Integer"/>
 	<field name="dataVenda" class="java.util.Date"/>
 	<field name="valor" class="java.math.BigDecimal"/>
+	<field name="numeroPuntoVenta" class="java.lang.Integer"/>
+	<field name="numeroCartao" class="java.lang.String"/>
+	<field name="NSU" class="java.lang.String"/>
+	<field name="bandeira" class="java.lang.String"/>
+	<field name="nomePuntoVenta" class="java.lang.String"/>
+	<field name="estabelecimento" class="java.lang.String"/>
+	<field name="terminal" class="java.lang.String"/>
 	<variable name="total_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
 		<variableExpression><![CDATA[$F{valorTotal}]]></variableExpression>
 	</variable>
@@ -36,50 +43,44 @@
 		<variableExpression><![CDATA[$F{valor}]]></variableExpression>
 	</variable>
 	<group name="groupRuta">
-		<groupExpression><![CDATA[$F{descPagamento}]]></groupExpression>
+		<groupExpression><![CDATA[$F{nomePuntoVenta}]]></groupExpression>
 		<groupHeader>
-			<band height="19">
+			<band height="16">
 				<textField isBlankWhenNull="true">
-					<reportElement x="0" y="0" width="179" height="16" uuid="f1171f5c-2175-4176-82b0-c1a31f78f1d3"/>
+					<reportElement uuid="f1171f5c-2175-4176-82b0-c1a31f78f1d3" x="0" y="0" width="137" height="16"/>
 					<textElement>
 						<font size="12" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{descPagamento}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{nomePuntoVenta}]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement uuid="89a68b6e-ab9f-46d4-8460-8ec8f4988dbe" x="137" y="0" width="103" height="16"/>
+					<textElement>
+						<font size="12" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{numeroPuntoVenta}]]></textFieldExpression>
 				</textField>
-				<line>
-					<reportElement x="0" y="0" width="803" height="1" uuid="b6bdef50-f793-4c23-b188-505c0fb7bf18"/>
-				</line>
-				<line>
-					<reportElement x="0" y="15" width="802" height="1" uuid="6e1204b5-dc16-40df-b592-9046e0b31a14"/>
-				</line>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="25">
 				<line>
-					<reportElement positionType="Float" x="0" y="0" width="803" height="1" uuid="8dd18564-6d32-4232-a0fd-f39054849109"/>
+					<reportElement uuid="8dd18564-6d32-4232-a0fd-f39054849109" positionType="Float" x="0" y="0" width="802" height="1"/>
 				</line>
-				<textField>
-					<reportElement x="0" y="1" width="218" height="23" uuid="a7c33cf2-944b-4bd1-bb55-72ab698cc599"/>
-					<textElement>
-						<font size="12" isBold="true" isItalic="false"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{descPagamento}.equals("CRÉDITO") ? $R{total.credito} : $R{total.debito}]]></textFieldExpression>
-				</textField>
-				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement x="349" y="1" width="38" height="10" uuid="27802809-5617-44e5-a89b-cc64e8bde961"/>
-					<textElement textAlignment="Right">
-						<font size="10"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$V{total_group}]]></textFieldExpression>
-				</textField>
 				<textField pattern="#,##0.00" isBlankWhenNull="true">
-					<reportElement x="648" y="1" width="132" height="23" uuid="b3279060-d361-41c6-bc5c-a02d9d08774c"/>
-					<textElement textAlignment="Right">
-						<font size="10"/>
+					<reportElement uuid="b3279060-d361-41c6-bc5c-a02d9d08774c" x="189" y="1" width="51" height="23"/>
+					<textElement>
+						<font size="10" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{TOTAL_TIPO_CARTAO}]]></textFieldExpression>
 				</textField>
+				<staticText>
+					<reportElement uuid="f9529467-a4f4-4539-a9e6-f00832931070" x="0" y="1" width="189" height="23"/>
+					<textElement>
+						<font size="12" isBold="true"/>
+					</textElement>
+					<text><![CDATA[Total Agência]]></text>
+				</staticText>
 			</band>
 		</groupFooter>
 	</group>
@@ -92,97 +93,141 @@
 	<pageHeader>
 		<band height="110" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="20" width="349" height="20" uuid="2523431f-2c2c-4a2b-a34f-785b8ea8f9dd"/>
+				<reportElement uuid="2523431f-2c2c-4a2b-a34f-785b8ea8f9dd" x="0" y="20" width="481" height="20"/>
 				<textElement textAlignment="Center">
 					<font size="15"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.titulo.relatorio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="40" width="112" height="20" uuid="9bb1d24c-1a5c-4281-b900-d35779e00807"/>
+				<reportElement uuid="9bb1d24c-1a5c-4281-b900-d35779e00807" x="0" y="40" width="137" height="20"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="648" y="0" width="56" height="20" uuid="77235663-6b8a-411f-89be-24b315b65adb"/>
+				<reportElement uuid="77235663-6b8a-411f-89be-24b315b65adb" x="601" y="0" width="79" height="20"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="704" y="20" width="52" height="20" uuid="cf1bcbcf-84b8-4d90-bbc7-22d9c7186952"/>
+				<reportElement uuid="cf1bcbcf-84b8-4d90-bbc7-22d9c7186952" x="601" y="20" width="79" height="20"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement x="704" y="0" width="98" height="20" uuid="efdae9bf-3550-4620-acd0-20c9c7b0e3b1"/>
+				<reportElement uuid="efdae9bf-3550-4620-acd0-20c9c7b0e3b1" x="680" y="0" width="122" height="20"/>
 				<textElement textAlignment="Left"/>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="756" y="20" width="24" height="20" uuid="4070d457-cdcc-434e-8e50-5494a05815f9"/>
+				<reportElement uuid="4070d457-cdcc-434e-8e50-5494a05815f9" x="680" y="20" width="63" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="780" y="20" width="22" height="20" uuid="26156964-8733-4ad1-96fd-2ae8414636b7"/>
+				<reportElement uuid="26156964-8733-4ad1-96fd-2ae8414636b7" x="743" y="20" width="59" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="60" width="802" height="1" uuid="27a77abc-db13-4836-9261-8208f3825802"/>
+				<reportElement uuid="27a77abc-db13-4836-9261-8208f3825802" x="0" y="60" width="802" height="1"/>
 			</line>
 			<textField>
-				<reportElement x="0" y="61" width="780" height="20" uuid="06a43567-1fd2-4c86-a0cc-443618ddf965"/>
+				<reportElement uuid="06a43567-1fd2-4c86-a0cc-443618ddf965" x="0" y="61" width="802" height="24"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{header.filtro} + $R{header.filtro.empresa} +  "   ( " + $P{NOME_EMPRESA} + " )  " + $R{header.filtro.agencia} +  "   ( " + $P{NOME_AGENCIA} + " )  " + $R{header.filtro.estacao}  +  "   ( " + $P{ESTACAO} + " )  "+ $R{header.filtro.bilheteiro}  +  "   ( " + $P{NOME_USUARIO} + " )  "]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="85" width="803" height="1" uuid="48a39edc-ed2a-40cb-8bfb-6e97bcb9088a"/>
+				<reportElement uuid="48a39edc-ed2a-40cb-8bfb-6e97bcb9088a" x="0" y="85" width="802" height="1"/>
 			</line>
 			<textField>
-				<reportElement x="0" y="86" width="179" height="23" uuid="c0f124b2-3691-4f49-9b86-69d76f249584"/>
-				<textElement textAlignment="Right" markup="none">
-					<font size="12" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{detail.dataOperacao}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="179" y="86" width="170" height="23" uuid="5faeb20b-f423-4bfa-bb2e-1f4f4aed6627"/>
-				<textElement textAlignment="Center" markup="none">
+				<reportElement uuid="5faeb20b-f423-4bfa-bb2e-1f4f4aed6627" x="601" y="86" width="79" height="24"/>
+				<textElement markup="none">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="349" y="86" width="131" height="23" uuid="824877eb-7028-4256-9503-7045d7eaee3c"/>
-				<textElement textAlignment="Right" markup="none">
+				<reportElement uuid="824877eb-7028-4256-9503-7045d7eaee3c" x="240" y="86" width="70" height="24"/>
+				<textElement textAlignment="Center" markup="none">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.qtdParcelas}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="480" y="86" width="168" height="23" uuid="b9d303b2-5ea9-4cf0-845b-142089ac8f4d"/>
-				<textElement textAlignment="Right" markup="none">
+				<reportElement uuid="b9d303b2-5ea9-4cf0-845b-142089ac8f4d" x="54" y="86" width="83" height="24"/>
+				<textElement markup="none">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="480" y="86" width="300" height="23" uuid="c5d483c4-89a2-4724-ad57-731676551f0f"/>
-				<textElement textAlignment="Right" markup="none">
+				<reportElement uuid="c5d483c4-89a2-4724-ad57-731676551f0f" x="189" y="86" width="51" height="24"/>
+				<textElement markup="none">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.valor}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="112" y="40" width="237" height="20" uuid="cb391edc-e0b3-4fbb-a58f-f26191bc1c16"/>
+				<reportElement uuid="cb391edc-e0b3-4fbb-a58f-f26191bc1c16" x="137" y="40" width="344" height="20"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{DATA_INICIAL} + "  a  " + $P{DATA_FINAL}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="90bba5fa-4d47-4bc6-94c0-3e3a5fd4cbd4" x="137" y="86" width="52" height="24"/>
+				<textElement markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.horaVenda}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="31c52994-7a05-4904-8b79-0a3cf93a7603" x="481" y="86" width="64" height="24"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.bandeira}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="4d645ff9-8f04-4ef9-86a2-0a03d5adcaca" x="545" y="86" width="56" height="24"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.nsu}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="401eb0b2-2b49-4f5a-892c-1be3de0b2f48" x="680" y="86" width="63" height="24"/>
+				<textElement markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.numeroCartao}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="ff1634d4-16c5-4f86-a875-de685af28c61" x="393" y="86" width="88" height="24"/>
+				<textElement markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.estabelecimento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="8ebd2e08-5804-45f0-a890-da20efeb2eb3" x="310" y="86" width="83" height="24"/>
+				<textElement markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.descFormaPagamento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="49855fbf-76fd-4692-8c18-1559c8a5a8f9" x="743" y="86" width="59" height="24"/>
+				<textElement markup="none">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.terminal}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
@@ -190,40 +235,82 @@
 	</columnHeader>
 	<detail>
 		<band height="15" splitType="Stretch">
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="648" y="0" width="132" height="15" uuid="80a57c70-9f34-49b9-86f9-14bb27c462ca"/>
-				<textElement textAlignment="Right">
+			<textField pattern="###0" isBlankWhenNull="true">
+				<reportElement uuid="e2737ee4-a6ee-4f1f-9a57-974c926a5d0d" x="240" y="0" width="70" height="15"/>
+				<textElement textAlignment="Center">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{valor}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="480" y="0" width="168" height="15" uuid="70f7c504-926b-4c12-ae8a-5c7fe4a9e45f"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="0" y="0" width="179" height="15" uuid="ec2db54b-37be-4aba-95a3-d2e3067ee3e5"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{dataOperacao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{qtdParcelas}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement x="179" y="1" width="170" height="14" uuid="9e67df94-d0f8-4a04-86c0-4862a331d448"/>
-				<textElement textAlignment="Center">
+				<reportElement uuid="ed87de37-aef0-40d9-b0ca-770b02d0de39" x="601" y="0" width="79" height="15"/>
+				<textElement>
 					<font size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{autorizacao}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement x="349" y="1" width="131" height="14" uuid="e2737ee4-a6ee-4f1f-9a57-974c926a5d0d"/>
+				<reportElement uuid="2553142c-df95-4e56-aa6d-752c0a33e651" x="545" y="0" width="56" height="15"/>
 				<textElement textAlignment="Center">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qtdParcelas}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{NSU}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement uuid="9808b2bd-a234-4cf4-bfa9-89a81fd743dd" x="680" y="0" width="63" height="15"/>
+				<textElement>
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numeroCartao}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement uuid="74696f67-59a4-4346-bb82-4f63847ef2b0" x="481" y="0" width="64" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{bandeira}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement uuid="e4d1e873-8b07-4286-8af7-5440c1f1ba0a" x="393" y="0" width="88" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{estabelecimento}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement uuid="0a679bc3-90d8-47d4-afff-206f562ec6a5" x="54" y="0" width="83" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField pattern="HH.mm" isBlankWhenNull="true">
+				<reportElement uuid="7308b189-5995-42c0-b243-dabf9782c352" x="137" y="0" width="52" height="15"/>
+				<textElement>
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="c1faedca-dc75-4fd7-9120-73cd81253ed9" x="189" y="0" width="51" height="15"/>
+				<textElement>
+					<font size="10" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valor}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement uuid="017735ec-285c-4afe-a27e-dfc5d73f64eb" x="310" y="0" width="83" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descPagamento}.equals("CRÉDITO") ? "C" : "D"]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement uuid="15a4bd94-f42b-429e-95e0-73257c9697d4" x="743" y="0" width="59" height="15"/>
+				<textElement>
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{terminal}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -239,19 +326,19 @@
 	<summary>
 		<band height="22" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="1" width="112" height="21" uuid="6813f5a3-1810-4b53-82ea-3df08df9548f"/>
+				<reportElement uuid="6813f5a3-1810-4b53-82ea-3df08df9548f" x="0" y="1" width="189" height="21"/>
 				<textElement>
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{group.total}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement positionType="Float" x="0" y="0" width="803" height="1" uuid="d9792af6-b583-4b6e-bb69-7edd7f78fdfa"/>
+				<reportElement uuid="d9792af6-b583-4b6e-bb69-7edd7f78fdfa" positionType="Float" x="0" y="0" width="802" height="1"/>
 			</line>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="648" y="1" width="132" height="21" uuid="7ef31b82-e8a2-4baa-821a-174d5ca113fe"/>
-				<textElement textAlignment="Right">
-					<font size="10"/>
+				<reportElement uuid="7ef31b82-e8a2-4baa-821a-174d5ca113fe" x="189" y="1" width="51" height="21"/>
+				<textElement>
+					<font size="10" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{TOTAL}]]></textFieldExpression>
 			</textField>
@@ -260,7 +347,8 @@
 	<noData>
 		<band height="20">
 			<textField>
-				<reportElement x="0" y="0" width="780" height="20" uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2"/>
+				<reportElement uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2" x="0" y="0" width="802" height="20"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasCartoesBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasCartoesBean.java
index 5e9b6e3a2..f736b59fc 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasCartoesBean.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasCartoesBean.java
@@ -12,7 +12,15 @@ public class RelatorioVendasCartoesBean {
 	private Integer qtdParcelas;
 	private BigDecimal valor;
 	private BigDecimal valorTotal;
-
+	private Integer numeroPuntoVenta;
+	private String nomePuntoVenta;
+	private String descOperadoraCartao;
+	private String NSU;
+	private String numeroCartao;
+	private String bandeira;
+	private String estabelecimento;
+	private String terminal;
+	
 	public Date getDataVenda() {
 		return dataVenda;
 	}
@@ -69,4 +77,68 @@ public class RelatorioVendasCartoesBean {
 		this.dataOperacao = dataOperacao;
 	}
 
+	public Integer getNumeroPuntoVenta() {
+		return numeroPuntoVenta;
+	}
+
+	public void setNumeroPuntoVenta(Integer numeroPuntoVenta) {
+		this.numeroPuntoVenta = numeroPuntoVenta;
+	}
+
+	public String getNomePuntoVenta() {
+		return nomePuntoVenta;
+	}
+
+	public void setNomePuntoVenta(String nomePuntoVenta) {
+		this.nomePuntoVenta = nomePuntoVenta;
+	}
+
+	public String getDescOperadoraCartao() {
+		return descOperadoraCartao;
+	}
+
+	public void setDescOperadoraCartao(String descOperadoraCartao) {
+		this.descOperadoraCartao = descOperadoraCartao;
+	}
+
+	public String getNSU() {
+		return NSU;
+	}
+
+	public void setNSU(String nSU) {
+		NSU = nSU;
+	}
+
+	public String getNumeroCartao() {
+		return numeroCartao;
+	}
+
+	public void setNumeroCartao(String numeroCartao) {
+		this.numeroCartao = numeroCartao;
+	}
+
+	public String getBandeira() {
+		return bandeira;
+	}
+
+	public void setBandeira(String bandeira) {
+		this.bandeira = bandeira;
+	}
+
+	public String getEstabelecimento() {
+		return estabelecimento;
+	}
+
+	public void setEstabelecimento(String estabelecimento) {
+		this.estabelecimento = estabelecimento;
+	}
+
+	public String getTerminal() {
+		return terminal;
+	}
+
+	public void setTerminal(String terminal) {
+		this.terminal = terminal;
+	}
+
 }
diff --git a/web/gui/relatorios/filtroRelatorioVendasCartoes.zul b/web/gui/relatorios/filtroRelatorioVendasCartoes.zul
index d90c6ae38..78fe89098 100644
--- a/web/gui/relatorios/filtroRelatorioVendasCartoes.zul
+++ b/web/gui/relatorios/filtroRelatorioVendasCartoes.zul
@@ -31,7 +31,7 @@
 					<label
 						value="${c:l('relatorioVendasCartoesController.lbEmpresa.value')}" />
 					<combobox id="cmbEmpresa" buttonVisible="true"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandarEmpresaUsuario"
 						model="@{winFiltroRelatorioVendasCartoes$composer.lsEmpresa}"
 						constraint="no empty" width="100%" />
 				</row>