From ded32d630bc0c98d4962d70f32d7e9abe380f064 Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 4 Jan 2019 18:34:48 +0000
Subject: [PATCH] fixed bug#12818 qua:Renato dev:Valdir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@88551 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/entidad/PricingEspecifico.java        |  8 --------
 .../ventaboletos/service/PricingEspecificoService.java |  4 +++-
 .../service/impl/PricingEspecificoServiceImpl.java     | 10 +++++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
index d217de0a2..8f6eb854c 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
@@ -175,14 +175,6 @@ public class PricingEspecifico implements Serializable, Cloneable {
 		this.usuarioId = usuarioId;
 	}
 
-//	public TipoPuntoVenta getTipoPtovta() {
-//		return tipoPtovta;
-//	}
-//
-//	public void setTipoPtovta(TipoPuntoVenta tipoPtovta) {
-//		this.tipoPtovta = tipoPtovta;
-//	}
-
 	public Parada getParada() {
 		return parada;
 	}
diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java b/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java
index c869e3470..cf5b3566f 100644
--- a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java
+++ b/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java
@@ -8,6 +8,8 @@ import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
+import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCategoria;
+
 import java.util.Date;
 import java.util.List;
 
@@ -21,7 +23,7 @@ public interface PricingEspecificoService extends GenericService<PricingEspecifi
 
 	public List<PricingEspecifico> buscarPorNome(String nome);
 
-	public PricingEspecifico clonarPricing(Long id, String nome);
+	public PricingEspecifico clonarPricing(Long id, String nome, List<PricingEspecificoCategoria> pricingCategoriaList);
 
 	public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal);
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java
index 8807f2a7c..332ee280b 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java
@@ -82,11 +82,11 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
 
 	@Override
     @Transactional
-	public PricingEspecifico clonarPricing(Long id, String nome) {
+	public PricingEspecifico clonarPricing(Long id, String nome, List<PricingEspecificoCategoria> pricingCategoriaList) {
 
 		PricingEspecifico pricingToClone = obtenerID(id);
 		PricingEspecifico clonePricing = new PricingEspecifico();
-			
+		
 		clonePricing.setNombPricing(nome);
 		clonePricing.setClaseServicio(pricingToClone.getClaseServicio());
 		clonePricing.setCorridaId(pricingToClone.getCorridaId());
@@ -102,7 +102,7 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
 
 		clonePricing.setPricingEspecificoAgenciasList(getPricingEspecificoAgenciasList(pricingToClone, clonePricing));
 		clonePricing.setPricingEspecificoCanalVendasList(getPricingEspecificoCanalVendasList(pricingToClone, clonePricing));
-		clonePricing.setPricingEspecificoCategoriaList(getPricingEspecificoCategoriaList(pricingToClone, clonePricing));
+		clonePricing.setPricingEspecificoCategoriaList(getPricingEspecificoCategoriaList(pricingToClone, clonePricing, pricingCategoriaList));
 		
 		return suscribir(clonePricing);
 	}
@@ -149,11 +149,11 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
 		return toReturn;
 	}
 	
-	private List<PricingEspecificoCategoria> getPricingEspecificoCategoriaList(PricingEspecifico pricingToClone, PricingEspecifico clonePricing) {
+	private List<PricingEspecificoCategoria> getPricingEspecificoCategoriaList(PricingEspecifico pricingToClone, PricingEspecifico clonePricing, List<PricingEspecificoCategoria> pricingCategoriaList) {
 
 		List<PricingEspecificoCategoria> toReturn = new ArrayList<PricingEspecificoCategoria>();
 
-		for (PricingEspecificoCategoria c : pricingToClone.getPricingEspecificoCategoriaList()) {
+		for (PricingEspecificoCategoria c : pricingCategoriaList) {
 			if (c.getActivo()) {
 				PricingEspecificoCategoria newCategoria = new PricingEspecificoCategoria();