Merge pull request 'Al-1627' (#17) from Al-1627 into master

Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/17
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: wallace <wallace@rjconsultores.com.br>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.0.19</version>
+	<version>1.0.20</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>

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";
+		}
 	};
 }

src/com/rjconsultores/ventaboletos/entidad/Empresa.java

@@ -408,6 +408,9 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
 	
 	@Column(name = "INDSEGUNDAVIASEGOPCIONAL")
 	private Boolean indSegundaViaSegOpcional;
+	
+	@Column(name = "INDJUROSCREDITO")
+	private Boolean indJurosCredito;
 	
 	@Transient
 	@NaoAuditar
@@ -1516,4 +1519,12 @@ public class Empresa implements Serializable, Auditavel<Empresa> {
 	public void setIndSegundaViaSegOpcional(Boolean indSegundaViaSegOpcional) {
 		this.indSegundaViaSegOpcional = indSegundaViaSegOpcional;
 	}
+
+	public Boolean getIndJurosCredito() {
+		return indJurosCredito;
+	}
+
+	public void setIndJurosCredito(Boolean indJurosCredito) {
+		this.indJurosCredito = indJurosCredito;
+	}
 }

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;
 	}
+
 }