svn commit: r728935 - in /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart: ShoppingCart.java ShoppingCartServices.java

Author: jleroux
Date: Tue Dec 23 03:54:26 2008
New Revision: 728935

URL: http://svn.apache.org/viewvc?rev=728935&view=rev
Log:
A patch from Stephen Rufle "Resetting OrderHeader status in ShoppingCartServices.loadCartFromOrder"  '(https://issues.apache.org/jira/browse/OFBIZ-2102) - OFBIZ-2102

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=728935&r1=728934&r2=728935&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Tue Dec 23 03:54:26 2008
@@ -68,6 +68,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;
@@ -4754,4 +4756,20 @@
     public void setOrderAttributes(Map orderAttributes) {
         this.orderAttributes = orderAttributes;
     }
+
+    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/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=728935&r1=728934&r2=728935&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Tue Dec 23 03:54:26 2008
@@ -181,6 +181,7 @@
         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);
@@ -190,6 +191,8 @@
         cart.setOrderDate(orderHeader.getTimestamp("orderDate"));
         cart.setOrderId(orderHeader.getString("orderId"));
         cart.setOrderName(orderHeader.getString("orderName"));
+        cart.setOrderStatusId(orderHeader.getString("statusId"));
+        cart.setOrderStatusString(currentStatusString);
 
         try {
             cart.setUserLogin(userLogin, dispatcher);