diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java index a0fda3b1e..a2cc03ed2 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java @@ -37,7 +37,6 @@ import com.rjconsultores.ventaboletos.service.CuponSecretariaService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.SecretariaEmpresaService; import com.rjconsultores.ventaboletos.service.SecretariaService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; import com.rjconsultores.ventaboletos.utilerias.TraslaparUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; @@ -228,7 +227,7 @@ public class EditarSecretariaController extends MyGenericForwardComposer { public void doAfterCompose(Component comp) throws Exception { secretaria = (Secretaria) Executions.getCurrent().getArg().get("secretaria"); secretariaList = (MyListbox) Executions.getCurrent().getArg().get("secretariaList"); - Boolean isMostraSerieSubserie = ApplicationProperties.getInstance().isSerieSubserieSecretaria(); + // Boolean isMostraSerieSubserie = ApplicationProperties.getInstance().isSerieSubserieSecretaria(); if (secretaria.getSecretariaId() != null) { lsSecretariaEmpresa = secretariaEmpresaService.buscarPorSecretaria(secretaria); } else { @@ -238,24 +237,13 @@ public class EditarSecretariaController extends MyGenericForwardComposer { super.doAfterCompose(comp); empresasList.setItemRenderer(new RenderSecretariaEmpresa()); empresasList.setData(lsSecretariaEmpresa); - cuponSecretariaList.setItemRenderer(new RenderCuponSecretaria(isMostraSerieSubserie)); + cuponSecretariaList.setItemRenderer(new RenderCuponSecretaria()); lsCuponSecretaria = new ArrayList(); cuponSecretariaList.setData(lsCuponSecretaria); - if (!isMostraSerieSubserie) { - rowSerieSubserie.setVisible(Boolean.FALSE); - rowValidaSerieSubserie.setVisible(Boolean.FALSE); - columnSerie.setVisible(Boolean.FALSE); - columnSubserieSerie.setVisible(Boolean.FALSE); - chkValidaSerieSubserie.setChecked(Boolean.FALSE); - txtSerie.getValue(); - txtSubserie.getValue(); - } if (secretaria.getSecretariaId() == null) { btnApagar.setVisible(Boolean.FALSE); - if (!isMostraSerieSubserie) { - chkValidaSerieSubserie.setChecked(secretaria.getValidaSerieSubSerie()); - onClick$chkValidaSerieSubserie(null); - } + chkValidaSerieSubserie.setChecked(secretaria.getValidaSerieSubSerie()); + onClick$chkValidaSerieSubserie(null); } else { secretaria = secretariaService.obtenerID(secretaria.getSecretariaId()); if (secretaria.getImprimeprecio().equals(Secretaria.DESCUENTO_COBRAR)) { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCuponSecretaria.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCuponSecretaria.java index 051116aab..87cf1308f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCuponSecretaria.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCuponSecretaria.java @@ -4,28 +4,26 @@ */ package com.rjconsultores.ventaboletos.web.utilerias.render; -import com.rjconsultores.ventaboletos.entidad.CuponSecretaria; import java.math.BigDecimal; + import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; +import com.rjconsultores.ventaboletos.entidad.CuponSecretaria; + /** * * @author Administrador */ public class RenderCuponSecretaria implements ListitemRenderer { - private Boolean isMostraSerieSubserie; public RenderCuponSecretaria(){ super(); } - public RenderCuponSecretaria(Boolean isMostraSerieSubserie ){ - super(); - this.isMostraSerieSubserie = isMostraSerieSubserie; - } + @Override public void render(Listitem lstm, Object o) throws Exception { CuponSecretaria cuponSecretaria = (CuponSecretaria) o; @@ -55,23 +53,22 @@ public class RenderCuponSecretaria implements ListitemRenderer { } lc.setParent(lstm); //Séie - if(isMostraSerieSubserie){ - String serie = cuponSecretaria.getSerie(); - if (serie != null) { - lc = new Listcell(serie.toString()); - } else { - lc = new Listcell(""); - } - lc.setParent(lstm); - //Subserie - String subserie = cuponSecretaria.getSubserie(); - if (subserie != null) { - lc = new Listcell(subserie.toString()); - } else { - lc = new Listcell(""); - } - lc.setParent(lstm); - } + String serie = cuponSecretaria.getSerie(); + if (serie != null) { + lc = new Listcell(serie.toString()); + } else { + lc = new Listcell(""); + } + lc.setParent(lstm); + // Subserie + String subserie = cuponSecretaria.getSubserie(); + if (subserie != null) { + lc = new Listcell(subserie.toString()); + } else { + lc = new Listcell(""); + } + lc.setParent(lstm); + BigDecimal porcentagemOutros = cuponSecretaria.getPorcdescuentooutros(); if (porcentagemOutros != null) { lc = new Listcell(porcentagemOutros.setScale(2).toString());