diff --git a/pom.xml b/pom.xml index f75634526..93df80b49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.3.3 + 1.3.4 rj-releases diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java b/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java index 730a9e76c..3024de118 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java +++ b/src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java @@ -34,6 +34,8 @@ public class EmpresaAdyenConfig implements Serializable { private String apiKey; @Column(name = "INDPRODUCAO") private Boolean indProducao; + @Column(name = "MERCHANTACCOUNTADYEN") + private String merchantAccountAdyen; @Column(name = "ACTIVO") private Boolean activo; @Column(name = "FECMODIF") @@ -102,6 +104,14 @@ public class EmpresaAdyenConfig implements Serializable { this.usuarioId = usuarioId; } + public String getMerchantAccountAdyen() { + return merchantAccountAdyen; + } + + public void setMerchantAccountAdyen(String merchantAccountAdyen) { + this.merchantAccountAdyen = merchantAccountAdyen; + } + @Override public int hashCode() { final int prime = 31; diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java index ecaeda15d..cd7c0548f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java @@ -343,6 +343,9 @@ public class PuntoVenta implements Serializable, Auditavel { @Column(name = "INDBLOQUEARDESCONTOWEB") private Boolean indBloquearDescontoWEB; + @Column(name = "MERCHANTSTOREADYEN") + private String merchantStoreAdyen; + public List getCobrancaAdicionalList() { return cobrancaAdicionalList; } @@ -1366,7 +1369,13 @@ public class PuntoVenta implements Serializable, Auditavel { public void setIndBloquearDescontoWEB(Boolean indBloquearDescontoWEB) { this.indBloquearDescontoWEB = indBloquearDescontoWEB; } - - + + public String getMerchantStoreAdyen() { + return merchantStoreAdyen; + } + + public void setMerchantStoreAdyen(String merchantStoreAdyen) { + this.merchantStoreAdyen = merchantStoreAdyen; + } } \ No newline at end of file