fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#AL-2525

master
Lucas 2023-05-12 18:06:28 -03:00
parent 47001d756f
commit 169323bd5b
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

10
src/com/rjconsultores/ventaboletos/entidad/EmpresaAdyenConfig.java
View File

@ -34,6 +34,8 @@ public class EmpresaAdyenConfig implements Serializable {
private String apiKey; private String apiKey;
@Column(name = "INDPRODUCAO") @Column(name = "INDPRODUCAO")
private Boolean indProducao; private Boolean indProducao;
@Column(name = "MERCHANTACCOUNTADYEN")
private String merchantAccountAdyen;
@Column(name = "ACTIVO") @Column(name = "ACTIVO")
private Boolean activo; private Boolean activo;
@Column(name = "FECMODIF") @Column(name = "FECMODIF")
@ -102,6 +104,14 @@ public class EmpresaAdyenConfig implements Serializable {
this.usuarioId = usuarioId; this.usuarioId = usuarioId;
} }
public String getMerchantAccountAdyen() {
return merchantAccountAdyen;
}
public void setMerchantAccountAdyen(String merchantAccountAdyen) {
this.merchantAccountAdyen = merchantAccountAdyen;
}
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;

13
src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java
View File

@ -343,6 +343,9 @@ public class PuntoVenta implements Serializable, Auditavel<PuntoVenta> {
@Column(name = "INDBLOQUEARDESCONTOWEB") @Column(name = "INDBLOQUEARDESCONTOWEB")
private Boolean indBloquearDescontoWEB; private Boolean indBloquearDescontoWEB;
@Column(name = "MERCHANTSTOREADYEN")
private String merchantStoreAdyen;
public List<CobrancaAdcPuntoVenta> getCobrancaAdicionalList() { public List<CobrancaAdcPuntoVenta> getCobrancaAdicionalList() {
return cobrancaAdicionalList; return cobrancaAdicionalList;
} }
@ -1366,7 +1369,13 @@ public class PuntoVenta implements Serializable, Auditavel<PuntoVenta> {
public void setIndBloquearDescontoWEB(Boolean indBloquearDescontoWEB) { public void setIndBloquearDescontoWEB(Boolean indBloquearDescontoWEB) {
this.indBloquearDescontoWEB = indBloquearDescontoWEB; this.indBloquearDescontoWEB = indBloquearDescontoWEB;
} }
public String getMerchantStoreAdyen() {
return merchantStoreAdyen;
}
public void setMerchantStoreAdyen(String merchantStoreAdyen) {
this.merchantStoreAdyen = merchantStoreAdyen;
}
} }