From 8c46e944c23a1d3b42cce5e2c0233ad9ba03c7ce Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Thu, 15 Jun 2023 20:30:38 -0300
Subject: [PATCH] bug#AL-2574

---
 pom.xml                                       |  2 +-
 .../constantes/TipoEventoExtra.java           |  1 +
 .../ventaboletos/entidad/FormaPago.java       | 22 +++++++++++++++++++
 .../ventaboletos/enums/TipoFormapago.java     |  1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 51a7aa77f..95c64faeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.5.3</version>
+	<version>1.5.4</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>
diff --git a/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java b/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java
index 7ba76e99a..dd215edc3 100644
--- a/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java
+++ b/src/com/rjconsultores/ventaboletos/constantes/TipoEventoExtra.java
@@ -21,6 +21,7 @@ public enum TipoEventoExtra {
 	TAXA_CONVENIENCIA_SVI("TAXA_CONVENIENCIA_SVI"),
 	TARIFA_SAFER("TARIFA_SAFER"),
 	JUROS_CARTAO_CREDITO("JUROS_CARTAO_CREDITO"),
+	EMBARQUE_JA("EMBARQUE_JA"),
 	;
 
 	private String descricao;
diff --git a/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java b/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java
index cb351c9b4..3c4281efd 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java
@@ -120,6 +120,12 @@ public class FormaPago implements Serializable, Auditavel<FormaPago> {
 	@Column(name = "TIPOEVENTOEXTRA_ID")
 	private Long tipoEventoExtraId;
 	
+	@Column(name = "INDESTORNO_RECEITA_DESPESA_CR")
+	private Boolean indEstornoReceitaDespesaCredito;
+	
+	@Column(name = "TIPOEVENTOEXTRACREDITO_ID")
+	private Long tipoEventoExtraIdCredito;
+	
 	@Transient
 	@NaoAuditar
 	private FormaPago formaPagoClone;
@@ -385,6 +391,22 @@ public class FormaPago implements Serializable, Auditavel<FormaPago> {
 		this.percentualDesconto = percentualDesconto;
 	}
 
+	public Boolean getIndEstornoReceitaDespesaCredito() {
+		return indEstornoReceitaDespesaCredito == null ? false : indEstornoReceitaDespesaCredito;
+	}
+
+	public void setIndEstornoReceitaDespesaCredito(Boolean indEstornoReceitaDespesaCredito) {
+		this.indEstornoReceitaDespesaCredito = indEstornoReceitaDespesaCredito;
+	}
+
+	public Long getTipoEventoExtraIdCredito() {
+		return tipoEventoExtraIdCredito;
+	}
+
+	public void setTipoEventoExtraIdCredito(Long tipoEventoExtraIdCredito) {
+		this.tipoEventoExtraIdCredito = tipoEventoExtraIdCredito;
+	}
+
 	@Override
 	public FormaPago getCloneObject() throws CloneNotSupportedException {
 		return formaPagoClone;
diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java b/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java
index 3d2abd24f..06b8fee7b 100644
--- a/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java
+++ b/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java
@@ -23,6 +23,7 @@ public enum TipoFormapago {
 	MOBIPIX(16,Labels.getLabel("editarFormaPagoController.lblMobiPix.label")),
 	ADYEN(17,Labels.getLabel("editarFormaPagoController.lblAdyen.label")),
 	MERCADO_PAGO(18,Labels.getLabel("editarFormaPagoController.lblMercadoPago.label")),
+	EMBARQUE_JA(19,Labels.getLabel("editarFormaPagoController.lblEmbarqueJa.label")),
 	;
 	
 	private Integer valor;