P12 - Definir a classe tarifária (bug #5797)

Tempo: 8 horas

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

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

@@ -0,0 +1,144 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zhtml.Messagebox;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zul.Paging;
+import org.zkoss.zul.Textbox;
+
+import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria;
+import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
+import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
+import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingClasseTarifaria;
+
+@Controller("busquedaPricingClasseTarifariaController")
+@Scope("prototype")
+public class BusquedaPricingClasseTarifariaController extends MyGenericForwardComposer {
+
+	private static final long serialVersionUID = 1L;
+	private static Logger log = Logger.getLogger(BusquedaPricingClasseTarifariaController.class);
+
+	@Autowired
+	private transient PagedListWrapper<PricingClasseTarifaria> plwPricingClasseTarifaria;
+
+	@Autowired
+	private PricingClasseTarifariaService pricingClasseTarifariaService;
+
+	private MyListbox pricingClasseTarifariaList;
+	private Paging pagingPricing;
+
+	private Textbox desc;
+	private Textbox sigla;
+
+	public void onClick$btnApagar(Event ev) {
+		try {
+			PricingClasseTarifaria p = (PricingClasseTarifaria) pricingClasseTarifariaList.getSelected();
+			if (p != null) {
+				int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPergunta"),
+						Labels.getLabel("busquedaPricingController.window.title"),
+						Messagebox.YES | Messagebox.NO,
+						Messagebox.QUESTION);
+
+				if (resp == Messagebox.YES) {
+					pricingClasseTarifariaService.borrar(p);
+					Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarOK"),
+							Labels.getLabel("busquedaPricingController.window.title"),
+							Messagebox.OK, Messagebox.INFORMATION);
+					pricingClasseTarifariaList.removeItem(p);
+				}
+			} else {
+				Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"),
+						Labels.getLabel("busquedaPricingController.window.title"),
+						Messagebox.OK, Messagebox.EXCLAMATION);
+			}
+		} catch (Exception ex) {
+			log.error("Erro ao eliminar Pricing Classe Tarifaria: ", ex);
+		}
+	}
+
+	private void refreshLista() {
+
+		HibernateSearchObject<PricingClasseTarifaria> pricingSearch = new HibernateSearchObject<PricingClasseTarifaria>(
+				PricingClasseTarifaria.class, pagingPricing.getPageSize());
+
+		if (!desc.getValue().isEmpty()) {
+			pricingSearch.addFilterILike("descClasseTarifaria", desc.getValue() + "%");
+		}
+
+		if (!sigla.getValue().isEmpty()) {
+			pricingSearch.addFilterILike("sigla", sigla.getValue());
+		}
+
+		pricingSearch.addFilterEqual("activo", Boolean.TRUE);
+		pricingSearch.addSortAsc("descClasseTarifaria");
+
+		plwPricingClasseTarifaria.init(pricingSearch, pricingClasseTarifariaList, pagingPricing);
+
+		if (pricingClasseTarifariaList.getData().length == 0) {
+			try {
+				Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels
+						.getLabel("busquedaPricingController.window.title"),
+						Messagebox.OK, Messagebox.INFORMATION);
+			} catch (InterruptedException ex) {
+			}
+		}
+	}
+
+	public void onClick$btnNovo(Event ev) {
+		verPricingClasseTarifaria(new PricingClasseTarifaria());
+	}
+
+	public void onClick$btnPesquisa(Event ev) throws InterruptedException {
+		refreshLista();
+	}
+
+	public void onClick$btnRefresh(Event ev) {
+		refreshLista();
+	}
+
+	@SuppressWarnings("unchecked")
+	private void verPricingClasseTarifaria(PricingClasseTarifaria pricingClasseTarifaria) {
+		if (pricingClasseTarifaria == null) {
+			return;
+		}
+
+		@SuppressWarnings("rawtypes")
+		Map args = new HashMap();
+		args.put("pricingClasseTarifaria", pricingClasseTarifaria);
+		args.put("pricingClasseTarifariaList", pricingClasseTarifariaList);
+
+		openWindow("/gui/pricing/editarPricingClasseTarifaria.zul",
+				Labels.getLabel("editarPricingClasseTarifariaController.window.title"), args, MODAL);
+	}
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+
+		super.doAfterCompose(comp);
+
+		pricingClasseTarifariaList.setItemRenderer(new RenderPricingClasseTarifaria());
+		pricingClasseTarifariaList.addEventListener("onDoubleClick", new EventListener() {
+
+			@Override
+			public void onEvent(Event event) throws Exception {
+				PricingClasseTarifaria pricing = (PricingClasseTarifaria) pricingClasseTarifariaList.getSelected();
+				verPricingClasseTarifaria(pricing);
+			}
+		});
+
+		refreshLista();
+	}
+
+}

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

