Skip to content

P
PERFORMA_REPLICA
Commit 62d7f008 by Nilu
Options

Company Owner account created email changes

parent 1cfab17b
Showing with 105 additions and 0 deletions
cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java
...@@ -29,6 +29,7 @@ public class SendCompanyUserInvitesFP extends SaveFP ...@@ -29,6 +29,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
private static final LoggingArea LOG = LoggingArea.createLoggingArea("SendCompanyUserInvites"); private static final LoggingArea LOG = LoggingArea.createLoggingArea("SendCompanyUserInvites");
protected ConfigurableArticleTemplateEmailer emailer; protected ConfigurableArticleTemplateEmailer emailer;
protected ConfigurableArticleTemplateEmailer ownerAccountCreatedEmailer;
protected ConfigurableArticleTemplateEmailer invitationEmailer; protected ConfigurableArticleTemplateEmailer invitationEmailer;
...@@ -148,6 +149,7 @@ public class SendCompanyUserInvitesFP extends SaveFP ...@@ -148,6 +149,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
super.init(context); super.init(context);
emailer = (ConfigurableArticleTemplateEmailer) (context.getSingleChild("AccountCreatedEmailer")); emailer = (ConfigurableArticleTemplateEmailer) (context.getSingleChild("AccountCreatedEmailer"));
ownerAccountCreatedEmailer = (ConfigurableArticleTemplateEmailer) (context.getSingleChild("OwnerAccountCreatedEmailer"));
invitationEmailer = (ConfigurableArticleTemplateEmailer) (context.getSingleChild("InvitationEmailer")); invitationEmailer = (ConfigurableArticleTemplateEmailer) (context.getSingleChild("InvitationEmailer"));
} }
...@@ -158,10 +160,26 @@ public class SendCompanyUserInvitesFP extends SaveFP ...@@ -158,10 +160,26 @@ public class SendCompanyUserInvitesFP extends SaveFP
LogMgr.log(LOG, LogLevel.PROCESSING1, "Sending Account Created mail from SendCompanyUserInvitesFP to :: ", companyUser); LogMgr.log(LOG, LogLevel.PROCESSING1, "Sending Account Created mail from SendCompanyUserInvitesFP to :: ", companyUser);
String link = LoopbackHTTP.getRemoteAccessURL(request) + "/extensions/adminportal/forgot_password.jsp"; String link = LoopbackHTTP.getRemoteAccessURL(request) + "/extensions/adminportal/forgot_password.jsp";
if(companyUser == companyUser.getCompany().getAddedByUser())
{
Article article = WebUtils.getArticleByShortCut(companyUser.getTransaction(), WebUtils.JOBS);
String jobCreateLink = LoopbackHTTP.getRemoteAccessURL(request)
+ article.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.CREATE_JOB).toMap(), "/");
Map defaultParams = CollectionUtils.mapEntry("link", link)
.mapEntry("create_job_link", jobCreateLink)
.toMap();
ObjectTransform transform = Utils.createCompoundTransform(defaultParams, companyUser.getUser(), companyUser.getCompany());
Utils.sendMail(ownerAccountCreatedEmailer, transform, new String[]{companyUser.getEmailAddressFromUser()}, null, companyUser);
}
else
{
Map defaultParams = CollectionUtils.mapEntry("link", link).toMap(); Map defaultParams = CollectionUtils.mapEntry("link", link).toMap();
ObjectTransform transform = Utils.createCompoundTransform(defaultParams, companyUser.getCompany(), companyUser.getUser()); ObjectTransform transform = Utils.createCompoundTransform(defaultParams, companyUser.getCompany(), companyUser.getUser());
Utils.sendMail(emailer, transform, new String[]{companyUser.getEmailAddressFromUser()}, null, companyUser); Utils.sendMail(emailer, transform, new String[]{companyUser.getEmailAddressFromUser()}, null, companyUser);
}
LogMgr.log(LOG, LogLevel.PROCESSING1, "Sent Account Created mail successfully from " + SendCompanyUserInvitesFP.class + " to :: ", companyUser); LogMgr.log(LOG, LogLevel.PROCESSING1, "Sent Account Created mail successfully from " + SendCompanyUserInvitesFP.class + " to :: ", companyUser);
} }
......
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<FORM name="*.bulkupdate" factory="Participant" class="performa.form.BulkUpdateFP"/> <FORM name="*.bulkupdate" factory="Participant" class="performa.form.BulkUpdateFP"/>
<FORM name="*.navigateBetweenStatus" factory="Participant" class="performa.form.NavigateBetweenStatusFP"/> <FORM name="*.navigateBetweenStatus" factory="Participant" class="performa.form.NavigateBetweenStatusFP"/>
<FORM name="*.sendCompanyUserInvites" factory="Participant" class="performa.form.SendCompanyUserInvitesFP"> <FORM name="*.sendCompanyUserInvites" factory="Participant" class="performa.form.SendCompanyUserInvitesFP">
<OwnerAccountCreatedEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="OwnerAccountCreatedMail"/>
<AccountCreatedEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="AccountCreatedMail"/> <AccountCreatedEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="AccountCreatedMail"/>
<InvitationEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="InvitationMail"/> <InvitationEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="InvitationMail"/>
</FORM> </FORM>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20171025_CMSExtract_OwnerAccountCreated.cms.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS xmlns:oneit="http://www.1iT.com.au" name="">
<NODE factory="Vector" name="Script">
<NODE class="oneit.appservices.upgrade.cms.CMSArticleUpdateOperation" factory="Participant" name="Owner Account Created Mail">
<createSpecificIdentifier factory='String' value='GKHZ94OVGDV0PK8GFPTFKCDUAPBRU3'/>
<articleIdentifiers factory="Array" class="java.lang.String">
<NODE factory="String" value="GKHZ94OVGDV0PK8GFPTFKCDUAPBRU3"/>
</articleIdentifiers>
<createdLabel factory="String" value="GKHZ94OVGDV0PK8GFPTFKCDUAPBRU3"/>
<newParentCategory factory="String" value="RESOURCE_LIBRARY"/>
<articleAttributeChanges factory="Map">
<NODE name="EmailTo" factory="Null"/>
<NODE name="On Left Menu" factory="Boolean" value="false"/>
<NODE name="On Top Menu" factory="Boolean" value="false"/>
<NODE name="On Footer Left" factory="Boolean" value="false"/>
<NODE name="EmailFrom" factory="String" value="help@talentology.com"/>
<NODE name="EmailSubject" factory="String" value="Welcome to Talentology, ${Company:CompanyName}!"/>
<NODE name="Shortcuts" factory="String" value="OwnerAccountCreatedMail"/>
<NODE name="EmailCC" factory="Null"/>
<NODE name="EmailBCC" factory="Null"/>
<NODE name="On Footer Menu" factory="Boolean" value="false"/>
<NODE name="On Footer Right" factory="Boolean" value="false"/>
</articleAttributeChanges>
<ormAttributeChanges factory="Map">
<NODE name="PublishDate" factory="Date" value="2016-02-05 00:00:00"/>
<NODE name="WithdrawDate" factory="Date" value="2066-02-05 16:00:00"/>
<NODE name="Title" factory="String" value="Owner Account Created Mail"/>
<NODE name="ShortTitle" factory="String" value="Reset Code Email"/>
<NODE name="SortOrder" factory="Integer" value="-200926"/>
<NODE name="Type" factory="Enumerated" class="oneit.business.content.ArticleType" value="ARTICLE"/>
<NODE name="Template" factory="Enumerated" class="oneit.business.content.ArticleTemplate" value="EMAIL_TEMPLATE"/>
</ormAttributeChanges>
<content factory="Map">
<NODE name="EmailBody" factory="Map">
<NODE name="Content" factory="String"><![CDATA[<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta content="HTML Tidy, see www.w3.org" name="generator">
<title></title>
</head>
<body>
<p>Hi&nbsp;${SecUser:FirstName},</p>
<p>Welcome to Talentology!</p>
<p>Your account&rsquo;s been set up and you&rsquo;re all ready to go. Whenever you sign in to Talentology, be sure to use <strong>${SecUser:UserName}</strong>&nbsp;along with the password that you just created.</p>
<p>And don&rsquo;t worry: If you ever forget your password, you can <a href="${link}">reset it</a> anytime.</p>
<p>Now, let&rsquo;s get going and <a href="${create_job_link}">set up a job</a>!</p>
<p>Thanks,</p>
<p>The Talentology Team</p>
</body>
</html>
]]></NODE>
<NODE name="TransformedContent" factory="String"><![CDATA[<p>Hi&nbsp;${SecUser:FirstName},</p><p>Welcome to Talentology!</p><p>Your account&rsquo;s been set up and you&rsquo;re all ready to go. Whenever you sign in to Talentology, be sure to use <strong>${SecUser:UserName}</strong>&nbsp;along with the password that you just created.</p><p>And don&rsquo;t worry: If you ever forget your password, you can <a href="${link}">reset it</a> anytime.</p><p>Now, let&rsquo;s get going and <a href="${create_job_link}">set up a job</a>!</p><p>Thanks,</p><p>The Talentology Team</p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE>
<NODE name="" factory="Map">
<NODE name="Content" factory="String"><![CDATA[
<p></p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE>
<NODE name="" factory="Map">
<NODE name="Content" factory="String"><![CDATA[
<p></p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE>
<NODE name="" factory="Map">
<NODE name="Content" factory="String"><![CDATA[
<p></p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE>
</content>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment