svn commit: r712244 - in /ofbiz/trunk/applications/ecommerce/webapp/ecommerce: cart/microcart.ftl images/checkoutProcess.js

[mor-2]

Author: mor
Date: Fri Nov  7 11:59:05 2008
New Revision: 712244

URL: http://svn.apache.org/viewvc?rev=712244&view=rev
Log:
Fix:Micro cart was not updated if a user change item(s) in cart on one page checkout.
Applied a different patch from Ravindra Mandre on Jira issue OFBIZ-2034 (https://issues.apache.org/jira/browse/OFBIZ-2034)

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl?rev=712244&r1=712243&r2=712244&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl Fri Nov  7 11:59:05 2008
@@ -25,9 +25,12 @@
 <div id="microcart">
     <div>
         <#if (shoppingCartSize > 0)>
-            ${uiLabelMap.EcommerceCartHas} <span id="microCartQuantity">${shoppingCart.getTotalQuantity()}</span>
-            <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
-            <span id="microCartTotal"><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></span>
+            <span id="microCartNotEmpty">
+                ${uiLabelMap.EcommerceCartHas} <span id="microCartQuantity">${shoppingCart.getTotalQuantity()}</span>
+                <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
+                <span id="microCartTotal"><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></span>
+            </span>
+            <span id="microCartEmpty" style="display:none">${uiLabelMap.OrderShoppingCartEmpty}</span>
         <#else>
             ${uiLabelMap.OrderShoppingCartEmpty}
         </#if>
@@ -36,7 +39,8 @@
     <div>
       <a href="<@ofbizUrl>view/showcart</@ofbizUrl>">[${uiLabelMap.OrderViewCart}]</a>
       <#if (shoppingCartSize > 0)>
-          <a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">[${uiLabelMap.OrderCheckoutQuick}]</a>
+          <span id="quickCheckoutEnabled"><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">[${uiLabelMap.OrderCheckoutQuick}]</a></span>
+          <span id="quickCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</span>
       <#else>
           <span class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</span>
       </#if>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=712244&r1=712243&r2=712244&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Fri Nov  7 11:59:05 2008
@@ -441,6 +441,10 @@
             if (data.totalQuantity == 0) {
                 $('emptyCartCheckoutPanel').show();
                 $('checkoutPanel').hide();
+                $('microCartNotEmpty').hide();
+                $('microCartEmpty').show();
+                $('quickCheckoutEnabled').hide();
+                $('quickCheckoutDisabled').show();
             } else {
                 // Used for edit cart
                 $('microCartQuantity').update(data.totalQuantity);