svn commit: r620164 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java

[mrisaliti]

Author: mrisaliti
Date: Sat Feb  9 09:51:32 2008
New Revision: 620164

URL: http://svn.apache.org/viewvc?rev=620164&view=rev
Log:
Small bug during convertion of features into the cart to Order Adjustment.
To search ProductFeatureAndAppl I have used also the productFeatureId field.

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

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=620164&r1=620163&r2=620164&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Sat Feb  9 09:51:32 2008
@@ -21,7 +21,17 @@
 import java.sql.Timestamp;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilHttp;
@@ -32,10 +42,10 @@
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.util.EntityUtil;
-import org.ofbiz.order.shoppingcart.product.ProductPromoWorker;
 import org.ofbiz.order.order.OrderReadHelper;
-import org.ofbiz.product.config.ProductConfigWrapper;
+import org.ofbiz.order.shoppingcart.product.ProductPromoWorker;
 import org.ofbiz.product.config.ProductConfigWorker;
+import org.ofbiz.product.config.ProductConfigWrapper;
 import org.ofbiz.product.product.ProductWorker;
 import org.ofbiz.security.Security;
 import org.ofbiz.service.GenericServiceException;
@@ -43,8 +53,6 @@
 import org.ofbiz.service.ModelService;
 import org.ofbiz.service.ServiceUtil;
 
-import javolution.util.FastMap;
-
 /**
  * A facade over the
  * {@link org.ofbiz.order.shoppingcart.ShoppingCart ShoppingCart}
@@ -191,7 +199,8 @@
                 try {
                     productFeatureAndAppl = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductFeatureAndAppl",
                                                                                     UtilMisc.toMap("productId", productId,
-                                                                                                   "productFeatureTypeId", selectedFeatureType))));
+                                                                                                   "productFeatureTypeId", selectedFeatureType,
+                                                                                                   "productFeatureId", selectedFeatureValue))));
                 } catch (GenericEntityException gee) {
                     Debug.logError(gee, module);
                 }