You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2016/03/19 15:38:48 UTC

svn commit: r1735777 - 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: diveshdutta
Date: Sat Mar 19 14:38:48 2016
New Revision: 1735777

URL: http://svn.apache.org/viewvc?rev=1735777&view=rev
Log:
[OFBIZ-1585] 

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=1735777&r1=1735776&r2=1735777&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sat Mar 19 14:38:48 2016
@@ -6699,4 +6699,10 @@
         <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=1735777&r1=1735776&r2=1735777&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 Sat Mar 19 14:38:48 2016
@@ -420,6 +420,24 @@ 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();
@@ -429,6 +447,8 @@ 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=1735777&r1=1735776&r2=1735777&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Mar 19 14:38:48 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="checkoutreview"/>
+        <response name="error" type="view" value="quickAnonOrderReview"/>
     </request-map>
     <request-map uri="processpayment">
         <security https="true" direct-request="false"/>

Re: svn commit: r1735777 - 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

Posted by Jacques Le Roux <ja...@les7arts.com>.
Great, thanks!

Looking forward :)

Jacques

Le 31/03/2016 12:43, Divesh Dutta a écrit :
> Hi Jacques,
>
> Will look into it soon.
>
> Thanks
> --
> Divesh Dutta.
>
> On Tue, Mar 22, 2016 at 2:49 PM, Jacques Le Roux <
> jacques.le.roux@les7arts.com> wrote:
>
>> Reverted at r1736164
>>
>> Jacques
>>
>>
>> Le 19/03/2016 16:26, Jacques Le Roux a écrit :
>>
>>> Hi Divesh,
>>>
>>> Sorry but after this change few tests fail:
>>> https://ci.apache.org/builders/ofbiz-trunk
>>> https://ci.apache.org/builders/ofbiz-trunk/builds/477
>>> https://ci.apache.org/projects/ofbiz/logs/trunk/html/
>>>
>>> Jacques
>>>
>>> Le 19/03/2016 15:38, diveshdutta@apache.org a écrit :
>>>
>>>> Author: diveshdutta
>>>> Date: Sat Mar 19 14:38:48 2016
>>>> New Revision: 1735777
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1735777&view=rev
>>>> Log:
>>>> [OFBIZ-1585]
>>>>
>>>> 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=1735777&r1=1735776&r2=1735777&view=diff
>>>>
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
>>>> (original)
>>>> +++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sat Mar
>>>> 19 14:38:48 2016
>>>> @@ -6699,4 +6699,10 @@
>>>>            <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=1735777&r1=1735776&r2=1735777&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
>>>> Sat Mar 19 14:38:48 2016
>>>> @@ -420,6 +420,24 @@ 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();
>>>> @@ -429,6 +447,8 @@ 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=1735777&r1=1735776&r2=1735777&view=diff
>>>>
>>>> ==============================================================================
>>>> ---
>>>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
>>>> (original)
>>>> +++
>>>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
>>>> Sat Mar 19 14:38:48 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="checkoutreview"/>
>>>> +        <response name="error" type="view"
>>>> value="quickAnonOrderReview"/>
>>>>        </request-map>
>>>>        <request-map uri="processpayment">
>>>>            <security https="true" direct-request="false"/>
>>>>
>>>>
>>>>
>>>>

Re: svn commit: r1735777 - 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

Posted by Divesh Dutta <di...@hotwaxsystems.com>.
Hi Jacques,

Will look into it soon.

Thanks
--
Divesh Dutta.

On Tue, Mar 22, 2016 at 2:49 PM, Jacques Le Roux <
jacques.le.roux@les7arts.com> wrote:

