Skip to content

P
PERFORMA_REPLICA
Commit b3785b44 by Jay
Options

S23960389 # Client - Incoming Issues (raised by Client) #Wrong terminology

parent 1378438d
Showing with 104 additions and 7 deletions
cmsWebApp/src/performa/form/SendVerificationMailFP.java
...@@ -127,7 +127,7 @@ public class SendVerificationMailFP extends SaveFP ...@@ -127,7 +127,7 @@ public class SendVerificationMailFP extends SaveFP
companyUser.getDefaultHiringTeam().setHiringTeamName(company.getCompanyName()); companyUser.getDefaultHiringTeam().setHiringTeamName(company.getCompanyName());
} }
Utils.sendVerificationMail(companyUser, request, emailer, SendVerificationMailFP.class.getName()); Utils.sendVerificationMail(job, companyUser, request, emailer, SendVerificationMailFP.class.getName());
LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending varification email.", companyUser); LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending varification email.", companyUser);
} }
...@@ -173,7 +173,7 @@ public class SendVerificationMailFP extends SaveFP ...@@ -173,7 +173,7 @@ public class SendVerificationMailFP extends SaveFP
+ "&aid=" + candidate.getID() + "&aid=" + candidate.getID()
+ "&pin=" + candidate.getVerificationKey(); + "&pin=" + candidate.getVerificationKey();
Map defaultParams = CollectionUtils.mapEntry("link", link).toMap(); Map defaultParams = CollectionUtils.mapEntry("link", link).toMap();
ObjectTransform transform = Utils.createCompoundTransform(defaultParams, candidate.getUser()); ObjectTransform transform = Utils.createCompoundTransform(defaultParams, candidate.getUser(), job);
Utils.sendMail(emailer, transform, new String[]{candidate.getUser().getUserName()}, null, candidate); Utils.sendMail(emailer, transform, new String[]{candidate.getUser().getUserName()}, null, candidate);
......
cmsWebApp/src/performa/utils/Utils.java
...@@ -426,7 +426,7 @@ public class Utils ...@@ -426,7 +426,7 @@ public class Utils
} }
public static void sendVerificationMail(CompanyUser companyUser, HttpServletRequest request, ConfigurableArticleTemplateEmailer emailer, String callingClass) throws BusinessException public static void sendVerificationMail(Job job, CompanyUser companyUser, HttpServletRequest request, ConfigurableArticleTemplateEmailer emailer, String callingClass) throws BusinessException
{ {
if(!CollectionUtils.equals(companyUser.getIsAccountVerified(), Boolean.TRUE)) if(!CollectionUtils.equals(companyUser.getIsAccountVerified(), Boolean.TRUE))
{ {
...@@ -446,7 +446,7 @@ public class Utils ...@@ -446,7 +446,7 @@ public class Utils
+ "?id=" + companyUser.getID() + "?id=" + companyUser.getID()
+ "&key=" + companyUser.getVerificationKey(); + "&key=" + companyUser.getVerificationKey();
Map defaultParams = CollectionUtils.mapEntry("link", link).toMap(); Map defaultParams = CollectionUtils.mapEntry("link", link).toMap();
ObjectTransform transform = Utils.createCompoundTransform(defaultParams, companyUser.getUser()); ObjectTransform transform = Utils.createCompoundTransform(defaultParams, companyUser.getUser(), job);
Utils.sendMail(emailer, transform, new String[]{companyUser.getEmailAddressFromUser()}, null, companyUser); Utils.sendMail(emailer, transform, new String[]{companyUser.getEmailAddressFromUser()}, null, companyUser);
......
cmsWebApp/webroot/extensions/applicantportal/messages/messagesOverride.txt
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#completeAssessment = Please complete your experience. #completeAssessment = Please complete your experience.
#emailExists = An account already exists with this email address. #emailExists = An account already exists with this email address.
#existsInOtherCompany = An account with this email address is already associated with another company. #existsInOtherCompany = An account with this email address is already associated with another company.
#emailSent = A verification email has been sent to you. Please check your email. #emailSent = Please check your email for further details.
#alreadyApplied = You have already applied for this job. #alreadyApplied = You have already applied for this job.
#uploadCover = Please upload your Cover Letter. #uploadCover = Please upload your Cover Letter.
#uploadCV = Please upload your CV. #uploadCV = Please upload your CV.
cmsWebApp/webroot/extensions/applicantportal/upgrades/20190313_UpdateAccountVerificationMail.cms.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<OBJECTS xmlns:oneit="http://www.1iT.com.au" name="">
<NODE factory="Vector" name="Script"><NODE class="oneit.appservices.upgrade.cms.CMSArticleUpdateOperation" factory="Participant" name="Account Verification Mail">
<createSpecificIdentifier factory='String' value='I90Q26LQURCWXZZFP21EWM3EHUGXTJ'/>
<articleIdentifiers factory="Array" class="java.lang.String">
<NODE factory="String" value="I90Q26LQURCWXZZFP21EWM3EHUGXTJ"/>
</articleIdentifiers>
<createdLabel factory="String" value="I90Q26LQURCWXZZFP21EWM3EHUGXTJ"/>
<articleAttributeChanges factory="Map">
<NODE name="EmailTo" factory="Null"/>
<NODE name="EmailFrom" factory="String" value="help@matchd.com"/>
<NODE name="EmailSubject" factory="String" value="[Matchd] Please verify your email address"/>
<NODE name="Shortcuts" factory="String" value="AccountVerificationMail"/>
<NODE name="EmailCC" factory="Null"/>
<NODE name="EmailBCC" factory="Null"/>
</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="Account Verification 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,</p>
<p>Thank-you for your application to ${Job:JobTitle}.&nbsp;</p>
<p>You entered <strong>${SecUser:UserName}</strong> as your email address for your Matchd account.<br>Please verify this email address and continue your application by clicking this link.&nbsp;</p>
<p>
<a href="${link}">Verify and continue now&nbsp;</a>
</p>
<p>Thanks,</p>
<p>The Matchd Team</p>
</body>
</html>
]]></NODE>
<NODE name="TransformedContent" factory="String"><![CDATA[<p>Hi,</p><p>Thank-you for your application to ${Job:JobTitle}.&nbsp;</p><p>You entered <strong>${SecUser:UserName}</strong> as your email address for your Matchd account.<br>Please verify this email address and continue your application by clicking this link.&nbsp;</p><p>
<a href="${link}">Verify and continue now&nbsp;</a>
</p><p>Thanks,</p><p>The Matchd 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>
<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
cmsWebApp/webroot/extensions/applicantportal/verification_sent.jsp
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
</div> </div>
<div class="main-verify-identity"> <div class="main-verify-identity">
<div class="pl-verify">Please verify your identity before applying to:</div> <div class="pl-verify">Thank-you for your application to:</div>
<div class="verify-i-title"> <div class="verify-i-title">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
</div> </div>
<div class="main-box-layout verify-i-setpone"> <div class="main-box-layout verify-i-setpone">
<div class="box-label">Sent! Check your email now</div> <div class="box-label">Please check your email for further details.</div>
</div> </div>
</div> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
\ 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