You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/06/03 06:32:47 UTC
svn commit: r950872 - in /ofbiz/branches/release10.04: ./
applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
Author: jleroux
Date: Thu Jun 3 04:32:46 2010
New Revision: 950872
URL: http://svn.apache.org/viewvc?rev=950872&view=rev
Log:
"Applied fix from trunk for revision: 950870 "
------------------------------------------------------------------------
r950870 | jleroux | 2010-06-03 06:28:27 +0200 (jeu. 03 juin 2010) | 4 lignes
A patch from Eric De Maulde 'Config price context doesn't refer to a product store id / product store group id' https://issues.apache.org/jira/browse/OFBIZ-3770 - OFBIZ-3770
For AGGREGATED product, the service "calculateProductPrice" doesn't refer to a product store, in order to select the right registered product price between different productStoreGroupId.
This patch add productStoreId to the price context in order to select the right registered product price
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 3 04:32:46 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=950872&r1=950871&r2=950872&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Thu Jun 3 04:32:46 2010
@@ -542,8 +542,7 @@ public class ProductConfigWrapper implem
BigDecimal listPrice = BigDecimal.ZERO;
BigDecimal price = BigDecimal.ZERO;
// Get the component's price
- Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct"), "prodCatalogId", catalogId, "webSiteId", webSiteId,
- "currencyUomId", currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", autoUserLogin);
+ Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct"), "prodCatalogId", catalogId, "webSiteId", webSiteId, "currencyUomId", currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", autoUserLogin, "productStoreId",productStoreId);
Map<String, Object> priceMap = dispatcher.runSync("calculateProductPrice", fieldMap);
BigDecimal componentListPrice = (BigDecimal) priceMap.get("listPrice");
BigDecimal componentPrice = (BigDecimal) priceMap.get("price");
@@ -607,8 +606,7 @@ public class ProductConfigWrapper implem
}
// Get the component's price
- Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId", pcw.webSiteId,
- "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", pcw.autoUserLogin);
+ Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId", pcw.webSiteId, "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", pcw.autoUserLogin, "productStoreId",productStoreId);
Map<String, Object> priceMap = dispatcher.runSync("calculateProductPrice", fieldMap);
BigDecimal componentListPrice = (BigDecimal) priceMap.get("listPrice");
BigDecimal componentPrice = (BigDecimal) priceMap.get("price");