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

Implementações na OCD feat bug#AL-3779' (!471) from AL-3779 into master 

Reviewed-on: adm/VentaBoletosAdm#471
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.63.0
fabio 2024-04-05 11:30:39 +00:00
parent 3901f8e84c d3b7016cbd
commit 89985de3f4
6 changed files with 27 additions and 5 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.62.0</version>
<version>1.63.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.43.2</modelWeb.version>
<flyway.version>1.35.0</flyway.version>
<modelWeb.version>1.44.0</modelWeb.version>
<flyway.version>1.36.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

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

@ -81,6 +81,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
private Checkbox chkIndsempregerarapagar;
private Checkbox chkIndOCDPorFormadePagamento;
private Row rowIndOCDPorFormadePagamento;
private Checkbox chkindEstornoPix;
private Radio rdSomenteCartao;
@ -138,6 +139,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
}else{
ptoVtaOCDParamList.setData(removerOCDPtoVtaParamInativo(ocdParamCorrente.getListOCDPtoVtaParam()));
}
chkindEstornoPix.setChecked(ocdParamCorrente.getIndEstornoPix());
}
private List<OCDPtoVtaParam> removerOCDPtoVtaParamInativo(List<OCDPtoVtaParam> listOCDPtoVtaParam){
@ -228,7 +230,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
ocdParamCorrente.setIndOCDPorFormadePagamento(chkIndOCDPorFormadePagamento.isChecked());
ocdParamCorrente.setIndtotalbilhete(chkIndtotalbilhete.isChecked());
ocdParamCorrente.setIndsempregerarapagar(chkIndsempregerarapagar.isChecked());
ocdParamCorrente.setIndEstornoPix(chkindEstornoPix.isChecked());
if (ocdParamCorrente.getOcdparamId() == null){
isSuscribir = true;
}
@ -411,4 +413,14 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
this.chkIndsempregerarapagar = chkIndsempregerarapagar;
}
public Checkbox getChkindEstornoPix() {
return chkindEstornoPix;
}
public void setChkindEstornoPix(Checkbox chkindEstornoPix) {
this.chkindEstornoPix = chkindEstornoPix;
}
}

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

@ -8189,6 +8189,7 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de pagamento para ge
busquedaOCDParamController.SomenteCartao.label = Somente cartão
busquedaOCDParamController.TodasFormasPagamento.label = Todas as formas de pagamento
busquedaOCDParamController.SomenteCartaoTooltiptext.value = Contempla as formas de pagamento crédito e débito
busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão
#complejidad contrasena

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

@ -8585,6 +8585,8 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de Pago Para la Gene
busquedaOCDParamController.SomenteCartao.label = Solo Tarjeta
busquedaOCDParamController.TodasFormasPagamento.label = Todas Las Formas de Pago
busquedaOCDParamController.SomenteCartaoTooltiptext.value = Contempla as Las Formas de Pago crédito e débito
busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão
# Relatorio Receita Embarcada Servico Controller
relatorioReceitaEmbarcadaServicoController.window.title = Reporte de Receta Embarcada por Corrida

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

@ -8255,6 +8255,7 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de pagamento para ge
busquedaOCDParamController.SomenteCartao.label = Somente cartão
busquedaOCDParamController.TodasFormasPagamento.label = Todas as formas de pagamento
busquedaOCDParamController.SomenteCartaoTooltiptext.value = Contempla as formas de pagamento crédito e débito
busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão
#complejidad contrasena

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

@ -68,6 +68,12 @@
</hbox>
</radiogroup>
</row>
<row>
<label value="${c:l('busquedaOCDParamController.indestornoPix.label')}" />
<checkbox id="chkindEstornoPix" value="@{winEditarOCDParam$composer.ocdParamCorrente.indOCDTroca}" checked="false" />
</row>
<row>
<label value="${c:l('busquedaOCDParamController.FormaPagamentoOCD.label')}" />
<radiogroup id="grTipoFormaPagamento">