diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/BusquedaClienteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/BusquedaClienteController.java index 654b3f9ce..a45900237 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/BusquedaClienteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/BusquedaClienteController.java @@ -8,6 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -49,6 +50,7 @@ public class BusquedaClienteController extends MyGenericForwardComposer { private MyTextbox txtApelidoMaterno; private MyTextbox txtNumRfc; private Intbox txtNumFidelidade; + private MyTextbox txtDesccorreo; private List lsTipoIdentificacion; private Combobox cmbTipoIdentificacion; @@ -120,6 +122,11 @@ public class BusquedaClienteController extends MyGenericForwardComposer { sistemaBusqueda.addFilterOr(Filter.equal("tipoIdentificacionUno", tipoIdentificacion),Filter.equal("tipoIdentificacionDos", tipoIdentificacion)); } + String desccorreo = txtDesccorreo.getText(); + if (StringUtils.isNotBlank(desccorreo)) { + sistemaBusqueda.addFilterOr(Filter.ilike("desccorreo", "%" + desccorreo.trim().concat("%")),Filter.ilike("desccorreo", "%" + desccorreo.trim().concat("%"))); + } + } sistemaBusqueda.addFilterEqual("activo", Boolean.TRUE); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCliente.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCliente.java index 1884377d5..3a0c7691a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCliente.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCliente.java @@ -70,6 +70,9 @@ public class RenderCliente implements ListitemRenderer { lc = new Listcell(cliente.getNumIdentificaDos() != null && !"null".equals(cliente.getNumIdentificaDos()) ? cliente.getNumIdentificaDos() : ""); lc.setParent(lstm); + + lc = new Listcell(cliente.getDesccorreo() != null && !"null".equals(cliente.getDesccorreo()) ? cliente.getDesccorreo() : ""); + lc.setParent(lstm); lstm.setAttribute("data", cliente); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 345d4d73f..308c37eea 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -4572,6 +4572,7 @@ busquedaClienteController.nombpaterno.label = Apellido paterno busquedaClienteController.nombmaterno.label = Apellido materno busquedaClienteController.numtelefono.label = Teléfono busquedaClienteController.numtelefonodos.label = Celular +busquedaClienteController.lbDescorreo.value = E-mail #Editar Cliente editarClienteController.window.title = Cliente diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 0b73e8ea3..ce9972f99 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -4622,6 +4622,7 @@ busquedaClienteController.nombpaterno.label = Sobrenome Paterno busquedaClienteController.nombmaterno.label = Sobrenome Materno busquedaClienteController.numtelefono.label = Telefone busquedaClienteController.numtelefonodos.label = Celular +busquedaClienteController.lbDescorreo.value = E-mail #Editar Cliente diff --git a/web/gui/senda_amigo/busquedaCliente.zul b/web/gui/senda_amigo/busquedaCliente.zul index c91e2411c..5d7389ded 100644 --- a/web/gui/senda_amigo/busquedaCliente.zul +++ b/web/gui/senda_amigo/busquedaCliente.zul @@ -67,6 +67,13 @@ maxlength="15" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/> + + @@ -108,6 +115,9 @@ +