Updated - HT021 - Invite Teammates : Allow skip.

Change - Tab - "Invite Users" to "Invite Teammates"

cmsWebApp/src/performa/form/SendCompanyUserInvitesFP.java

@@ -38,9 +38,12 @@ public class SendCompanyUserInvitesFP extends SaveFP
         HttpServletRequest  request     =   submission.getRequest();
         Company             company     =   (Company) process.getAttribute("Company");
         CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
+        Boolean             isSkip      =   CollectionUtils.equals((Boolean) request.getAttribute("Skip"), Boolean.TRUE);
         
         if(companyUser != null && companyUser == company.getAddedByUser())
         {
+            if(!isSkip)
+            {
                 for(CompanyUser cUser : company.getUsersSet())
                 {
                     if(!CollectionUtils.equals(cUser, company.getAddedByUser()))
@@ -52,6 +55,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
                         BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
                     }
                 }
+            }
         
             if(!company.isTrue(company.getIsVerified()))
             {
@@ -72,9 +76,11 @@ public class SendCompanyUserInvitesFP extends SaveFP
         CompanyUser         companyUser     =   (CompanyUser) request.getAttribute("CompanyUser");
         SecUser             secUser         =   companyUser.getUser();
         Boolean             socialLogin     =   CollectionUtils.equals(process.getAttribute("socialLogin"), Boolean.TRUE);
+        Boolean             isSkip          =   CollectionUtils.equals((Boolean) request.getAttribute("Skip"), Boolean.TRUE);
 
         LogMgr.log(LOG, LogLevel.PROCESSING1, "Verifing Company User", companyUser, secUser);
 
+        companyUser.setRole(RoleType.ADMIN);
         companyUser.setIsAccountVerified(Boolean.TRUE);
         company.setIsVerified(Boolean.TRUE);
 
@@ -82,7 +88,6 @@ public class SendCompanyUserInvitesFP extends SaveFP
 
         if(!socialLogin)
         {
-        
             request.getSession().setAttribute (SecUser.SEC_USER_ID, secUser);
             request.getSession().setAttribute (SessionSecUserDecorator.REFRESH_SECURITY, Boolean.TRUE);
             
@@ -96,10 +101,20 @@ public class SendCompanyUserInvitesFP extends SaveFP
             //process user invitations
             for(CompanyUser cUser : company.getUsersSet())
             {
-                if(!CollectionUtils.equals(cUser, companyUser))
+                if(!CollectionUtils.equals(cUser, company.getAddedByUser()))
                 {
                     SecUser sUser   =   cUser.getUser();
 
+                    if(isSkip) //remove invitaions due to skip
+                    {
+                        sUser.removeFromExtensions(cUser);
+                        cUser.delete();
+                        sUser.delete();
+                        
+                        LogMgr.log(LOG, LogLevel.PROCESSING1, "Removed user details for skip.", cUser, sUser);
+                    }
+                    else
+                    {
                         LogMgr.log(LOG, LogLevel.PROCESSING1, "Started to send invitaion email.", cUser);
 
                         sUser.setUserName(sUser.getEmail().toLowerCase());
@@ -115,6 +130,7 @@ public class SendCompanyUserInvitesFP extends SaveFP
                     }
                 }
             }
+        }
         
         // Create company and the first user of it in intercom
         

cmsWebApp/webroot/css/common.css

@@ -5562,3 +5562,21 @@ input{
   padding: 16px;
   float: left;
 }
+
+.skip-btn{
+    letter-spacing: 1px;
+    color: #ffffff;
+    font-size: 11px;
+    font-weight: 500;
+    border-radius: 100px;
+    background-color: #667281;
+    display: inline-block;
+    min-height: 45px;
+    line-height: 45px;
+    padding: 0 23.37px;
+    text-transform: uppercase;
+    background-repeat: no-repeat;
+    background-position: center left 20px;
+    padding: 0px 35px 0px 35px;
+    margin-top: 10px
+}
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/company_profile.jsp

@@ -74,7 +74,7 @@
             </div>
 
             <div class="text-center company-profile-btn">
-                <oneit:button   value="Confirm details & invite users"  name="gotoPage"   cssClass="btn btn-primary box-btn"
+                <oneit:button   value="Confirm details & invite teammates"  name="gotoPage"   cssClass="btn btn-primary box-btn"
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>"/>
             </div>
         </div>

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

@@ -30,7 +30,7 @@
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("Company", company).toMap())
                                                                 .toMap() %>">
                     <span>2</span>
-                    <div>Invite Users</div>
+                    <div>Invite Teammates</div>
                 </oneit:button>
             </li>
             <li><a href="#"><span>3</span><div>Welcome</div></a></li>

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

@@ -41,7 +41,7 @@
 
         <div class="main-user-invite" id="<%= secUser.getID() %>">
             <span class="delete-company-user"  onclick="return deleteUser (<%= deleteVarKey %>)"><span></span></span>
-            <oneit:ormInput obj="<%= secUser %>"    type="text" attributeName="Email"   cssClass="form-control" />
+            <oneit:ormInput obj="<%= secUser %>"    type="text" attributeName="Email"   cssClass="form-control" style="text-transform: lowercase"/>
         </div>
     </oneit:evalBody>
        

cmsWebApp/webroot/extensions/adminportal/invite_users.jsp

@@ -79,8 +79,18 @@
                 <oneit:button   value="Send invites & proceed"  name="sendCompanyUserInvites"   cssClass="btn btn-primary box-btn"
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
                                                                     .mapEntry("CompanyUser", companyUser)
+                                                                    .mapEntry("Skip", Boolean.FALSE)
                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("socialLogin", socialLogin).mapEntry("Company", company).toMap())
                                                                     .toMap() %>"/>
+ 
+                <div>
+                    <oneit:button   value="Skip"    name="sendCompanyUserInvites"   cssClass="btn skip-btn"
+                                    requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
+                                                                        .mapEntry("CompanyUser", companyUser)
+                                                                        .mapEntry("Skip", Boolean.TRUE)
+                                                                        .mapEntry("procParams", CollectionUtils.mapEntry("socialLogin", socialLogin).mapEntry("Company", company).toMap())
+                                                                        .toMap() %>"/>
+                </div>
             </div>
         </div>
     </oneit:form>

cmsWebApp/webroot/extensions/adminportal/verify_company.jsp

@@ -43,16 +43,18 @@
                 && companyUser.getIsAccountVerified()!=Boolean.TRUE)
         {
             socialLogin =   Boolean.TRUE;
+            invalid     =   Boolean.FALSE;
         }
-        else
+        
+        if(invalid)
         {
             response.sendRedirect(WebUtils.getArticleByShortCut(process.getTransaction(), WebUtils.ADMIN_HOME).getLink(request));
         }
     }
     
-    process.setAttribute("Company", companyUser.getCompany());
-
     Debug.assertion(companyUser != null, "Invalid CompanyUser in admin portal");
+
+    process.setAttribute("Company", companyUser.getCompany());
 %>
     <script type="text/javascript">
         $(document.body).addClass('bg-color');