You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/09/24 17:54:52 UTC
svn commit: r698619 - in /ofbiz/trunk/specialpurpose/mypage:
script/org/ofbiz/mypage/MyPageServices.xml
templates/email/CompletedCustRequestNotification.ftl
templates/email/CreateCustRequestNotification.ftl
Author: hansbak
Date: Wed Sep 24 08:54:51 2008
New Revision: 698619
URL: http://svn.apache.org/viewvc?rev=698619&view=rev
Log:
fixed baseurl missing in customer request email notification
Modified:
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl
ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml?rev=698619&r1=698618&r2=698619&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml Wed Sep 24 08:54:51 2008
@@ -96,18 +96,24 @@
<call-service service-name="getPartyEmail" in-map-name="getPartyEmail">
<result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/>
</call-service>
- <set field="bodyParameters.person" from-field="person"/>
- <set field="bodyParameters.custRequest" from-field="custReq"/>
- <set field="bodyParameters.partyId" from-field="custReq.fromPartyId"/>
- <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
- <set field="emailParams.subject" from-field="storeEmail.subject"/>
- <set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/>
- <set field="emailParams.sendCc" from-field="storeEmail.ccAddress"/>
- <set field="emailParams.sendBcc" from-field="storeEmail.bccAddress"/>
- <set field="emailParams.contentType" value="text/html"/>
- <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
- <set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
- <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
+ <entity-and list-name="webSites" entity-name="WebSite">
+ <field-map field-name="productStoreId" env-name="storeEmail.productStoreId" />
+ </entity-and>
+ <first-from-list entry-name="webSite" list-name="webSites" />
+ <if-not-empty field="emailParams.sendTo">
+ <set field="bodyParameters.person" from-field="person"/>
+ <set field="bodyParameters.custRequest" from-field="custReq"/>
+ <set field="bodyParameters.partyId" from-field="custReq.fromPartyId"/>
+ <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
+ <set field="emailParams.subject" from-field="storeEmail.subject"/>
+ <set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/>
+ <set field="emailParams.sendCc" from-field="storeEmail.ccAddress"/>
+ <set field="emailParams.sendBcc" from-field="storeEmail.bccAddress"/>
+ <set field="emailParams.contentType" value="text/html"/>
+ <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
+ <set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
+ <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
+ </if-not-empty>
</if-not-empty>
</then>
</if>
Modified: ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl?rev=698619&r1=698618&r2=698619&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl Wed Sep 24 08:54:51 2008
@@ -29,7 +29,7 @@
<p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed.
<br/><br/>
The status and used hours can always be checked at the url: <br/>
- https://${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
+ ${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
<br/><br/>
Regards.<br/><br/>
Thank you for your business.
Modified: ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl?rev=698619&r1=698618&r2=698619&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl Wed Sep 24 08:54:51 2008
@@ -31,7 +31,7 @@
We will solve/implement the request as soon as possible
<br/><br/>
The status and used hours can always be checked at the url: <br/>
- https://${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
+ ${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
<br/><br/>
Regards.
<br/><br/>