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

fixes bug#AL-4463

master
Aristides dos Reis Júnior 2024-10-03 10:47:26 -03:00
parent 9ff88ec40b
commit 19f569d3f3
7 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.149.2</version>
<version>1.150.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.112.1</modelWeb.version>
<flyway.version>1.97.0</flyway.version>
<modelWeb.version>1.113.0</modelWeb.version>
<flyway.version>1.98.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

25
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java
View File

@ -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;

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

@ -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

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

@ -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

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

@ -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

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

@ -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

4
web/gui/catalogos/editarOCDParam.zul
View File

@ -85,6 +85,10 @@
</hbox>
</radiogroup>
</row>
<row id="rowIndReembolsoAdmin">
<label value="${c:l('busquedaOCDParamController.indReembolsoAdmin.label')}" />
<checkbox id="chkIndReembolsoAdmin" value="@{winEditarOCDParam$composer.ocdParamCorrente.indReembolsoAdmin}" checked="false" />
</row>
<row id="rowIndOCDPorFormadePagamento">
<label value="${c:l('busquedaOCDParamController.indOCDPorFormadePagamento.label')}" />
<checkbox id="chkIndOCDPorFormadePagamento" value="@{winEditarOCDParam$composer.ocdParamCorrente.indOCDPorFormadePagamento}" checked="false" />