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 2011/07/25 08:30:21 UTC
svn commit: r1150558 - in /ofbiz/trunk/specialpurpose/ecommerce:
templates/email/ webapp/ecommerce/WEB-INF/
Author: hansbak
Date: Mon Jul 25 06:30:19 2011
New Revision: 1150558
URL: http://svn.apache.org/viewvc?rev=1150558&view=rev
Log:
contactlist emails, chamge from forms to url's because forms not always work with several email clients.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl?rev=1150558&r1=1150557&r2=1150558&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl Mon Jul 25 06:30:19 2011
@@ -20,18 +20,12 @@ under the License.
<body>
<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">Successfully subscribed from ${contactList.contactListName} contact list.</p>
- <#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" />
- <form method="post" id="contactListOptOut" action="${verifyUrl}">
- <fieldset>
- <input type="hidden" name="contactListId" value="${contactListParty.contactListId}" />
- <input type="hidden" name="partyId" value="${contactListParty.partyId}" />
- <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId?if_exists}" />
- <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
- <input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING" />
- <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
- <input type="hidden" name="baseLocation" value="${baseLocation?if_exists}" />
- <input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription." />
- </fieldset>
- </form>
+
+ <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists>
+ <#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+ </#if>
+ <a href="${verifyUrl}">If this was by mistake, click here to unsubscribe your subscription again.</a>
+
</body>
</html>
Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl?rev=1150558&r1=1150557&r2=1150558&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl Mon Jul 25 06:30:19 2011
@@ -20,5 +20,14 @@ under the License.
<body>
<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">Successfully unsubscribed from ${contactList.contactListName} contact list.</p>
+
+ <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_SUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists>
+ <#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+ </#if>
+ <a href="${verifyUrl}">If this was by mistake, click here subscribe again.</a>
+
+
+
</body>
</html>
Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1150558&r1=1150557&r2=1150558&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl Mon Jul 25 06:30:19 2011
@@ -32,21 +32,12 @@ under the License.
<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p>
- <p class="tabletext">To complete your unsubscription use the verify form in your <a href="${baseEcommerceSecureUrl}viewprofile">online profile</a>, or use the following link:</p>
- <#if (contactListPartyStatus.optInVerifyCode)?has_content><p class="tabletext">Your verify code is: ${contactListPartyStatus.optInVerifyCode}</p></#if>
+ <p class="tabletext">To complete your unsubscription click the on the following link:</p>
- <#assign verifyUrl = baseEcommerceSecureUrl + "contactListOptOut" />
- <form method="post" id="contactListOptOut" action="${verifyUrl}">
- <fieldset>
- <input type="hidden" name="communicationEventId" value="${communicationEventId}" />
- <input type="hidden" name="contactListId" value="${contactListParty.contactListId}" />
- <input type="hidden" name="partyId" value="${contactListParty.partyId}" />
- <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId?if_exists}" />
- <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
- <input type="hidden" name="statusId" value="CLPT_UNSUBSCRIBED" />
- <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
- <input type="submit" name="submitButton" value="Please click here to verify your newsletter unsubscription." />
- </fieldset>
- </form>
+ <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId?if_exists+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode>
+ <#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+ </#if>
+ <a href="${verifyUrl}">Please click here to verify your unsubscription.</a>
</body>
</html>
Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=1150558&r1=1150557&r2=1150558&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl Mon Jul 25 06:30:19 2011
@@ -32,21 +32,13 @@ under the License.
<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">We have received a request for subscription to the ${contactList.contactListName} contact list.</p>
-<p class="tabletext">To complete your subscription use the verify form in your <a href="${baseEcommerceSecureUrl}viewprofile">online profile</a>, or use the following link:</p>
-<#if (contactListPartyStatus.optInVerifyCode)?has_content><p class="tabletext">Your verify code is: ${contactListPartyStatus.optInVerifyCode}</p></#if>
+<p class="tabletext">To complete your subscription click the on the following link:</p>
+
+<#assign verifyUrl = baseEcommerceSecureUrl+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists>
+<#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+</#if>
+<a href="${verifyUrl}">Please click here to verify your subscription.</a>
-<#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" />
-<form method="post" id="updateContactListPartyNoUserLogin" action="${verifyUrl}">
- <fieldset>
- <input type="hidden" name="contactListId" value="${contactListParty.contactListId}" />
- <input type="hidden" name="partyId" value="${contactListParty.partyId}" />
- <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId?if_exists}" />
- <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
- <input type="hidden" name="statusId" value="CLPT_ACCEPTED" />
- <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
- <input type="hidden" name="baseLocation" value="${baseLocation?if_exists}" />
- <input type="submit" name="submitButton" value="Please click here to verify your newsletter subscription." />
- </fieldset>
-</form>
</body>
</html>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1150558&r1=1150557&r2=1150558&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Jul 25 06:30:19 2011
@@ -1338,7 +1338,7 @@ under the License.
<response name="error" type="view" value="main"/>
</request-map>
<request-map uri="contactListOptOut" track-serverhit="false" track-visit="false">
- <security https="true" auth="false"/>
+ <security https="false" auth="false"/>
<event type="service" invoke="updateContactListPartyNoUserLogin"/>
<response name="success" type="view" value="ContactListOptOut"/>
</request-map>
@@ -1593,7 +1593,7 @@ under the License.
<response name="error" type="view" value="viewprofile"/>
</request-map>
<request-map uri="updateContactListPartyNoUserLogin">
- <security https="true" auth="false"/>
+ <security https="false" auth="false"/>
<event type="service" invoke="updateContactListPartyNoUserLogin"/>
<response name="success" type="view" value="main"/>
<response name="error" type="view" value="main"/>