diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java index 09f56b58c..3b29fa46f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java @@ -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 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"), @@ -302,6 +307,13 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { public Checkbox getChkIndRestricaoFormaPago() { 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 diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 3261ed577..b0ce4ef6e 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -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 diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 3e934a8d5..175719d12 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -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 diff --git a/web/gui/catalogos/editarFormaPago.zul b/web/gui/catalogos/editarFormaPago.zul index f2b0dedc9..70a80de8f 100644 --- a/web/gui/catalogos/editarFormaPago.zul +++ b/web/gui/catalogos/editarFormaPago.zul @@ -97,6 +97,11 @@ value="${c:l('editarFormaPagoController.lblRestricaoFormaPago.label')}" /> + +