Index: branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java =================================================================== diff -u -r255112 -r255224 --- branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java (.../LocateProductServiceV4Impl.java) (revision 255112) +++ branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java (.../LocateProductServiceV4Impl.java) (revision 255224) @@ -675,6 +675,7 @@ if (delivery.isFreeDelivery() && delivery.isQuickestOption()) { majorAccountsDelivery.setFreeDeliveryMOT(delivery.getDeliveryType()); majorAccountsDelivery.setFreeDeliveryCutOffDateTime(cutOffDateTime); + /** if (delivery.getDeliveryEstimate() != null) { //get the timezone to check if its after midnight float shipFromTZ = 0; @@ -697,6 +698,15 @@ else majorAccountsDelivery.setFreeDeliveryMaxDateRange(availabilityServiceContextV4.getDateTime(delivery.getDeliveryEstimate().getDurationMaxValue(), delivery.getCutOffTime(), beginningOfDay, false, delivery.getDeliveryEstimate().getDurationDesignator(), delivery.getDayofweekString(),localCrossedUTCMidnight)); } + */ + + if (delivery.getDeliveryEstimate() != null) { + if (delivery.getDeliveryEstimate().getExpectationRangeMin()!=null) + majorAccountsDelivery.setFreeDeliveryMinDateRange(delivery.getDeliveryEstimate().getExpectationRangeMin()); + + if (delivery.getDeliveryEstimate().getExpectationRangeMax()!=null) + majorAccountsDelivery.setFreeDeliveryMaxDateRange(delivery.getDeliveryEstimate().getExpectationRangeMax()); + } } //Paid delivery quickest option