svn commit: r1736164 - in /ofbiz/trunk: applications/order/config/OrderErrorUiLabels.xml applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Author: jleroux
Date: Tue Mar 22 09:18:59 2016
New Revision: 1736164

URL: http://svn.apache.org/viewvc?rev=1736164&view=rev
Log:
Reverts r1735777, it was for "Credit card valdation does not work properly during anonymous quick checkout process" - https://issues.apache.org/jira/browse/OFBIZ-1585

Few tests don't pass

Modified:
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=1736164&r1=1736163&r2=1736164&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Tue Mar 22 09:18:59 2016
@@ -6699,10 +6699,4 @@
         <value xml:lang="vi">Bạn không thể thêm sản phẩm ảo ('Virtual' product) tại đây, bạn hãy chọn trong các hàng hóa liên quan (related variants).</value>
         <value xml:lang="zh">在这里你不能添加一个虚拟产品，请选择一个相关的变型。</value>
     </property>
-    <property key="OrderNoPaymentMethodSelected">
-        <value xml:lang="en">No Payment Method selected </value>
-    </property>
-    <property key="OrderNoShipmentMethodSelected">
-        <value xml:lang="en">No Shipment Method selected</value>
-    </property>
 </resource>

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=1736164&r1=1736163&r2=1736164&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 Mar 22 09:18:59 2016
@@ -420,24 +420,6 @@ public class CheckOutEvents {
         return "success";
     }
 
-    // Check for payment method and shipping method exist for checkout process of anonymous user
-    public static String checkoutValidation(HttpServletRequest request, HttpServletResponse response) {
-        ShoppingCart cart = (ShoppingCart) request.getSession().getAttribute("shoppingCart");
-        List<GenericValue> paymentMethods = cart.getPaymentMethods();
-        if (UtilValidate.isEmpty(paymentMethods)) {
-            String errMsg = UtilProperties.getMessage(resource_error, "OrderNoPaymentMethodSelected", (cart != null ? cart.getLocale() : UtilHttp.getLocale(request)));
-            request.setAttribute("_ERROR_MESSAGE_",errMsg);
-            return "error";
-        }
-        String shipmentMethod = cart.getShipmentMethodTypeId();
-        if (UtilValidate.isEmpty(shipmentMethod)) {
-            String errMsg = UtilProperties.getMessage(resource_error, "OrderNoShipmentMethodSelected", (cart != null ? cart.getLocale() : UtilHttp.getLocale(request)));
-            request.setAttribute("_ERROR_MESSAGE_",errMsg);
-            return "error";
-        }
-        return "success";
-    }
-
     // Create order event - uses createOrder service for processing
     public static String createOrder(HttpServletRequest request, HttpServletResponse response) {
         HttpSession session = request.getSession();
@@ -447,8 +429,6 @@ public class CheckOutEvents {
         GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
         CheckOutHelper checkOutHelper = new CheckOutHelper(dispatcher, delegator, cart);
         Map<String, Object> callResult;
-        String result = checkoutValidation(request,response);
-        if ("error".equals(result)) return "error";
 
         if (UtilValidate.isEmpty(userLogin)) {
             userLogin = cart.getUserLogin();

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1736164&r1=1736163&r2=1736164&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Mar 22 09:18:59 2016
@@ -733,7 +733,7 @@ under the License.
         <event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents" invoke="createOrder"/>
         <response name="sales_order" type="request" value="checkBlacklist"/>
         <response name="work_order" type="request" value="checkBlacklist"/>
-        <response name="error" type="view" value="quickAnonOrderReview"/>
+        <response name="error" type="view" value="checkoutreview"/>
     </request-map>
     <request-map uri="processpayment">
         <security https="true" direct-request="false"/>