svn commit: r813136 - in /ofbiz/trunk: applications/order/config/OrderUiLabels.xml specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl

Author: jleroux
Date: Wed Sep  9 22:00:20 2009
New Revision: 813136

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

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=813136&r1=813135&r2=813136&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Sep  9 22:00:20 2009
@@ -8191,6 +8191,12 @@
         <value xml:lang="zh">营业税</value>
         <value xml:lang="zh_CN">销售税</value>
     </property>
+    <property key="OrderSalesTaxIncluded">
+        <value xml:lang="en">Of which Sales Tax included</value>
+        <value xml:lang="en_GB">Of which VAT included</value>
+        <value xml:lang="fr">Dont TVA incluse</value>
+        <value xml:lang="ja">Of which Sales Tax included</value>
+    </property>
     <property key="OrderSave">
         <value xml:lang="cs">UÅ¡etříte</value>
         <value xml:lang="de">Sie sparen</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=813136&r1=813135&r2=813136&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Wed Sep  9 22:00:20 2009
@@ -322,14 +322,19 @@
     </table>
     <table>
         <#if shoppingCart.getAdjustments()?has_content>
+            <tr>
+              <th>${uiLabelMap.CommonSubTotal}:</th>
+              <td><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></td>
+              <td>&nbsp;</td>
+            </tr>
+            <#if (shoppingCart.getDisplaySubTotal()-shoppingCart.getSubTotal() > 0.0)>
               <tr>
-                <th>${uiLabelMap.CommonSubTotal}:</th>
-                <td><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></td>
-                <td>&nbsp;</td>
+                <th>${uiLabelMap.OrderSalesTaxIncluded}:</th>
+                <td><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal()-shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency()/></td>
               </tr>
+            </#if>
             <#list shoppingCart.getAdjustments() as cartAdjustment>
               <#assign adjustmentType = cartAdjustment.getRelatedOneCache("OrderAdjustmentType")>
-              <!-- adjustment info: ${cartAdjustment.toString()} -->
               <tr>
                 <th>
                     ${uiLabelMap.EcommerceAdjustment} - ${adjustmentType.get("description",locale)?if_exists}
@@ -340,13 +345,6 @@
               </tr>
             </#list>
         </#if>
-
-        <#if (shoppingCart.getTotalSalesTax() > 0.0)>
-        <tr>
-          <th>${uiLabelMap.OrderSalesTax}:</th>
-          <td><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></td>
-        </tr>
-        </#if>
         <tr>
           <th>${uiLabelMap.EcommerceCartTotal}:</th>
           <td><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></td>