diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CopiarTarifaOficialController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CopiarTarifaOficialController.java index be45054f4..223378978 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CopiarTarifaOficialController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CopiarTarifaOficialController.java @@ -35,8 +35,6 @@ public class CopiarTarifaOficialController extends MyGenericForwardComposer { */ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(CopiarTarifaOficialController.class); - @Autowired private VigenciaTarifaService vigenciaTarifaService; @Autowired @@ -46,6 +44,7 @@ public class CopiarTarifaOficialController extends MyGenericForwardComposer { private Radio rdComPegagio; private Radio rdComTarifa; private Radio rdComTaxaEmbarque; + private Radio rdComSeguro; @Override public void doAfterCompose(Component comp) throws Exception { @@ -59,8 +58,9 @@ public class CopiarTarifaOficialController extends MyGenericForwardComposer { Boolean calculaPedagio = (rdComPegagio.getValue() == null) ? Boolean.FALSE : rdComPegagio.isChecked(); Boolean calculaTarifa = (rdComTarifa.getValue() == null) ? Boolean.FALSE : rdComTarifa.isChecked(); Boolean calculaTaxaEmbarque = (rdComTaxaEmbarque.getValue() == null) ? Boolean.FALSE : rdComTaxaEmbarque.isChecked(); + Boolean calculaSeguro = (rdComSeguro.getValue() == null) ? Boolean.FALSE : rdComSeguro.isChecked(); - tarifaOficialService.copiarParaTarifa((VigenciaTarifa) cmbVigencia.getSelectedItem().getValue(), calculaPedagio, calculaTarifa, calculaTaxaEmbarque); + tarifaOficialService.copiarParaTarifa((VigenciaTarifa) cmbVigencia.getSelectedItem().getValue(), calculaPedagio, calculaTarifa, calculaTaxaEmbarque, calculaSeguro); Messagebox.show(Labels.getLabel("copiarTarifaOficialController.MSG.copiaOK"), Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 7d7779e4f..f57327397 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -4844,6 +4844,7 @@ copiarTarifaOficialController.SemTarifa.label = No copiarTarifaOficialController.CalculaTaxaEmbarque.label = Actualizar Tasa de abordaje copiarTarifaOficialController.ComTaxaEmbarque.label = Si copiarTarifaOficialController.SemTaxaEmbarque.label = No +copiarTarifaOficialController.CalculaSeguro.label = Atualizar Seguro # Búsqueda TaxaEmbarqueKm busquedaTaxaEmbarqueKmController.window.title = Tasa de abordaje por intervalo de Km diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 4c83dbd9a..93530bdcc 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -4902,6 +4902,7 @@ copiarTarifaOficialController.SemTarifa.label = Não copiarTarifaOficialController.CalculaTaxaEmbarque.label = Atualizar Taxa de Embarque copiarTarifaOficialController.ComTaxaEmbarque.label = Sim copiarTarifaOficialController.SemTaxaEmbarque.label = Não +copiarTarifaOficialController.CalculaSeguro.label = Atualizar Seguro # Editar Tarifa por KM ARTESP editarTarifaKmController.window.title = Tarifa por Km - ARTESP diff --git a/web/gui/tarifas/copiarTarifaOficial.zul b/web/gui/tarifas/copiarTarifaOficial.zul index 6cd86201c..54fd687d3 100644 --- a/web/gui/tarifas/copiarTarifaOficial.zul +++ b/web/gui/tarifas/copiarTarifaOficial.zul @@ -64,6 +64,15 @@ + +