svn commit: r820650 - /ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java

[jacopoc]

Author: jacopoc
Date: Thu Oct  1 13:25:45 2009
New Revision: 820650

URL: http://svn.apache.org/viewvc?rev=820650&view=rev
Log:
Fix to allow for the status change in eBay also when we have the itemId but no transactionId.

Modified:
    ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java

Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=820650&r1=820649&r2=820650&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Thu Oct  1 13:25:45 2009
@@ -254,8 +254,8 @@
         String shipped = (String)context.get("shipped");
 
         try {
-            if (itemId == null || transactionId == null) {
-                Debug.logError("Cannot be retrieve itemId and transactionId from externalId", module);
+            if (itemId == null && transactionId == null) {
+                Debug.logError("Cannot retrieve itemId and transactionId from externalId", module);
                 return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.errorDuringBuildItemAndTransactionIdFromExternalId", locale));
             }
 
@@ -292,7 +292,7 @@
                 UtilXml.addChildElementValue(transElem, "Shipped", shipped, transDoc);
             }
 
-            UtilXml.addChildElementValue(transElem, "TransactionID", transactionId, transDoc);
+            UtilXml.addChildElementValue(transElem, "TransactionID", (transactionId==null? "0": transactionId), transDoc);
 
             dataItemsXml.append(UtilXml.writeXmlDocument(transDoc));
         } catch (Exception e) {