diff --git a/pom.xml b/pom.xml
index 51a7aa77f..95c64faeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
br.com.rjconsultores
ModelWeb
- 1.5.3
+ 1.5.4
rj-releases
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 {
@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 {
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;