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

Merge pull request 'AL-4466' (!686) from AL-4466_1 into master 

Reviewed-on: adm/VentaBoletosAdm#686
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Valdir Cordeiro 2024-08-28 20:03:08 +00:00
parent a50a4aefd8 f4ff5fb593
commit 219872c1db
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -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>

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java
View File

@ -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);

12
web/gui/ingreso/editarTipoEventoExtra.zul
View File

@ -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