svn commit: r483239 - in /incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog: productdetail.bsh productsummary.bsh

[sichen]

Author: sichen
Date: Wed Dec  6 13:24:36 2006
New Revision: 483239

URL: http://svn.apache.org/viewvc?view=rev&rev=483239
Log:
Fix a bug where during ordermgr order entry the prices calculated were for the CSR user party instead of for the actual customer

Modified:
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh?view=diff&rev=483239&r1=483238&r2=483239
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh Wed Dec  6 13:24:36 2006
@@ -171,6 +171,7 @@
         priceContext.put("productStoreId", productStoreId);
         priceContext.put("checkIncludeVat", "Y");
         priceContext.put("agreementId", cart.getAgreementId());
+        priceContext.put("partyId", cart.getPartyId());  // IMPORTANT: must put this in, or price will be calculated for the CSR instead of the customer
         priceMap = dispatcher.runSync("calculateProductPrice", priceContext);
         context.put("priceMap", priceMap);
     } else {

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh?view=diff&rev=483239&r1=483238&r2=483239
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productsummary.bsh Wed Dec  6 13:24:36 2006
@@ -86,6 +86,7 @@
         priceContext.put("prodCatalogId", catalogId);
         priceContext.put("productStoreId", productStoreId);
         priceContext.put("agreementId", cart.getAgreementId());
+        priceContext.put("partyId", cart.getPartyId());  // IMPORTANT: otherwise it'll be calculating prices using the logged in user which could be a CSR instead of the customer
         priceContext.put("checkIncludeVat", "Y");
         priceMap = dispatcher.runSync("calculateProductPrice", priceContext);