Index: branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java
===================================================================
diff -u -r255224 -r256121
--- branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java	(.../LocateProductServiceV4Impl.java)	(revision 255224)
+++ branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java	(.../LocateProductServiceV4Impl.java)	(revision 256121)
@@ -411,6 +411,18 @@
                                                 fulfillment.setAlternateIdentifier(displayName);
                                             fulfillment.setCity(site.getSiteCity());
                                             fulfillment.setState(site.getSiteState());
+                                            
+                                            //set fulfillment country and zip code 
+                                            SiteDTO siteDTO = nSightCache.getSiteIdToSiteMap().get(site.getSiteId());
+                                            if (siteDTO.getZipCode() != null)
+                                            	fulfillment.setZipcode(siteDTO.getZipCode());
+                                            else
+                                            	fulfillment.setZipcode("Not Available");
+                                            if (siteDTO.getCountry() != null)
+                                            	fulfillment.setCountry(siteDTO.getCountry());
+                                            else
+                                            	fulfillment.setCountry("Not Available");
+                                            
                                             if (availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()) {
                                                 Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                 fulfillment.setDelivery(delivery);
@@ -438,6 +450,18 @@
                                                 fulfillment.setAlternateIdentifier(displayName);
                                             fulfillment.setCity(site.getSiteCity());
                                             fulfillment.setState(site.getSiteState());
+                                            
+                                            //set fulfillment country and zip code 
+                                            SiteDTO siteDTO = nSightCache.getSiteIdToSiteMap().get(site.getSiteId());
+                                            if (siteDTO.getZipCode() != null)
+                                            	fulfillment.setZipcode(siteDTO.getZipCode());
+                                            else
+                                            	fulfillment.setZipcode("Not Available");
+                                            if (siteDTO.getCountry() != null)
+                                            	fulfillment.setCountry(siteDTO.getCountry());
+                                            else
+                                            	fulfillment.setCountry("Not Available");
+                                            
                                             if (availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()) {
                                                 Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                 fulfillment.setDelivery(delivery);
@@ -465,6 +489,18 @@
                                                 fulfillment.setAlternateIdentifier(displayName);
                                             fulfillment.setCity(site.getSiteCity());
                                             fulfillment.setState(site.getSiteState());
+                                            
+                                          //set fulfillment country and zip code 
+                                            SiteDTO siteDTO = nSightCache.getSiteIdToSiteMap().get(site.getSiteId());
+                                            if (siteDTO.getZipCode() != null)
+                                            	fulfillment.setZipcode(siteDTO.getZipCode());
+                                            else
+                                            	fulfillment.setZipcode("Not Available");
+                                            if (siteDTO.getCountry() != null)
+                                            	fulfillment.setCountry(siteDTO.getCountry());
+                                            else
+                                            	fulfillment.setCountry("Not Available");
+                                            
                                             if(availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()){
                                                 Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                 fulfillment.setDelivery(delivery);
@@ -502,6 +538,18 @@
                                                     fulfillment.setAlternateIdentifier(displayName);
                                                 fulfillment.setCity(site.getSiteCity());
                                                 fulfillment.setState(site.getSiteState());
+                                                
+                                                //set fulfillment country and zip code 
+                                                SiteDTO siteDTO = nSightCache.getSiteIdToSiteMap().get(site.getSiteId());
+                                                if (siteDTO.getZipCode() != null)
+                                                	fulfillment.setZipcode(siteDTO.getZipCode());
+                                                else
+                                                	fulfillment.setZipcode("Not Available");
+                                                if (siteDTO.getCountry() != null)
+                                                	fulfillment.setCountry(siteDTO.getCountry());
+                                                else
+                                                	fulfillment.setCountry("Not Available");
+                                                
                                                 if(availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()){
                                                     Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                     fulfillment.setDelivery(delivery);
@@ -522,6 +570,18 @@
                                                     fulfillment.setAlternateIdentifier(displayName);
                                                 fulfillment.setCity(site.getSiteCity());
                                                 fulfillment.setState(site.getSiteState());
+                                                
+                                                //set fulfillment country and zip code 
+                                                SiteDTO siteDTO = nSightCache.getSiteIdToSiteMap().get(site.getSiteId());
+                                                if (siteDTO.getZipCode() != null)
+                                                	fulfillment.setZipcode(siteDTO.getZipCode());
+                                                else
+                                                	fulfillment.setZipcode("Not Available");
+                                                if (siteDTO.getCountry() != null)
+                                                	fulfillment.setCountry(siteDTO.getCountry());
+                                                else
+                                                	fulfillment.setCountry("Not Available");
+                                                
                                                 if(availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()){
                                                     Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                     fulfillment.setDelivery(delivery);
@@ -829,6 +889,17 @@
             fulfillment.setAlternateIdentifier(siteDTO.getDisplayName());
         fulfillment.setCity(siteDTO.getCity());
         fulfillment.setState(siteDTO.getState());
+        
+        //set fulfillment country and zip code 
+        if (siteDTO.getZipCode() != null)
+        	fulfillment.setZipcode(siteDTO.getZipCode());
+        else
+        	fulfillment.setZipcode("Not Available");
+        if (siteDTO.getCountry() != null)
+        	fulfillment.setCountry(siteDTO.getCountry());
+        else
+        	fulfillment.setCountry("Not Available");
+        
         if (needDeliveryInformation) {
             Delivery delivery = new Delivery();
             String localDateTimeInUTC = LocalDateTime.ofInstant(Instant.now(),ZoneId.systemDefault()).toString();