svn commit: r563059 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java

[jacopoc]

Author: jacopoc
Date: Mon Aug  6 01:02:26 2007
New Revision: 563059

URL: http://svn.apache.org/viewvc?view=rev&rev=563059
Log:
Fix for automatic eBay order completion upon ofbiz shipment.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java?view=diff&rev=563059&r1=563058&r2=563059
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java Mon Aug  6 01:02:26 2007
@@ -379,12 +379,7 @@
                 Debug.logError("Cannot be retrieve itemId and transactionId from externalId", module);
                 return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.errorDuringBuildItemAndTransactionIdFromExternalId", locale));
             }
-            
-            // the CompleteSale api wants only the first 12 characters of the ItemId for TransactionId = 0
-            if ("0".equals(transactionId)) {
-                itemId = itemId.substring(0, 11);
-            }
-            
+
             Document transDoc = UtilXml.makeEmptyXmlDocument("CompleteSaleRequest");
             Element transElem = transDoc.getDocumentElement();
             transElem.setAttribute("xmlns", "urn:ebay:apis:eBLBaseComponents");
@@ -1181,7 +1176,7 @@
         String partyId = "_NA_";
         String shipmentMethodTypeId = "NO_SHIPPING";
         
-   /*   if (shippingService != null) {
+        if (shippingService != null) {
             if ("USPSPriority".equals(shippingService)) {
                 partyId = "USPS";
                 shipmentMethodTypeId = "PRIORITY";
@@ -1216,7 +1211,7 @@
                 partyId = "_NA_";
                 shipmentMethodTypeId = "PICK_UP";
             }
-        } */      
+        }
         
         cart.setCarrierPartyId(partyId);
         cart.setShipmentMethodTypeId(shipmentMethodTypeId);