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

fixes bug#20116 

dev: Thiago Veloso
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103552 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2020-09-28 13:26:13 +00:00
parent 09db858a3f
commit 790733c228
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
View File

@ -53,6 +53,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
private Button btnApagar;
private BusquedaFormaPagoController busquedaFormaPagoController;
private Checkbox chkIndRestricaoFormaPago;
private Checkbox chkIndTransferenciaReativacao;
private Checkbox chkCompoeTarifaETaxa;
private Checkbox chkCompoeTarifa;
private Radio rd1;
@ -62,6 +63,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
private static Logger log = Logger.getLogger(EditarFormaPagoController.class);
private Row rowEquivalencia;
private Row rowRestricaoFormaPago;
private Row rowTransferenciaReativacao;
private Row rowTarifaTaxa;
private Row rowSomenteTarifa;
private boolean exibeTipoRestricaoFormaPago;
@ -95,6 +97,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
*/
if (formaPago.getCveSistema() != null) {
rowRestricaoFormaPago.setVisible(false);
rowTransferenciaReativacao.setVisible(false);
rowTarifaTaxa.setVisible(false);
rowSomenteTarifa.setVisible(false);
}else if(formaPago.getIndRestricaoFormaPago() == null ||
@ -128,6 +131,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
chkIndEstorno.setChecked(formaPago.getIndProcessoEstorno());
chkIndVoucherRodoviaria.setChecked(formaPago.getIndVoucherRodoviaria());
chkIndTransferenciaReativacao.setChecked(formaPago.getIndTransferenciaReativacao());
if (formaPago.getFormapagoId() == 1) {
cmbTipoFormapago.setDisabled(Boolean.TRUE);
@ -225,6 +229,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked());
formaPago.setIndVoucherRodoviaria(chkIndVoucherRodoviaria.isChecked());
formaPago.setIndTransferenciaReativacao(chkIndTransferenciaReativacao.isChecked());
if (formaPago.getFormapagoId() == null) {
List<FormaPago> lsFP =
@ -232,7 +237,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
if (lsFP.isEmpty()) {
formaPagoService.suscribir(formaPago);
formaPagoList.addItem(formaPago);
formaPagoList.addItemNovo(formaPago);
Messagebox.show(
Labels.getLabel("editarFormaPagoController.MSG.suscribirOK"),
@ -303,6 +308,13 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
return chkIndRestricaoFormaPago;
}
/**
* @return the chkIndTransferenciaReativacao
*/
public Checkbox getChkIndTransferenciaReativacao() {
return chkIndTransferenciaReativacao;
}
/**
* @return the chkCompoeTarifaETaxa
*/
@ -317,6 +329,14 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
return chkCompoeTarifa;
}
/**
* @param chkIndTransferenciaReativacao
* the chkIndTransferenciaReativacao to set
*/
public void setChkIndTransferenciaReativacao(Checkbox chkIndTransferenciaReativacao) {
this.chkIndTransferenciaReativacao = chkIndTransferenciaReativacao;
}
/**
* @param chkIndRestricaoFormaPago
* the chkIndRestricaoFormaPago to set

1
web/WEB-INF/i3-label_es_MX.label
View File

@ -1084,6 +1084,7 @@ editarFormaPagoController.lblSomenteTarifa.label=Compone Tarifa
editarFormaPagoController.lblCarteiraDigital.label=Billetera digital
editarFormaPagoController.lblAtivaProcessoEstorno.label=Activa el proceso de contracargo
editarFormaPagoController.lblVoucherRodoviaria.label=Voucher Rodoviária
editarFormaPagoController.lblTransferenciaReativacao.label=Utiliza na Transferência / Reativação
editarFormaPagoController.lblTipoCarteiraDigital.label=Tipo Carteira Digital
editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples

1
web/WEB-INF/i3-label_pt_BR.label
View File

@ -1171,6 +1171,7 @@ editarFormaPagoController.lblSomenteTarifa.label=Compõe Tarifa
editarFormaPagoController.lblCarteiraDigital.label=Carteira Digital
editarFormaPagoController.lblAtivaProcessoEstorno.label=Ativa processo de estorno
editarFormaPagoController.lblVoucherRodoviaria.label=Voucher Rodoviária
editarFormaPagoController.lblTransferenciaReativacao.label=Utiliza na Transferência / Reativação
editarFormaPagoController.lblTipoCarteiraDigital.label=Tipo Carteira Digital
editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples

5
web/gui/catalogos/editarFormaPago.zul
View File

@ -97,6 +97,11 @@
value="${c:l('editarFormaPagoController.lblRestricaoFormaPago.label')}" />
<checkbox id="chkIndRestricaoFormaPago" checked="false"/>
</row>
<row id="rowTransferenciaReativacao">
<label
value="${c:l('editarFormaPagoController.lblTransferenciaReativacao.label')}" />
<checkbox id="chkIndTransferenciaReativacao" checked="false"/>
</row>
<row id="rowTarifaTaxa">
<label
value="${c:l('editarFormaPagoController.lblTarifaTaxa.label')}" />