@@ -29,7 +29,6 @@ import org.zkoss.zul.Textbox;
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.entidad.Pricing;
-import com.rjconsultores.ventaboletos.entidad.PricingRuta;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.ParadaService;

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

@@ -234,7 +234,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
 	private Button btnApagarCategoria;
 	private Button btnModificarCategoria;
 	private Button btnModificarFormapago;
-	private Button btnOcupaAntecipaAutomatico;
 	private boolean salvo = false;
 	private Boolean gravarNovo = Boolean.TRUE;
 	private Textbox nombrePricing;
@@ -891,6 +890,7 @@ public class EditarPricingController extends MyGenericForwardComposer {
 		return true;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void onClick$btnSalvar(Event ev) throws InterruptedException {
 		if (!validarObligatorios()) {
 			return;

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

@@ -12,10 +12,14 @@ import org.zkoss.zhtml.Messagebox;
 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 org.zkoss.zul.Intbox;
+import org.zkoss.zul.api.Comboitem;
 
 import com.rjconsultores.ventaboletos.entidad.Pricing;
+import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria;
 import com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa;
+import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService;
 import com.rjconsultores.ventaboletos.service.PricingOcupaAntecipaService;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.ConstraintPorcentagem;
@@ -28,6 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
 public class EditarPricingOcupaAntecipaController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
+	private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class);
 	@Autowired
 	private PricingOcupaAntecipaService pricingOcupaAntecipaService;
 	private PricingOcupaAntecipa pricingOcupaAntecipa;
@@ -41,9 +46,12 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 	private MyTextboxDecimal porcentaje;
 	private MyTextboxDecimal importe;
 	private List<PricingOcupaAntecipa> lsPricingOcupaAntecipa;
-
 	private ConstraintPorcentagem ct;
-	private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class);
+
+	@Autowired
+	private PricingClasseTarifariaService pricingClasseTarifariaService;
+	private List<PricingClasseTarifaria> lsClasseTarifarias;
+	private Combobox cmbPricingClasseTarifaria;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -52,6 +60,17 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 		updateEntidad();
 
 		super.doAfterCompose(comp);
+
+		lsClasseTarifarias = pricingClasseTarifariaService.obtenerTodos();
+
+		if (pricingOcupaAntecipa.getPricingClasseTarifaria() != null) {
+			org.zkoss.zul.Comboitem ci = new org.zkoss.zul.Comboitem(pricingOcupaAntecipa.getPricingClasseTarifaria().toString());
+			ci.setAttribute("value", pricingOcupaAntecipa.getPricingClasseTarifaria());
+			ci.setValue(pricingOcupaAntecipa.getPricingClasseTarifaria());
+			ci.setParent(cmbPricingClasseTarifaria);
+			cmbPricingClasseTarifaria.setSelectedItem(ci);
+		}
+
 	}
 
 	private void updateEntidad() {
@@ -75,7 +94,6 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 
 	public void onClick$btnCerrar(Event ev) throws Exception {
 		updateEntidad();
-		
 	}
 
 	public void onClick$btnAdicionarOcupaAntecipa(Event ev) throws Exception {
@@ -115,6 +133,12 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 			return;
 		}
 
+		Comboitem cbiClasseTarifaria = cmbPricingClasseTarifaria.getSelectedItem();
+		if (cbiClasseTarifaria != null) {
+			PricingClasseTarifaria pct = (PricingClasseTarifaria) cbiClasseTarifaria.getValue();
+			pricingOcupaAntecipa.setPricingClasseTarifaria(pct);
+		}
+
 		if (porcentaje.getValueDecimal() != null && importe.getValueDecimal() != null) {
 
 			Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada.centoDin"),
@@ -198,4 +222,9 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 	public void setCt(ConstraintPorcentagem ct) {
 		this.ct = ct;
 	}
+
+	public List<PricingClasseTarifaria> getLsClasseTarifarias() {
+		return lsClasseTarifarias;
+	}
+
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java

@@ -0,0 +1,90 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad;
+
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zhtml.Messagebox;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Textbox;
+
+import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria;
+import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+
+@Controller("editarPricingClasseTarifariaController")
+@Scope("prototype")
+public class EditarPricingClasseTarifariaController extends MyGenericForwardComposer {
+
+	private static final long serialVersionUID = 1L;
+	private static Logger log = Logger.getLogger(EditarPricingClasseTarifariaController.class);
+
+	@Autowired
+	private PricingClasseTarifariaService pricingClasseTarifariaService;
+	private Textbox desc;
+	private Textbox sigla;
+	private String siglaVieja;
+
+	private MyListbox pricingClasseTarifariaList;
+	private PricingClasseTarifaria pricingClasseTarifaria;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+
+		pricingClasseTarifaria = (PricingClasseTarifaria) Executions.getCurrent().getArg().get("pricingClasseTarifaria");
+		pricingClasseTarifariaList = (MyListbox) Executions.getCurrent().getArg().get("pricingClasseTarifariaList");
+
+		super.doAfterCompose(comp);
+
+		siglaVieja = pricingClasseTarifaria.getPricingClasseTarifariaId() != null ? pricingClasseTarifaria.getSigla() : "";
+		if (pricingClasseTarifaria.getPricingClasseTarifariaId() != null) {
+			desc.setValue(pricingClasseTarifaria.getDescClasseTarifaria());
+			sigla.setValue(pricingClasseTarifaria.getSigla());
+		}
+	}
+
+	public void onClick$btnAdicionarClasseTarifaria(Event ev) throws Exception {
+		try {
+			boolean validacion;
+			if (siglaVieja.equals(sigla.getValue()))
+				validacion = true;
+			else
+				validacion = pricingClasseTarifariaService.validacionSigla(sigla.getValue());
+			if (validacion) {
+				pricingClasseTarifaria.setDescClasseTarifaria(desc.getValue());
+				pricingClasseTarifaria.setSigla(sigla.getValue());
+
+				if (pricingClasseTarifaria.getPricingClasseTarifariaId() == null) {
+					pricingClasseTarifaria = pricingClasseTarifariaService.suscribir(pricingClasseTarifaria);
+					pricingClasseTarifariaList.addItemNovo(pricingClasseTarifaria);
+
+					if (pricingClasseTarifaria.getPricingClasseTarifariaId() != null) {
+						Messagebox.show(Labels.getLabel("editarPricingClasseTarifariaController.btnAdd.resp"),
+								Labels.getLabel("editarPricingClasseTarifariaController.window.title"),
+								Messagebox.OK, Messagebox.EXCLAMATION);
+					}
+				} else {
+					pricingClasseTarifaria = pricingClasseTarifariaService.actualizacion(pricingClasseTarifaria);
+					pricingClasseTarifariaList.updateItem(pricingClasseTarifaria);
+				}
+
+				closeWindow();
+			} else {
+				Messagebox.show(Labels.getLabel("editarPricingClasseTarifariaController.MSG.Error.sigla"),
+						Labels.getLabel("editarPricingClasseTarifariaController.window.title"),
+						Messagebox.OK, Messagebox.EXCLAMATION);
+			}
+
+		} catch (Exception e) {
+			log.error("Erro ao salvar Pricing Classe Tarifaria:", e);
+			Messagebox.show(e.getMessage(),
+					Labels.getLabel("editarPricingClasseTarifariaController.window.title"),
+					Messagebox.OK, Messagebox.EXCLAMATION);
+		}
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/pricing/ItemMenuPricingClasseTarifaria.java

@@ -0,0 +1,25 @@
+package com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing;
+
+import org.zkoss.util.resource.Labels;
+
+import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
+import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
+
+public class ItemMenuPricingClasseTarifaria extends DefaultItemMenuSistema {
+
+	public ItemMenuPricingClasseTarifaria() {
+		super("editarPricingClasseTarifariaController.window.title");
+	}
+
+	@Override
+	public String getClaveMenu() {
+		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MENU.PRICINGCLASSETARIFARIA";
+	}
+
+	@Override
+	public void ejecutar() {
+		PantallaUtileria.openWindow("/gui/pricing/busquedaPricingClasseTarifaria.zul",
+				Labels.getLabel("editarPricingClasseTarifariaController.window.title"), null, desktop);
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties

@@ -72,6 +72,7 @@ tarifas.tarifaEscala=com.rjconsultores.ventaboletos.web.utilerias.menu.item.tari
 pricing=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.MenuPricing
 pricing.general=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.ItemMenuPricing
 pricing.especifico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.ItemMenuPricingEspecifico
+pricing.classeTarifaria=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.ItemMenuPricingClasseTarifaria
 cortesias=com.rjconsultores.ventaboletos.web.utilerias.menu.item.cortesias.MenuCortesias
 cortesias.grupoCortesia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.cortesias.ItemMenuGrupoCortesia
 cortesias.tipoCortesia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.cortesias.ItemMenuTipoCortesia

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

@@ -0,0 +1,26 @@
+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.PricingClasseTarifaria;
+
+public class RenderPricingClasseTarifaria implements ListitemRenderer {
+
+	public void render(Listitem lstm, Object o) throws Exception {
+		PricingClasseTarifaria pct = (PricingClasseTarifaria) o;
+
+		Listcell lc = new Listcell(pct.getPricingClasseTarifariaId() == null ? "" : pct.getPricingClasseTarifariaId().toString());
+		lc.setParent(lstm);
+
+		lc = new Listcell(pct.getDescClasseTarifaria() == null ? "" : pct.getDescClasseTarifaria());
+		lc.setParent(lstm);
+
+		lc = new Listcell(pct.getSigla() == null ? "" : pct.getSigla());
+		lc.setParent(lstm);
+
+		lstm.setAttribute("data", pct);
+	}
+
+}

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

@@ -37,6 +37,9 @@ public class RenderPricingOcupaAntecipa implements ListitemRenderer {
 		lc = new Listcell(pm.getImporte() == null ? "" : pm.getImporte().toString());
 		lc.setParent(lstm);
 		
+		lc = new Listcell(pm.getPricingClasseTarifaria() == null ? "" : pm.getPricingClasseTarifaria().getSigla());
+		lc.setParent(lstm);
+
 		lstm.setAttribute("data", pm);
 	}
 }

src/java/spring-config.xml

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

web/WEB-INF/i3-label_es_MX.label

@@ -2261,6 +2261,19 @@ editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoOcupacion = Oc
 editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionInicial = La lista de ocupaciones debería comenzar con la ocupación inicial igual a 1.
 editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionNoSubsequente = La lista de ocupaciones debe ser posterior.
 
+# Editar Pricing Classe Tarifaria
+editarPricingClasseTarifariaController.window.title = Pricing Clases Arancelarias
+editarPricingClasseTarifariaController.label.desc = Descripción
+editarPricingClasseTarifariaController.label.sigla = Abreviatura
+editarPricingClasseTarifariaController.btnAdd.resp = Nuevas Clases Arancel añadido correctamente.
+editarPricingClasseTarifariaController.btnNew = Nueva Clase de Tarifa
+editarPricingClasseTarifariaController.label.title = Clases Arancel
+editarPricingClasseTarifariaController.btnAdd.tooltiptext = Agregar Clases Arancel
+editarPricingClasseTarifariaController.btnBorrar.tooltiptext = Borrar Clases Arancel
+editarPricingClasseTarifariaController.label.tooltiptext = Clase Arancel
+editarPricingClasseTarifariaController.MSG.addError = Tienes una clase de tarifa matriculado. Retire registrada antes de registrar otro.
+editarPricingClasseTarifariaController.MSG.Error.sigla = Tener un registro con esta sigla en el sistema.
+
 # Búsqueda Sistema
 busquedaSistemaController.window.title = Sistema
 busquedaSistemaController.btnRefresh.tooltiptext = Actualizar

web/WEB-INF/i3-label_pt_BR.label

@@ -2308,6 +2308,19 @@ editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoOcupacion = Oc
 editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionInicial = A primeira ocupação deverá ter valor de ocupação inicial igual a 1.
 editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionNoSubsequente = A lista de ocupações deverão ser subsequentes.
 
+# Editar Pricing Classe Tarifaria
+editarPricingClasseTarifariaController.window.title = Pricing Classes Tarifarias
+editarPricingClasseTarifariaController.label.desc = Descrição
+editarPricingClasseTarifariaController.label.sigla = Sigla
+editarPricingClasseTarifariaController.btnAdd.resp = Nova Classes Tarifarias adicionada com sucesso.
+editarPricingClasseTarifariaController.btnNew = Nova Classe Tarifaria
+editarPricingClasseTarifariaController.label.title = Classes Tarifarias
+editarPricingClasseTarifariaController.btnAdd.tooltiptext = Adicionar Classe Tarifaria
+editarPricingClasseTarifariaController.btnBorrar.tooltiptext = Remover Classe Tarifaria
+editarPricingClasseTarifariaController.label.tooltiptext = Classe Tarifaria
+editarPricingClasseTarifariaController.MSG.addError = Já possui uma Classe Tarifaria cadastrada. Remova a cadastrada antes de cadastrar outra.
+editarPricingClasseTarifariaController.MSG.Error.sigla = Já possui um registro com esta sigla no sistema.
+
 # Pesquisa Sistema
 busquedaSistemaController.window.title = Sistema
 busquedaSistemaController.btnRefresh.tooltiptext = Atualizar

web/gui/pricing/busquedaPricingClasseTarifaria.zul

@@ -0,0 +1,75 @@
+<?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="winBusquedaPricingClasseTarifaria"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+
+<zk xmlns="http://www.zkoss.org/2005/zul">
+
+	<window id="winBusquedaPricingClasseTarifaria"
+		title="${c:l('editarPricingClasseTarifariaController.window.title')}"
+		apply="${busquedaPricingClasseTarifariaController}"
+		contentStyle="overflow:auto" height="520px" width="720px"
+		border="normal">
+
+		<toolbar>
+			<button id="btnRefresh" image="/gui/img/refresh.png"
+				width="35px"
+				tooltiptext="${c:l('busquedaPricingController.btnRefresh.tooltiptext')}" />
+			<separator orient="vertical" />
+			<button id="btnApagar" height="20"
+				image="/gui/img/remove.png" width="35px"
+				tooltiptext="${c:l('editarPricingController.btnApagarPricing.tooltiptext')}" />
+			<button id="btnNovo" image="/gui/img/add.png" width="35px"
+				tooltiptext="${c:l('busquedaPricingController.btnNovo.tooltiptext')}" />
+			<separator orient="vertical" />
+			<button id="btnCerrar"
+				onClick="winBusquedaPricingClasseTarifaria.detach()"
+				image="/gui/img/exit.png" width="35px"
+				tooltiptext="${c:l('busquedaPricingController.btnCerrar.tooltiptext')}" />
+		</toolbar>
+
+
+		<grid fixedLayout="true">
+			<columns>
+				<column width="40%" />
+				<column width="60%" />
+			</columns>
+			<rows>
+				<row>
+					<label
+						value="${c:l('editarPricingClasseTarifariaController.label.desc')}" />
+					<textbox id="desc" maxlength="20"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+				</row>
+				<row>
+					<label
+						value="${c:l('editarPricingClasseTarifariaController.label.sigla')}" />
+					<textbox id="sigla" maxlength="1"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+				</row>
+			</rows>
+		</grid>
+
+		<toolbar>
+			<button id="btnPesquisa" image="/gui/img/find.png"
+				label="${c:l('busquedaPricingController.btnPesquisa.label')}" />
+		</toolbar>
+
+		<paging id="pagingPricing" pageSize="15" />
+		<listbox id="pricingClasseTarifariaList"
+			use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
+			multiple="false" height="60%" vflex="false">
+			<listhead sizable="true">
+				<listheader image="/gui/img/create_doc.gif" width="70px"
+					label="${c:l('lb.id')}" sort="auto(pricingId)" />
+				<listheader image="/gui/img/create_doc.gif"
+					label="${c:l('editarPricingClasseTarifariaController.label.desc')}"
+					sort="auto(descClasseTarifaria)" />
+				<listheader image="/gui/img/create_doc.gif"
+					label="${c:l('editarPricingClasseTarifariaController.label.sigla')}"
+					sort="auto(sigla)" />
+			</listhead>
+		</listbox>
+	</window>
+</zk>

web/gui/pricing/editarPricing.zul

@@ -747,6 +747,10 @@
 												image="/gui/img/create_doc.gif" sort="auto(importe)"
 												align="left"
 												label="${c:l('editarPricingController.importe.value')}" />
+											<listheader
+												image="/gui/img/create_doc.gif" sort="auto(importe)"
+												align="left"
+												label="${c:l('editarPricingClasseTarifariaController.label.tooltiptext')}" />
 										</listhead>
 									</listbox>
 								</vbox>

web/gui/pricing/editarPricingClasseTarifaria.zul

@@ -0,0 +1,48 @@
+<?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="winEditarPricingClasseTarifaria"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+
+
+<zk xmlns="http://www.zkoss.org/2005/zul">
+	<window id="winEditarPricingClasseTarifaria" border="normal"
+		apply="${editarPricingClasseTarifariaController}" width="450px"
+		height="457x" contentStyle="overflow:auto"
+		title="${c:l('editarPricingClasseTarifariaController.window.title')}">
+
+		<toolbar>
+			<hbox spacing="5px" style="padding:1px" align="right">
+				<button id="btnAdicionarClasseTarifaria" height="20"
+					image="/gui/img/save.png" width="35px"
+					tooltiptext="${c:l('editarPricingOcupacionController.btnSalvar.tooltiptext')}" />
+				<button id="btnCerrar" height="20"
+					image="/gui/img/exit.png" width="35px"
+					onClick="winEditarPricingClasseTarifaria.detach()"
+					tooltiptext="${c:l('editarPricingOcupacionController.btnFechar.tooltiptext')}" />
+			</hbox>
+		</toolbar>
+
+		<grid fixedLayout="true">
+			<columns>
+				<column width="45%" />
+				<column width="55%" />
+			</columns>
+			<rows>
+				<row>
+					<label value="${c:l('editarPricingClasseTarifariaController.label.desc')}" />
+					<textbox id="desc" constraint="no empty"
+						maxlength="20"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+				</row>
+				<row>
+					<label value="${c:l('editarPricingClasseTarifariaController.label.sigla')}" />
+					<textbox id="sigla" maxlength="1"
+						constraint="no empty"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+				</row>
+			</rows>
+		</grid>
+
+	</window>
+</zk>

web/gui/pricing/editarPricingOcupaAntecipa.zul

@@ -15,8 +15,9 @@
 				<button id="btnAdicionarOcupaAntecipa" height="20"
 					image="/gui/img/save.png" width="35px"
 					tooltiptext="${c:l('editarPricingOcupacionController.btnSalvar.tooltiptext')}" />
-				<button id="btnCerrar" height="20" image="/gui/img/exit.png"
-					width="35px" onClick="winEditarPricingOcupaAntecipa.detach()"
+				<button id="btnCerrar" height="20"
+					image="/gui/img/exit.png" width="35px"
+					onClick="winEditarPricingOcupaAntecipa.detach()"
 					tooltiptext="${c:l('editarPricingOcupacionController.btnFechar.tooltiptext')}" />
 			</hbox>
 		</toolbar>
@@ -64,18 +65,36 @@
 					<label
 						value="${c:l('editarPricingController.porcentaje.value')}" />
 
-					<textbox id="porcentaje" precision="7" scale="2"  width="80%"
+					<textbox id="porcentaje" precision="7" scale="2"
+						width="80%"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
 						value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.porcentaje,
                             converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
 					<label
 						value="${c:l('editarPricingController.importe.value')}" />
-					<textbox id="importe" precision="7" scale="2" width="80%"
+					<textbox id="importe" precision="7" scale="2"
+						width="80%"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
 						value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.importe,
                             converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}" />
 				</row>
+			</rows>
+		</grid>
 
+		<grid fixedLayout="true">
+			<columns>
+				<column width="22.5%" />
+				<column width="77.5%" />
+			</columns>
+			<rows>
+				<row>
+					<label
+						value="${c:l('editarPricingClasseTarifariaController.label.title')}" />
+					<combobox id="cmbPricingClasseTarifaria" width="90%"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						mold="rounded" buttonVisible="true"
+						model="@{winEditarPricingOcupaAntecipa$composer.lsClasseTarifarias}" />
+				</row>
 			</rows>
 		</grid>
 	</window>