From dfa9f3859b2cb9d2a50529e02b8b834de1d3e24d Mon Sep 17 00:00:00 2001
From: "bruno.neves" <bruno.neves@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 23 May 2017 20:12:48 +0000
Subject: [PATCH] =?UTF-8?q?fix=20bug=20#0009077=20-cria=C3=A7=C3=A3o=20da?=
 =?UTF-8?q?=20funcionalidade=20de=20desconto=20no=20pricing?=
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@69221 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarPricingEspecificoOcupacionController.java       | 7 +++++--
 .../render/RenderPricingEspecificoOcupacion.java          | 3 +++
 web/gui/pricing/editarPricingEspecifico.zul               | 3 +++
 web/gui/pricing/editarPricingEspecificoOcupacion.zul      | 8 ++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java
index e21ca6374..59be78638 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java
@@ -37,6 +37,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
 	private MyListbox pricingListEspOcupacion;
 
 	private MyTextboxDecimal tarifa;
+	private MyTextboxDecimal desconto;
 	private MyTextboxDecimal ocupacioninicial;
 	private MyTextboxDecimal ocupacionfinal;
 	
@@ -59,6 +60,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
 			tarifa.setValue(pricingEspecificoOcupacion.getTarifa() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getTarifa(), locale));
 			ocupacioninicial.setValue(pricingEspecificoOcupacion.getOcupacioninicial() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getOcupacioninicial(), locale));
 			ocupacionfinal.setValue(pricingEspecificoOcupacion.getOcupacionfinal() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getOcupacionfinal(), locale));
+			desconto.setValue(pricingEspecificoOcupacion.getDescuento() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getDescuento(), locale));
 		}
 	}
 
@@ -66,7 +68,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
 		tarifa.getValue();
 		ocupacioninicial.getValue();
 		ocupacionfinal.getValue();
-
+		desconto.getValue();
 		try {
 			if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() == null) {
 				pricingEspecificoOcupacion = new PricingEspecificoOcupacion();
@@ -76,7 +78,8 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
 			pricingEspecificoOcupacion.setOcupacioninicial(ocupacioninicial.getValueDecimal());
 			pricingEspecificoOcupacion.setOcupacionfinal(ocupacionfinal.getValueDecimal());
 			pricingEspecificoOcupacion.setPricingEspecifico(pricingEspecifico);
-
+			pricingEspecificoOcupacion.setDescuento(desconto.getValueDecimal());
+			
 			pricingEspecificoOcupacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
 			pricingEspecificoOcupacion.setFecmodif(Calendar.getInstance().getTime());
 			pricingEspecificoOcupacion.setActivo(true);
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingEspecificoOcupacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingEspecificoOcupacion.java
index ef74ef960..c25981d60 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingEspecificoOcupacion.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingEspecificoOcupacion.java
@@ -23,6 +23,9 @@ public class RenderPricingEspecificoOcupacion implements ListitemRenderer {
 
 		lc = new Listcell(peo.getOcupacionfinal().toString());
 		lc.setParent(lstm);
+		
+		lc = new Listcell(peo.getDescuento() == null ?"":peo.getDescuento().toString());
+		lc.setParent(lstm);
 
 	}
 
diff --git a/web/gui/pricing/editarPricingEspecifico.zul b/web/gui/pricing/editarPricingEspecifico.zul
index 967f58bfa..b0f12dc5a 100644
--- a/web/gui/pricing/editarPricingEspecifico.zul
+++ b/web/gui/pricing/editarPricingEspecifico.zul
@@ -178,6 +178,9 @@
 								<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>
diff --git a/web/gui/pricing/editarPricingEspecificoOcupacion.zul b/web/gui/pricing/editarPricingEspecificoOcupacion.zul
index b262cecd1..905f5b318 100644
--- a/web/gui/pricing/editarPricingEspecificoOcupacion.zul
+++ b/web/gui/pricing/editarPricingEspecificoOcupacion.zul
@@ -28,6 +28,7 @@
 				<column width="60%" />
 			</columns>
 			<rows>
+			
 				<row>
 					<label
 						value="${c:l('editarPricingEspecificoOcupacionController.tarifa.label')}" />
@@ -49,6 +50,13 @@
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
 						precision="7" scale="2" constraint="no empty" />
 				</row>
+				<row>
+					<label
+						value="${c:l('editarPricingEspecificoOcupacionController.desconto.label')}" />
+					<textbox id="desconto"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
+						precision="5" scale="2" />
+				</row>
 			</rows>
 		</grid>
 	</window>