svn commit: r436784 - /incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java

Author: jleroux
Date: Fri Aug 25 06:13:04 2006
New Revision: 436784

URL: http://svn.apache.org/viewvc?rev=436784&view=rev
Log:
A patch from Eriks Dobelis (see OFBiz-180 : Anonymous checkout does not go beyond shipping options). Thanks Erik.

Modified:
    incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java

Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=436784&r1=436783&r2=436784&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Fri Aug 25 06:13:04 2006
@@ -714,8 +714,15 @@
                 // set the options
                 if (mode != null && mode.equals("options")) {
                     shippingMethod = request.getParameter(shipGroupIndex + "_shipping_method");
+                    if (UtilValidate.isEmpty(shippingMethod)) {
+                        shippingMethod = request.getParameter("shipping_method");
+                    }
                     shippingInstructions = request.getParameter(shipGroupIndex + "_shipping_instructions");
+                    if (UtilValidate.isEmpty(shippingInstructions))
+                        shippingInstructions = request.getParameter("shipping_instructions");
                     maySplit = request.getParameter(shipGroupIndex + "_may_split");
+                    if (UtilValidate.isEmpty(maySplit))
+                        maySplit = request.getParameter("may_split");
                     giftMessage = request.getParameter(shipGroupIndex + "_gift_message");
                     isGift = request.getParameter(shipGroupIndex + "_is_gift");
                     internalCode = request.getParameter("internalCode"); // FIXME