You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/02/01 19:47:28 UTC
svn commit: r739813 - in /ofbiz/trunk/applications:
ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
party/script/org/ofbiz/party/party/PartyServices.xml
party/script/org/ofbiz/party/user/UserEvents.xml
party/servicedef/services.xml
Author: mor
Date: Sun Feb 1 18:47:27 2009
New Revision: 739813
URL: http://svn.apache.org/viewvc?rev=739813&view=rev
Log:
Applied slightly modified patch from Santosh Malviya, Rahul Satalkar.
"Send email notification when a new user is created" OFBIZ-2123(https://issues.apache.org/jira/browse/OFBIZ-2123)
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
ofbiz/trunk/applications/party/servicedef/services.xml
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=739813&r1=739812&r2=739813&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sun Feb 1 18:47:27 2009
@@ -1322,6 +1322,9 @@
<call-service service-name="createPartyTelecomNumber" in-map-name="billToTelecomNumberCtx">
<result-to-field result-name="contactMechId" field="billToTelecomContactMechId"/>
</call-service>
+
+ <set-service-fields service-name="sendCreatePartyEmailNotification" map="emailAddressCtx" to-map="serviceInMap"/>
+ <call-service-asynch service-name="sendCreatePartyEmailNotification" in-map-name="serviceInMap"/>
</simple-method>
<simple-method method-name="updateCustomerProfile" short-description="Update a customer profile">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=739813&r1=739812&r2=739813&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Sun Feb 1 18:47:27 2009
@@ -815,10 +815,11 @@
<!-- send party creation email notification -->
<simple-method method-name="sendCreatePartyEmailNotification" short-description="Notification email on party creation" login-required="false">
- <map-to-map map="parameters" to-map="bodyParameters"/>
+ <map-to-map map="parameters" to-map="bodyParameters"/>
+ <set field="emailType" value="PARTY_REGIS_CONFIRM"/>
<entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings">
<condition-list>
- <condition-expr field-name="emailType" operator="equals" value="PARTY_REGIS_CONFIRM"/>
+ <condition-expr field-name="emailType" operator="equals" from-field="emailType"/>
</condition-list>
</entity-condition>
<first-from-list entry="storeEmail" list="productStoreEmailSettings"/>
@@ -839,7 +840,7 @@
<set field="emailParams.contentType" from-field="storeEmail.contentType"/>
<set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
<set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
- <set field="emailParams.emailType" from-field="parameters.emailType"/>
+ <set field="emailParams.emailType" from-field="emailType"/>
<call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
</if-not-empty>
</simple-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=739813&r1=739812&r2=739813&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Sun Feb 1 18:47:27 2009
@@ -395,7 +395,6 @@
<!--send New User Email Notification-->
<set field="emailContext.partyId" from-field="partyId"/>
- <set field="emailContext.emailType" value="PARTY_REGIS_CONFIRM"/>
<set-service-fields service-name="sendCreatePartyEmailNotification" map="emailContext" to-map="serviceInMap"/>
<call-service service-name="sendCreatePartyEmailNotification" in-map-name="serviceInMap"/>
</simple-method>
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=739813&r1=739812&r2=739813&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Sun Feb 1 18:47:27 2009
@@ -903,7 +903,6 @@
location="org/ofbiz/party/party/PartyServices.xml" invoke="sendCreatePartyEmailNotification" auth="false">
<attribute name="partyId" type="String" mode="IN" optional="false"/>
<attribute name="emailAddress" type="String" mode="IN" optional="false"/>
- <attribute name="emailType" type="String" mode="IN" optional="false"/>
</service>
<!-- Email address verification services-->