From 3eaed1d039a2e180a026b230f331271fea609dc4 Mon Sep 17 00:00:00 2001
From: luis <luis@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 17 Jul 2017 21:43:28 +0000
Subject: [PATCH] =?UTF-8?q?Mantis=20#9271:=20(GAP020=20-=20GAP024=20-=20GA?=
 =?UTF-8?q?P072)=20-=20Solicita=C3=A7=C3=A3o=20Estorno=20de=20Cart=C3=A3o?=
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@71460 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../catalogos/EditarOrgaoConcedenteController.java        | 4 +++-
 .../web/utilerias/render/RenderOrgaoCancelacion.java      | 4 ++++
 web/gui/catalogos/editarOrgaoConcedente.zul               | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
index d1448858e..48389fa21 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
@@ -66,6 +66,7 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 	private MyTextbox txtTiempoLimite;
 	private MyTextbox txtTiempoLimiteCambio;
 	private Checkbox chkIndnaopermitetransferencia;
+	private Checkbox chkIndsolicitadatostarjeta;
 	private MyComboboxEmpresa cmbEmpresa;
 
 	private MyTextboxDecimal txtIndicePeaje;
@@ -182,7 +183,8 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 		oc.setIndMultaTransferencia(radMultaTransferenciaSim.isChecked());
 		oc.setIndDevolucaoTransferencia(radDevolucaoTransferenciaSim.isChecked());
 		oc.setIndCobrancaTransferencia(radCobrancaTransferenciaSim.isChecked());
-
+		oc.setIndSolicitaDatosTarjeta(chkIndsolicitadatostarjeta.isChecked());
+		
 		if (StringUtils.isNotBlank(txtTiempoLimiteCambio.getValue())) {
 			oc.setTiempolimiteCambio(new Integer(txtTiempoLimiteCambio.getValue()));
 			oc.setPorcCambioEmbarcado(txtPorcCambioEmbarcado.getValueDecimal());
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
index 258bab4fb..3732ba2f7 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
@@ -55,6 +55,10 @@ public class RenderOrgaoCancelacion implements ListitemRenderer {
 		lc.setParent(lstm);
 		lc.setStyle("text-align:center");
 
+        lc = new Listcell(orgaoCancelacion.getIndSolicitaDatosTarjeta() != null && orgaoCancelacion.getIndSolicitaDatosTarjeta() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO"));
+        lc.setParent(lstm);
+        lc.setStyle("text-align:center");
+        
         lstm.setAttribute("data", orgaoCancelacion);
     }
 }
diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul
index b6f7a83e6..3250be2cd 100644
--- a/web/gui/catalogos/editarOrgaoConcedente.zul
+++ b/web/gui/catalogos/editarOrgaoConcedente.zul
@@ -206,6 +206,12 @@
 								<radio id="radCobrancaTransferenciaNao" label="${c:l('editarOrgaoConcedenteController.no.label')}" checked="true"/>
 							</radiogroup>
 							</row>
+							<row>
+								<label
+									value="${c:l('editarOrgaoConcedenteController.indsolicitadatostarjeta.label')}" />
+								<checkbox
+									id="chkIndsolicitadatostarjeta" />
+							</row>
 						</rows>
 					</grid>
 
@@ -250,6 +256,8 @@
 								label="${c:l('editarOrgaoConcedenteController.indDevolucaoTransferencia.label')}" width="300px"  />
 							<listheader image="/gui/img/create_doc.gif"
 								label="${c:l('editarOrgaoConcedenteController.indCobrancaTransferencia.label')}" width="280px"  />
+							<listheader image="/gui/img/create_doc.gif"
+								label="${c:l('editarOrgaoConcedenteController.indsolicitadatostarjeta.label')}" width="170px"/>
 						</listhead>
 					</listbox>
 				</tabpanel>