Author: ashish
Date: Mon Jan 3 09:09:17 2011
New Revision: 1054565
URL:
http://svn.apache.org/viewvc?rev=1054565&view=revLog:
Bug fix. Make sure we have websiteId available if not take it from cart if its there to make sure we have webSite associated with the order in createOrder method.
Thanks Pranay for the contribution!
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1054565&r1=1054564&r2=1054565&view=diff==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Mon Jan 3 09:09:17 2011
@@ -589,6 +589,9 @@ public class CheckOutHelper {
context.put("grandTotal", grandTotal);
context.put("userLogin", userLogin);
context.put("visitId", visitId);
+ if (UtilValidate.isEmpty(webSiteId)) {
+ webSiteId = cart.getWebSiteId();
+ }
context.put("webSiteId", webSiteId);
context.put("originOrderId", originOrderId);