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

Merge pull request 'fixes bug#AL-2254' (!81) from AL-2254 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/81
Reviewed-by: wallace <wallace@rjconsultores.com.br>
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.0.62
Gleison da Cruz 2023-02-28 17:10:11 +00:00
parent b4cb921834 5e7da0303f
commit 74be02e8f8
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.0.61</version> <version>1.0.62</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
View File

@ -1922,15 +1922,20 @@ public void onClick$btnTestEmailFlexBus(Event ev) throws InterruptedException {
RetornoStoreVO retornoStoreVO = MercadoPagoService.getInstance().retornarStoreMercadoPago( RetornoStoreVO retornoStoreVO = MercadoPagoService.getInstance().retornarStoreMercadoPago(
txtUserIdMercadoPago.getValue(), txtUrlApiMercadoPago.getValue(), txtTokenMercadoPago.getValue()); txtUserIdMercadoPago.getValue(), txtUrlApiMercadoPago.getValue(), txtTokenMercadoPago.getValue());
if (retornoStoreVO != null){
for (StoreVO vo : retornoStoreVO.getResults()) { for (StoreVO vo : retornoStoreVO.getResults()) {
if (store != null && vo.toString().equals(store)) { if (store != null && vo.toString().equals(store)) {
this.storeVO = vo; this.storeVO = vo;
} }
lsStoreMercadoPago.add(vo); lsStoreMercadoPago.add(vo);
} }
}
RetornoPosVO retornoPosVO = MercadoPagoService.getInstance() RetornoPosVO retornoPosVO = MercadoPagoService.getInstance()
.retornarPosMercadoPago(txtUrlApiMercadoPago.getValue(), txtTokenMercadoPago.getValue()); .retornarPosMercadoPago(txtUrlApiMercadoPago.getValue(), txtTokenMercadoPago.getValue());
if (retornoPosVO != null) {
for (PosVO vo : retornoPosVO.getResults()) { for (PosVO vo : retornoPosVO.getResults()) {
if (pos != null && vo.toString().equals(pos)) { if (pos != null && vo.toString().equals(pos)) {
this.posVO = vo; this.posVO = vo;
@ -1938,6 +1943,7 @@ public void onClick$btnTestEmailFlexBus(Event ev) throws InterruptedException {
lsPosMercadoPago.add(vo); lsPosMercadoPago.add(vo);
} }
} }
}
public Combobox getCmbEstadoInscEstadual() { public Combobox getCmbEstadoInscEstadual() {
return cmbEstadoInscEstadual; return cmbEstadoInscEstadual;