svn commit: r747719 - in /ofbiz/trunk/applications: order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java order/webapp/ordermgr/entry/cart/minicart.ftl product/src/org/ofbiz/product/config/ProductConfigWrapper.java

[bibryam]

Author: bibryam
Date: Wed Feb 25 09:31:18 2009
New Revision: 747719

URL: http://svn.apache.org/viewvc?rev=747719&view=rev
Log:
Applied a slightly modified patch from Eric DE MAULDE, OFBIZ-2206: "Cart : same product but different configuration with the same option"

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
    ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=747719&r1=747718&r2=747719&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Wed Feb 25 09:31:18 2009
@@ -237,6 +237,9 @@
                 request.setAttribute("product_id", productId);
                 request.setAttribute("_EVENT_MESSAGE_", UtilProperties.getMessage(resource_error, "cart.addToCart.configureProductBeforeAddingToCart", locale));
                 return "product";
+            } else {
+                // load the Config Id
+                ProductConfigWorker.storeProductConfigWrapper(configWrapper, delegator);
             }
         }
         

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=747719&r1=747718&r2=747719&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Wed Feb 25 09:31:18 2009
@@ -63,7 +63,7 @@
             </#list>
             <tr>
               <td colspan="3" align="right">
-                <div><b>${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></b></div>
+                <div><b>${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></b></div>
               </td>
             </tr>
           </table>

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=747719&r1=747718&r2=747719&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Wed Feb 25 09:31:18 2009
@@ -745,7 +745,9 @@
                 return false;
             }
             ConfigOption co = (ConfigOption)obj;
-            // TODO: we should compare also the GenericValues
+            if (componentOptions != null && !componentOptions.equals(co.getComponentOptions())) {
+                return false;
+            }
             
             return isSelected() == co.isSelected();
         }