Author: lektran
Date: Sun Oct 21 11:27:10 2012
New Revision: 1400626
URL: http://svn.apache.org/viewvc?rev=1400626&view=rev
Log:
Replace more misc. webSiteId retrievals with calls to
WebSiteWorker.getWebSiteId(request). Deprecated
CatalogWorker.getWebSiteId(request) and CatalogWorker.getWebSite(request).
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
(original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
Sun Oct 21 11:27:10 2012
@@ -42,6 +42,7 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* DataEvents Class
@@ -279,7 +280,7 @@ public class DataEvents {
response.setContentType(mimeType);
}
OutputStream os = response.getOutputStream();
- DataResourceWorker.streamDataResource(os, delegator,
dataResourceId, "", application.getInitParameter("webSiteId"),
UtilHttp.getLocale(request), application.getRealPath("/"));
+ DataResourceWorker.streamDataResource(os, delegator,
dataResourceId, "", WebSiteWorker.getWebSiteId(request),
UtilHttp.getLocale(request), application.getRealPath("/"));
os.flush();
} catch (GenericEntityException e) {
String errMsg = "Error downloading digital product content: " +
e.toString();
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java
(original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java
Sun Oct 21 11:27:10 2012
@@ -40,6 +40,7 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.webapp.website.WebSiteWorker;
import javolution.util.FastMap;
@@ -75,7 +76,7 @@ public class OrderEvents {
response.setContentType(orderRoleAndProductContentInfo.getString("mimeTypeId"));
}
OutputStream os = response.getOutputStream();
- DataResourceWorker.streamDataResource(os, delegator,
dataResourceId, "", application.getInitParameter("webSiteId"),
UtilHttp.getLocale(request), application.getRealPath("/"));
+ DataResourceWorker.streamDataResource(os, delegator,
dataResourceId, "", WebSiteWorker.getWebSiteId(request),
UtilHttp.getLocale(request), application.getRealPath("/"));
os.flush();
} catch (GenericEntityException e) {
String errMsg = "Error downloading digital product content: " +
e.toString();
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
Sun Oct 21 11:27:10 2012
@@ -54,6 +54,7 @@ import org.ofbiz.service.LocalDispatcher
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
import org.ofbiz.webapp.stats.VisitHandler;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* Events used for processing checkout and orders.
@@ -446,7 +447,7 @@ public class CheckOutEvents {
String distributorId = (String)
session.getAttribute("_DISTRIBUTOR_ID_");
String affiliateId = (String) session.getAttribute("_AFFILIATE_ID_");
String visitId = VisitHandler.getVisitId(session);
- String webSiteId = CatalogWorker.getWebSiteId(request);
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
callResult = checkOutHelper.createOrder(userLogin, distributorId,
affiliateId, trackingCodeOrders, areOrderItemsExploded, visitId, webSiteId);
if (callResult != null) {
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
Sun Oct 21 11:27:10 2012
@@ -57,6 +57,7 @@ import org.ofbiz.service.GenericServiceE
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* Shopping cart events.
@@ -459,7 +460,7 @@ public class ShoppingListEvents {
// safety check for missing required parameter.
if (cart.getWebSiteId() == null) {
- cart.setWebSiteId(CatalogWorker.getWebSiteId(request));
+ cart.setWebSiteId(WebSiteWorker.getWebSiteId(request));
}
// locate the user's identity
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy
Sun Oct 21 11:27:10 2012
@@ -28,6 +28,7 @@ import org.ofbiz.product.catalog.*;
import org.ofbiz.order.shoppingcart.*;
import org.ofbiz.product.store.*;
import org.ofbiz.party.party.PartyWorker;
+import org.ofbiz.webapp.website.WebSiteWorker
cart = ShoppingCartEvents.getCartObject(request);
context.cart = cart;
@@ -90,7 +91,7 @@ if (paymentMethodTypeIds) {
context.paymentMethodType = paymentMethodType;
}
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
productStoreId = ProductStoreWorker.getProductStoreId(request);
productStore = ProductStoreWorker.getProductStore(productStoreId, delegator);
if (productStore) {
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy
Sun Oct 21 11:27:10 2012
@@ -27,6 +27,7 @@ import org.ofbiz.entity.condition.*;
import org.ofbiz.entity.util.*;
import org.ofbiz.webapp.taglib.*;
import org.ofbiz.webapp.stats.VisitHandler;
+import org.ofbiz.webapp.website.WebSiteWorker
import org.ofbiz.order.shoppingcart.ShoppingCartEvents;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.category.*;
@@ -122,7 +123,7 @@ if (inlineProduct) {
// get the product price
- webSiteId = CatalogWorker.getWebSiteId(request);
+ webSiteId = WebSiteWorker.getWebSiteId(request);
autoUserLogin = request.getSession().getAttribute("autoUserLogin");
if (cart.isSalesOrder()) {
// sales order: run the "calculateProductPrice" service
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
Sun Oct 21 11:27:10 2012
@@ -37,6 +37,7 @@ import org.ofbiz.product.product.Product
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
import org.ofbiz.webapp.stats.VisitHandler;
+import org.ofbiz.webapp.website.WebSiteWorker
import org.ofbiz.order.shoppingcart.ShoppingCartEvents;
import org.ofbiz.order.shoppingcart.ShoppingCart;
@@ -165,7 +166,7 @@ if (product) {
// get the product price
catalogId = CatalogWorker.getCurrentCatalogId(request);
currentCatalogId = catalogId;
- webSiteId = CatalogWorker.getWebSiteId(request);
+ webSiteId = WebSiteWorker.getWebSiteId(request);
autoUserLogin = request.getSession().getAttribute("autoUserLogin");
if (cart.isSalesOrder()) {
// sales order: run the "calculateProductPrice" service
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
Sun Oct 21 11:27:10 2012
@@ -32,6 +32,7 @@ import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
import org.ofbiz.order.shoppingcart.*;
import org.ofbiz.product.product.ProductWorker;
+import org.ofbiz.webapp.website.WebSiteWorker
import java.text.NumberFormat;
//either optProduct, optProductId or productId must be specified
@@ -39,7 +40,7 @@ product = request.getAttribute("optProdu
optProductId = request.getAttribute("optProductId");
productId = product?.productId ?: optProductId ?:
request.getAttribute("productId");
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
catalogId = CatalogWorker.getCurrentCatalogId(request);
cart = ShoppingCartEvents.getCartObject(request);
productStore = null;
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
Sun Oct 21 11:27:10 2012
@@ -20,9 +20,10 @@
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.product.catalog.CatalogWorker;
+import org.ofbiz.webapp.website.WebSiteWorker
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
currencyUomId = parameters.currencyUomId ?: UtilHttp.getCurrencyUom(request);
context.currencyUomId = currencyUomId;
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java
Sun Oct 21 11:27:10 2012
@@ -50,10 +50,19 @@ public class CatalogWorker {
private CatalogWorker () {}
+
+ /**
+ * @deprecated - Use WebSiteWorker.getWebSiteId(ServletRequest) instead
+ */
+ @Deprecated
public static String getWebSiteId(ServletRequest request) {
return WebSiteWorker.getWebSiteId(request);
}
+ /**
+ * @deprecated - Use WebSiteWorker.getWebSite(ServletRequest) instead
+ */
+ @Deprecated
public static GenericValue getWebSite(ServletRequest request) {
return WebSiteWorker.getWebSite(request);
}
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java
Sun Oct 21 11:27:10 2012
@@ -41,6 +41,7 @@ import org.ofbiz.product.config.ProductC
import org.ofbiz.product.product.ProductWorker;
import org.ofbiz.product.store.ProductStoreWorker;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.webapp.website.WebSiteWorker;
import org.ofbiz.base.util.cache.UtilCache;
/**
@@ -57,7 +58,7 @@ public class ProductConfigWorker {
public static ProductConfigWrapper getProductConfigWrapper(String
productId, String currencyUomId, HttpServletRequest request) {
ProductConfigWrapper configWrapper = null;
String catalogId = CatalogWorker.getCurrentCatalogId(request);
- String webSiteId = CatalogWorker.getWebSiteId(request);
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
String productStoreId = ProductStoreWorker.getProductStoreId(request);
GenericValue autoUserLogin =
(GenericValue)request.getSession().getAttribute("autoUserLogin");
try {
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
Sun Oct 21 11:27:10 2012
@@ -47,6 +47,7 @@ import org.ofbiz.product.product.Product
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* ProductStoreWorker - Worker class for store related functionality
@@ -80,7 +81,7 @@ public class ProductStoreWorker {
if (session != null && session.getAttribute("productStoreId") != null)
{
return (String) session.getAttribute("productStoreId");
} else {
- GenericValue webSite = CatalogWorker.getWebSite(request);
+ GenericValue webSite = WebSiteWorker.getWebSite(httpRequest);
if (webSite != null) {
String productStoreId = webSite.getString("productStoreId");
// might be nice to do this, but not needed and has a problem
with dependencies: setSessionProductStore(productStoreId, httpRequest);
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
(original)
+++
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
Sun Oct 21 11:27:10 2012
@@ -60,6 +60,7 @@ import org.ofbiz.security.SecurityConfig
import org.ofbiz.security.SecurityFactory;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceContainer;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* ContextFilter - Restricts access to raw files and configures servlet
objects.
@@ -126,7 +127,7 @@ public class ContextFilter implements Fi
// set the webSiteId in the session
if
(UtilValidate.isEmpty(httpRequest.getSession().getAttribute("webSiteId"))){
- httpRequest.getSession().setAttribute("webSiteId",
config.getServletContext().getAttribute("webSiteId"));
+ httpRequest.getSession().setAttribute("webSiteId",
WebSiteWorker.getWebSiteId(httpRequest));
}
// set the filesystem path of context root.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
Sun Oct 21 11:27:10 2012
@@ -28,10 +28,11 @@ import org.ofbiz.product.config.ProductC
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
import org.ofbiz.order.shoppingcart.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
miniProduct = request.getAttribute("miniProduct");
optProductId = request.getAttribute("optProductId");
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
productStoreId = ProductStoreWorker.getProductStoreId(request);
cart = ShoppingCartEvents.getCartObject(request);
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy
Sun Oct 21 11:27:10 2012
@@ -25,6 +25,7 @@ import org.ofbiz.order.order.*;
import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
cart = session.getAttribute("shoppingCart");
context.cart = cart;
@@ -67,7 +68,7 @@ if (paymentMethodTypeIds) {
context.paymentMethodType = paymentMethodType;
}
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
productStore = ProductStoreWorker.getProductStore(request);
context.productStore = productStore;
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
Sun Oct 21 11:27:10 2012
@@ -27,6 +27,7 @@ import org.ofbiz.order.order.*;
import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
+import org.ofbiz.webapp.website.WebSiteWorker
orderId = parameters.orderId;
orderHeader = null;
@@ -147,7 +148,7 @@ if (orderHeader) {
}
}
- webSiteId = orderHeader.webSiteId ?: CatalogWorker.getWebSiteId(request);
+ webSiteId = orderHeader.webSiteId ?: WebSiteWorker.getWebSiteId(request);
payToPartyId = productStore.payToPartyId;
paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId);
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
Sun Oct 21 11:27:10 2012
@@ -29,6 +29,7 @@ import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
import org.ofbiz.service.calendar.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
party = userLogin.getRelatedOne("Party", false);
@@ -37,7 +38,7 @@ currencyUomId = cart.getCurrency();
productStoreId = ProductStoreWorker.getProductStoreId(request);
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
context.productStoreId = productStoreId;
context.currencyUomId = currencyUomId;
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp Sun Oct
21 11:27:10 2012
@@ -20,10 +20,11 @@ under the License.
<%@ page import="org.ofbiz.base.util.*" %>
<%@ page import="org.ofbiz.entity.*" %>
<%@ page import="org.ofbiz.entity.util.*" %>
+<%@ page import="org.ofbiz.webapp.website.WebSiteWorker" %>
<jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator"
scope="request" />
<%
ServletContext context = pageContext.getServletContext();
-String webSiteId = (String) context.getAttribute("webSiteId");
+String webSiteId = WebSiteWorker.getWebSiteId(request);
List<GenericValue> webAnalytics = delegator.findByAnd("WebAnalyticsConfig",
UtilMisc.toMap("webSiteId", webSiteId), null, false);
%>
<html>
Modified:
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml?rev=1400626&r1=1400625&r2=1400626&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml
(original)
+++
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml
Sun Oct 21 11:27:10 2012
@@ -196,7 +196,7 @@ under the License.
parameters.put("webPosSession", webPosSession);
parameters.put("productStoreId",
org.ofbiz.product.store.ProductStoreWorker.getProductStoreId(request));
parameters.put("catalogId",
org.ofbiz.product.catalog.CatalogWorker.getCurrentCatalogId(request));
- parameters.put("webSiteId",
org.ofbiz.product.catalog.CatalogWorker.getWebSiteId(request));
+ parameters.put("webSiteId",
org.ofbiz.webapp.website.WebSiteWorker.getWebSiteId(request));
session = request.getSession();
parameters.put("autoUserLogin",
session.getAttribute("autoUserLogin"));
cart = webPosSession.getCart();