> Reverted at r1736164
>
> Jacques
>
>
> Le 19/03/2016 16:26, Jacques Le Roux a écrit :
>
>> Hi Divesh,
>>
>> Sorry but after this change few tests fail:
>> https://ci.apache.org/builders/ofbiz-trunk
>> https://ci.apache.org/builders/ofbiz-trunk/builds/477
>> https://ci.apache.org/projects/ofbiz/logs/trunk/html/
>>
>> Jacques
>>
>> Le 19/03/2016 15:38, diveshdutta@apache.org a écrit :
>>
>>> Author: diveshdutta
>>> Date: Sat Mar 19 14:38:48 2016
>>> New Revision: 1735777
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1735777&view=rev
>>> Log:
>>> [OFBIZ-1585]
>>>
>>> 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=1735777&r1=1735776&r2=1735777&view=diff
>>>
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
>>> (original)
>>> +++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sat Mar
>>> 19 14:38:48 2016
>>> @@ -6699,4 +6699,10 @@
>>>           <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=1735777&r1=1735776&r2=1735777&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
>>> Sat Mar 19 14:38:48 2016
>>> @@ -420,6 +420,24 @@ 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();
>>> @@ -429,6 +447,8 @@ 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=1735777&r1=1735776&r2=1735777&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
>>> (original)
>>> +++
>>> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
>>> Sat Mar 19 14:38:48 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="checkoutreview"/>
>>> +        <response name="error" type="view"
>>> value="quickAnonOrderReview"/>
>>>       </request-map>
>>>       <request-map uri="processpayment">
>>>           <security https="true" direct-request="false"/>
>>>
>>>
>>>
>>>
>>

Re: svn commit: r1735777 - 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

Posted by Jacques Le Roux <ja...@les7arts.com>.
Reverted at r1736164

Jacques

Le 19/03/2016 16:26, Jacques Le Roux a écrit :
> Hi Divesh,
>
> Sorry but after this change few tests fail:
> https://ci.apache.org/builders/ofbiz-trunk
> https://ci.apache.org/builders/ofbiz-trunk/builds/477
> https://ci.apache.org/projects/ofbiz/logs/trunk/html/
>
> Jacques
>
> Le 19/03/2016 15:38, diveshdutta@apache.org a écrit :
>> Author: diveshdutta
>> Date: Sat Mar 19 14:38:48 2016
>> New Revision: 1735777
>>
>> URL: http://svn.apache.org/viewvc?rev=1735777&view=rev
>> Log:
>> [OFBIZ-1585]
>>
>> 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=1735777&r1=1735776&r2=1735777&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
>> +++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sat Mar 19 14:38:48 2016
>> @@ -6699,4 +6699,10 @@
>>           <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=1735777&r1=1735776&r2=1735777&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 Sat Mar 19 14:38:48 2016
>> @@ -420,6 +420,24 @@ 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();
>> @@ -429,6 +447,8 @@ 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=1735777&r1=1735776&r2=1735777&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Mar 19 14:38:48 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="checkoutreview"/>
>> +        <response name="error" type="view" value="quickAnonOrderReview"/>
>>       </request-map>
>>       <request-map uri="processpayment">
>>           <security https="true" direct-request="false"/>
>>
>>
>>
>

Re: svn commit: r1735777 - 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

Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Divesh,

Sorry but after this change few tests fail:
https://ci.apache.org/builders/ofbiz-trunk
https://ci.apache.org/builders/ofbiz-trunk/builds/477
https://ci.apache.org/projects/ofbiz/logs/trunk/html/

Jacques

Le 19/03/2016 15:38, diveshdutta@apache.org a écrit :
> Author: diveshdutta
> Date: Sat Mar 19 14:38:48 2016
> New Revision: 1735777
>
> URL: http://svn.apache.org/viewvc?rev=1735777&view=rev
> Log:
> [OFBIZ-1585]
>
> 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=1735777&r1=1735776&r2=1735777&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
> +++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sat Mar 19 14:38:48 2016
> @@ -6699,4 +6699,10 @@
>           <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=1735777&r1=1735776&r2=1735777&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 Sat Mar 19 14:38:48 2016
> @@ -420,6 +420,24 @@ 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();
> @@ -429,6 +447,8 @@ 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=1735777&r1=1735776&r2=1735777&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Mar 19 14:38:48 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="checkoutreview"/>
> +        <response name="error" type="view" value="quickAnonOrderReview"/>
>       </request-map>
>       <request-map uri="processpayment">
>           <security https="true" direct-request="false"/>
>
>
>