Author: jleroux
Date: Fri May 31 13:05:59 2013
New Revision: 1488197
URL: http://svn.apache.org/r1488197
Log:
Uses Stephen's patch to fix "CheckOutEvents setCheckOutPages"
https://issues.apache.org/jira/browse/OFBIZ-4161
There is an extra check in CheckOutEvents.setCheckOutPages that prevents an
error message from being produced when no payment method is selected on the
"How shall you pay" step of the checkout process.
jleroux: and you got redirected to the order entry page, with the patch you
stay on the payment method page.
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1488000
Modified:
ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1488197&r1=1488196&r2=1488197&view=diff
==============================================================================
---
ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
(original)
+++
ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
Fri May 31 13:05:59 2013
@@ -892,10 +892,6 @@ public class CheckOutEvents {
selectedPaymentMethods.put("EXT_BILLACT", UtilMisc.<String,
Object>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");