From 2d73d160bb62fa335429c8343195cdea6f70aab1 Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 28 Jun 2017 18:06:14 +0000
Subject: [PATCH] fixes bug #9035

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@70758 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../tarifas/EditarTarifaMinimaController.java | 11 +++++++---
 web/gui/tarifas/editarTarifasMinimas.zul      | 22 ++++++++++---------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
index 5d6684a3b..83790f346 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
@@ -184,6 +184,13 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
         tarifaMinima.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
         tarifaMinima.setActivo(Boolean.TRUE);
         
+        Comboitem cbiRuta = cmbRuta.getSelectedItem();
+		Ruta ruta = null;
+		if (cbiRuta != null) {
+			ruta = (Ruta) cbiRuta.getValue();
+		}
+		tarifaMinima.setRuta(ruta);
+        
         Comboitem cbiVigenciaTarifa = cmbVigencia.getSelectedItem();
 		VigenciaTarifa vigenciaTarifa = null;
 		if (cbiVigenciaTarifa != null) {
@@ -243,9 +250,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
 
             } else {
                 if (tarifaMinima.getTarifaminimaId() == null) {
-                    List<TarifaMinima> lsTM = tarifaMinimaService.pesquisar(
-                            tarifaMinima.getMoneda(), tarifaMinima.getPlaza(), tarifaMinima.getMarca(),
-                            tarifaMinima.getOrigem(), tarifaMinima.getDestino(), tarifaMinima.getClaseServicio(),tarifaMinima.getOrgaoConcedente() );
+                    List<TarifaMinima> lsTM = tarifaMinimaService.pesquisar(tarifaMinima );
 
                     if (lsTM.isEmpty()) {
                         tarifaMinimaService.suscribir(tarifaMinima);
diff --git a/web/gui/tarifas/editarTarifasMinimas.zul b/web/gui/tarifas/editarTarifasMinimas.zul
index e08942712..651e38011 100644
--- a/web/gui/tarifas/editarTarifasMinimas.zul
+++ b/web/gui/tarifas/editarTarifasMinimas.zul
@@ -61,6 +61,17 @@
                         use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" 
                         selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.marca}"/>
                 </row>
+                
+                 <row>
+                    <label value="${c:l('busquedaTarifasMinimasController.lhClaseServicio.label')}"/>
+                    <combobox id="cmbClaseServicio" constraint="no empty"
+                        mold="rounded" buttonVisible="true" width="90%" 
+                        model="@{winEditarTarifaMinima$composer.lsClaseServico}"
+                        use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+                        selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/>
+                        
+                </row>
+                
                 <row>
                 	<label
                 		value="${c:l('modificacionMasivaTarifasController.orgaoConcedente.label')}" />
@@ -96,21 +107,12 @@
                         use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada" 
                         initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"
                         selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/>
-                </row>
-                <row>
-                    <label value="${c:l('busquedaTarifasMinimasController.lhClaseServicio.label')}"/>
-                    <combobox id="cmbClaseServicio" constraint="no empty"
-                        mold="rounded" buttonVisible="true" width="90%" 
-                        model="@{winEditarTarifaMinima$composer.lsClaseServico}"
-                        use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-                        selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/>
-                        
                 </row>
                 
     			 <row>
             <label value="${c:l('busquedaTarifaController.lhFeciniciovigencia.label')}"/>
                 <combobox id="cmbVigencia" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-                        disabled="false"
+                        disabled="false" constraint="no empty"
                         mold="rounded" buttonVisible="true" width="90%"
                         model="@{winEditarTarifaMinima$composer.lsVigenciaTarifa}"
                         selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.vigenciaTarifa}"/>