diff --git a/pom.xml b/pom.xml index 783df8d2e..889c4b006 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.0.19 + 1.0.20 rj-releases diff --git a/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java b/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java index bb36db74b..0b46d7de6 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java +++ b/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java @@ -95,5 +95,10 @@ public enum TipoEventoExtra { public String toString() { return "TARIFA_SAFER"; } + }, + JUROS_CARTAO_CREDITO{ + public String toString() { + return "JUROS_CARTAO_CREDITO"; + } }; } diff --git a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java index fb475565a..db424da00 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Empresa.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Empresa.java @@ -408,6 +408,9 @@ public class Empresa implements Serializable, Auditavel { @Column(name = "INDSEGUNDAVIASEGOPCIONAL") private Boolean indSegundaViaSegOpcional; + + @Column(name = "INDJUROSCREDITO") + private Boolean indJurosCredito; @Transient @NaoAuditar @@ -1516,4 +1519,12 @@ public class Empresa implements Serializable, Auditavel { public void setIndSegundaViaSegOpcional(Boolean indSegundaViaSegOpcional) { this.indSegundaViaSegOpcional = indSegundaViaSegOpcional; } + + public Boolean getIndJurosCredito() { + return indJurosCredito; + } + + public void setIndJurosCredito(Boolean indJurosCredito) { + this.indJurosCredito = indJurosCredito; + } } diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java b/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java index 84aa12900..eefcc9ced 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java +++ b/src/com/rjconsultores/ventaboletos/entidad/TarjetaCredito.java @@ -46,6 +46,10 @@ public class TarjetaCredito implements Serializable { @OneToOne @JoinColumn(name = "EMPRESA_ID") private Empresa empresa; + @Column(name = "TARIFAMINIMA") + private BigDecimal tarifaMinima; + @Column(name = "INDAPLICAVENDA") + private Boolean indAplicaVenda; public Integer getTarjetaCreditoId() { return tarjetaCreditoId; @@ -118,6 +122,22 @@ public class TarjetaCredito implements Serializable { public void setEmpresa(Empresa empresa) { this.empresa = empresa; } + + public BigDecimal getTarifaMinima() { + return tarifaMinima; + } + + public void setTarifaMinima(BigDecimal tarifaMinima) { + this.tarifaMinima = tarifaMinima; + } + + public Boolean getIndAplicaVenda() { + return indAplicaVenda; + } + + public void setIndAplicaVenda(Boolean indAplicaVenda) { + this.indAplicaVenda = indAplicaVenda; + } @Override public int hashCode() { @@ -143,4 +163,5 @@ public class TarjetaCredito implements Serializable { return false; return true; } + }