Author: mor
Date: Tue Jul 29 05:29:33 2008
New Revision: 680682
URL: http://svn.apache.org/viewvc?rev=680682&view=rev
Log:
Now micro cart is also updated - on doing checkout through One Page. Patch from
Brajesh Patel
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=680682&r1=680681&r2=680682&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl
(original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl Tue
Jul 29 05:29:33 2008
@@ -25,9 +25,9 @@
<div id="microcart">
<div>
<#if (shoppingCartSize > 0)>
- ${uiLabelMap.EcommerceCartHas} ${shoppingCart.getTotalQuantity()}
+ ${uiLabelMap.EcommerceCartHas}<div
id="microCartQuantity">${shoppingCart.getTotalQuantity()}</div>
<#if shoppingCart.getTotalQuantity() ==
1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
- <@ofbizCurrency amount=shoppingCart.getGrandTotal()
isoCode=shoppingCart.getCurrency()/>
+ <div id="microCartTotal"><@ofbizCurrency
amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></div>
<#else>
${uiLabelMap.OrderShoppingCartEmpty}
</#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=680682&r1=680681&r2=680682&view=diff
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
Tue Jul 29 05:29:33 2008
@@ -477,10 +477,12 @@
$('checkoutPanel').hide();
} else {
// Used for edit cart
+ $('microCartQuantity').update(data.totalQuantity);
$('cartSubTotal').update(data.subTotalCurrencyFormatted);
$('cartDiscountValue').update(data.displayOrderAdjustmentsTotalCurrencyFormatted);
$('cartTotalShipping').update(data.totalShippingCurrencyFormatted);
$('cartTotalSalesTax').update(data.totalSalesTaxCurrencyFormatted);
+
$('microCartTotal').update(data.displayGrandTotalCurrencyFormatted);
$('cartDisplayGrandTotal').update(data.displayGrandTotalCurrencyFormatted);
// Used for summary
$('completedCartSubTotal').update(data.subTotalCurrencyFormatted);