Author: jleroux
Date: Thu May 30 20:35:05 2013
New Revision: 1487997
URL: http://svn.apache.org/r1487997
Log:
Fixes "CheckOutEvents setCheckOutPages"
https://issues.apache.org/jira/browse/OFBIZ-4161
Simply returns an error in request and get to the view, as does shipping
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=1487997&r1=1487996&r2=1487997&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:35:05 2013
@@ -893,7 +893,8 @@ public class CheckOutEvents {
}
if (UtilValidate.isEmpty(selectedPaymentMethods)) {
- return "error";
+ 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
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=1487997&r1=1487996&r2=1487997&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:35:05 2013
@@ -748,6 +748,7 @@ 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"/>
