diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java index 44e2034c4..7bc4687ea 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java @@ -215,9 +215,6 @@ public class EditarPricingController extends MyGenericForwardComposer { private Button btnNovoOcupaAntecipa; private Button btnApagarOcupaAntecipa; private Button btnModificarOcupaAntecipa; - private Button btnNovoAnticipacion; - private Button btnApagarAnticipacion; - private Button btnModificarAnticipacion; private Button btnNovoTipoServicio; private Button btnApagarTipoServicio; private Button btnModificarTipoServicio; @@ -425,82 +422,82 @@ public class EditarPricingController extends MyGenericForwardComposer { if (pricing.getPricingId() != null) { pricing = pricingService.obtenerID(pricing.getPricingId()); - lsPricingVigencia = pricing.getPricingVigenciaList(buscarPricingInativosAtivos); + lsPricingVigencia = pricing.getPricingVigenciaList(); pricingVigenciaList.setData(lsPricingVigencia); if (lsPricingVigencia.size() > 0) { pricingVigenciaList.setSelectedIndex(0); } - lsPricingImporte = pricing.getPricingImporteList(buscarPricingInativosAtivos); + lsPricingImporte = pricing.getPricingImporteList(); pricingImporteList.setData(lsPricingImporte); if (lsPricingImporte.size() > 0) { pricingImporteList.setSelectedIndex(0); } - lsPricingMarca = pricing.getPricingMarcaList(buscarPricingInativosAtivos); + lsPricingMarca = pricing.getPricingMarcaList(); pricingMarcaList.setData(lsPricingMarca); if (lsPricingMarca.size() > 0) { pricingMarcaList.setSelectedIndex(0); } - lsPricingClase = pricing.getPricingClaseList(buscarPricingInativosAtivos); + lsPricingClase = pricing.getPricingClaseList(); pricingClaseList.setData(lsPricingClase); if (lsPricingClase.size() > 0) { pricingClaseList.setSelectedIndex(0); } - lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList(buscarPricingInativosAtivos); + lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList(); pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa); if (lsPricingOcupaAntecipa.size() > 0) { pricingOcupaAntecipaList.setSelectedIndex(0); } - lsPricingTipoServicio = pricing.getPricingTipoServicioList(buscarPricingInativosAtivos); + lsPricingTipoServicio = pricing.getPricingTipoServicioList(); pricingTipoServicioList.setData(lsPricingTipoServicio); if (lsPricingTipoServicio.size() > 0) { pricingTipoServicioList.setSelectedIndex(0); } - lsPricingPuntoVenta = pricing.getPricingPuntoventaList(buscarPricingInativosAtivos); + lsPricingPuntoVenta = pricing.getPricingPuntoventaList(); pricingPuntoVentaList.setData(lsPricingPuntoVenta); if (lsPricingPuntoVenta.size() > 0) { pricingPuntoVentaList.setSelectedIndex(0); } - lsPricingCategoria = pricing.getPricingCategoriaList(buscarPricingInativosAtivos); + lsPricingCategoria = pricing.getPricingCategoriaList(); pricingCategoriaList.setData(lsPricingCategoria); if (lsPricingCategoria.size() > 0) { pricingCategoriaList.setSelectedIndex(0); } - lsPricingRuta = pricing.getPricingRutaList(buscarPricingInativosAtivos); + lsPricingRuta = pricing.getPricingRutaList(); pricingRutaList.setData(lsPricingRuta); if (lsPricingRuta.size() > 0) { pricingRutaList.setSelectedIndex(0); } - lsPricingMercado = pricing.getPricingMercadoList(buscarPricingInativosAtivos); + lsPricingMercado = pricing.getPricingMercadoList(); pricingMercadoList.setData(lsPricingMercado); - lsPricingTipoPtoVta = pricing.getPricingTipoptovtaList(buscarPricingInativosAtivos); + lsPricingTipoPtoVta = pricing.getPricingTipoptovtaList(); pricingTipoPtoVtaList.setData(lsPricingTipoPtoVta); if (lsPricingTipoPtoVta.size() > 0) { pricingTipoPtoVtaList.setSelectedIndex(0); } - lsPricingCorrida = pricing.getPricingCorridaList(buscarPricingInativosAtivos); + lsPricingCorrida = pricing.getPricingCorridaList(); pricingCorridaList.setData(lsPricingCorrida); - lsPricingDia = pricing.getPricingDiaList(buscarPricingInativosAtivos); + lsPricingDia = pricing.getPricingDiaList(); pricingDiaList.setData(lsPricingDia); - lsPricingAsiento = pricing.getPricingAsientoList(buscarPricingInativosAtivos); + lsPricingAsiento = pricing.getPricingAsientoList(); pricingAsientoList.setData(lsPricingAsiento); - lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList(buscarPricingInativosAtivos); + lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList(); pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa); - lsPricingTipoServicio = pricing.getPricingTipoServicioList(buscarPricingInativosAtivos); + lsPricingTipoServicio = pricing.getPricingTipoServicioList(); pricingTipoServicioList.setData(lsPricingTipoServicio); if (pricing.getIndtransferible() == Boolean.FALSE) { @@ -956,7 +953,7 @@ public class EditarPricingController extends MyGenericForwardComposer { // Se for por porcentage eu desativo todos os importes if (radioPor.isChecked()) { pricing = pricingService.obtenerID(pricing.getPricingId()); - for (PricingImporte pi : pricing.getPricingImporteList(Pricing.ATIVO)) { + for (PricingImporte pi : pricing.getPricingImporteList()) { pricingImporteService.borrar(pi); } } @@ -1048,7 +1045,7 @@ public class EditarPricingController extends MyGenericForwardComposer { for (Object o : listPVigencia) { pricing = pricingService.obtenerID(pricing.getPricingId()); - lsPricingVigencia = pricing.getPricingVigenciaList(Pricing.ATIVO); + lsPricingVigencia = pricing.getPricingVigenciaList(); PricingVigencia pVigencia = (PricingVigencia) o; lsPricingVigencia.remove(pVigencia); @@ -2065,9 +2062,6 @@ public class EditarPricingController extends MyGenericForwardComposer { btnNovoOcupaAntecipa.setDisabled(desativar); btnApagarOcupaAntecipa.setDisabled(desativar); btnModificarOcupaAntecipa.setDisabled(desativar); - btnNovoAnticipacion.setDisabled(desativar); - btnApagarAnticipacion.setDisabled(desativar); - btnModificarAnticipacion.setDisabled(desativar); btnNovoTipoServicio.setDisabled(desativar); btnApagarTipoServicio.setDisabled(desativar); btnModificarTipoServicio.setDisabled(desativar); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java index 7707e1686..f8cc30848 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java @@ -127,7 +127,7 @@ public class EditarPricingCorridaController extends MyGenericForwardComposer { public void onClick$btnAdicionarCorrida(Event ev) throws Exception { try { - List lsPricingViagem = (pricing.getPricingCorridaList(Pricing.ATIVO) == null) ? new ArrayList() : pricing.getPricingCorridaList(Pricing.ATIVO); + List lsPricingViagem = (pricing.getPricingCorridaList() == null) ? new ArrayList() : pricing.getPricingCorridaList(); List ls = corridaList.getSelectedsItens(); if (!ls.isEmpty()) { for (Object o : ls) { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java index 78a8facaa..40eca1236 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java @@ -54,9 +54,9 @@ public class RenderPricing implements ListitemRenderer { Integer pricingInativoAtivo = p.getActivo(); SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm"); - if (!p.getPricingVigenciaList(pricingInativoAtivo).isEmpty()) { + if (!p.getPricingVigenciaList().isEmpty()) { String data = ""; - for (PricingVigencia pv : p.getPricingVigenciaList(pricingInativoAtivo)) { + for (PricingVigencia pv : p.getPricingVigenciaList()) { data = data + dt.format(pv.getFecinicioviaje()) + " a " + dt.format(pv.getFecfinviaje()) + " ou "; } data = data.substring(0, data.length() - 3);