svn commit: r811717 - in /ofbiz/branches/release09.04: ./ specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl

Author: jleroux
Date: Sat Sep  5 21:29:53 2009
New Revision: 811717

URL: http://svn.apache.org/viewvc?rev=811717&view=rev
Log:
"Applied fix from trunk for revision: 811716  "
------------------------------------------------------------------------
r811716 | jleroux | 2009-09-05 23:19:08 +0200 (sam. 05 sept. 2009) | 3 lignes

A patch from Eric DE MAULDE "MiniProductSummary : showPricesWithVatTax and Currency " (https://issues.apache.org/jira/browse/OFBIZ-2613) - OFBIZ-2613


------------------------------------------------------------------------

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
    ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep  5 21:29:53 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy?rev=811717&r1=811716&r2=811717&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy Sat Sep  5 21:29:53 2009
@@ -17,6 +17,9 @@
  * under the License.
  */
 
+import java.math.BigDecimal;
+import java.util.Map;
+
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.*;
 import org.ofbiz.service.*;
@@ -49,15 +52,28 @@
     if (userLogin) priceParams.partyId = userLogin.partyId;
     priceResult = dispatcher.runSync("calculateProductPrice", priceParams);
     // returns: isSale, price, orderItemPriceInfos
-
     context.priceResult = priceResult;
+    // Check if Price has to be displayed with tax
+    if (productStore.get("showPricesWithVatTax").equals("Y")) {
+        Map priceMap = dispatcher.runSync("calcTaxForDisplay", UtilMisc.toMap("basePrice", priceResult.get("price"), "locale", locale, "productId", optProductId, "productStoreId", productStoreId));
+        context.price = priceMap.get("priceWithTax");
+    } else {
+        context.price = priceResult.get("price");
+    }
 
     // get aggregated product totalPrice
     if ("AGGREGATED".equals(miniProduct.productTypeId)) {
         configWrapper = ProductConfigWorker.getProductConfigWrapper(optProductId, cart.getCurrency(), request);
         if (configWrapper) {
             configWrapper.setDefaultConfig();
-            context.totalPrice = configWrapper.getTotalPrice();
+            // Check if Config Price has to be displayed with tax
+            if (productStore.get("showPricesWithVatTax").equals("Y")) {
+                BigDecimal totalPriceNoTax = configWrapper.getTotalPrice();
+                Map totalPriceMap = dispatcher.runSync("calcTaxForDisplay", UtilMisc.toMap("basePrice", totalPriceNoTax, "locale", locale, "productId", optProductId, "productStoreId", productStoreId));
+                context.totalPrice = totalPriceMap.get("priceWithTax");
+            } else {
+                context.totalPrice = configWrapper.getTotalPrice();
+            }
         }
     }
 

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl?rev=811717&r1=811716&r2=811717&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl Sat Sep  5 21:29:53 2009
@@ -22,7 +22,7 @@
       <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")>
         <#if "Y" = miniProduct.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if>
         <#if totalPrice?exists>
-          <p>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></p>
+          <p>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=priceResult.currencyUsed/></span></p>
         <#else>
           <b><span class="<#if priceResult.isSale>salePrice<#else>normalPrice</#if>">
           <@ofbizCurrency amount=priceResult.price isoCode=priceResult.currencyUsed/></span></b>