You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2014/08/16 20:53:12 UTC
svn commit: r1618398 - in /ofbiz/branches/release13.07: ./
framework/base/src/org/ofbiz/base/json/
specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
Author: apatel
Date: Sat Aug 16 18:53:12 2014
New Revision: 1618398
URL: http://svn.apache.org/r1618398
Log:
Applied fix from trunk for revision: 1618397
===
[OFBIZ-5690] Fixed email issue. Thanks for help.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/json/ (props changed)
ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1618397
Propchange: ofbiz/branches/release13.07/framework/base/src/org/ofbiz/base/json/
------------------------------------------------------------------------------
Merged /ofbiz/trunk/framework/base/src/org/ofbiz/base/json:r1618397
Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1618398&r1=1618397&r2=1618398&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Sat Aug 16 18:53:12 2014
@@ -27,7 +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;
@@ -148,7 +148,6 @@ if (orderHeader) {
}
}
- webSiteId = orderHeader.webSiteId ?: WebSiteWorker.getWebSiteId(request);
payToPartyId = productStore.payToPartyId;
paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId);