[OFBiz] SVN: r5619 - trunk/applications/order/src/org/ofbiz/order/shoppingcart

[jacopo at svn.ofbiz.org]

Author: jacopo
Date: 2005-09-01 07:49:02 -0500 (Thu, 01 Sep 2005)
New Revision: 5619

Modified:
   trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Log:
Improved the way the quote items are added to the cart: now the order in the cart is the same as the order in the quote.

Modified: trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
===================================================================
--- trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java	2005-08-31 23:08:19 UTC (rev 5618)
+++ trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java	2005-09-01 12:49:02 UTC (rev 5619)
@@ -471,7 +471,7 @@
         Iterator itemIter = null;
         
         try {
-            itemIter = UtilMisc.toIterator(delegator.findByAnd("QuoteItem", UtilMisc.toMap("quoteId", quoteId), null));
+            itemIter = UtilMisc.toIterator(delegator.findByAnd("QuoteItem", UtilMisc.toMap("quoteId", quoteId), UtilMisc.toList("quoteItemSeqId")));
         } catch (GenericEntityException e) {
             Debug.logWarning(e.getMessage(), module);
             itemIter = null;
@@ -500,7 +500,7 @@
                     try {
                         // TODO: it would be better to implement a new ShoppingCartItem.makeItem(...) method
                         //       that takes as input the quoteItem generic value
-                        ShoppingCartItem sci = ShoppingCartItem.makeItem(new Integer(0), quoteItem.getString("productId"),
+                        ShoppingCartItem sci = ShoppingCartItem.makeItem(null, quoteItem.getString("productId"),
                                                                          0, quoteItem.getDouble("quantity").doubleValue(), 
                                                                          null, null, catalogId, null, 
                                                                          dispatcher, this.cart);