diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java index 577b7136b..1f24e408f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java @@ -4,10 +4,8 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; -import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -23,9 +21,7 @@ import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.exception.BusinessException; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.service.SeguroKmService; import com.rjconsultores.ventaboletos.service.TarifaOficialService; -import com.rjconsultores.ventaboletos.service.VigenciaTarifaService; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; /** @@ -36,18 +32,14 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(GenerarTarifaOrgaoController.class); + private static final long serialVersionUID = 1L; @Autowired private RutaService rutaService; @Autowired - private VigenciaTarifaService vigenciaTarifaService; - @Autowired private TarifaOficialService tarifaOficialService; @Autowired private OrgaoConcedenteService orgaoConcedenteService; - @Autowired - private SeguroKmService seguroKmService; private List lsRuta; private List lsOrgaoConcedente; private Combobox cmbRuta; @@ -56,6 +48,14 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { private Checkbox chkTaxaEmbarque; private Checkbox chkSeguro; + public List getLsRuta() { + return lsRuta; + } + + public List getLsOrgaoConcedente() { + return lsOrgaoConcedente; + } + @Override public void doAfterCompose(Component comp) throws Exception { lsOrgaoConcedente = orgaoConcedenteService.obtenerTodos(); @@ -90,26 +90,17 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { if (chkSeguro.isChecked()) { tarifaOficialService.atualizarSeguro(rutaId, orgaoConcedenteId); } - + tarifaOficialService.aplicarArredondamentoTarifa(orgaoConcedenteId); Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK"), Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), Messagebox.OK, Messagebox.INFORMATION); - + } catch (BusinessException e) { Messagebox.show(e.getLocalizedMessage(), Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), Messagebox.OK, Messagebox.EXCLAMATION); } } - - public List getLsRuta() { - return lsRuta; - } - - public List getLsOrgaoConcedente() { - return lsOrgaoConcedente; - } - } diff --git a/web/gui/tarifas/generarTarifaOrgao.zul b/web/gui/tarifas/generarTarifaOrgao.zul index b76e3526b..33d30c9d0 100644 --- a/web/gui/tarifas/generarTarifaOrgao.zul +++ b/web/gui/tarifas/generarTarifaOrgao.zul @@ -5,13 +5,19 @@ - -