Author: jacopoc
Date: Tue Nov 20 03:24:00 2007
New Revision: 596625
URL:
http://svn.apache.org/viewvc?rev=596625&view=revLog:
Small improvement to the currency uom handling in the shopping list screen: instead of getting the generic currency (from general.properties) it now uses the cart's currency (a cart object is automatically set if not available).
Another improvement, not in this patch, would be that of considering the currency of the ShoppingList (if set).
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh?rev=596625&r1=596624&r2=596625&view=diff==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh Tue Nov 20 03:24:00 2007
@@ -22,6 +22,7 @@
import org.ofbiz.entity.*;
import org.ofbiz.entity.util.*;
import org.ofbiz.entity.condition.*;
+import org.ofbiz.order.shoppingcart.ShoppingCartEvents;
import org.ofbiz.order.shoppingcart.shipping.*;
import org.ofbiz.order.shoppinglist.*;
import org.ofbiz.party.contact.*;
@@ -34,10 +35,12 @@
userLogin = session.getAttribute("userLogin");
party = userLogin.getRelatedOne("Party");
+cart = ShoppingCartEvents.getCartObject(request);
+currencyUomId = cart.getCurrency();
+
productStoreId = ProductStoreWorker.getProductStoreId(request);
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
webSiteId = CatalogWorker.getWebSiteId(request);
-currencyUomId = UtilHttp.getCurrencyUom(request);
context.put("productStoreId", productStoreId);
context.put("currencyUomId", currencyUomId);