svn commit: r668703 - in /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart: CheckOutEvents.java CheckOutHelper.java

[jacopoc]

Author: jacopoc
Date: Tue Jun 17 08:11:38 2008
New Revision: 668703

URL: http://svn.apache.org/viewvc?rev=668703&view=rev
Log:
Fixed bug that was preventing to return an error message to the user checking out an order in the ecommerce application without a shipping option.

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

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=668703&r1=668702&r2=668703&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Tue Jun 17 08:11:38 2008
@@ -92,7 +92,7 @@
             } catch (CartItemModifyException e) {
                 Debug.logError(e, module);
             }
-        }else if ("shippingoptions".equals(curPage) == true){
+        } else if ("shippingoptions".equals(curPage) == true) {
             //remove empty ship group
             cart.cleanUpShipGroups();
         }

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=668703&r1=668702&r2=668703&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 Tue Jun 17 08:11:38 2008
@@ -1341,7 +1341,8 @@
     public Map finalizeOrderEntryOptions(int shipGroupIndex, String shippingMethod, String shippingInstructions, String maySplit,
             String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate) {
 
-        Map result;
+        Map result = ServiceUtil.returnSuccess();
+
         String errMsg=null;
         //Verify the shipping method is valid
         if (UtilValidate.isNotEmpty(shippingMethod)) {
@@ -1398,7 +1399,6 @@
             }
         }
 
-        result = ServiceUtil.returnSuccess();
         return result;
     }