Author: jleroux
Date: Thu May 30 20:42:31 2013
New Revision: 1488000
URL: http://svn.apache.org/r1488000
Log:
Reverts r1487997 and uses Stephen's patch for Fixes "CheckOutEvents
setCheckOutPages" https://issues.apache.org/jira/browse/OFBIZ-4161
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
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=1488000&r1=1487999&r2=1488000&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
Thu May 30 20:42:31 2013
@@ -892,11 +892,6 @@ public class CheckOutEvents {
selectedPaymentMethods.put("EXT_BILLACT", UtilMisc.<String,
Object>toMap("amount", billingAccountAmt, "securityCode", null));
}
- if (UtilValidate.isEmpty(selectedPaymentMethods)) {
- request.setAttribute("_ERROR_MESSAGE_",
UtilProperties.getMessage(resource_error,"checkhelper.select_method_of_payment",
(cart != null ? cart.getLocale() : Locale.getDefault())));
- return "paymentError";
- }
-
// 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");
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1488000&r1=1487999&r2=1488000&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Thu
May 30 20:42:31 2013
@@ -748,7 +748,6 @@ under the License.
<response name="shipping" type="view" value="shipsetting"/>
<response name="shippingAddress" type="view" value="EditShipAddress"/>
<response name="options" type="view" value="optionsetting"/>
- <response name="paymentMissing" type="view" value="billsetting"/>
<response name="payment" type="request"
value="calcShippingBeforePayment"/>
<response name="paymentError" type="request"
value="calcShippingBeforePayment"/>
<response name="term" type="view" value="orderTerm"/>
