You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2008/07/29 15:23:31 UTC
svn commit: r680688 - in
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce: cart/microcart.ftl
images/checkoutProcess.js
Author: mor
Date: Tue Jul 29 06:23:30 2008
New Revision: 680688
URL: http://svn.apache.org/viewvc?rev=680688&view=rev
Log:
Reverting last my commit - as this breaks the micro cart layout. It needs some other approach to keep consistent with the current layout for micro cart.
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=680688&r1=680687&r2=680688&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl Tue Jul 29 06:23:30 2008
@@ -25,9 +25,9 @@
<div id="microcart">
<div>
<#if (shoppingCartSize > 0)>
- ${uiLabelMap.EcommerceCartHas}<div id="microCartQuantity">${shoppingCart.getTotalQuantity()}</div>
+ ${uiLabelMap.EcommerceCartHas} ${shoppingCart.getTotalQuantity()}
<#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
- <div id="microCartTotal"><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></div>
+ <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/>
<#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=680688&r1=680687&r2=680688&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Tue Jul 29 06:23:30 2008
@@ -477,12 +477,10 @@
$('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);