From 5e64eccf2925621466d3cf1a2652a16d5f741cd4 Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 8 Jul 2016 17:26:31 +0000 Subject: [PATCH] merge mantis #7637 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57762 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarConvenioController.java | 55 +++++++++++++++++++ web/WEB-INF/i3-label_es_MX.label | 2 + web/WEB-INF/i3-label_pt_BR.label | 2 + .../editarConvenio.zul | 12 +++- 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java index 2d297bfd1..cc40fc229 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java @@ -25,6 +25,7 @@ import org.zkoss.zul.Bandbox; import org.zkoss.zul.Button; import org.zkoss.zul.Checkbox; import org.zkoss.zul.Combobox; +import org.zkoss.zul.Constraint; import org.zkoss.zul.Label; import org.zkoss.zul.Longbox; import org.zkoss.zul.Paging; @@ -89,6 +90,7 @@ public class EditarConvenioController extends MyGenericForwardComposer { private MyListbox convenioList; private MyListbox convenioDetList; private Textbox txtDescConvenio; + private Textbox txtCveConvenio; private MyCustomTextboxDecimal txtTarifa; private MyCustomTextboxDecimal txtTxEmbarque; @@ -117,6 +119,9 @@ public class EditarConvenioController extends MyGenericForwardComposer { private Paging pagingCliente; private Cliente clienteToSave; + private Radio rdGeral; + private Radio rdPorCliente; + private Radio rdPorNumDocumento; private Radio rdPorQuantidade; private Radio rdNaoInformar; @@ -428,6 +433,15 @@ public class EditarConvenioController extends MyGenericForwardComposer { rdPrecioTotal.setChecked(Boolean.TRUE); } } + + if(convenio.getIndGeral().equals((short) 1)){ + rdGeral.setSelected(true); + } else{ + rdPorCliente.setSelected(true); + txtDescConvenio.setDisabled(true); + txtCveConvenio.setDisabled(true); + bandBoxCliente.setConstraint("no empty"); + } setClienteToSave(convenio.getCliente()); bandBoxCliente.setValue(convenio.getCliente() != null ? convenio.getCliente().getNombcliente() : null); @@ -524,6 +538,10 @@ public class EditarConvenioController extends MyGenericForwardComposer { public void onClick$btnSalvar(Event ev) { txtDescConvenio.getValue(); + + if(rdPorCliente.isSelected() && bandBoxCliente.getValue() == null){ + return; + } try { @@ -549,6 +567,12 @@ public class EditarConvenioController extends MyGenericForwardComposer { convenio.setIndDescuentoNormal(getTipoDesconto()); convenio.setCliente(getClienteToSave()); + if(rdGeral.isSelected()){ + convenio.setIndGeral((short) 1); + }else{ + convenio.setIndGeral((short) 0); + } + if (rdDescuento.isChecked()) { convenio.setImprimeprecio(Convenio.IMPRIME_DESCONTO); } else if (rdPrecioDescuento.isChecked()) { @@ -1469,6 +1493,37 @@ public class EditarConvenioController extends MyGenericForwardComposer { bandBoxCliente.setValue(cliente.getNombcliente()); setClienteToSave(cliente); bandBoxCliente.close(); + + txtDescConvenio.setValue(cliente.getNombcliente()); + txtCveConvenio.setValue(cliente.getNumIdentificaDos()); + convenio.setDescconvenio(cliente.getNombcliente()); + convenio.setCveconvenio(cliente.getNumIdentificaDos()); } } + + public void onClick$rdGeral(Event ev){ + bandBoxCliente.setConstraint(""); + txtDescConvenio.setDisabled(false); + txtCveConvenio.setDisabled(false); + } + + public void onClick$rdPorCliente(Event ev) { + if (rdPorCliente.isChecked()) { + bandBoxCliente.setValue(""); + bandBoxCliente.setConstraint("no empty"); + txtDescConvenio.setDisabled(true); + txtCveConvenio.setDisabled(true); + + Constraint c = txtDescConvenio.getConstraint(); + txtDescConvenio.setConstraint(""); + txtDescConvenio.setValue(""); + txtDescConvenio.setConstraint(c); + + Constraint c2 = txtCveConvenio.getConstraint(); + txtCveConvenio.setConstraint(""); + txtCveConvenio.setValue(""); + txtCveConvenio.setConstraint(c2); + } + } + } \ No newline at end of file diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 96f43d7d2..f2122d94a 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -3867,6 +3867,8 @@ editarConvenioController.MSG.erro.origemDestinoTrechos = Tramo para el Origen: { editarConvenioController.PorNumDocumento.value = Poner numero de descuento editarConvenioController.PorQuantidade.value = Por Cantidad editarConvenioController.NaoInformar.value = No Informar +editarConvenioController.PorCliente.value = Por Cliente +editarConvenioController.Geral.value = Geral editarConvenioController.lbTarifa.value = Tarifa editarConvenioController.lbTxEmbarque.value = Tasa de abordaje editarConvenioController.lbPedagio.value = Peaje diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 12e45f0c4..58c673188 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -3939,6 +3939,8 @@ editarConvenioController.MSG.erro.origemDestinoTrechos = Trecho para a Origem: { editarConvenioController.PorNumDocumento.value = Por Número do Documento editarConvenioController.PorQuantidade.value = Por Quantidade editarConvenioController.NaoInformar.value = Não Informar +editarConvenioController.PorCliente.value = Por Cliente +editarConvenioController.Geral.value = Geral editarConvenioController.lbTarifa.value = Tarifa editarConvenioController.lbTxEmbarque.value = Taxa de Embarque editarConvenioController.lbPedagio.value = Pedágio diff --git a/web/gui/configuraciones_comerciales/editarConvenio.zul b/web/gui/configuraciones_comerciales/editarConvenio.zul index 7ecd7ab67..1e0afc64e 100644 --- a/web/gui/configuraciones_comerciales/editarConvenio.zul +++ b/web/gui/configuraciones_comerciales/editarConvenio.zul @@ -40,7 +40,15 @@ - + + + + + + + + +