svn commit: r780725 - in /ofbiz/trunk/specialpurpose/googlecheckout: servicedef/secas.xml src/org/ofbiz/googlecheckout/GoogleRequestServices.java

[jaz-3]

Author: jaz
Date: Mon Jun  1 17:02:46 2009
New Revision: 780725

URL: http://svn.apache.org/viewvc?rev=780725&view=rev
Log:
fixed bug when tracking numbers are null (causing a rollback of quickship); added status vs oldstatus condition check to ecas

Modified:
    ofbiz/trunk/specialpurpose/googlecheckout/servicedef/secas.xml
    ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java

Modified: ofbiz/trunk/specialpurpose/googlecheckout/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/servicedef/secas.xml?rev=780725&r1=780724&r2=780725&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/servicedef/secas.xml (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/servicedef/secas.xml Mon Jun  1 17:02:46 2009
@@ -27,10 +27,12 @@
     
     <!-- order related services -->
     <eca service="changeOrderStatus" event="commit" run-on-error="false">
+        <condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
         <condition field-name="statusId" operator="equals" value="ORDER_CANCELLED"/>
         <action service="sendGoogleOrderCancelRequest" mode="sync"/>
     </eca>
     <eca service="changeOrderItemStatus" event="commit" run-on-failure="false" run-on-error="false">
+        <condition-field field-name="statusId" operator="not-equals" to-field-name="fromStatusId"/>
         <condition field-name="statusId" operator="equals" value="ITEM_CANCELLED"/>
         <action service="sendGoogleOrderItemCancelRequest" mode="sync" result-to-context="true" ignore-failure="false"/>
     </eca>

Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=780725&r1=780724&r2=780725&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Mon Jun  1 17:02:46 2009
@@ -449,6 +449,9 @@
                                     if (UtilValidate.isEmpty(track)) {
                                         track = route.getString("trackingIdNumber");
                                     }
+                                    if (track == null) {
+                                        track = "";
+                                    }
 
                                     try {
                                         ShipItemsRequest isr = new ShipItemsRequest(mInfo, externalId);