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

Merge pull request 'bug#AL-1808' (#24) from AL-1808 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/24
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.0.18
aristides 2022-12-22 13:08:42 +00:00
parent e8a74f7b33 3915507299
commit ec17c208c2
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -3,7 +3,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.17</version> <version>1.0.18</version>
<packaging>war</packaging> <packaging>war</packaging>
<distributionManagement> <distributionManagement>
@ -55,13 +55,13 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.0.13</version> <version>1.0.14</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>Flyway</artifactId> <artifactId>Flyway</artifactId>
<version>1.0.5</version> <version>1.0.6</version>
</dependency> </dependency>
<dependency> <dependency>

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

@ -74,6 +74,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
private Checkbox chkIndVoucherRodoviaria; private Checkbox chkIndVoucherRodoviaria;
private Checkbox chkIndETicket;
private Row rowIdEventoExtra; private Row rowIdEventoExtra;
private MyComboboxEstandar cmbTipoFormapago; private MyComboboxEstandar cmbTipoFormapago;
@ -144,6 +146,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
chkIndEstorno.setChecked(formaPago.getIndProcessoEstorno()); chkIndEstorno.setChecked(formaPago.getIndProcessoEstorno());
chkIndVoucherRodoviaria.setChecked(formaPago.getIndVoucherRodoviaria()); chkIndVoucherRodoviaria.setChecked(formaPago.getIndVoucherRodoviaria());
chkIndTransferenciaReativacao.setChecked(formaPago.getIndTransferenciaReativacao()); chkIndTransferenciaReativacao.setChecked(formaPago.getIndTransferenciaReativacao());
chkIndETicket.setChecked(formaPago.getIndETicket());
if (formaPago.getFormapagoId() == 1) { if (formaPago.getFormapagoId() == 1) {
cmbTipoFormapago.setDisabled(Boolean.TRUE); cmbTipoFormapago.setDisabled(Boolean.TRUE);
@ -281,6 +284,7 @@ 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());
formaPago.setIndETicket(chkIndETicket.isChecked());
if (formaPago.getFormapagoId() == null) { if (formaPago.getFormapagoId() == null) {
List<FormaPago> lsFP = List<FormaPago> lsFP =

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

@ -1396,6 +1396,7 @@ editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples
editarFormaPagoController.lblCateiraDigitalTef.label = TEF editarFormaPagoController.lblCateiraDigitalTef.label = TEF
editarFormaPagoController.lblCateiraDigitalTpi.label = TPI editarFormaPagoController.lblCateiraDigitalTpi.label = TPI
editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link
editarFormaPagoController.lblETicket.label=E_Ticket
# Muestra o tipo de Pesquisa Ponto Venda # Muestra o tipo de Pesquisa Ponto Venda
busquedaTipoPuntoVentaController.window.title = Canal de Venda busquedaTipoPuntoVentaController.window.title = Canal de Venda

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

@ -1218,6 +1218,7 @@ editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples
editarFormaPagoController.lblCateiraDigitalTef.label = TEF editarFormaPagoController.lblCateiraDigitalTef.label = TEF
editarFormaPagoController.lblCateiraDigitalTpi.label = TPI editarFormaPagoController.lblCateiraDigitalTpi.label = TPI
editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link
editarFormaPagoController.lblETicket.label=E_Ticket
# Muestra o tipo de Búsqueda Punto de venta # Muestra o tipo de Búsqueda Punto de venta
busquedaTipoPuntoVentaController.window.title = Canal de venta busquedaTipoPuntoVentaController.window.title = Canal de venta

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

@ -1397,6 +1397,7 @@ editarFormaPagoController.lblCateiraDigitalTrocoSimples.label = Troco Simples
editarFormaPagoController.lblCateiraDigitalTef.label = TEF editarFormaPagoController.lblCateiraDigitalTef.label = TEF
editarFormaPagoController.lblCateiraDigitalTpi.label = TPI editarFormaPagoController.lblCateiraDigitalTpi.label = TPI
editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link editarFormaPagoController.lblCateiraDigitalCielo.label = Cielo Link
editarFormaPagoController.lblETicket.label=E_Ticket
# Muestra o tipo de Pesquisa Ponto Venda # Muestra o tipo de Pesquisa Ponto Venda
busquedaTipoPuntoVentaController.window.title = Canal de Venda busquedaTipoPuntoVentaController.window.title = Canal de Venda