Author: jleroux
Date: Tue Dec 16 08:15:01 2008
New Revision: 727075
URL:
http://svn.apache.org/viewvc?rev=727075&view=revLog:
A patch from Stephen Rufle "ShoppingCartServices.loadCartFromOrder" '(
https://issues.apache.org/jira/browse/OFBIZ-2079) - OFBIZ-2079
+ formatting missing in 727073 (forgot to save the file :/)
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=727075&r1=727074&r2=727075&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 16 08:15:01 2008
@@ -4718,13 +4718,11 @@
super.finalize();
}
- public Map getOrderAttributes()
- {
+ public Map getOrderAttributes() {
return orderAttributes;
}
- public void setOrderAttributes(Map orderAttributes)
- {
+ public void setOrderAttributes(Map orderAttributes) {
this.orderAttributes = orderAttributes;
}
}
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=727075&r1=727074&r2=727075&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 16 08:15:01 2008
@@ -189,6 +189,9 @@
cart.setOrderType(orderTypeId);
cart.setChannelType(orderHeader.getString("salesChannelEnumId"));
cart.setInternalCode(orderHeader.getString("internalCode"));
+ cart.setOrderDate(orderHeader.getTimestamp("orderDate"));
+ cart.setOrderId(orderHeader.getString("orderId"));
+ cart.setOrderName(orderHeader.getString("orderName"));
try {
cart.setUserLogin(userLogin, dispatcher);