fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-2403' (!108) from AL-2403 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/108
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
master 1.0.86
Gleison da Cruz 2023-03-30 13:55:35 +00:00
parent cd4b07f771 9ed633d6da
commit be8432c770
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.0.85</version>
<version>1.0.86</version>
<packaging>war</packaging>
<properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties
View File

@ -31,10 +31,10 @@ servico.label=Servi
dataServico.label=Data Serviço
bilhete.label=Bilhete
valorTransacao.label=Valor Transação
empresa.label=Empresa:
empresa.label=Empresa
formaPago.label=Forma de Pagamento
pontoDeventa.label=Ponto de Venda
motivoCancelamento.label=Motivo Cancelamento
estabelecimento.label=Estab.
estabelecimento.label=Estabelecimento
adquirente.label=Adquirente
nsuhost.label=NSU/Host

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper
View File

Binary file not shown.

72
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml
View File

@ -50,163 +50,163 @@
<group name="empresa" isStartNewPage="true" isReprintHeaderOnEachPage="true" minHeightToStartNewPage="150">
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
<groupHeader>
<band height="21">
<band height="23">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="cdddc9db-1bdc-42fe-9a7a-c442fbc27980" stretchType="RelativeToTallestObject" x="1" y="0" width="67" height="20"/>
<reportElement uuid="cdddc9db-1bdc-42fe-9a7a-c442fbc27980" stretchType="RelativeToTallestObject" x="1" y="1" width="65" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="SansSerif" size="5" isBold="false" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{empresa.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="6d606a89-ef32-44fa-a1ae-6b9c0179e3ac" stretchType="RelativeToTallestObject" x="134" y="0" width="25" height="20"/>
<reportElement uuid="6d606a89-ef32-44fa-a1ae-6b9c0179e3ac" stretchType="RelativeToTallestObject" x="128" y="1" width="29" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{agencia.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="78789f48-2720-4a0f-8200-48c7168dcc20" stretchType="RelativeToTallestObject" x="159" y="0" width="30" height="20"/>
<reportElement uuid="78789f48-2720-4a0f-8200-48c7168dcc20" stretchType="RelativeToTallestObject" x="158" y="1" width="29" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{bilheteiro.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="75e8fd92-595b-4031-9583-95cbe3b0b8aa" stretchType="RelativeToTallestObject" x="189" y="0" width="35" height="20"/>
<reportElement uuid="75e8fd92-595b-4031-9583-95cbe3b0b8aa" stretchType="RelativeToTallestObject" x="189" y="1" width="34" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{data.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="801625b5-a4f7-4052-80cb-ced378ba6756" stretchType="RelativeToTallestObject" x="263" y="0" width="30" height="20"/>
<reportElement uuid="801625b5-a4f7-4052-80cb-ced378ba6756" stretchType="RelativeToTallestObject" x="263" y="1" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cpf.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="fdefd76d-7c9d-4674-ae4b-24e3bc6b1e8f" stretchType="RelativeToTallestObject" x="224" y="0" width="39" height="20"/>
<reportElement uuid="fdefd76d-7c9d-4674-ae4b-24e3bc6b1e8f" stretchType="RelativeToTallestObject" x="224" y="1" width="39" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cliente.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="26e5eeeb-ff3d-41ea-9978-2c04418120b2" stretchType="RelativeToTallestObject" x="293" y="0" width="40" height="20"/>
<reportElement uuid="26e5eeeb-ff3d-41ea-9978-2c04418120b2" stretchType="RelativeToTallestObject" x="293" y="1" width="40" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{email.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="bb82a4ef-15b6-4284-9160-9714da3579bb" stretchType="RelativeToTallestObject" x="333" y="0" width="28" height="20"/>
<reportElement uuid="bb82a4ef-15b6-4284-9160-9714da3579bb" stretchType="RelativeToTallestObject" x="333" y="1" width="28" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{telefone.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b5679ed7-3404-4a11-ad22-d1460be15ba1" stretchType="RelativeToTallestObject" x="423" y="0" width="35" height="20"/>
<reportElement uuid="b5679ed7-3404-4a11-ad22-d1460be15ba1" stretchType="RelativeToTallestObject" x="423" y="1" width="35" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cartao.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ee1b4575-d301-457c-bfc3-0c78550ac894" stretchType="RelativeToTallestObject" x="458" y="0" width="56" height="20"/>
<reportElement uuid="ee1b4575-d301-457c-bfc3-0c78550ac894" stretchType="RelativeToTallestObject" x="458" y="1" width="56" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{numeroCartao.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="58d1a7ea-be04-49b9-b7bb-913fafaf7a76" stretchType="RelativeToTallestObject" x="515" y="0" width="32" height="20"/>
<reportElement uuid="58d1a7ea-be04-49b9-b7bb-913fafaf7a76" stretchType="RelativeToTallestObject" x="515" y="1" width="32" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{nsu.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="7eaf1a6c-5182-4b0e-aa4f-20af519c69f8" stretchType="RelativeToTallestObject" x="549" y="0" width="30" height="20"/>
<reportElement uuid="7eaf1a6c-5182-4b0e-aa4f-20af519c69f8" stretchType="RelativeToTallestObject" x="549" y="1" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{autorizacao.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="4dbb8177-8d50-4b80-9a61-1991b940fd06" stretchType="RelativeToTallestObject" x="361" y="0" width="31" height="20"/>
<reportElement uuid="4dbb8177-8d50-4b80-9a61-1991b940fd06" stretchType="RelativeToTallestObject" x="361" y="1" width="31" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{formaPago.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="99bce7f3-8e93-41c0-ba75-ee5e1ad183e1" stretchType="RelativeToTallestObject" x="392" y="0" width="31" height="20"/>
<reportElement uuid="99bce7f3-8e93-41c0-ba75-ee5e1ad183e1" stretchType="RelativeToTallestObject" x="392" y="1" width="31" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{pontoDeventa.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="e6061d48-5d85-48a8-960d-23bc16157462" stretchType="RelativeToTallestObject" x="68" y="0" width="32" height="20"/>
<reportElement uuid="e6061d48-5d85-48a8-960d-23bc16157462" stretchType="RelativeToTallestObject" x="67" y="1" width="31" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="SansSerif" size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{motivoCancelamento.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="468fff71-1268-4136-9d45-c81f154addae" stretchType="RelativeToTallestObject" x="599" y="0" width="20" height="20"/>
<reportElement uuid="468fff71-1268-4136-9d45-c81f154addae" stretchType="RelativeToTallestObject" x="599" y="1" width="20" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{adquirente.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="5efb0333-63a8-44be-9eb0-786a3852c1be" stretchType="RelativeToTallestObject" x="100" y="0" width="36" height="20"/>
<reportElement uuid="5efb0333-63a8-44be-9eb0-786a3852c1be" stretchType="RelativeToTallestObject" x="99" y="1" width="28" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{estabelecimento.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="14265fbe-d0be-4a76-b76b-844f21ca3612" stretchType="RelativeToTallestObject" x="579" y="0" width="20" height="20"/>
<reportElement uuid="14265fbe-d0be-4a76-b76b-844f21ca3612" stretchType="RelativeToTallestObject" x="579" y="1" width="20" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{nsuhost.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ac3fbe18-d2c6-4fc1-aa4c-b3c8c91b1174" stretchType="RelativeToTallestObject" x="619" y="0" width="25" height="20"/>
<reportElement uuid="ac3fbe18-d2c6-4fc1-aa4c-b3c8c91b1174" stretchType="RelativeToTallestObject" x="619" y="1" width="25" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{dataTransacao.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="da0677b0-a380-4686-ad53-61ddf129e143" stretchType="RelativeToTallestObject" x="644" y="0" width="25" height="20"/>
<reportElement uuid="da0677b0-a380-4686-ad53-61ddf129e143" stretchType="RelativeToTallestObject" x="644" y="1" width="25" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{valorEstorno.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="f1442d1b-8590-4deb-8bc5-96b2316462b7" stretchType="RelativeToTallestObject" x="669" y="0" width="23" height="20"/>
<reportElement uuid="f1442d1b-8590-4deb-8bc5-96b2316462b7" stretchType="RelativeToTallestObject" x="669" y="1" width="23" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{origem.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="c61f1d44-90da-401f-a832-b8c06682bde8" stretchType="RelativeToTallestObject" x="692" y="0" width="22" height="20"/>
<reportElement uuid="c61f1d44-90da-401f-a832-b8c06682bde8" stretchType="RelativeToTallestObject" x="692" y="1" width="22" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{destino.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="67b880a8-7be7-42d7-889a-78c9b2113a4c" stretchType="RelativeToTallestObject" x="714" y="0" width="20" height="20"/>
<reportElement uuid="67b880a8-7be7-42d7-889a-78c9b2113a4c" stretchType="RelativeToTallestObject" x="714" y="1" width="19" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
@ -220,14 +220,14 @@
<textFieldExpression><![CDATA[$R{dataServico.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="84ffd875-2c40-418f-916d-305d98a04dfc" stretchType="RelativeToTallestObject" x="754" y="0" width="20" height="20"/>
<reportElement uuid="84ffd875-2c40-418f-916d-305d98a04dfc" stretchType="RelativeToTallestObject" x="754" y="1" width="20" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{bilhete.label}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="53e910c5-7876-4cad-96c8-8bebeabcc0b6" stretchType="RelativeToTallestObject" x="775" y="0" width="25" height="20"/>
<reportElement uuid="53e910c5-7876-4cad-96c8-8bebeabcc0b6" stretchType="RelativeToTallestObject" x="775" y="1" width="25" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
@ -342,9 +342,9 @@
<band splitType="Stretch"/>
</columnHeader>
<detail>
<band height="28" splitType="Stretch">
<band height="30" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b6303a6f-7dcb-4e04-b760-9da3cc781862" stretchType="RelativeToTallestObject" x="134" y="1" width="25" height="27"/>
<reportElement uuid="b6303a6f-7dcb-4e04-b760-9da3cc781862" stretchType="RelativeToTallestObject" x="128" y="1" width="29" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/>
@ -352,7 +352,7 @@
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="82deceaa-3bf0-40e5-8d0f-24cbc6799b18" stretchType="RelativeToTallestObject" x="159" y="1" width="30" height="27"/>
<reportElement uuid="82deceaa-3bf0-40e5-8d0f-24cbc6799b18" stretchType="RelativeToTallestObject" x="158" y="1" width="29" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
@ -437,7 +437,7 @@
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="7bd19ec9-ea19-44e6-96c1-b8e1c191538d" stretchType="RelativeToTallestObject" x="714" y="1" width="23" height="27"/>
<reportElement uuid="7bd19ec9-ea19-44e6-96c1-b8e1c191538d" stretchType="RelativeToTallestObject" x="714" y="1" width="19" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
@ -472,8 +472,8 @@
</textElement>
<textFieldExpression><![CDATA[$F{cliente}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="3494fbec-c42c-4657-8bef-7eee71c35b68" stretchType="RelativeToTallestObject" x="189" y="1" width="35" height="27"/>
<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
<reportElement uuid="3494fbec-c42c-4657-8bef-7eee71c35b68" stretchType="RelativeToTallestObject" x="189" y="1" width="34" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
@ -494,15 +494,15 @@
<textFieldExpression><![CDATA[$F{agenciaVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="bc174bfa-6426-47bd-9eab-20cf741a233c" stretchType="RelativeToTallestObject" x="68" y="0" width="32" height="27"/>
<reportElement uuid="bc174bfa-6426-47bd-9eab-20cf741a233c" stretchType="RelativeToTallestObject" x="67" y="1" width="31" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="SansSerif" size="5" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/>
</textElement>
<textFieldExpression><![CDATA[$F{descmotivo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="aec06746-db94-40a9-8923-4a6b1fe8022c" stretchType="RelativeToTallestObject" x="102" y="1" width="32" height="27"/>
<textField pattern="" isBlankWhenNull="true">
<reportElement uuid="aec06746-db94-40a9-8923-4a6b1fe8022c" stretchType="RelativeToTallestObject" x="99" y="1" width="28" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="5" isPdfEmbedded="true"/>
</textElement>
@ -523,7 +523,7 @@
<textFieldExpression><![CDATA[$F{adquirente}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="afc496ba-8293-401b-9af8-cfec257b0dc4" stretchType="RelativeToTallestObject" x="1" y="1" width="67" height="27"/>
<reportElement uuid="afc496ba-8293-401b-9af8-cfec257b0dc4" stretchType="RelativeToTallestObject" x="1" y="1" width="65" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="SansSerif" size="5" isBold="false" isUnderline="false" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/>