svn commit: r814343 - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java specialpurpose/ecommerce/config/EcommerceUiLabels.xml specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl

Author: jleroux
Date: Sun Sep 13 16:50:26 2009
New Revision: 814343

URL: http://svn.apache.org/viewvc?rev=814343&view=rev
Log:
Improve r813136
"Show the total taxes included in sub total when taxes included in prices is selected in store"

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=814343&r1=814342&r2=814343&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sun Sep 13 16:50:26 2009
@@ -2522,6 +2522,11 @@
         return itemsTotal;
     }
 
+    public BigDecimal getDisplayTaxIncluded() {
+        BigDecimal taxIncluded  = getDisplaySubTotal().subtract(getSubTotal());
+        return taxIncluded.setScale(taxFinalScale, taxRounding);
+    }
+
     public BigDecimal getDisplayRecurringSubTotal() {
         BigDecimal itemsTotal = BigDecimal.ZERO;
         Iterator i = iterator();

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=814343&r1=814342&r2=814343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Sun Sep 13 16:50:26 2009
@@ -291,7 +291,7 @@
         <value xml:lang="zh">文章</value>
     </property>
     <property key="EcommerceBlogContentNotFound">
-        <value xml:lang="da">Kan ikke finde blog indhold!</value>  
+        <value xml:lang="da">Kan ikke finde blog indhold!</value>
         <value xml:lang="en">Unable to find Blog content!</value>
         <value xml:lang="fr">Impossible de trouver le contenu du blog !</value>
         <value xml:lang="it">Non è possibile trovare il contenuto Blog!</value>
@@ -2179,7 +2179,7 @@
         <value xml:lang="de">Produktnummer</value>
         <value xml:lang="en">Product Number</value>
         <value xml:lang="es">Producto</value>
-        <value xml:lang="fr">N° d'article</value>
+        <value xml:lang="fr">N° d'article : </value>
         <value xml:lang="hi_IN">सामान नम्बर:</value>
         <value xml:lang="it">Codice prodotto:</value>
         <value xml:lang="ja">Product ID:</value>
@@ -2236,7 +2236,7 @@
         <value xml:lang="zh">询价历史记录</value>
     </property>
     <property key="EcommerceRate">
-        <value xml:lang="da">Hyppighed</value>    
+        <value xml:lang="da">Hyppighed</value>
         <value xml:lang="de">Steuern</value>
         <value xml:lang="en">Rate</value>
         <value xml:lang="es">Tasa</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=814343&r1=814342&r2=814343&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Sun Sep 13 16:50:26 2009
@@ -327,10 +327,10 @@
               <td><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></td>
               <td>&nbsp;</td>
             </tr>
-            <#if (shoppingCart.getDisplaySubTotal()-shoppingCart.getSubTotal() > 0.0)>
+            <#if (shoppingCart.getDisplayTaxIncluded() > 0.0)>
               <tr>
                 <th>${uiLabelMap.OrderSalesTaxIncluded}:</th>
-                <td><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal()-shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency()/></td>
+                <td><@ofbizCurrency amount=shoppingCart.getDisplayTaxIncluded() isoCode=shoppingCart.getCurrency()/></td>
                 <td>&nbsp;</td>
               </tr>
             </#if>