Merge pull request 'AL-1627' (#34) from AL-1627 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/34 Reviewed-by: wallace <wallace@rjconsultores.com.br> Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>master 1.0.28
commit
6e33d954ad
6
pom.xml
6
pom.xml
|
|
@ -4,12 +4,12 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>br.com.rjconsultores</groupId>
|
||||
<artifactId>ventaboletosadm</artifactId>
|
||||
<version>1.0.27</version>
|
||||
<version>1.0.28</version>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
<modelWeb.version>1.0.19</modelWeb.version>
|
||||
<flyway.version>1.0.9</flyway.version>
|
||||
<modelWeb.version>1.0.20</modelWeb.version>
|
||||
<flyway.version>1.0.10</flyway.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import java.util.Map;
|
|||
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasParcelamentoBean;
|
||||
|
|
@ -63,6 +64,8 @@ public class RelatorioVendasParcelamento extends Relatorio {
|
|||
stmt.setInt("empresaId", Integer.parseInt(empresa));
|
||||
}
|
||||
|
||||
stmt.setString("juros", TipoEventoExtra.JUROS_CARTAO_CREDITO.toString());
|
||||
|
||||
rset1 = stmt.executeQuery();
|
||||
|
||||
while (rset1.next()) {
|
||||
|
|
@ -93,6 +96,10 @@ public class RelatorioVendasParcelamento extends Relatorio {
|
|||
vendasParcelamento.setAutorizacao(rset1.getString("autorizacao"));
|
||||
vendasParcelamento.setNsu(rset1.getString("nsu"));
|
||||
vendasParcelamento.setParcelas(rset1.getString("parcelas"));
|
||||
|
||||
BigDecimal juros = rset1.getBigDecimal("juros");
|
||||
vendasParcelamento.setJuros(juros != null ? juros : BigDecimal.ZERO);
|
||||
|
||||
BigDecimal valor = rset1.getBigDecimal("valor");
|
||||
vendasParcelamento.setValor(valor != null ? valor : BigDecimal.ZERO);
|
||||
|
||||
|
|
@ -152,7 +159,9 @@ public class RelatorioVendasParcelamento extends Relatorio {
|
|||
sql.append(" ct.numautorizacion AS autorizacao, ");
|
||||
sql.append(" ct.NSU AS nsu, ");
|
||||
sql.append(" ct.cantparcelas AS parcelas, ");
|
||||
sql.append(" ct.importe AS valor ");
|
||||
sql.append(" ct.importe AS valor, ");
|
||||
sql.append(" coalesce(case when tee.cvetipoevento = :juros then ee.impingreso else 0 end, 0) as juros ");
|
||||
|
||||
sql.append(" FROM caja c ");
|
||||
sql.append(" INNER JOIN PUNTO_VENTA pv ON c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
|
||||
sql.append(" INNER JOIN marca m ON m.marca_id = c.marca_id ");
|
||||
|
|
@ -164,6 +173,8 @@ public class RelatorioVendasParcelamento extends Relatorio {
|
|||
sql.append(" INNER JOIN caja_formapago cfp ON cfp.caja_id = c.caja_id ");
|
||||
sql.append(" INNER JOIN caja_det_pago cdp ON cdp.cajaformapago_id = cfp.cajaformapago_id ");
|
||||
sql.append(" INNER JOIN caja_tarjeta ct ON ct.cajadetpago_id = cdp.cajadetpago_id ");
|
||||
sql.append(" LEFT JOIN evento_extra ee ON (ee.boleto_id = c.TRANSACAO_ID) ");
|
||||
sql.append(" LEFT JOIN tipo_evento_extra tee on tee.tipoeventoextra_id = ee.tipoeventoextra_id ");
|
||||
sql.append(" WHERE ");
|
||||
sql.append(" fechorventa BETWEEN :de AND :ate ");
|
||||
sql.append(" AND ct.CANTPARCELAS BETWEEN :parcIni AND :parcFim ");
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ detail.tarifa = Tarifa
|
|||
detail.taxa = Taxa
|
||||
detail.total = Total
|
||||
detail.valor = Valor
|
||||
detail.juros = Juros
|
||||
|
||||
#Labels header
|
||||
header.data = Data :
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioAgenciaFechamento" pageWidth="1515" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1475" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioAgenciaFechamento" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
|
||||
<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="RelatorioAgenciaFechamento" pageWidth="1570" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1530" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioAgenciaFechamento" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
|
||||
<property name="ireport.zoom" value="1.1269722013523682"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.x" value="636"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
|
||||
|
|
@ -41,33 +41,34 @@
|
|||
<field name="nsu" class="java.lang.String"/>
|
||||
<field name="parcelas" class="java.lang.String"/>
|
||||
<field name="valor" class="java.math.BigDecimal"/>
|
||||
<field name="juros" class="java.math.BigDecimal"/>
|
||||
<background>
|
||||
<band splitType="Stretch"/>
|
||||
</background>
|
||||
<pageHeader>
|
||||
<band height="40" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement x="1155" y="19" width="49" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
|
||||
<reportElement x="1196" y="19" width="49" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
|
||||
<textElement>
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="1321" y="-1" width="56" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
|
||||
<reportElement x="1362" y="-1" width="56" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
|
||||
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField evaluationTime="Report">
|
||||
<reportElement x="1453" y="19" width="22" height="20" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
|
||||
<reportElement x="1494" y="19" width="22" height="20" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="1387" y="19" width="42" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
|
||||
<reportElement x="1428" y="19" width="42" height="20" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
|
||||
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="1204" y="19" width="182" height="20" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/>
|
||||
<reportElement x="1245" y="19" width="182" height="20" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/>
|
||||
<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
|
|
@ -75,12 +76,12 @@
|
|||
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm">
|
||||
<reportElement x="1377" y="-1" width="98" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
|
||||
<reportElement x="1418" y="-1" width="98" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="1429" y="19" width="24" height="20" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
|
||||
<reportElement x="1470" y="19" width="24" height="20" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -214,21 +215,21 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1305" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="8f882b0b-dd40-4400-944f-37f6d665523b"/>
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1346" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="8f882b0b-dd40-4400-944f-37f6d665523b"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.nsu}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1362" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="5bdd18ab-722e-43b4-8ab7-375ae263cf83"/>
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1403" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="5bdd18ab-722e-43b4-8ab7-375ae263cf83"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.parcelas}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1059" y="0" width="84" height="36" isPrintWhenDetailOverflows="true" uuid="27429a4a-76c4-4143-b87f-2a6fcf215adb"/>
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1100" y="0" width="84" height="36" isPrintWhenDetailOverflows="true" uuid="27429a4a-76c4-4143-b87f-2a6fcf215adb"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -242,7 +243,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.outros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1419" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="2f54df78-5136-4876-a2c6-18bf63cea761"/>
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1460" y="0" width="57" height="36" isPrintWhenDetailOverflows="true" uuid="2f54df78-5136-4876-a2c6-18bf63cea761"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -256,7 +257,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1143" y="0" width="103" height="36" isPrintWhenDetailOverflows="true" uuid="d4b53c4b-a381-4dcf-974f-25e5ce06a382"/>
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1184" y="0" width="103" height="36" isPrintWhenDetailOverflows="true" uuid="d4b53c4b-a381-4dcf-974f-25e5ce06a382"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -270,12 +271,19 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.taxa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1246" y="0" width="59" height="36" isPrintWhenDetailOverflows="true" uuid="8dca13fb-4d0e-460c-96df-2572dbcd9e11"/>
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1287" y="0" width="59" height="36" isPrintWhenDetailOverflows="true" uuid="8dca13fb-4d0e-460c-96df-2572dbcd9e11"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.autorizacao}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="1059" y="-1" width="41" height="36" isPrintWhenDetailOverflows="true" uuid="9bab4049-bac2-4542-94a5-de5fbb18f60b"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.juros}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
|
|
@ -386,14 +394,14 @@
|
|||
<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1305" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="c41691a6-ca0a-44c8-9a25-6811b247c3ad"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1346" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="c41691a6-ca0a-44c8-9a25-6811b247c3ad"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nsu}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1143" y="0" width="103" height="17" isPrintWhenDetailOverflows="true" uuid="3d717851-0c25-4152-9b7a-8bbe475e892d"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1184" y="0" width="103" height="17" isPrintWhenDetailOverflows="true" uuid="3d717851-0c25-4152-9b7a-8bbe475e892d"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
|
|
@ -407,21 +415,21 @@
|
|||
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1059" y="0" width="84" height="17" isPrintWhenDetailOverflows="true" uuid="c5e075d0-975e-4a63-b88b-bb53f8eeb5eb"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1100" y="0" width="84" height="17" isPrintWhenDetailOverflows="true" uuid="c5e075d0-975e-4a63-b88b-bb53f8eeb5eb"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{percentual}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1419" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="70d6a240-31b6-4d97-b003-9704f91b099e"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1460" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="70d6a240-31b6-4d97-b003-9704f91b099e"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valor}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1246" y="0" width="59" height="17" isPrintWhenDetailOverflows="true" uuid="32b588df-4bfe-4da9-967b-e461053515b8"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1287" y="0" width="59" height="17" isPrintWhenDetailOverflows="true" uuid="32b588df-4bfe-4da9-967b-e461053515b8"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
|
|
@ -435,7 +443,7 @@
|
|||
<textFieldExpression><![CDATA[$F{taxa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1362" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="8fb01e5a-8b64-46e0-ba29-a05a2f64d95e"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1403" y="0" width="57" height="17" isPrintWhenDetailOverflows="true" uuid="8fb01e5a-8b64-46e0-ba29-a05a2f64d95e"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
|
|
@ -448,6 +456,13 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1059" y="0" width="41" height="17" isPrintWhenDetailOverflows="true" uuid="285db214-cbfc-422c-a8a9-29dc04f2b6f8"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
|
||||
<font size="11" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{juros}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<noData>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ public class RelatorioVendasParcelamentoBean {
|
|||
private String nsu;
|
||||
private String parcelas;
|
||||
private BigDecimal valor;
|
||||
private BigDecimal juros;
|
||||
|
||||
public String getEmpresaNome() {
|
||||
return empresaNome;
|
||||
|
|
@ -230,5 +231,12 @@ public class RelatorioVendasParcelamentoBean {
|
|||
this.valor = valor;
|
||||
}
|
||||
|
||||
public BigDecimal getJuros() {
|
||||
return juros;
|
||||
}
|
||||
|
||||
public void setJuros(BigDecimal juros) {
|
||||
this.juros = juros;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -380,6 +380,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
|
|||
private Checkbox chkPermiteReativacaoPassagemBpeEstacaoNaoBpe;
|
||||
private Checkbox chkImprimirEmbarqueDesembarqCupom;
|
||||
private Checkbox chkIndSegundaViaSeguroOpcional;
|
||||
private Checkbox chkIndJurosCredito;
|
||||
|
||||
private CKeditor messageConteudoEmail;
|
||||
private CKeditor messageConteudoEmailFiscal;
|
||||
|
|
@ -624,6 +625,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
|
|||
chkIndCheckinBloqueadoNoshow.setChecked(BooleanUtils.toBoolean(empresa.getIndCheckinBloqueadoRemarcacao()));
|
||||
chkIndAgrupamentoLocalidadeConexao.setChecked(BooleanUtils.toBoolean(empresa.getIndAgrupLocConexao()));
|
||||
chkIndSegundaViaSeguroOpcional.setChecked(BooleanUtils.toBoolean(empresa.getIndSegundaViaSegOpcional()));
|
||||
chkIndJurosCredito.setChecked(BooleanUtils.toBoolean(empresa.getIndJurosCredito()));
|
||||
chkIndHabilitaVendaDeBilheteSemelhante.setChecked(BooleanUtils.toBoolean(empresa.getIndVendeDeBilheteSemelhante()));
|
||||
|
||||
txtUrlBaseSeguro.setText(empresa.getUrlBaseEmpresaSeguro());
|
||||
|
|
@ -876,6 +878,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
|
|||
chkIndLimitaCategoriaPorCorrida.getValue();
|
||||
chkIndCheckinBloqueadoNoshow.getValue();
|
||||
chkIndSegundaViaSeguroOpcional.getValue();
|
||||
chkIndJurosCredito.getValue();
|
||||
chkIndHabilitaVendaDeBilheteSemelhante.getValue();
|
||||
|
||||
txtIrkPadrao.getValue();
|
||||
|
|
@ -1011,6 +1014,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
|
|||
|
||||
empresa.setIndAgrupLocConexao(chkIndAgrupamentoLocalidadeConexao.isChecked());
|
||||
empresa.setIndSegundaViaSegOpcional(chkIndSegundaViaSeguroOpcional.isChecked());
|
||||
empresa.setIndJurosCredito(chkIndJurosCredito.isChecked());
|
||||
empresa.setIndVendeDeBilheteSemelhante(chkIndHabilitaVendaDeBilheteSemelhante.isChecked());
|
||||
|
||||
if(rdCst00.isChecked()) {
|
||||
|
|
|
|||
|
|
@ -7625,6 +7625,8 @@ busquedaTarjetaCreditoController.tarjetaCreditoId.label = ID
|
|||
busquedaTarjetaCreditoController.cantMaxSinTasa.label = Max. sem juros
|
||||
busquedaTarjetaCreditoController.canMaxConTasa.label = Max. com juros
|
||||
busquedaTarjetaCreditoController.tasa.label = Juros
|
||||
busquedaTarjetaCreditoController.parcelaMinima.label = Parcela Mínima
|
||||
busquedaTarjetaCreditoController.indAplicarJuros.label = Aplicar juros venda
|
||||
|
||||
#Editar Tarjeta Credito
|
||||
editarTarjetaCreditoController.window.title = Cartão de Crédito
|
||||
|
|
@ -9463,6 +9465,7 @@ editarEmpresaController.alertaVDAPosHorarioViagem.help=Alerta para venda após h
|
|||
editarEmpresaController.confMovFPTrocaVlrDeposito=Soma Forma de Pagamento 'TROCA PASSAGEM' no Valor de Depósito na Conferência de Movimento
|
||||
editarEmpresaController.confMovFPTrocaVlrDeposito.help=Soma Forma de Pagamento 'TROCA PASSAGEM' no Valor de Depósito na Conferência de Movimento
|
||||
editarEmpresaController.indSegundaViaSeguroOpcional= Emite Segunda via do seguro opcional
|
||||
editarEmpresaController.indJurosCredito= Habilita juros no cartão de crédito
|
||||
|
||||
editarEmpresaController.encerraViagemFechorllegada.ajuda=Habilita o encerramento pela data de chegada. O padrão é a validação pela data de saída.
|
||||
editarEmpresaController.usaTabelaPrecoEmbarcada.ajuda=Utilizar tabela de preço da Embarcada
|
||||
|
|
|
|||
|
|
@ -7155,6 +7155,8 @@ busquedaTarjetaCreditoController.tarjetaCreditoId.label = ID
|
|||
busquedaTarjetaCreditoController.cantMaxSinTasa.label = Max. sin intereses
|
||||
busquedaTarjetaCreditoController.canMaxConTasa.label = Max. con intereses
|
||||
busquedaTarjetaCreditoController.tasa.label = Intereses
|
||||
busquedaTarjetaCreditoController.parcelaMinima.label = Parcela Mínima
|
||||
busquedaTarjetaCreditoController.indAplicarJuros.label = Aplicar juros venda
|
||||
|
||||
#Editar Tarjeta Credito
|
||||
editarTarjetaCreditoController.window.title = Tarjeta de crédito
|
||||
|
|
@ -9115,6 +9117,7 @@ editarEmpresaController.confMovFPTrocaVlrDeposito.help=Suma del método de pago
|
|||
editarEmpresaController.comTransfGeraCaja=Transferencias de suma que mueven efectivo en los retornos totales en el cálculo de la comisión
|
||||
editarEmpresaController.comTransfGeraCaja.help=Transferencias de suma que mueven efectivo en los retornos totales en el cálculo de la comisión
|
||||
editarEmpresaController.indSegundaViaSeguroOpcional= Emite una segunda copia del seguro opcional
|
||||
editarEmpresaController.indJurosCredito= Habilita juros no cartão de crédito
|
||||
|
||||
editarEmpresaController.encerraViagemFechorllegada.ajuda=Controla o encerramento da viagem pela data de saída data de chegada da corrida.
|
||||
editarEmpresaController.usaTabelaPrecoEmbarcada.ajuda=Utilizar tabela de preço da Embarcada
|
||||
|
|
|
|||
|
|
@ -7623,6 +7623,8 @@ busquedaTarjetaCreditoController.tarjetaCreditoId.label = ID
|
|||
busquedaTarjetaCreditoController.cantMaxSinTasa.label = Max. sem juros
|
||||
busquedaTarjetaCreditoController.canMaxConTasa.label = Max. com juros
|
||||
busquedaTarjetaCreditoController.tasa.label = Juros
|
||||
busquedaTarjetaCreditoController.parcelaMinima.label = Parcela Mínima
|
||||
busquedaTarjetaCreditoController.indAplicarJuros.label = Aplicar juros venda
|
||||
|
||||
#Editar Tarjeta Credito
|
||||
editarTarjetaCreditoController.window.title = Cartão de Crédito
|
||||
|
|
@ -9461,6 +9463,7 @@ editarEmpresaController.alertaVDAPosHorarioViagem.help=Alerta para venda após h
|
|||
editarEmpresaController.confMovFPTrocaVlrDeposito=Soma Forma de Pagamento 'TROCA PASSAGEM' no Valor de Depósito na Conferência de Movimento
|
||||
editarEmpresaController.confMovFPTrocaVlrDeposito.help=Soma Forma de Pagamento 'TROCA PASSAGEM' no Valor de Depósito na Conferência de Movimento
|
||||
editarEmpresaController.indSegundaViaSeguroOpcional= Emite Segunda via do seguro opcional
|
||||
editarEmpresaController.indJurosCredito= Habilita juros no cartão de crédito
|
||||
editarEmpresaController.indHabilitaVendaDeBilheteSemelhante= Hailita a venda de bilhete semelhante na mesma cesta de compra.
|
||||
editarEmpresaController.indHabilitaVendaDeBilheteSemelhante.help = Habilita a venda de bilhetes semelhante na mesma cesta de compra, respeitando o preço do primeiro bilhete.
|
||||
|
||||
|
|
|
|||
|
|
@ -1020,15 +1020,12 @@
|
|||
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.indSegundaViaSeguroOpcional')}" style="cursor: help" />
|
||||
</hlayout>
|
||||
</groupbox>
|
||||
|
||||
</row>
|
||||
|
||||
|
||||
|
||||
<row>
|
||||
<row>
|
||||
<groupbox>
|
||||
<caption
|
||||
label="${c:l('editarEmpresaController.indHabilitaVendaDeBilheteSemelhante')}" />
|
||||
|
||||
<hlayout>
|
||||
<checkbox
|
||||
id="chkIndHabilitaVendaDeBilheteSemelhante"
|
||||
|
|
@ -1037,15 +1034,19 @@
|
|||
src="/gui/img/Question_mark_1.png"
|
||||
tooltiptext="${c:l('editarEmpresaController.indHabilitaVendaDeBilheteSemelhante.help')}"
|
||||
style="cursor: help" />
|
||||
|
||||
|
||||
</hlayout>
|
||||
</groupbox>
|
||||
|
||||
|
||||
</row>
|
||||
<groupbox>
|
||||
<caption label="${c:l('editarEmpresaController.indJurosCredito')}" />
|
||||
|
||||
<hlayout>
|
||||
<checkbox id="chkIndJurosCredito" value="@{winEditarEmpresa$composer.empresa.indJurosCredito}" />
|
||||
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.indJurosCredito')}" style="cursor: help" />
|
||||
</hlayout>
|
||||
</groupbox>
|
||||
</row>
|
||||
</rows>
|
||||
|
||||
|
||||
</grid>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
|
|
|
|||
|
|
@ -74,6 +74,24 @@
|
|||
converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
|
||||
|
||||
</row>
|
||||
<row>
|
||||
<label
|
||||
value="${c:l('busquedaTarjetaCreditoController.parcelaMinima.label')}" />
|
||||
<textbox id="txtTarifaMinima"
|
||||
constraint="no zero, no negative" precision="5"
|
||||
scale="2"
|
||||
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
|
||||
value="@{winEditarTarjetaCredito$composer.tarjetaCredito.tarifaMinima,
|
||||
converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
|
||||
|
||||
</row>
|
||||
<row>
|
||||
<label
|
||||
value="${c:l('busquedaTarjetaCreditoController.indAplicarJuros.label')}" />
|
||||
<checkbox id="chkAplicaVenda"
|
||||
checked="@{winEditarTarjetaCredito$composer.tarjetaCredito.indAplicaVenda}" />
|
||||
</row>
|
||||
|
||||
</rows>
|
||||
</grid>
|
||||
</window>
|
||||
|
|
|
|||
Loading…
Reference in New Issue