Finish Hotfix-HiringTeam

cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java

@@ -93,8 +93,6 @@ public class SendCompanyUserInvitesFP extends SaveFP
         companyUser.setIsAccountVerified(Boolean.TRUE);
         company.setIsVerified(Boolean.TRUE);
 
-        sendAccountCreatedMail(companyUser, request);
-
         if(!socialLogin)
         {
             request.getSession().setAttribute (SecUser.SEC_USER_ID, secUser);
@@ -117,9 +115,11 @@ public class SendCompanyUserInvitesFP extends SaveFP
             StripeUtils.createCustomer(companyUser.getDefaultHiringTeam());
             LogMgr.log(LOG, LogLevel.PROCESSING1,"Created customer in Stripe, customer reference ", company.getStripeReference());
             
-//            StripeUtils.subscribeCustomer(company);
-//            LogMgr.log(LOG, LogLevel.PROCESSING1,"Subscribed customer to default plan in Stripe, subscription reference ", company.getStripeSubscription());
-            
+            // in case user changes hiring team name on verify step
+            if(companyUser.getDefaultHiringTeam() != null)
+            {
+                companyUser.getDefaultHiringTeam().setHiringTeamName(company.getCompanyName());
+            }
             
             //process user invitations
             for(CompanyUserHiringTeamLink cUser : hiringTeam.getUsersSet())
@@ -164,6 +164,8 @@ public class SendCompanyUserInvitesFP extends SaveFP
             }
         }
         
+        sendAccountCreatedMail(companyUser, request);
+        
         return super.processForm(process, submission, params);
     }
 
@@ -190,7 +192,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
             {
                 Article         article         =   WebUtils.getArticleByShortCut(companyUser.getTransaction(), WebUtils.JOBS);
                 String          jobCreateLink   =   LoopbackHTTP.getRemoteAccessURL(request) 
-                                                            + article.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.CREATE_JOB).toMap(), "/");
+                                                            + article.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.START_JOB).toMap(), "/");
                 Map             defaultParams   =   CollectionUtils.mapEntry("link", link)
                                                                     .mapEntry("create_job_link", jobCreateLink)
                                                                     .toMap(); 

cmsWebApp/webroot/extensions/adminportal/inc/company_user_data.jsp

@@ -98,7 +98,7 @@
             else
             {
         %>
-                <oneit:ormInput obj="<%= hiringTeam %>"    type="text" attributeName="HiringTeamName" cssClass="form-control" required="true" placeholder="Your company name"/>
+                <oneit:ormInput obj="<%= company %>"    type="text" attributeName="CompanyName" cssClass="form-control" required="true" placeholder="Your company name"/>
         <%
             }
         %>