Index: sbn-actions/src/main/java/com/sbn/booking/action/ProductsVoyagesAction.java
===================================================================
--- sbn-actions/src/main/java/com/sbn/booking/action/ProductsVoyagesAction.java	(revision 3685)
+++ sbn-actions/src/main/java/com/sbn/booking/action/ProductsVoyagesAction.java	(revision 3686)
@@ -69,7 +69,7 @@
             Booking booking = getBooking();
             voyages =
                     productListBuilder.getCruiseVoyages( booking.getItineraryIdFromFrontEnd(),
-                            booking.getCountryCode() );
+                            booking.getCountryCode(), booking.getCompanyCode());
         }
 
         return voyages;
Index: hal-ejb/src/main/java/com/hal/sf/persistence/dao/VoyageDAO.java
===================================================================
--- hal-ejb/src/main/java/com/hal/sf/persistence/dao/VoyageDAO.java	(revision 3685)
+++ hal-ejb/src/main/java/com/hal/sf/persistence/dao/VoyageDAO.java	(revision 3686)
@@ -69,6 +69,14 @@
  *     </ul>
  *   </li>
  * </ul>
+ * <ul>
+ *   <li> bsk -  Dec 12, 2012
+ *     <ul>
+ *       <li>added an overloaded method for
+ *       findAvailableGdsVoyagesByWebItineraryId</li>
+ *     </ul>
+ *   </li>
+ * </ul>
  * 
  * @author pfs
  */
@@ -84,6 +92,9 @@
     public List<Voyage> findAvailableGdsVoyagesByWebItineraryId(
             final String webItineraryId );
     
+    public List<Voyage> findAvailableGdsVoyagesByWebItineraryId(
+            final String webItineraryId, final String codeCo );
+    
     public List<Voyage> findCruiseTourVoyagesByTourItineraryId(
             final String tourItineraryId );
     
Index: hal-ejb/src/main/java/com/hal/sf/persistence/dao/jpa/VoyageDAOJpaImpl.java
===================================================================
--- hal-ejb/src/main/java/com/hal/sf/persistence/dao/jpa/VoyageDAOJpaImpl.java	(revision 3685)
+++ hal-ejb/src/main/java/com/hal/sf/persistence/dao/jpa/VoyageDAOJpaImpl.java	(revision 3686)
@@ -69,6 +69,15 @@
  *     </ul>
  *   </li>
  * </ul>
+ * <ul>
+ *   <li> bsk -  Dec 12, 2012
+ *     <ul>
+ *       <li>added an overloaded method for
+ *       findAvailableGdsVoyagesByWebItineraryId</li>
+ *     </ul>
+ *   </li>
+ * </ul>
+ * 
  * @author pfs
  */
 
