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

Merge pull request 'fixes bug #AL-2209' (!115) from AL-2209 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/115
master 1.0.92
pinheiro 2023-04-01 02:19:36 +00:00
parent 753df5b8bb 404aafc3fc
commit 59d5feea31
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.0.91</version> <version>1.0.92</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -310,10 +310,15 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked()); formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked());
formaPago.setIndVoucherRodoviaria(chkIndVoucherRodoviaria.isChecked()); formaPago.setIndVoucherRodoviaria(chkIndVoucherRodoviaria.isChecked());
formaPago.setIndTransferenciaReativacao(chkIndTransferenciaReativacao.isChecked()); formaPago.setIndTransferenciaReativacao(chkIndTransferenciaReativacao.isChecked());
if(radioPor.isChecked()) {
formaPago.setValorDesconto(valorDescontoBox.getValue()); formaPago.setPercentualDesconto(percentualDescontoBox.getValue());
formaPago.setPercentualDesconto(percentualDescontoBox.getValue()); formaPago.setValorDesconto(null);
formaPago.setIndPercentualDesconto(radioPor.isChecked() ? true : false); formaPago.setIndPercentualDesconto(true);
}else {
formaPago.setIndPercentualDesconto(false);
formaPago.setValorDesconto(valorDescontoBox.getValue());
formaPago.setPercentualDesconto(null);
}
if (formaPago.getFormapagoId() == null) { if (formaPago.getFormapagoId() == null) {
List<FormaPago> lsFP = List<FormaPago> lsFP =

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

@ -144,14 +144,14 @@
<label <label
value="${c:l('editarFormaPagoController.percentualDescontoFormaPagamento.label')}" /> value="${c:l('editarFormaPagoController.percentualDescontoFormaPagamento.label')}" />
<decimalbox id="percentualDescontoBox" <decimalbox id="percentualDescontoBox"
format="##,##%" constraint="no negative" maxlength="5" width="98%" format="##,##%" constraint="no negative" maxlength="6" width="98%"
value="@{winEditarFormaPago$composer.formaPago.percentualDesconto}" /> value="@{winEditarFormaPago$composer.formaPago.percentualDesconto}" />
</row> </row>
<row id="rowValorDesconto"> <row id="rowValorDesconto">
<label value="${c:l('editarFormaPagoController.valorDescontoFormaPagamento.label')}" /> <label value="${c:l('editarFormaPagoController.valorDescontoFormaPagamento.label')}" />
<decimalbox id="valorDescontoBox" <decimalbox id="valorDescontoBox"
width="98%" constraint="no negative" maxlength="5" format="#,##0.00" width="98%" constraint="no negative" maxlength="6" format="#,##0.00"
value="@{winEditarFormaPago$composer.formaPago.valorDesconto}" /> value="@{winEditarFormaPago$composer.formaPago.valorDesconto}" />
</row> </row>