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

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

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/111
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.0.88
pinheiro 2023-03-31 13:26:54 +00:00
parent f76e629b65 44e33a3014
commit f3e04883df
4 changed files with 586 additions and 487 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.0.87</version>
<version>1.0.88</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.0.46</modelWeb.version>
<flyway.version>1.0.29</flyway.version>
<modelWeb.version>1.0.47</modelWeb.version>
<flyway.version>1.0.31</flyway.version>
</properties>
<distributionManagement>

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

File diff suppressed because it is too large Load Diff

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

@ -1403,6 +1403,13 @@ editarFormaPagoController.lblCateiraDigitalTef.label = TEF
editarFormaPagoController.lblCateiraDigitalTpi.label = TPI
editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link
editarFormaPagoController.lblETicket.label=E_Ticket
editarFormaPagoController.lblIndPercentualDesconto.value= Desconto Forma Pagamento
editarFormaPagoController.lblDescuentoImporte.value=Absoluto
editarFormaPagoController.lblDescuentoPorc.value=Percentual
editarFormaPagoController.percentualDescontoFormaPagamento.label= Percentual desconto
editarFormaPagoController.valorDescontoFormaPagamento.label= Valor desconto
# Muestra o tipo de Pesquisa Ponto Venda
busquedaTipoPuntoVentaController.window.title = Canal de Venda

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

@ -6,7 +6,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winEditarFormaPago" border="normal"
apply="${editarFormaPagoController}" width="400px"
apply="${editarFormaPagoController}" width="450px"
contentStyle="overflow:auto"
title="${c:l('editarFormaPagoController.window.title')}">
<toolbar>
@ -128,6 +128,33 @@
value="${c:l('editarFormaPagoController.lblSomenteTarifa.label')}" />
<checkbox id="chkCompoeTarifa" checked="false"/>
</row>
<row id="rowIndPercentualDesconto" spans="1,3" >
<label
value="${c:l('editarFormaPagoController.lblIndPercentualDesconto.value')}" />
<radiogroup id="desconto">
<radio id="radioImp"
label="${c:l('editarFormaPagoController.lblDescuentoImporte.value')}" />
<radio id="radioPor"
label="${c:l('editarFormaPagoController.lblDescuentoPorc.value')}" />
</radiogroup>
</row>
<row id="rowPercentualDesconto">
<label
value="${c:l('editarFormaPagoController.percentualDescontoFormaPagamento.label')}" />
<decimalbox id="percentualDescontoBox"
format="##,##%" constraint="no negative" maxlength="5" width="98%"
value="@{winEditarFormaPago$composer.formaPago.percentualDesconto}" />
</row>
<row id="rowValorDesconto">
<label value="${c:l('editarFormaPagoController.valorDescontoFormaPagamento.label')}" />
<decimalbox id="valorDescontoBox"
width="98%" constraint="no negative" maxlength="5" format="#,##0.00"
value="@{winEditarFormaPago$composer.formaPago.valorDesconto}" />
</row>
</rows>
</grid>