@@ -112,14 +121,37 @@
     public List<Voyage> findAvailableGdsVoyagesByWebItineraryId(
             final String webItineraryId )
     {
+        return findAvailableGdsVoyagesByWebItineraryId(webItineraryId, null);
+    }
+    
+    /**
+     * Returns List<Voyage> all available gds voyages.
+     * 
+     * @param webItineraryId
+     * @param codeCo: Company Code
+     * @return List<Voyage>
+     */
+    public List<Voyage> findAvailableGdsVoyagesByWebItineraryId(
+            final String webItineraryId, final String codeCo )
+    {
         final List<String> flagGdsList = new ArrayList<String>();
         flagGdsList.add( "Y" );
         flagGdsList.add( "W" );
-        List<Voyage> voyageList =
-                this.findByCriteria( Restrictions.eq( "webItineraryId",
-                        webItineraryId ), Restrictions.eq( "status", "A" ),
-                        Restrictions.in( "flagGdsWeb", flagGdsList ) );
+        List<Voyage> voyageList;
+        if(codeCo == null)
+        {
+        voyageList = this.findByCriteria( Restrictions.eq( "webItineraryId",
+                 webItineraryId ), Restrictions.eq( "status", "A" ), 
+                 Restrictions.in( "flagGdsWeb", flagGdsList ) );
+        }
+        else
+        {
+        	voyageList = this.findByCriteria( Restrictions.eq( "webItineraryId",
+                  webItineraryId ), Restrictions.eq("id.codeCo", codeCo), 
+                  Restrictions.eq( "status", "A" ), Restrictions.in( "flagGdsWeb", flagGdsList ) );
+        }
         return voyageList;
+ 
     }
     
     /**
Index: hal-ejb/src/main/java/com/hal/sf/helper/ProductListBuilder.java
===================================================================
--- hal-ejb/src/main/java/com/hal/sf/helper/ProductListBuilder.java	(revision 3685)
+++ hal-ejb/src/main/java/com/hal/sf/helper/ProductListBuilder.java	(revision 3686)
@@ -28,13 +28,13 @@
     private CountryAlterVoyageDescService countryAlterVoyageDescService;
 
 
-    public List<Voyage> getCruiseVoyages( String itineraryId, String countryCode )
+    public List<Voyage> getCruiseVoyages( String itineraryId, String countryCode, String codeCo )
             throws BookingException
     {
         List<Voyage> voyages = new ArrayList<Voyage>();
         try
         {
-            voyages = voyageService.findVoyagesByWebItineraryId( itineraryId, countryCode );
+            voyages = voyageService.findVoyagesByWebItineraryId( itineraryId, countryCode, codeCo );
         }
         catch ( Exception e )
         {
Index: hal-ejb/src/main/java/com/hal/sf/booking/action/ProductsVoyagesAction.java
===================================================================
--- hal-ejb/src/main/java/com/hal/sf/booking/action/ProductsVoyagesAction.java	(revision 3685)
+++ hal-ejb/src/main/java/com/hal/sf/booking/action/ProductsVoyagesAction.java	(revision 3686)
@@ -68,7 +68,7 @@
             Booking booking = getBooking();
             voyages =
                     productListBuilder.getCruiseVoyages( booking.getItineraryIdFromFrontEnd(),
-                            booking.getCountryCode() );
+                            booking.getCountryCode(), booking.getCompanyCode() );
         }
 
         return voyages;
Index: hal-ejb/src/main/java/com/hal/sf/service/VoyageCruiseTourService.java
===================================================================
--- hal-ejb/src/main/java/com/hal/sf/service/VoyageCruiseTourService.java	(revision 3685)
+++ hal-ejb/src/main/java/com/hal/sf/service/VoyageCruiseTourService.java	(revision 3686)
@@ -25,6 +25,13 @@
  * </ul>
  * </li>
  * </ul>
+ * <ul>
+ * <li>bsk 12.11.2012
+ * <ul>
+ * <li>Changed the overloaded findVoyagesByWebItineraryId to accept company code </li>
+ * </ul>
+ * </li>
+ * </ul>
  */
 public interface VoyageCruiseTourService
 {
@@ -43,7 +50,7 @@
     List<Voyage> findVoyagesForTourDepartures( List<TourDeparture> tourDepartures );
     
     List<Voyage> findVoyagesByWebItineraryId( final String webItineraryId,
-            final String countryCode ) throws Exception;
+            final String countryCode, final String codeCo ) throws Exception;
 
     List<Voyage> findVoyagesForTourDepartures( final String tourItineraryId,
             final String countryCode );
Index: hal-ejb/src/main/java/com/hal/sf/service/VoyageCruiseTourServiceImpl.java
===================================================================
--- hal-ejb/src/main/java/com/hal/sf/service/VoyageCruiseTourServiceImpl.java	(revision 3685)
+++ hal-ejb/src/main/java/com/hal/sf/service/VoyageCruiseTourServiceImpl.java	(revision 3686)
@@ -42,6 +42,13 @@
  * </ul>
  * </li>
  * </ul>
+ * <ul>
+ * <li>bsk 12.11.2012
+ * <ul>
+ * <li>Changed the overloaded findVoyagesByWebItineraryId to accept company code </li>
+ * </ul>
+ * </li>
+ * </ul>
  */
 public class VoyageCruiseTourServiceImpl implements VoyageCruiseTourService
 {
@@ -149,13 +156,13 @@
      */
     @ Transactional ( readOnly = true )
     public List<Voyage> findVoyagesByWebItineraryId(
-            final String webItineraryId, final String countryCode )
+            final String webItineraryId, final String countryCode, final String codeCo )
             throws Exception
     {
         final List<Voyage> gdsAvailableVoyageList =
                 this.voyageDAO
                         .findAvailableGdsVoyagesByWebItineraryId( webItineraryId
-                                .toUpperCase() );
+                                .toUpperCase(), codeCo.toUpperCase() );
         List<Voyage> validVoyageList = new ArrayList<Voyage>();
         final List<VoyageCountries> voyageCountriesList =
                 this.voyageCountriesDAO.findVoyageCountries();
Index: .
===================================================================
--- .	(revision 3685)
+++ .	(revision 3686)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /branches/features/bsk_add_companyCode_to_findvoyages:r3680-3685