svn commit: r654160 - in /ofbiz/trunk/applications/party: script/org/ofbiz/party/party/PartyServices.xml script/org/ofbiz/party/user/UserEvents.xml servicedef/services.xml templates/email/CreatePartyNotification.ftl

[mor-2]

Author: mor
Date: Wed May  7 09:15:55 2008
New Revision: 654160

URL: http://svn.apache.org/viewvc?rev=654160&view=rev
Log:
misc improvements in email notification on new account creation

Modified:
    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
    ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl

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=654160&r1=654159&r2=654160&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 Wed May  7 09:15:55 2008
@@ -827,13 +827,16 @@
         </entity-condition>
         <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
         <if-not-empty field-name="bodyScreenLocation" map-name="storeEmail">
+            <entity-one entity-name="Person" value-name="person"/>
+            <set field="bodyParameters.person" from-field="person"/>
+            <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
+            
             <set field="emailParams.sendTo" from-field="parameters.emailAddress"/>
             <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" from-field="storeEmail.contentType"/>
-            <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
             <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
             <map-to-map to-map-name="emailParams.bodyParameters" map-name="parameters"/>
             <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>

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=654160&r1=654159&r2=654160&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 Wed May  7 09:15:55 2008
@@ -394,6 +394,7 @@
         <field-to-request field-name="partyId" map-name="tempMap" request-name="partyId"/>
 
         <!--send New User Email Notification-->
+        <set field="emailContext.partyId" from-field="partyId"/>
         <set-service-fields service-name="sendCreatePartyEmailNotification" map-name="emailContext" to-map-name="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=654160&r1=654159&r2=654160&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Wed May  7 09:15:55 2008
@@ -833,6 +833,7 @@
     </service>
     <service name="sendCreatePartyEmailNotification" engine="simple"
             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"/>
     </service>
     

Modified: ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl?rev=654160&r1=654159&r2=654160&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl (original)
+++ ofbiz/trunk/applications/party/templates/email/CreatePartyNotification.ftl Wed May  7 09:15:55 2008
@@ -25,7 +25,7 @@
     </head>
     <body>
         <h1>${title}</h1>
-        <p>Hello ${parameters.USER_TITLE?if_exists} ${parameters.USER_FIRST_NAME?if_exists} ${parameters.USER_MIDDLE_NAME?if_exists} ${parameters.USER_LAST_NAME?if_exists} ${parameters.USER_SUFFIX?if_exists},</p>
-        <p>Your account has been created.</p>
+        <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p>
+        <p>Your account has been created successfully.</p>
     </body>
 </html>