[Opentaps-crmcommits] [opentaps commits] r7277 - versions/1.0/trunk/hot-deploy/amazon/src/org/opentaps/amazon/order

[Chris L. <cli...@ea...>]

Author: cliberty
Date: 2008-01-15 23:17:45 -0800 (Tue, 15 Jan 2008)
New Revision: 7277

Modified:
   versions/1.0/trunk/hot-deploy/amazon/src/org/opentaps/amazon/order/AmazonOrderServices.java
Log:
Amazon: Only attempt to acknowledge orders which have been successfully imported

Modified: versions/1.0/trunk/hot-deploy/amazon/src/org/opentaps/amazon/order/AmazonOrderServices.java
===================================================================
--- versions/1.0/trunk/hot-deploy/amazon/src/org/opentaps/amazon/order/AmazonOrderServices.java	2008-01-16 07:02:55 UTC (rev 7276)
+++ versions/1.0/trunk/hot-deploy/amazon/src/org/opentaps/amazon/order/AmazonOrderServices.java	2008-01-16 07:17:45 UTC (rev 7277)
@@ -1159,7 +1159,9 @@
         try {
             
             // Get a list of all orders which haven't been acknowledged or for which acknowledgement failed last time
-            List<GenericValue> amazonOrders = delegator.findByCondition("AmazonOrder", new EntityExpr("ackStatusId", EntityOperator.IN, Arrays.asList(AmazonConstants.statusOrderNotAcknowledged, AmazonConstants.statusOrderSuccessAcknowledgementError)), null, null);
+            List cond = UtilMisc.toList(new EntityExpr("ackStatusId", EntityOperator.IN, Arrays.asList(AmazonConstants.statusOrderNotAcknowledged, AmazonConstants.statusOrderSuccessAcknowledgementError)),
+                                        new EntityExpr("statusId", EntityOperator.EQUALS, AmazonConstants.statusOrderImported));
+            List<GenericValue> amazonOrders = delegator.findByCondition("AmazonOrder", new EntityConditionList(cond, EntityOperator.AND), null, null);
             if (UtilValidate.isEmpty(amazonOrders)) {
                 String message = UtilProperties.getMessage(AmazonConstants.errorResource, "AmazonError_AckOrderNoOrders", locale);
                 Debug.logInfo(message, module);