From 19f569d3f34003ccd7e8b51c1e10293df83b4ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Thu, 3 Oct 2024 10:47:26 -0300 Subject: [PATCH] fixes bug#AL-4463 --- pom.xml | 6 ++--- .../catalogos/EditarOCDParamController.java | 25 ++++++++++++++++++- web/WEB-INF/i3-label_en.label | 1 + web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_fr_FR.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/catalogos/editarOCDParam.zul | 4 +++ 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 79c5cf753..df452615a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.149.2 + 1.150.0 war - 1.112.1 - 1.97.0 + 1.113.0 + 1.98.0 UTF-8 diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java index b0ca0fe63..fbfcf4790 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java @@ -79,8 +79,10 @@ public class EditarOCDParamController extends MyGenericForwardComposer { private Radio rdPenalizacionOrgaoConcedente; private Checkbox chkIndtotalbilhete; private Checkbox chkIndsempregerarapagar; + private Checkbox chkIndReembolsoAdmin; private Checkbox chkIndOCDPorFormadePagamento; private Row rowIndOCDPorFormadePagamento; + private Row rowIndReembolsoAdmin; private Checkbox chkindEstornoPix; @@ -127,6 +129,8 @@ public class EditarOCDParamController extends MyGenericForwardComposer { chkOCDTransferencia.setChecked(ocdParamCorrente.getIndOCDTransferencia() == null ? false : ocdParamCorrente.getIndOCDTransferencia()); chkIndtotalbilhete.setChecked(ocdParamCorrente.getIndtotalbilhete() == null ? false : ocdParamCorrente.getIndtotalbilhete()); chkIndsempregerarapagar.setChecked(ocdParamCorrente.getIndsempregerarapagar() == null ? false : ocdParamCorrente.getIndsempregerarapagar()); + chkIndReembolsoAdmin.setChecked(ocdParamCorrente.getIndReembolsoAdmin()); + rowIndReembolsoAdmin.setVisible(ocdParamCorrente.getIndOcdDinheiro()); chkIndOCDPorFormadePagamento.setChecked(ocdParamCorrente.getIndOCDPorFormadePagamento() == null ? false : ocdParamCorrente.getIndOCDPorFormadePagamento()); rowIndOCDPorFormadePagamento.setVisible(!ocdParamCorrente.getIndOcdDinheiro()); txtPenalizacion.setDisabled(!ocdParamCorrente.getIndPenalizacionOCD()); @@ -162,13 +166,17 @@ public class EditarOCDParamController extends MyGenericForwardComposer { public void onClick$rdSomenteCartao(Event ev) throws InterruptedException { if(rdSomenteCartao.isChecked()) { rowIndOCDPorFormadePagamento.setVisible(true); + rowIndReembolsoAdmin.setVisible(false); + chkIndReembolsoAdmin.setChecked(false); } } public void onClick$rdTodasFormasPagamento(Event ev) throws InterruptedException { if(rdTodasFormasPagamento.isChecked()) { rowIndOCDPorFormadePagamento.setVisible(false); - chkIndOCDPorFormadePagamento.setChecked(false); + chkIndOCDPorFormadePagamento.setChecked(false); + rowIndReembolsoAdmin.setVisible(true); + } } @@ -228,6 +236,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer { ocdParamCorrente.setIndPenalizacionOCD(rdPenalizacionOCD.isChecked()); ocdParamCorrente.setIndOcdDinheiro(rdTodasFormasPagamento.isChecked()); ocdParamCorrente.setIndOCDPorFormadePagamento(chkIndOCDPorFormadePagamento.isChecked()); + ocdParamCorrente.setIndReembolsoAdmin(chkIndReembolsoAdmin.isChecked()); ocdParamCorrente.setIndtotalbilhete(chkIndtotalbilhete.isChecked()); ocdParamCorrente.setIndsempregerarapagar(chkIndsempregerarapagar.isChecked()); ocdParamCorrente.setIndEstornoPix(chkindEstornoPix.isChecked()); @@ -304,6 +313,20 @@ public class EditarOCDParamController extends MyGenericForwardComposer { log.error(ex.toString()); } } + + public void onClick$chkIndReembolsoAdmin(Event ev) throws InterruptedException { + if(chkIndReembolsoAdmin.isChecked()) { + chkindEstornoPix.setChecked(false); + } + } + + public void onClick$chkindEstornoPix(Event ev) throws InterruptedException { + if(chkindEstornoPix.isChecked()) { + chkIndReembolsoAdmin.setChecked(false); + } + } + + public Textbox getTxtDiasPagar() { return txtDiasPagar; diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index e0eb62b91..ff1712dc8 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -1338,6 +1338,7 @@ busquedaOCDParamController.btnPesquisa.label = Search busquedaOCDParamController.diasPagar.label = Days to pay busquedaOCDParamController.empresa.label = Company busquedaOCDParamController.indOCDPorFormadePagamento.label = Generate the OCD separated by payment method +busquedaOCDParamController.indReembolsoAdmin.label = Quitar OCD administrativamente busquedaOCDParamController.indTotalBilhete.help = Apply Fine to Total Ticket, if unchecked, the fine in OCD will only apply to the fare value. busquedaOCDParamController.indTotalBilhete.label = Apply Fine to Total Ticket busquedaOCDParamController.indestornoPix.label = Estonate with pix by default diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 784378a8a..2150cd483 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1332,6 +1332,7 @@ busquedaOCDParamController.btnPesquisa.label = Buscar busquedaOCDParamController.diasPagar.label = Días para pagar busquedaOCDParamController.empresa.label = Empresa busquedaOCDParamController.indOCDPorFormadePagamento.label = Gerar a OCD separada por forma de pagamento +busquedaOCDParamController.indReembolsoAdmin.label = Quitar OCD administrativamente busquedaOCDParamController.indTotalBilhete.help = Aplicar Multa no Total do Bilhete, caso desmarcado a multa na OCD incidirá apenas no valor da tarifa. busquedaOCDParamController.indTotalBilhete.label = Penalización en el Total del Pasaje busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label index cacdaa173..c0e2b422a 100644 --- a/web/WEB-INF/i3-label_fr_FR.label +++ b/web/WEB-INF/i3-label_fr_FR.label @@ -1336,6 +1336,7 @@ busquedaOCDParamController.btnPesquisa.label = Recherche busquedaOCDParamController.diasPagar.label = Jours pour payer busquedaOCDParamController.empresa.label = Entreprise busquedaOCDParamController.indOCDPorFormadePagamento.label = Générer l'OCD séparé par mode de paiement +busquedaOCDParamController.indReembolsoAdmin.label = Quitar OCD administrativamente busquedaOCDParamController.indTotalBilhete.help = Appliquer l'amende au billet total. Si cette case n'est pas cochée, l'amende dans l'OCD ne s'appliquera qu'à la valeur du tarif. busquedaOCDParamController.indTotalBilhete.label = Appliquer une amende au ticket total busquedaOCDParamController.indestornoPix.label = Estonate avec pix par défaut diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 3f336202c..ef2487cd8 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1333,6 +1333,7 @@ busquedaOCDParamController.btnPesquisa.label = Buscar busquedaOCDParamController.diasPagar.label = Dias para pagar busquedaOCDParamController.empresa.label = Empresa busquedaOCDParamController.indOCDPorFormadePagamento.label = Gerar a OCD separada por forma de pagamento +busquedaOCDParamController.indReembolsoAdmin.label = Quitar OCD administrativamente busquedaOCDParamController.indTotalBilhete.help = Aplicar Multa no Total do Bilhete, caso desmarcado a multa na OCD incidirá apenas no valor da tarifa. busquedaOCDParamController.indTotalBilhete.label = Aplicar Multa no Total do Bilhete busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão diff --git a/web/gui/catalogos/editarOCDParam.zul b/web/gui/catalogos/editarOCDParam.zul index 8aa4a3031..74579aa08 100644 --- a/web/gui/catalogos/editarOCDParam.zul +++ b/web/gui/catalogos/editarOCDParam.zul @@ -85,6 +85,10 @@ + +