svn commit: r587073 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java

[jacopoc]

Author: jacopoc
Date: Mon Oct 22 05:41:37 2007
New Revision: 587073

URL: http://svn.apache.org/viewvc?rev=587073&view=rev
Log:
Fixed bug reported by Bilgin Ibryam in the dev list: however the code here would really need to be further cleaned up.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=587073&r1=587072&r2=587073&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Mon Oct 22 05:41:37 2007
@@ -1028,7 +1028,7 @@
             List cashCodBaExpr = UtilMisc.toList(new EntityExpr("paymentMethodTypeId", EntityOperator.EQUALS, "CASH"),
                                            new EntityExpr("paymentMethodTypeId", EntityOperator.EQUALS, "EXT_COD"),
                                            new EntityExpr("paymentMethodTypeId", EntityOperator.EQUALS, "EXT_BILLACT"));
-            List cashCodBaPaymentPreferences = EntityUtil.filterByAnd(allPaymentPreferences, cashCodBaExpr);
+            List cashCodBaPaymentPreferences = EntityUtil.filterByOr(allPaymentPreferences, cashCodBaExpr);
 
             if (UtilValidate.isNotEmpty(cashCodBaPaymentPreferences) &&
                     UtilValidate.isNotEmpty(allPaymentPreferences) &&