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

Merge pull request 'AL-2895' (!73) from AL-2895 into master 

Reviewed-on: adm/ModelWeb#73
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Lucas Taiã 2023-07-06 13:24:25 +00:00
parent d6c972ddc2 5538817117
commit d835c11eae
3 changed files with 12 additions and 12 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.6.5</version>
<version>1.6.6</version>
<distributionManagement>
<repository>
<id>rj-releases</id>

11
src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java
View File

@ -80,6 +80,9 @@ public class PtovtaEmpresa implements Serializable, Auditavel<PtovtaEmpresa>{
@Column(name = "NUMSITEF")
private String numeroSitef;
@Column(name = "MERCHANTSTOREADYEN")
private String merchantStoreAdyen;
@NaoAuditar
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@JoinColumn(name = "PTOVTAEMPRESA_ID", referencedColumnName = "PTOVTAEMPRESA_ID")
@ -233,6 +236,14 @@ public class PtovtaEmpresa implements Serializable, Auditavel<PtovtaEmpresa>{
this.contasBancaria = contasBancaria;
}
public String getMerchantStoreAdyen() {
return merchantStoreAdyen;
}
public void setMerchantStoreAdyen(String merchantStoreAdyen) {
this.merchantStoreAdyen = merchantStoreAdyen;
}
public String getContasBancariaInfo() {
if (!getContasBancaria().isEmpty()) {
StringBuilder sb = new StringBuilder();

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

@ -346,9 +346,6 @@ public class PuntoVenta implements Serializable, Auditavel<PuntoVenta> {
@Column(name = "INDBLOQUEARDESCONTOWEB")
private Boolean indBloquearDescontoWEB;
@Column(name = "MERCHANTSTOREADYEN")
private String merchantStoreAdyen;
public List<CobrancaAdcPuntoVenta> getCobrancaAdicionalList() {
return cobrancaAdicionalList;
}
@ -1373,14 +1370,6 @@ public class PuntoVenta implements Serializable, Auditavel<PuntoVenta> {
this.indBloquearDescontoWEB = indBloquearDescontoWEB;
}
public String getMerchantStoreAdyen() {
return merchantStoreAdyen;
}
public void setMerchantStoreAdyen(String merchantStoreAdyen) {
this.merchantStoreAdyen = merchantStoreAdyen;
}
public Integer getTempoMaxServicoEmVenda() {
return tempoMaxServicoEmVenda;
}