From f4ff5fb5936435c732b41877a2fcddc1c9effcd4 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Wed, 28 Aug 2024 16:56:42 -0300
Subject: [PATCH] AL-4466

---
 pom.xml                                              |  4 ++--
 .../ingreso/EditarTipoEventoExtraController.java     |  8 ++++++++
 web/gui/ingreso/editarTipoEventoExtra.zul            | 12 ++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f6fa658d0..bcd479e73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
 	<packaging>war</packaging> 
     
 	<properties>
-		<modelWeb.version>1.101.0</modelWeb.version>
-		<flyway.version>1.88.2</flyway.version>
+		<modelWeb.version>1.102.0</modelWeb.version>
+		<flyway.version>1.89.0</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java
index 0f5deeab9..1ee555119 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java
@@ -92,6 +92,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
 	private MyComboboxEstandar cmbEmpresa;
 	private MyComboboxPuntoVenta cmbPontoVenda;
 	private MyComboboxImpresionLayoutConfig cmbImpresionLayoutConfig;
+	private MyComboboxImpresionLayoutConfig cmbImpresionLayoutEmailConfig;
 	/*Forma de Pagamento*/
 	private List<Empresa> lsEmpresas;
 	/*Forma de Pagamento*/
@@ -144,6 +145,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
 				rowIndEnviaExcessoDeBagagemSefaz.setVisible(false);
 			}
 			cmbImpresionLayoutConfig.setInitialValue(tipoEventoExtra.getImpresionLayoutConfig());
+			cmbImpresionLayoutEmailConfig.setInitialValue(tipoEventoExtra.getImpresionLayoutEmailConfig());
 		} else {
 			rowIndEnviaExcessoDeBagagemSefaz.setVisible(false);
 			btnApagar.setVisible(false);
@@ -291,6 +293,12 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
 		if (cbImpresionLayoutConfig != null) {
 			tipoEventoExtra.setImpresionLayoutConfig((ImpresionLayoutConfig) cbImpresionLayoutConfig.getValue());
 		}
+		
+		Comboitem cbImpresionLayoutEmailConfig = cmbImpresionLayoutEmailConfig.getSelectedItem();
+		tipoEventoExtra.setImpresionLayoutEmailConfig(null);
+		if (cbImpresionLayoutEmailConfig != null) {
+			tipoEventoExtra.setImpresionLayoutEmailConfig((ImpresionLayoutConfig) cbImpresionLayoutEmailConfig.getValue());
+		}
 
 		try {
 			tipoEventoExtra.setActivo(Boolean.TRUE);
diff --git a/web/gui/ingreso/editarTipoEventoExtra.zul b/web/gui/ingreso/editarTipoEventoExtra.zul
index 1c0d3034c..d7e31557c 100644
--- a/web/gui/ingreso/editarTipoEventoExtra.zul
+++ b/web/gui/ingreso/editarTipoEventoExtra.zul
@@ -6,7 +6,7 @@
 
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winEditarTipoEventoExtra" border="normal"
-		apply="${editarTipoEventoExtraController}" width="520px"
+		apply="${editarTipoEventoExtraController}" width="600px"
 		contentStyle="overflow:auto"
 		title="${c:l('editarTipoEventoExtraController.window.title')}">
 
@@ -66,11 +66,19 @@
 							</row>
 							 <row>
 								<label
-									value="${c:l('busquedaImpresionLayoutConfigController.window.title')}" />
+									value="${c:l('editarEmpresaController.cmbImpresionLayoutConfig')}" />
 								<combobox id="cmbImpresionLayoutConfig"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxImpresionLayoutConfig"
 									selectedItem="@{winEditarTipoEventoExtra$composer.tipoEventoExtra.impresionLayoutConfig}"
 									mold="rounded" buttonVisible="true" width="100%" />
+							</row>
+							 <row>
+								<label
+									value="${c:l('editarEmpresaController.lblLayoutEmail')}" />
+								<combobox id="cmbImpresionLayoutEmailConfig"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxImpresionLayoutConfig"
+									selectedItem="@{winEditarTipoEventoExtra$composer.tipoEventoExtra.impresionLayoutEmailConfig}"
+									mold="rounded" buttonVisible="true" width="100%" />
 							</row>
 							<row id="rowIndEnviaExcessoDeBagagemSefaz">
 								<label