From b726f746fa437436fe752329c94fcf3360cd411d Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 1 Oct 2020 17:29:52 +0000
Subject: [PATCH] =?UTF-8?q?0020523:=20Aguia=20Branca=20-=20GLPI=2029148=20?=
 =?UTF-8?q?-=20[PROJETO]=20-=20ESPEC=20DE=20REGISTRO=20NO=20CAIXA=20DA=20S?=
 =?UTF-8?q?OLICITA=C3=87=C3=83O=20DE=20CANCELAMENTO=20-=20DUVIDA=20bug#205?=
 =?UTF-8?q?23=20dev:wilian=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103634 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../catalogos/EditarFormaPagoController.java   | 18 +++++++++++++++++-
 web/WEB-INF/i3-label_es_MX.label               |  1 +
 web/WEB-INF/i3-label_pt_BR.label               |  1 +
 web/gui/catalogos/editarFormaPago.zul          |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
index 6c3d16f5e..e25b49e8c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java
@@ -73,6 +73,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 	private Checkbox chkIndEstorno;
 	
 	private Checkbox chkIndVoucherRodoviaria;
+	
+	private Row rowIdEventoExtra;
 
 	private MyComboboxEstandar cmbTipoFormapago;
 	private MyComboboxEstandar cmbTipoCarteiraDigital;
@@ -161,6 +163,10 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 		if(formaPago.getTipoFormapago() != null) {
 			cmbTipoFormapago.setValue(formaPago.getTipoFormapago().toString());
 		}
+
+		if(formaPago != null) {
+			rowIdEventoExtra.setVisible(formaPago.getIndProcessoEstorno());
+		} 
 		
 		if(formaPago.getTipoCarteiraDigital() != null) {
 			cmbTipoCarteiraDigital.setValue(formaPago.getTipoCarteiraDigital().toString());
@@ -203,10 +209,12 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 		if(cmbTipoFormapago.getSelectedItem() != null) {
 			TipoFormapago tipoFormaPagoEscolhido = ((TipoFormapago) cmbTipoFormapago.getSelectedItem().getValue());
 			
-			if(tipoFormaPagoEscolhido.equals(TipoFormapago.CREDITO) || tipoFormaPagoEscolhido.equals(TipoFormapago.DEBITO)) {
+			if(tipoFormaPagoEscolhido.equals(TipoFormapago.CREDITO) || tipoFormaPagoEscolhido.equals(TipoFormapago.DEBITO) || chkIndEstorno.isChecked()) {
 				chkIndEstorno.setChecked(true);
+				rowIdEventoExtra.setVisible(true);
 			} else {
 				chkIndEstorno.setChecked(false);
+				rowIdEventoExtra.setVisible(false);
 			}
 			
 			if(TipoFormapago.CARTEIRA_DIGITAL.equals(tipoFormaPagoEscolhido)) {
@@ -267,6 +275,10 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 					formaPago.setIndRestricaoFormaPago(IndRestricaoFormaPago.SOMENTE_TARIFA.getSigla());
 				}
 			}
+			
+			if(!chkIndEstorno.isChecked()) {
+				formaPago.setTipoEventoExtraId(null);
+			}
 
 			formaPago.setIndProcessoEstorno(chkIndEstorno.isChecked());
 			formaPago.setIndVoucherRodoviaria(chkIndVoucherRodoviaria.isChecked());
@@ -470,4 +482,8 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 	public void setChkIndVoucherRodoviaria(Checkbox chkIndVoucherRodoviaria) {
 		this.chkIndVoucherRodoviaria = chkIndVoucherRodoviaria;
 	}
+	
+	public void onClick$chkIndEstorno(Event event) {
+		rowIdEventoExtra.setVisible(chkIndEstorno.isChecked());
+	}
 }
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 56c53657d..900a3d0e8 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -1085,6 +1085,7 @@ editarFormaPagoController.lblCarteiraDigital.label=Billetera digital
 editarFormaPagoController.lblAtivaProcessoEstorno.label=Activa el proceso de contracargo
 editarFormaPagoController.lblVoucherRodoviaria.label=Voucher Rodoviária
 editarFormaPagoController.lblTransferenciaReativacao.label=Utiliza na Transferência / Reativação
+editarFormaPagoController.lblEventoExtra.label=ID Tipo Evento Extra Estorno
 
 editarFormaPagoController.MSG.tipoCarteiraDigital.label=Informe o tipo da Tipo Carteira Digital
 editarFormaPagoController.lblTipoCarteiraDigital.label=Tipo Carteira Digital
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index ae966a894..cb339c23d 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -1172,6 +1172,7 @@ editarFormaPagoController.lblCarteiraDigital.label=Carteira Digital
 editarFormaPagoController.lblAtivaProcessoEstorno.label=Ativa processo de estorno
 editarFormaPagoController.lblVoucherRodoviaria.label=Voucher Rodoviária
 editarFormaPagoController.lblTransferenciaReativacao.label=Utiliza na Transferência / Reativação
+editarFormaPagoController.lblEventoExtra.label=ID Tipo Evento Extra Estorno
 
 editarFormaPagoController.MSG.tipoCarteiraDigital.label=Informe o tipo da Tipo Carteira Digital
 editarFormaPagoController.lblTipoCarteiraDigital.label=Tipo Carteira Digital
diff --git a/web/gui/catalogos/editarFormaPago.zul b/web/gui/catalogos/editarFormaPago.zul
index 8afd2c70b..e2528cd76 100644
--- a/web/gui/catalogos/editarFormaPago.zul
+++ b/web/gui/catalogos/editarFormaPago.zul
@@ -94,6 +94,12 @@
 					<checkbox id="chkIndEstorno" checked="false"/>
 				</row>
 				
+				<row id="rowIdEventoExtra">
+					<label value="${c:l('editarFormaPagoController.lblEventoExtra.label')}" />
+					<longbox id="txtIdEventoExtra" width="100px" maxlength="10"
+						value="@{winEditarFormaPago$composer.formaPago.tipoEventoExtraId}" />
+				</row>
+				
 				<row >
 					<label
 						value="${c:l('editarFormaPagoController.lblVoucherRodoviaria.label')}" />