fix bug #0009072 - Adicionada funcionalidade de multiplas agencias no pricing

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71822 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoCanalVendasController.java

@@ -0,0 +1,166 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.log4j.Logger;
+import org.hibernate.Hibernate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Combobox;
+
+import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
+import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas;
+import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
+import com.rjconsultores.ventaboletos.service.PricingEspecificoCanalVendasService;
+import com.rjconsultores.ventaboletos.service.PricingEspecificoService;
+import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+
+@Controller("editarPricingEspecificoCanalVendasController")
+@Scope("prototype")
+public class EditarPricingEspecificoCanalVendasController extends MyGenericForwardComposer {
+
+	private static final long serialVersionUID = 1L;
+	private static Logger log = Logger.getLogger(EditarPricingEspecificoCanalVendasController.class);
+
+	private PricingEspecifico pricingEspecifico;
+	private PricingEspecificoCanalVendas pricingEspecificoCanal;
+	private MyListbox pricingListEspCanalVenda;
+	private List<PricingEspecificoCanalVendas> lspricingCanal;
+	private List<TipoPuntoVenta> lsPtovata;
+	
+	public List<TipoPuntoVenta> getLsPtovata() {
+		return lsPtovata;
+	}
+
+	public void setLsPtovata(List<TipoPuntoVenta> lsPtovata) {
+		this.lsPtovata = lsPtovata;
+	}
+	@Autowired
+	private PricingEspecificoService pricingEspecificoService;
+	@Autowired
+	private TipoPuntoVentaService puntoVentaService;
+    
+	private Combobox cmbPtovta;
+	
+	@Autowired
+	private PricingEspecificoCanalVendasService pricingEspecificoCanalService;
+	
+	private Boolean isEdicao;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+		lsPtovata = puntoVentaService.obtenerTodos();
+		pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico");
+		if(pricingEspecifico.getPricingespecificoId() != null){
+			pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId());
+			lspricingCanal =  pricingEspecifico.getPricingEspecificoCanalVendasList();
+			
+		}
+		
+		pricingEspecificoCanal = (PricingEspecificoCanalVendas) Executions.getCurrent().getArg().get("pricingEspecificoCanal");
+		pricingListEspCanalVenda = (MyListbox) Executions.getCurrent().getArg().get("pricingListEspCanal");
+		isEdicao = (Boolean) Executions.getCurrent().getArg().get("isEdicao");
+	    
+		
+		super.doAfterCompose(comp);
+		Locale locale = new Locale("pt", "BR");
+	
+
+	}
+
+	public void onClick$btnAdicionarPricingEspCanal(Event ev) throws Exception {
+		PricingEspecificoCanalVendas pricingCanal  = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId());
+
+		List<PricingEspecificoCanalVendas> peoList = null;
+		if (lspricingCanal == null || lspricingCanal.isEmpty()) {
+			peoList = new ArrayList<PricingEspecificoCanalVendas>();
+		} else {
+			peoList = pricingEspecifico.getPricingEspecificoCanalVendasList();
+		}
+		Hibernate.initialize(pricingEspecifico);
+		Hibernate.initialize(pricingEspecificoCanal);
+		
+		if (pricingEspecificoCanal.getPricingEspecificoCanalId() != null && peoList.contains(pricingCanal)) {
+			int index = peoList.indexOf(pricingCanal);
+			if(index >= 0) {
+				peoList.set(index, pricingCanal);
+			}
+		} else {
+			peoList.add(pricingCanal);
+		}
+		if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) {
+			pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue());
+		}
+		
+		pricingEspecificoCanal.setActivo(Boolean.TRUE);
+		pricingEspecifico.setPricingEspecificoCanalVendasList(peoList);
+		pricingListEspCanalVenda.addItemNovo(pricingCanal);
+		if(pricingListEspCanalVenda.getSize()>1){
+			TipoPuntoVenta tpv = puntoVentaService.obtenerID(new Short("-1"));
+			PricingEspecificoCanalVendas pecv = new PricingEspecificoCanalVendas();
+			pecv.setTipoPtovta(tpv);
+			pecv.setActivo(Boolean.TRUE);
+			pecv.setPricingEspecifico(pricingEspecifico);
+			pricingListEspCanalVenda.removeItem(pecv);
+		}
+		
+		closeWindow();
+	}
+	public void onClick$btnApagarPricingEspCanal(Event ev) throws Exception {
+		PricingEspecificoCanalVendas pricingCanal  = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId());
+
+		List<PricingEspecificoCanalVendas> peoList = null;
+		if (lspricingCanal == null || lspricingCanal.isEmpty()) {
+			peoList = new ArrayList<PricingEspecificoCanalVendas>();
+		} else {
+			peoList = pricingEspecifico.getPricingEspecificoCanalVendasList();
+		}
+		Hibernate.initialize(pricingEspecifico);
+		Hibernate.initialize(pricingEspecificoCanal);
+		
+		if (pricingEspecificoCanal.getPricingEspecificoCanalId() != null && peoList.contains(pricingCanal)) {
+			int index = peoList.indexOf(pricingCanal);
+			if(index >= 0) {
+				peoList.set(index, pricingCanal);
+			}
+		} else {
+			peoList.add(pricingCanal);
+		}
+		if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) {
+			pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue());
+		}
+		
+		pricingEspecificoCanal.setActivo(Boolean.TRUE);
+		pricingEspecifico.setPricingEspecificoCanalVendasList(peoList);
+		pricingListEspCanalVenda.addItemNovo(pricingCanal);
+		closeWindow();
+	}
+
+	public PricingEspecifico getPricingEspecifico() {
+		return pricingEspecifico;
+	}
+
+	public void setPricingEspecifico(PricingEspecifico pricingEspecifico) {
+		this.pricingEspecifico = pricingEspecifico;
+	}
+
+	public Combobox getCmbPtovta() {
+		return cmbPtovta;
+	}
+
+	public void setCmbPtovta(Combobox cmbPtovta) {
+		this.cmbPtovta = cmbPtovta;
+	}
+	
+	
+
+}

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java

