Index: branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/AvailabilityServiceContextV4.java =================================================================== diff -u -r255782 -r256159 --- branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/AvailabilityServiceContextV4.java (.../AvailabilityServiceContextV4.java) (revision 255782) +++ branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/AvailabilityServiceContextV4.java (.../AvailabilityServiceContextV4.java) (revision 256159) @@ -300,9 +300,16 @@ public boolean requestDateTimeBeforeCutOffTime (String deliveryCutOffDateTime, float cutOffOfset, int durationDays, SiteDTO shipFromSite){ - OffsetDateTime deliveryCutOffOffSetDateTime = OffsetDateTime.parse(deliveryCutOffDateTime) - .withOffsetSameInstant(ZoneId.of(shipFromSite.getTimeZoneID()).getRules().getOffset(Instant.now())); + String dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"; + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat); + LocalDateTime dateTime = LocalDateTime.parse(deliveryCutOffDateTime, formatter); + OffsetDateTime cutOffDateTimeUTC = OffsetDateTime.of(dateTime, ZoneOffset.UTC); + OffsetDateTime cutOffDateTimeLocal = cutOffDateTimeUTC.withOffsetSameInstant(ZoneOffset.ofTotalSeconds((int) (cutOffOfset*60*60))); + + OffsetDateTime deliveryCutOffOffSetDateTime = cutOffDateTimeLocal + .withOffsetSameLocal(ZoneId.of(shipFromSite.getTimeZoneID()).getRules().getOffset(Instant.now())); + ZonedDateTime nowShipFrom = ZonedDateTime.now(ZoneId.of(shipFromSite.getTimeZoneID())); OffsetDateTime localTimeShipFrom = nowShipFrom.toOffsetDateTime(); return localTimeShipFrom.isBefore(deliveryCutOffOffSetDateTime);