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

Merge pull request 'Ajustes envio email Izypay fixes bug#AL-4812' (!665) from AL-4812 into master 

Reviewed-on: adm/VentaBoletosAdm#665
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master
fabio 2024-08-21 11:18:30 +00:00
parent de18d70261 18c535186f
commit 46879d749e
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,3 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
import java.io.ByteArrayInputStream;
@ -303,7 +299,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
//IziPay
private Textbox txtIziPayClientId;
private Textbox txtIziPaySecret;
private Textbox txtIziPayDiasCancela;
private Textbox txtIziPayMinutosCancela;
private Textbox txtIziPayUrl;
//Recarga Celular
@ -762,7 +758,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
txtIziPayClientId.setText(empresaIziPayConfig.getClientId());
txtIziPaySecret.setText(empresaIziPayConfig.getSecret());
txtIziPayUrl.setText(empresaIziPayConfig.getUrl());
txtIziPayDiasCancela.setText(empresaIziPayConfig.getDiasCancela().toString());
txtIziPayMinutosCancela.setText(empresaIziPayConfig.getMinutosCancela().toString());
}
if (empresaRecargaConfig != null) {
@ -1763,10 +1759,10 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
empresaIziPayConfig.setSecret(txtIziPaySecret.getValue());
empresaIziPayConfig.setUrl(txtIziPayUrl.getValue());
empresaIziPayConfig.setDiasCancela(
StringUtils.isEmpty(txtIziPayDiasCancela.getValue())?
empresaIziPayConfig.setMinutosCancela(
StringUtils.isEmpty(txtIziPayMinutosCancela.getValue())?
30:
Integer.parseInt(txtIziPayDiasCancela.getValue())
Integer.parseInt(txtIziPayMinutosCancela.getValue())
);
}

6
web/gui/catalogos/editarEmpresa.zul
View File

@ -2348,8 +2348,8 @@
</row>
<row>
<label
value="${c:l('editarEmpresaController.lblDiasCancela.value')}" />
<textbox id="txtIziPayDiasCancela"
value="${c:l('editarEmpresaController.lblMinutosCancela.value')}" />
<textbox id="txtIziPayMinutosCancela"
width="50%"
maxlength="20"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxCustom" />
@ -3142,7 +3142,7 @@
<listheader image="/gui/img/create_doc.gif"
label="${c:l('editarEmpresaController.cmbConfigLayoutTiposVenda')}" sort="auto(tipoVenta.desctipoventa)" />
<listheader image="/gui/img/create_doc.gif"
label="${c:l('editarEmpresaController.cmbImpresionLayoutConfig')} sort="auto(impresionlayoutconfigId.descricao)" />
label="${c:l('editarEmpresaController.cmbImpresionLayoutConfig')}" sort="auto(impresionlayoutconfigId.descricao)" />
<listheader image="/gui/img/create_doc.gif"
label="${c:l('editarEmpresaController.lblLayoutEmail')}" sort="auto(indEmail)" />
</listhead>