From 352bf7ec6464e99a0968c8ba457fc79da50f4ec5 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 14 Nov 2013 19:24:00 +0000
Subject: [PATCH] =?UTF-8?q?Pricing=20-=20Ocupa=C3=A7=C3=A3o=20/=20Antecipa?=
 =?UTF-8?q?=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@32055 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../pricing/EditarPricingController.java      |  1 -
 .../EditarPricingOcupaAntecipaController.java | 40 ++++++-------------
 .../pricing/editarPricingOcupaAntecipa.zul    |  4 +-
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
index 7bc4687ea..83c0e25f7 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
@@ -1808,7 +1808,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
 
 		Map args = new HashMap();
 		args.put("pricingOcupaAntecipa", pOcupaAntecipa);
-		args.put("pricing", pricing);
 		args.put("pricingOcupaAntecipaList", pricingOcupaAntecipaList);
 
 		openWindow("/gui/pricing/editarPricingOcupaAntecipa.zul",
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java
index c873912f7..f613837bc 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java
@@ -38,14 +38,13 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 	private Intbox cantasientosmax;
 	private Decimalbox porcentaje;
 	private Decimalbox importe;
-	private Pricing pricing;
+
 	private ConstraintPorcentagem ct;
 	private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class);
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 		ct = new ConstraintPorcentagem();
-		pricing = (Pricing) Executions.getCurrent().getArg().get("pricing");
 		pricingOcupaAntecipa = (PricingOcupaAntecipa) Executions.getCurrent().getArg().get("pricingOcupaAntecipa");
 		pricingOcupaAntecipaList = (MyListbox) Executions.getCurrent().getArg().get("pricingOcupaAntecipaList");
 
@@ -70,35 +69,20 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos
 							Messagebox.OK, Messagebox.EXCLAMATION);
 				} else {
 
-					Boolean podeSalvar = Boolean.FALSE;
-					if (cantasientosmin.getValue() != null && cantasientosmax.getValue() != null) {
-						podeSalvar = pricingOcupaAntecipaService.podeSalvar(pricing, pricingOcupaAntecipa);
-					} else {
-						if (cantdiasmin.getValue() < cantdiasmax.getValue()) {
-							podeSalvar = Boolean.TRUE;
-						}
-					}
-
 					List<PricingOcupaAntecipa> lsPricingOcupacion = pricingOcupaAntecipaService.obtenerPorPricing(pricingOcupaAntecipa.getPricing());
 
-					if (podeSalvar) {
-						if (pricingOcupaAntecipa != null) {
-							lsPricingOcupacion.remove(pricingOcupaAntecipa);
-						}
-
-						if (pricingOcupaAntecipa.getPricingocupaantecipaId() != null) {
-							pricingOcupaAntecipaService.actualizacion(pricingOcupaAntecipa);
-							pricingOcupaAntecipaList.updateItem(pricingOcupaAntecipa);
-						} else {
-							pricingOcupaAntecipaService.suscribir(pricingOcupaAntecipa);
-							pricingOcupaAntecipaList.addItemNovo(pricingOcupaAntecipa);
-						}
-						closeWindow();
-					} else {
-						Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada"),
-								Labels.getLabel("editarPricingController.windowOcupacion.title"),
-								Messagebox.OK, Messagebox.EXCLAMATION);
+					if (pricingOcupaAntecipa != null) {
+						lsPricingOcupacion.remove(pricingOcupaAntecipa);
 					}
+
+					if (pricingOcupaAntecipa.getPricingocupaantecipaId() != null) {
+						pricingOcupaAntecipaService.actualizacion(pricingOcupaAntecipa);
+						pricingOcupaAntecipaList.updateItem(pricingOcupaAntecipa);
+					} else {
+						pricingOcupaAntecipaService.suscribir(pricingOcupaAntecipa);
+						pricingOcupaAntecipaList.addItemNovo(pricingOcupaAntecipa);
+					}
+					closeWindow();
 				}
 			}
 
diff --git a/web/gui/pricing/editarPricingOcupaAntecipa.zul b/web/gui/pricing/editarPricingOcupaAntecipa.zul
index 66af6e8af..1ca98c927 100644
--- a/web/gui/pricing/editarPricingOcupaAntecipa.zul
+++ b/web/gui/pricing/editarPricingOcupaAntecipa.zul
@@ -57,8 +57,8 @@
 						value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.porcentaje}" />
 					<label
 						value="${c:l('editarPricingController.importe.value')}" />
-					<decimalbox id="importe" maxlength="5"
-						format="###.##"
+					<decimalbox id="importe" maxlength="7"
+						format="#####.##"
 						value="@{winEditarPricingOcupaAntecipa$composer.pricingOcupaAntecipa.importe}" />
 				</row>