From d3b7016cbd0129540da24e4e0cdc441816e2ce32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?=
 <aristides.reis@totvs.com.br>
Date: Thu, 4 Apr 2024 23:50:49 -0300
Subject: [PATCH] fixes bug#AL-3779

---
 pom.xml                                          |  6 +++---
 .../catalogos/EditarOCDParamController.java      | 16 ++++++++++++++--
 web/WEB-INF/i3-label_en.label                    |  1 +
 web/WEB-INF/i3-label_es_MX.label                 |  2 ++
 web/WEB-INF/i3-label_pt_BR.label                 |  1 +
 web/gui/catalogos/editarOCDParam.zul             |  6 ++++++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ddd16bb5f..a7b6097b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.62.0</version> 
+	<version>1.63.0</version> 
 	<packaging>war</packaging>  
   
 	<properties>
-		<modelWeb.version>1.43.2</modelWeb.version>
-		<flyway.version>1.35.0</flyway.version>
+		<modelWeb.version>1.44.0</modelWeb.version>
+		<flyway.version>1.36.0</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java
index e6d95ff74..b0ca0fe63 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java
@@ -80,7 +80,8 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 	private Checkbox chkIndtotalbilhete;
 	private Checkbox chkIndsempregerarapagar;
 	private Checkbox chkIndOCDPorFormadePagamento;
-	private Row rowIndOCDPorFormadePagamento;
+	private Row rowIndOCDPorFormadePagamento;	
+	private Checkbox chkindEstornoPix;
 
 	
 	private Radio rdSomenteCartao;
@@ -138,6 +139,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 		}else{
 			ptoVtaOCDParamList.setData(removerOCDPtoVtaParamInativo(ocdParamCorrente.getListOCDPtoVtaParam()));
 		}
+		chkindEstornoPix.setChecked(ocdParamCorrente.getIndEstornoPix());
 	}
 	
 	private List<OCDPtoVtaParam> removerOCDPtoVtaParamInativo(List<OCDPtoVtaParam> listOCDPtoVtaParam){
@@ -228,7 +230,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 			ocdParamCorrente.setIndOCDPorFormadePagamento(chkIndOCDPorFormadePagamento.isChecked());
 			ocdParamCorrente.setIndtotalbilhete(chkIndtotalbilhete.isChecked());
 			ocdParamCorrente.setIndsempregerarapagar(chkIndsempregerarapagar.isChecked());
-			
+			ocdParamCorrente.setIndEstornoPix(chkindEstornoPix.isChecked());
 			if (ocdParamCorrente.getOcdparamId() == null){
 				isSuscribir = true;
 			}
@@ -410,5 +412,15 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 	public void setChkIndsempregerarapagar(Checkbox chkIndsempregerarapagar) {
 		this.chkIndsempregerarapagar = chkIndsempregerarapagar;
 	}
+
+	public Checkbox getChkindEstornoPix() {
+		return chkindEstornoPix;
+	}
+
+	public void setChkindEstornoPix(Checkbox chkindEstornoPix) {
+		this.chkindEstornoPix = chkindEstornoPix;
+	}
+	
+	
 	
 }
\ No newline at end of file
diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label
index a1d320fc7..cc4cbc713 100644
--- a/web/WEB-INF/i3-label_en.label
+++ b/web/WEB-INF/i3-label_en.label
@@ -8189,6 +8189,7 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de pagamento para ge
 busquedaOCDParamController.SomenteCartao.label = Somente cartão
 busquedaOCDParamController.TodasFormasPagamento.label = Todas as formas de pagamento
 busquedaOCDParamController.SomenteCartaoTooltiptext.value = Contempla as formas de pagamento crédito e débito 
+busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão
 
 
 #complejidad contrasena
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 54f330651..f56b5f358 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -8585,6 +8585,8 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de Pago Para la Gene
 busquedaOCDParamController.SomenteCartao.label = Solo Tarjeta
 busquedaOCDParamController.TodasFormasPagamento.label = Todas Las Formas de Pago
 busquedaOCDParamController.SomenteCartaoTooltiptext.value = Contempla as Las Formas de Pago crédito e débito 
+busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão
+
 
 # Relatorio Receita Embarcada Servico Controller
 relatorioReceitaEmbarcadaServicoController.window.title = Reporte de Receta Embarcada por Corrida
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 684a04763..8eddd7937 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -8255,6 +8255,7 @@ busquedaOCDParamController.FormaPagamentoOCD.label = Formas de pagamento para ge
 busquedaOCDParamController.SomenteCartao.label = Somente cartão
 busquedaOCDParamController.TodasFormasPagamento.label = Todas as formas de pagamento
 busquedaOCDParamController.SomenteCartaoTooltiptext.value = Contempla as formas de pagamento crédito e débito 
+busquedaOCDParamController.indestornoPix.label = Estonar com pix por Padrão
 
 
 #complejidad contrasena
diff --git a/web/gui/catalogos/editarOCDParam.zul b/web/gui/catalogos/editarOCDParam.zul
index 337143007..8aa4a3031 100644
--- a/web/gui/catalogos/editarOCDParam.zul
+++ b/web/gui/catalogos/editarOCDParam.zul
@@ -68,6 +68,12 @@
 							</hbox>
 						</radiogroup>
 				</row>
+				 <row>
+				 <label value="${c:l('busquedaOCDParamController.indestornoPix.label')}" />
+			
+				  	<checkbox id="chkindEstornoPix" value="@{winEditarOCDParam$composer.ocdParamCorrente.indOCDTroca}" checked="false" />
+       
+				 </row>
 				<row>
 					<label value="${c:l('busquedaOCDParamController.FormaPagamentoOCD.label')}" />
 						<radiogroup id="grTipoFormaPagamento">