@@ -37,6 +37,7 @@ import com.rjconsultores.ventaboletos.entidad.Moneda;
 import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
 import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia;
+import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas;
 import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
@@ -47,6 +48,7 @@ import com.rjconsultores.ventaboletos.service.MarcaService;
 import com.rjconsultores.ventaboletos.service.MonedaService;
 import com.rjconsultores.ventaboletos.service.ParadaService;
 import com.rjconsultores.ventaboletos.service.PricingEspecificoAgenciaService;
+import com.rjconsultores.ventaboletos.service.PricingEspecificoCanalVendasService;
 import com.rjconsultores.ventaboletos.service.PricingEspecificoOcupacionService;
 import com.rjconsultores.ventaboletos.service.PricingEspecificoService;
 import com.rjconsultores.ventaboletos.service.PuntoVentaService;
@@ -55,6 +57,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingAgencia;
+import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingCanal;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingEspecificoOcupacion;
 
 /**
@@ -90,6 +93,9 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 	private PuntoVentaService puntoVenService;
 	@Autowired
 	private PricingEspecificoAgenciaService  pricingEspecificoAgenciaService;
+	@Autowired
+	private PricingEspecificoCanalVendasService  pricingEspecificoCanalVendasService;
+
 
 	private PricingEspecifico pricingEspecifico;
 	private MyListbox pricingList;
@@ -116,8 +122,11 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 
 	private MyListbox pricingListEspOcupacion;
 	private MyListbox pricingListEspAgencia;
+	private MyListbox pricingListEspCanal;
 	private List<PricingEspecificoOcupacion> pricingEspecificoADesativar;
 	private List<PricingEspecificoAgencia> pricingEspecificoADesativarAgencia;
+	
+	private List<PricingEspecificoCanalVendas> pricingEspecificoADesativarCanal;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -130,11 +139,12 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 		pricingList = (MyListbox) Executions.getCurrent().getArg().get("pricingList");
 		pricingEspecificoADesativar = new ArrayList<PricingEspecificoOcupacion>();
 		pricingEspecificoADesativarAgencia = new ArrayList<PricingEspecificoAgencia>();
-		
+		pricingEspecificoADesativarCanal = new ArrayList<PricingEspecificoCanalVendas>();
 		super.doAfterCompose(comp);
 
 		pricingListEspOcupacion.setItemRenderer(new RenderPricingEspecificoOcupacion());
 		pricingListEspAgencia.setItemRenderer(new RenderPricingAgencia());
+		pricingListEspCanal.setItemRenderer(new RenderPricingCanal());
 
 		if (pricingEspecifico.getPricingespecificoId() == null) {
 			btnApagar.setVisible(Boolean.FALSE);
@@ -169,6 +179,17 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 					verPricingEspecificoAgencia(especificoAgencia, true);
 				}
 			});
+			
+			
+			pricingListEspCanal.setData(pricingEspecifico.getPricingEspecificoCanalListActivos());
+			pricingListEspCanal.addEventListener("onDoubleClick", new EventListener() {
+
+				@Override
+				public void onEvent(Event event) throws Exception {
+					PricingEspecificoCanalVendas especificoCanalVendas = (PricingEspecificoCanalVendas) pricingListEspCanal.getSelected();
+					verPricingEspecificoCanal(especificoCanalVendas, true);
+				}
+			});
 		}
 
 		fechaInicio.focus(); 
@@ -198,6 +219,18 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 		openWindow("/gui/pricing/editarPricingEspecificoAgencia.zul",
 				Labels.getLabel("editarPricingController.window.title"), args, MODAL);
 	}
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public void verPricingEspecificoCanal(PricingEspecificoCanalVendas especificoCanalVendas, Boolean isEdicao) {
+
+		Map args = new HashMap();
+		args.put("pricingEspecifico", pricingEspecifico);
+		args.put("pricingEspecificoCanal", especificoCanalVendas);
+		args.put("isEdicao", isEdicao);
+		args.put("pricingListEspCanal", pricingListEspCanal);
+
+		openWindow("/gui/pricing/editarPricingEspecificoCanalVendas.zul",
+				Labels.getLabel("editarPricingController.window.title"), args, MODAL);
+	}
 
 	public void onClick$btnNovoPricingEspOcup(Event ev) throws InterruptedException {
 		verPricingEspecificoOcupacion(new PricingEspecificoOcupacion(), false);
@@ -206,6 +239,9 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 	public void onClick$btnNovoPricingAgencia(Event ev) throws InterruptedException {
 		verPricingEspecificoAgencia(new PricingEspecificoAgencia(), false);
 	}
+	public void onClick$btnNovoPricingCanal(Event ev) throws InterruptedException {
+		verPricingEspecificoCanal(new PricingEspecificoCanalVendas(), false);
+	}
 
 	public void onClick$btnApagarPricingEspOcup(Event ev) throws InterruptedException {
 		if (pricingListEspOcupacion.getSelected() == null) {
@@ -253,6 +289,29 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 			}
 		}
 	}
+	public void onClick$btnApagarPricingEspCanal(Event ev) throws InterruptedException {
+		if (pricingListEspCanal.getSelected() == null) {
+			Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"),
+					Labels.getLabel("editarPricingController.window.title"),
+					Messagebox.OK, Messagebox.EXCLAMATION);
+		} else {
+			int resp = Messagebox.show(Labels.getLabel("editarPricingEspecificoAgenciaController.MSG.borrarPergunta"),
+					Labels.getLabel("busquedaPricingEspecificoController.window.title"),
+					Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
+			if (resp == Messagebox.YES) {
+				PricingEspecificoCanalVendas pricingEspecificoCanal = (PricingEspecificoCanalVendas) pricingListEspCanal.getSelected();
+
+				if (pricingEspecificoCanal.getPricingEspecificoCanalId() != null) {
+					pricingEspecificoCanal.setActivo(false);
+					pricingListEspCanal.removeItem(pricingEspecificoCanal);
+					pricingEspecificoADesativarCanal.add(pricingEspecificoCanal);
+				} else {
+					pricingListEspOcupacion.removeSelectedItem();
+					removerPricingCanalVendas(pricingEspecificoCanal);
+				}
+			}
+		}
+	}
 
 	private void removerPricingOcupacion(PricingEspecificoOcupacion especificoOcupacion) {
 		if (especificoOcupacion.getPricingEspecificoOcupacionId() != null) {
@@ -285,6 +344,11 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 			pricingEspecifico.getPricingEspecificoAgenciasList().remove(especificoAgencia);
 		} 
 	}
+	private void removerPricingCanalVendas(PricingEspecificoCanalVendas especificoCanalVendas) {
+		if (especificoCanalVendas.getPricingEspecificoCanalId() != null) {
+			pricingEspecifico.getPricingEspecificoAgenciasList().remove(especificoCanalVendas);
+		} 
+	}
 
 	public void onClick$btnModificarPricingEspOcup(Event ev) {
 		PricingEspecificoOcupacion especificoOcupacion = (PricingEspecificoOcupacion) pricingListEspOcupacion.getSelected();
@@ -341,7 +405,10 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 			}
 			
 		}
-
+		List<PricingEspecificoCanalVendas> pecv =  (List<PricingEspecificoCanalVendas>) pricingListEspCanal.getModel();
+		List<PricingEspecificoAgencia> pea =  (List<PricingEspecificoAgencia>) pricingListEspAgencia.getModel();
+		pricingEspecifico.setPricingEspecificoAgenciasList(pea);
+		pricingEspecifico.setPricingEspecificoCanalVendasList(pecv);
 		if (pricingEspecifico.getTipoPtovta() == null) {
 			Messagebox.show(Labels.getLabel("editarPricingController.MSG.tipoPtoVta"),
 					Labels.getLabel("busquedaPricingEspecificoController.window.title"),
@@ -458,16 +525,31 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 				pricingEspecifico.setPricingEspecificoAgenciasList(new ArrayList<PricingEspecificoAgencia>());
 			}
 			if (pricingEspecifico.getPricingEspecificoAgenciasList().isEmpty()){
-				PricingEspecificoAgencia pea = new PricingEspecificoAgencia();
+				PricingEspecificoAgencia pea1 = new PricingEspecificoAgencia();
-				pea.setPricingEspecifico(pricingEspecifico);
+				pea1.setPricingEspecifico(pricingEspecifico);
 				PuntoVenta pv = puntoVenService.obtenerID(-1);
-				pea.setPuntoVenta(pv);
+				pea1.setPuntoVenta(pv);
-				pea.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+				pea1.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
-				pea.setFecmodif(new Date());
+				pea1.setFecmodif(new Date());
-				pea.setActivo(Boolean.TRUE);
+				pea1.setActivo(Boolean.TRUE);
 				pricingEspecifico.setPricingEspecificoAgenciasList(new ArrayList<PricingEspecificoAgencia>());
-				pricingEspecifico.getPricingEspecificoAgenciasList().add(pea);
+				pricingEspecifico.getPricingEspecificoAgenciasList().add(pea1);
 			}
+			if(pricingEspecifico.getPricingEspecificoCanalVendasList() == null ){
+				pricingEspecifico.setPricingEspecificoCanalVendasList(new ArrayList<PricingEspecificoCanalVendas>());
+			}
+			if (pricingEspecifico.getPricingEspecificoCanalVendasList().isEmpty()){
+				PricingEspecificoCanalVendas pea1 = new PricingEspecificoCanalVendas();
+				pea1.setPricingEspecifico(pricingEspecifico);
+				TipoPuntoVenta tpv = puntoVentaService.obtenerID(new Short("-1"));
+				pea1.setTipoPtovta(tpv);
+				pea1.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
+				pea1.setFecmodif(new Date());
+				pea1.setActivo(Boolean.TRUE);
+				pricingEspecifico.setPricingEspecificoCanalVendasList(new ArrayList<PricingEspecificoCanalVendas>());
+				pricingEspecifico.getPricingEspecificoCanalVendasList().add(pea1);
+			}
+			
 			if (pricingEspecifico.getPricingespecificoId() == null) {
 				pricingEspecificoService.suscribir(pricingEspecifico);
 				pricingList.addItemNovo(pricingEspecifico);
@@ -503,6 +585,11 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 			pricingEspecificoAgenciaService.actualizacion(p);
 		}
 	}
+	private void desativarPricingEspecificoCanalDesativados() {
+		for (PricingEspecificoCanalVendas p : pricingEspecificoADesativarCanal) {
+			pricingEspecificoCanalVendasService.actualizacion(p);
+		}
+	}
 
 	/**
 	 * Valida se a lista de ocupações são subsequentes e se a primeira ocupação possui ocupação inicial igual a 1.
@@ -909,6 +996,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 	public void setRdExibirVendaNo(Radio rdExibirVendaNo) {
 		this.rdExibirVendaNo = rdExibirVendaNo;
 	}
+	
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void onClick$btnCopiar(Event ev) throws InterruptedException {

src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingCanal.java

@@ -0,0 +1,28 @@
+package com.rjconsultores.ventaboletos.web.utilerias.render;
+
+import org.zkoss.zul.Listcell;
+import org.zkoss.zul.Listitem;
+import org.zkoss.zul.ListitemRenderer;
+
+import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas;
+
+public class RenderPricingCanal implements ListitemRenderer {
+
+	public void render(Listitem lstm, Object o) throws Exception {
+		PricingEspecificoCanalVendas pea = (PricingEspecificoCanalVendas) o;
+
+		if (!pea.getActivo()) {
+			return;
+		}
+
+		Listcell lc = new Listcell(pea.getTipoPtovta().getTipoptovtaId().toString());
+		lc.setParent(lstm);
+
+		lc = new Listcell(pea.getTipoPtovta().getDesctipo().toString());
+		lc.setParent(lstm);
+
+		
+
+	}
+
+}

src/java/spring-config.xml

@@ -224,6 +224,7 @@
 				<value>com.rjconsultores.ventaboletos.entidad.PricingEspecifico</value>
 				<value>com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion</value>
 				<value>com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia</value>
+				<value>com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas</value>
 				<value>com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria</value>
 				<value>com.rjconsultores.ventaboletos.entidad.PricingRuta</value>
 				<value>com.rjconsultores.ventaboletos.entidad.ProductoServicio

web/gui/pricing/editarPricingEspecifico.zul

@@ -16,18 +16,18 @@
 				<button id="btnApagar" height="20"
 					image="/gui/img/remove.png" width="35px"
 					tooltiptext="${c:l('editarPricingController.btnApagarPricing.tooltiptext')}" />
-				<button id="btnSalvar" disabled="${arg.isReadOnly}" height="20"
+				<button id="btnSalvar" disabled="${arg.isReadOnly}"
-					image="/gui/img/save.png" width="35px"
+					height="20" image="/gui/img/save.png" width="35px"
 					tooltiptext="${c:l('editarPricingController.btnSalvar.tooltiptext')}" />
-					
-									<separator orient="vertical" />
 
-				<button id="btnCopiar" disabled="${arg.isReadOnly}" height="20"
+				<separator orient="vertical" />
-					image="/gui/img/copiar.png" width="35px"
+
+				<button id="btnCopiar" disabled="${arg.isReadOnly}"
+					height="20" image="/gui/img/copiar.png" width="35px"
 					tooltiptext="${c:l('editarPricingController.btnCopiar.tooltiptext')}" />
 
 				<separator orient="vertical" />
-					
+
 				<button id="btnFechar"
 					onClick="winEditarPricingEspecifico.detach()" height="20"
 					image="/gui/img/exit.png" width="35px"
@@ -40,212 +40,250 @@
 					label="${c:l('editarPricingEspecificoController.tabGen.label')}" />
 				<tab id="B"
 					label="${c:l('editarPricingEspecificoController.tabAge.label')}" />
+				<tab id="C"
+					label="${c:l('editarPricingController.ptovta.value')}" />
 			</tabs>
-			
+
 			<tabpanels>
 				<!-- General -->
 				<tabpanel>
-		<grid>
+					<grid>
-			<columns>
+						<columns>
-				<column width="40%" />
+							<column width="40%" />
-				<column width="60%" />
+							<column width="60%" />
-			</columns>
+						</columns>
-			<rows>
+						<rows>
-				<row>
+							<row>
-					<label
-						value="${c:l('editarPricingController.nombrePricingEsp.label')}" />
-					<textbox id="nombrePricing" constraint="no empty"
-						maxlength="20"
-						value="@{winEditarPricingEspecifico$composer.pricingEspecifico.nombPricing}"
-						width="50%"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.lhFechaHoraInicio.label')}" />
-					<datebox width="200px" id="fechaInicio"
-						
-						value="@{winEditarPricingEspecifico$composer.pricingEspecifico.fechorinicio}"
-						format="dd/MM/yyyy HH:mm" mold="rounded" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.lhFechaHoraFin.label')}" />
-					<datebox width="200px" id="fechaFin" 
-						value="@{winEditarPricingEspecifico$composer.pricingEspecifico.fechorfin}"
-						format="dd/MM/yyyy HH:mm" mold="rounded" />
-				</row>
-
-				<row>
-					<label
-						value="${c:l('editarPricingController.lhCorridaId.labelLH')}" />
-					<intbox id="txtCorridaId" mold="rounded"
-						value="@{winEditarPricingEspecifico$composer.pricingEspecifico.corridaId}" />
-				</row>
-
-				<row>
-					<label
-						value="${c:l('editarPricingController.ptovta.value')}" />
-					<combobox id="cmbPtovta"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" width="90%"
-						model="@{winEditarPricingEspecifico$composer.lsPtovata}"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.tipoPtovta}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.windowCategoria.title')}" />
-					<combobox id="cmbCategoria"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" width="90%"
-						model="@{winEditarPricingEspecifico$composer.lsCategoria}"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.categoria}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.windowTipoServicio.title')}" />
-					<combobox id="cmbServicio"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" width="90%"
-						model="@{winEditarPricingEspecifico$composer.lsclaseServicio}"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.claseServicio}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.marca.value')}" />
-					<combobox id="cmbMarca"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" width="90%"
-						model="@{winEditarPricingEspecifico$composer.lsMarca}"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.marca}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.origem.label')}" />
-					<combobox id="cmbOrigem"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
-						mold="rounded" buttonVisible="true" width="90%"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.parada}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.destino.label')}" />
-					<combobox id="cmbDestino"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
-						mold="rounded" buttonVisible="true" width="90%"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.parada1}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.impMon.value')}" />
-					<combobox id="cmbMoneda"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" width="90%"
-						model="@{winEditarPricingEspecifico$composer.lsMoneda}"
-						selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.moneda}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.tarifiaredondoabierto.label')}" />
-					<textbox id="tarifaAbierto"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-						precision="7" scale="2" constraint="no empty"
-						value="@{winEditarPricingEspecifico$composer.pricingEspecifico.tarifaredabierto,converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
-				</row>
-				<row>
-					<label
-						value="${c:l('editarPricingController.exibirVenda.label')}" />
-					<radiogroup Id="radioExibirVenda">
-						<hbox align="center">
-							<radio Id="rdExibirVendaSi"
-								label="${c:l('editarPricingController.si.label')}"
-								checked="true" />
-							<radio Id="rdExibirVendaNo"
-								label="${c:l('editarPricingController.no.label')}" />
-						</hbox>
-					</radiogroup>
-				</row>
-			</rows>
-		</grid>
-
-		<grid>
-			<rows>
-				<row valign="top">
-					<vbox height="100%" width="100%">
-						<toolbar>
-							<hbox spacing="5px" style="padding:1px"
-								align="right">
 								<label
-									value="${c:l('editarPricingEspecificoOcupacionController.ocupacao.label')}:" />
+									value="${c:l('editarPricingController.nombrePricingEsp.label')}" />
-								<button id="btnNovoPricingEspOcup" disabled="${arg.isReadOnly}" 
+								<textbox id="nombrePricing"
-									image="/gui/img/add.png" width="35px"
+									constraint="no empty" maxlength="20"
-									tooltiptext="${c:l('editarPricingController.btnNovoVigencia.tooltiptext')}" />
+									value="@{winEditarPricingEspecifico$composer.pricingEspecifico.nombPricing}"
-								<button id="btnApagarPricingEspOcup" disabled="${arg.isReadOnly}" 
+									width="50%"
-									height="20" image="/gui/img/remove.png" width="35px"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
-									tooltiptext="${c:l('editarPricingController.btnApagarPricing.tooltiptext')}" />
+							</row>
-								<button id="btnModificarPricingEspOcup" disabled="${arg.isReadOnly}" 
+							<row>
-									label="${c:l('editarPricingController.btnModificar.value')}" />
-							</hbox>
-						</toolbar>
-						<listbox id="pricingListEspOcupacion"
-							use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
-							multiple="false">
-							<listhead sizable="true">
-								<listheader
-									image="/gui/img/create_doc.gif" sort="auto(tarifa)"
-									label="${c:l('editarPricingEspecificoOcupacionController.tarifa.label')}" />
-								<listheader
-									image="/gui/img/create_doc.gif" sort="auto(ocupacioninicial)"
-									label="${c:l('editarPricingEspecificoOcupacionController.ocupacionInicial.label')}" />
-								<listheader
-									image="/gui/img/create_doc.gif" sort="auto(ocupacionfinal)"
-									label="${c:l('editarPricingEspecificoOcupacionController.ocupacionFinal.label')}" />
-								<listheader
-									image="/gui/img/create_doc.gif" sort="auto(desconto)"
-									label="${c:l('editarPricingEspecificoOcupacionController.desconto.label')}" />
-							</listhead>
-						</listbox>
-					</vbox>
-				</row>
-			</rows>
-		</grid>
-		</tabpanel>
-		<tabpanel>
-		<grid>
-			<rows>
-				<row valign="top">
-					<vbox height="100%" width="100%">
-						<toolbar>
-							<hbox spacing="5px" style="padding:1px"
-								align="right">
 								<label
-									value="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}:" />
+									value="${c:l('editarPricingController.lhFechaHoraInicio.label')}" />
-								<button id="btnNovoPricingAgencia" disabled="${arg.isReadOnly}" 
+								<datebox width="200px" id="fechaInicio"
-									image="/gui/img/add.png" width="35px"
+									value="@{winEditarPricingEspecifico$composer.pricingEspecifico.fechorinicio}"
-									tooltiptext="${c:l('editarPricingController.btnAgencia.tooltiptext')}" />
+									format="dd/MM/yyyy HH:mm" mold="rounded" />
-								<button id="btnApagarPricingEspAgencia" disabled="${arg.isReadOnly}" 
+							</row>
-									height="20" image="/gui/img/remove.png" width="35px"
+							<row>
-									tooltiptext="${c:l('editarPricingController.btnApagarAgencia.tooltiptext')}" />
+								<label
-							</hbox>
+									value="${c:l('editarPricingController.lhFechaHoraFin.label')}" />
-						</toolbar>
+								<datebox width="200px" id="fechaFin"
-						<listbox id="pricingListEspAgencia"
+									value="@{winEditarPricingEspecifico$composer.pricingEspecifico.fechorfin}"
-							use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
+									format="dd/MM/yyyy HH:mm" mold="rounded" />
-							multiple="false">
+							</row>
-							<listhead sizable="true">
+
-								<listheader
+							<row>
-									image="/gui/img/create_doc.gif" sort="auto(tarifa)"
+								<label
-									label="${c:l('editarPricingEspecificoOcupacionController.agenciaId.label')}" />
+									value="${c:l('editarPricingController.lhCorridaId.labelLH')}" />
-								<listheader
+								<intbox id="txtCorridaId" mold="rounded"
-									image="/gui/img/create_doc.gif" sort="auto(ocupacioninicial)"
+									value="@{winEditarPricingEspecifico$composer.pricingEspecifico.corridaId}" />
-									label="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}" />
+							</row>
-							</listhead>
+							<row>
-						</listbox>
+								<label
-					</vbox>
+									value="${c:l('editarPricingController.windowCategoria.title')}" />
-				</row>
+								<combobox id="cmbCategoria"
-			</rows>
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-		</grid>
+									mold="rounded" buttonVisible="true" width="90%"
-		</tabpanel>
+									model="@{winEditarPricingEspecifico$composer.lsCategoria}"
-		</tabpanels>
+									selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.categoria}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.windowTipoServicio.title')}" />
+								<combobox id="cmbServicio"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+									mold="rounded" buttonVisible="true" width="90%"
+									model="@{winEditarPricingEspecifico$composer.lsclaseServicio}"
+									selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.claseServicio}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.marca.value')}" />
+								<combobox id="cmbMarca"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+									mold="rounded" buttonVisible="true" width="90%"
+									model="@{winEditarPricingEspecifico$composer.lsMarca}"
+									selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.marca}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.origem.label')}" />
+								<combobox id="cmbOrigem"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
+									mold="rounded" buttonVisible="true" width="90%"
+									selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.parada}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.destino.label')}" />
+								<combobox id="cmbDestino"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
+									mold="rounded" buttonVisible="true" width="90%"
+									selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.parada1}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.impMon.value')}" />
+								<combobox id="cmbMoneda"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+									mold="rounded" buttonVisible="true" width="90%"
+									model="@{winEditarPricingEspecifico$composer.lsMoneda}"
+									selectedItem="@{winEditarPricingEspecifico$composer.pricingEspecifico.moneda}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.tarifiaredondoabierto.label')}" />
+								<textbox id="tarifaAbierto"
+									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
+									precision="7" scale="2" constraint="no empty"
+									value="@{winEditarPricingEspecifico$composer.pricingEspecifico.tarifaredabierto,converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
+							</row>
+							<row>
+								<label
+									value="${c:l('editarPricingController.exibirVenda.label')}" />
+								<radiogroup Id="radioExibirVenda">
+									<hbox align="center">
+										<radio Id="rdExibirVendaSi"
+											label="${c:l('editarPricingController.si.label')}"
+											checked="true" />
+										<radio Id="rdExibirVendaNo"
+											label="${c:l('editarPricingController.no.label')}" />
+									</hbox>
+								</radiogroup>
+							</row>
+						</rows>
+					</grid>
+
+					<grid>
+						<rows>
+							<row valign="top">
+								<vbox height="100%" width="100%">
+									<toolbar>
+										<hbox spacing="5px"
+											style="padding:1px" align="right">
+											<label
+												value="${c:l('editarPricingEspecificoOcupacionController.ocupacao.label')}:" />
+											<button
+												id="btnNovoPricingEspOcup" disabled="${arg.isReadOnly}"
+												image="/gui/img/add.png" width="35px"
+												tooltiptext="${c:l('editarPricingController.btnNovoVigencia.tooltiptext')}" />
+											<button
+												id="btnApagarPricingEspOcup" disabled="${arg.isReadOnly}"
+												height="20" image="/gui/img/remove.png" width="35px"
+												tooltiptext="${c:l('editarPricingController.btnApagarPricing.tooltiptext')}" />
+											<button
+												id="btnModificarPricingEspOcup" disabled="${arg.isReadOnly}"
+												label="${c:l('editarPricingController.btnModificar.value')}" />
+										</hbox>
+									</toolbar>
+									<listbox
+										id="pricingListEspOcupacion"
+										use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
+										multiple="false">
+										<listhead sizable="true">
+											<listheader
+												image="/gui/img/create_doc.gif" sort="auto(tarifa)"
+												label="${c:l('editarPricingEspecificoOcupacionController.tarifa.label')}" />
+											<listheader
+												image="/gui/img/create_doc.gif"
+												sort="auto(ocupacioninicial)"
+												label="${c:l('editarPricingEspecificoOcupacionController.ocupacionInicial.label')}" />
+											<listheader
+												image="/gui/img/create_doc.gif" sort="auto(ocupacionfinal)"
+												label="${c:l('editarPricingEspecificoOcupacionController.ocupacionFinal.label')}" />
+											<listheader
+												image="/gui/img/create_doc.gif" sort="auto(desconto)"
+												label="${c:l('editarPricingEspecificoOcupacionController.desconto.label')}" />
+										</listhead>
+									</listbox>
+								</vbox>
+							</row>
+						</rows>
+					</grid>
+				</tabpanel>
+				<tabpanel>
+					<grid>
+						<rows>
+							<row valign="top">
+								<vbox height="100%" width="100%">
+									<toolbar>
+										<hbox spacing="5px"
+											style="padding:1px" align="right">
+											<label
+												value="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}:" />
+											<button
+												id="btnNovoPricingAgencia" disabled="${arg.isReadOnly}"
+												image="/gui/img/add.png" width="35px"
+												tooltiptext="${c:l('editarPricingController.btnAgencia.tooltiptext')}" />
+											<button
+												id="btnApagarPricingEspAgencia" disabled="${arg.isReadOnly}"
+												height="20" image="/gui/img/remove.png" width="35px"
+												tooltiptext="${c:l('editarPricingController.btnApagarAgencia.tooltiptext')}" />
+										</hbox>
+									</toolbar>
+									<listbox id="pricingListEspAgencia"
+										use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
+										multiple="false">
+										<listhead sizable="true">
+											<listheader
+												image="/gui/img/create_doc.gif" sort="auto(tarifa)"
+												label="${c:l('editarPricingEspecificoOcupacionController.agenciaId.label')}" />
+											<listheader
+												image="/gui/img/create_doc.gif"
+												sort="auto(ocupacioninicial)"
+												label="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}" />
+										</listhead>
+									</listbox>
+								</vbox>
+							</row>
+						</rows>
+					</grid>
+				</tabpanel>
+				<tabpanel>
+					<grid>
+						<rows>
+							<row>
+									
+							<vbox height="100%" width="100%">
+									<toolbar>
+										<hbox spacing="5px"
+											style="padding:1px" align="right">
+											<label
+									value="${c:l('editarPricingController.ptovta.value')}" />
+											<button
+												id="btnNovoPricingCanal" disabled="${arg.isReadOnly}"
+												image="/gui/img/add.png" width="35px"
+												tooltiptext="${c:l('editarPricingController.btnAgencia.tooltiptext')}" />
+											<button
+												id="btnApagarPricingEspCanal" disabled="${arg.isReadOnly}"
+												height="20" image="/gui/img/remove.png" width="35px"
+												tooltiptext="${c:l('editarPricingController.btnApagarAgencia.tooltiptext')}" />
+										</hbox>
+									</toolbar>
+									<listbox id="pricingListEspCanal"
+										use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
+										multiple="false">
+										<listhead sizable="true">
+											<listheader
+												image="/gui/img/create_doc.gif" sort="auto(tarifa)"
+												label="${c:l('editarPricingEspecificoOcupacionController.agenciaId.label')}" />
+											<listheader
+												image="/gui/img/create_doc.gif"
+												sort="auto(ocupacioninicial)"
+												label="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}" />
+										</listhead>
+									</listbox>
+								</vbox>
+							</row>
+						</rows>
+					</grid>
+				</tabpanel>
+			</tabpanels>
 		</tabbox>
 	</window>
 

web/gui/pricing/editarPricingEspecificoAgencia.zul

@@ -13,8 +13,9 @@
 		title="${c:l('editarPricingController.window.title')}">
 		<toolbar>
 			<hbox spacing="5px" style="padding:1px" align="right">
-				<button id="btnAdicionarPricingEspAgencia" disabled="${arg.isReadOnly}" height="20"
+				<button id="btnAdicionarPricingEspAgencia"
-					image="/gui/img/save.png" width="35px"
+					disabled="${arg.isReadOnly}" height="20" image="/gui/img/save.png"
+					width="35px"
 					tooltiptext="${c:l('editarPricingVigenciaController.btnSalvar.tooltiptext')}" />
 				<button height="20" image="/gui/img/exit.png"
 					width="35px" onClick="winEditarPricingEspecificoAgencia.detach()"
@@ -29,11 +30,13 @@
 			</columns>
 			<rows>
 				<row>
-				   <label value="${c:l('busquedaEstacionController.lhPuntoVenta.label')}" />
+					<label
-						<combobox id="cmbPuntoVenta" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
+						value="${c:l('busquedaEstacionController.lhPuntoVenta.label')}" />
-									mold="rounded" buttonVisible="true" width="90%" />
+					<combobox id="cmbPuntoVenta"
-							</row>
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
-						</rows>
+						mold="rounded" buttonVisible="true" width="90%" />
+				</row>
+			</rows>
 		</grid>
 	</window>
 </zk>

web/gui/pricing/editarPricingEspecificoCanalVendas.zul

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?page contentType="text/html;charset=UTF-8"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winEditarPricingEspecificoCanalVendas"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+
+<zk xmlns="http://www.zkoss.org/2005/zul">
+
+	<window id="winEditarPricingEspecificoCanalVendas" border="normal"
+		apply="${editarPricingEspecificoCanalVendasController}" width="600px"
+		contentStyle="overflow:auto"
+		title="${c:l('editarPricingController.window.title')}">
+		<toolbar>
+			<hbox spacing="5px" style="padding:1px" align="right">
+				<button id="btnAdicionarPricingEspCanal"
+					disabled="${arg.isReadOnly}" height="20" image="/gui/img/save.png"
+					width="35px"
+					tooltiptext="${c:l('editarPricingVigenciaController.btnSalvar.tooltiptext')}" />
+				<button height="20" image="/gui/img/exit.png"
+					width="35px"
+					onClick="winEditarPricingEspecificoCanalVendas.detach()"
+					tooltiptext="${c:l('editarPricingVigenciaController.btnFechar.tooltiptext')}" />
+			</hbox>
+		</toolbar>
+
+		<grid fixedLayout="true">
+			<columns>
+				<column width="40%" />
+				<column width="60%" />
+			</columns>
+			<rows>
+				<row>
+					<label
+						value="${c:l('editarPricingController.ptovta.value')}" />
+					<combobox id="cmbPtovta"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						mold="rounded" buttonVisible="true" width="90%"
+						model="@{winEditarPricingEspecificoCanalVendas$composer.lsPtovata}"/>
+				</row>
+			</rows>
+
+		</grid>
+	</window>
+</zk>