svn commit: r1488200 - in /ofbiz/branches/release10.04: ./ applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java

Author: jleroux
Date: Fri May 31 13:21:50 2013
New Revision: 1488200

URL: http://svn.apache.org/r1488200
Log:
"Applied fix from trunk for revision: 1488000"
------------------------------------------------------------------------
r1488000 | jleroux | 2013-05-30 22:42:31 +0200 (jeu., 30 mai 2013) | 3 lines

Reverts r1487997 and uses Stephen's patch for Fixes "CheckOutEvents setCheckOutPages" https://issues.apache.org/jira/browse/OFBIZ-4161


------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1488000

Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1488200&r1=1488199&r2=1488200&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Fri May 31 13:21:50 2013
@@ -863,10 +863,6 @@ public class CheckOutEvents {
                 selectedPaymentMethods.put("EXT_BILLACT", UtilMisc.toMap("amount", billingAccountAmt, "securityCode", null));
             }
 
-            if (UtilValidate.isEmpty(selectedPaymentMethods)) {
-                return "error";
-            }
-
             // If the user has just created a new payment method, add it to the map with a null amount, so that
             //  it becomes the sole payment method for the order.
             String newPaymentMethodId = (String) request.getAttribute("paymentMethodId");