svn commit: r728936 - in /ofbiz/branches/release4.0: ./ applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java

Author: jleroux
Date: Tue Dec 23 03:58:14 2008
New Revision: 728936

URL: http://svn.apache.org/viewvc?rev=728936&view=rev
Log:
A patch from Stephen Rufle "Resetting OrderHeader status in ShoppingCartServices.loadCartFromOrder"  '(https://issues.apache.org/jira/browse/OFBIZ-2102) - OFBIZ-2102
(Done by hand, automatically merged well but was unable to commit automatically, not sure why, maybe SVN merge new features)

Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
    ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 23 03:58:14 2008
@@ -1 +1 @@
-/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,721904,727806
+/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=728936&r1=728935&r2=728936&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Tue Dec 23 03:58:14 2008
@@ -75,6 +75,8 @@
     private String poNumber = null;
     private String orderId = null;
     private String orderName = null;
+    private String orderStatusId = null;
+    private String orderStatusString = null;
     private String firstAttemptOrderId = null;
     private String externalId = null;
     private String internalCode = null;
@@ -4324,4 +4326,20 @@
         // DEJ20050518 we should not call clear because it kills the auto-save shopping list and is unnecessary given that when this object is GC'ed it will cause everything it points to that isn't referenced anywhere else to be GC'ed too: this.clear();
         super.finalize();
     }
+
+    public String getOrderStatusId() {
+        return orderStatusId;
+    }
+
+    public void setOrderStatusId(String orderStatusId) {
+        this.orderStatusId = orderStatusId;
+    }
+
+    public String getOrderStatusString() {
+        return orderStatusString;
+    }
+
+    public void setOrderStatusString(String orderStatusString) {
+        this.orderStatusString = orderStatusString;
+    }
 }

Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=728936&r1=728935&r2=728936&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Tue Dec 23 03:58:14 2008
@@ -175,12 +175,15 @@
         String orderTypeId = orh.getOrderTypeId();
         String currency = orh.getCurrency();
         String website = orh.getWebSiteId();
+        String currentStatusString = orh.getCurrentStatusString();
 
         // create the cart
         ShoppingCart cart = new ShoppingCart(delegator, productStoreId, website, locale, currency);
         cart.setOrderType(orderTypeId);
         cart.setChannelType(orderHeader.getString("salesChannelEnumId"));
         cart.setInternalCode(orderHeader.getString("internalCode"));
+        cart.setOrderStatusId(orderHeader.getString("statusId"));
+        cart.setOrderStatusString(currentStatusString);
 
         try {
             cart.setUserLogin(userLogin, dispatcher);