diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java index 5804d6552..1f3f0746c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java @@ -188,13 +188,16 @@ public class EditarPricingDiaController extends MyGenericForwardComposer { if (horarioinicio.getValue().after(horariofin.getValue())) { Messagebox.show(Labels.getLabel("editarPricingController.MSG.datas"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.OK, Messagebox.EXCLAMATION); + return; + } + if (!ckFecViaje.isChecked() && !ckFecVenta.isChecked()) { + Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioData"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION); return; } if (!rdLun.isChecked() && !rdMar.isChecked() && !rdMie.isChecked() && !rdJue.isChecked() && !rdVie.isChecked() && !rdSab.isChecked() && !rdDom.isChecked()) { Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioDia"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION); - return; } try { diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 55596a18d..25dc0e917 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -2140,6 +2140,8 @@ editarPricingController.lbVieM.value = Sex editarPricingController.lbSabM.value = Sáb editarPricingController.lbDomM.value = Dom editarPricingController.lbDatas.value = Datas +editarPricingController.lbFecViaje.value = Data Viagem +editarPricingController.lbFecVenta.value = Data Venda editarPricingController.ckFecViagem.value = Data da Viagem editarPricingController.ckFecCompra.value = Data da Compra editarPricingController.hIni.value = Horário Inicial @@ -3507,6 +3509,7 @@ editarConfiguracionCategoriaDatosCategoriaController.title=Editar dados Tipo de #Editar pricing dia EditarPricingDiaController.MSG.obligatorioDia=Deve de seleccionar um dia da semana +EditarPricingDiaController.MSG.obligatorioData=Deve de seleccionar um dos filtros de datas, data de venda ou data de viagem # INFORME PASAJERO POR SERVICIO informePasajeroServicioController.window.title = Passageiro por Serviço diff --git a/web/gui/pricing/editarPricing.zul b/web/gui/pricing/editarPricing.zul index 4010ed8a3..7c365f51f 100644 --- a/web/gui/pricing/editarPricing.zul +++ b/web/gui/pricing/editarPricing.zul @@ -552,38 +552,40 @@ image="/gui/img/create_doc.gif" sort="auto(horariofin)" label="${c:l('editarPricingController.hFim.value')}" />