Skip to content

P
PERFORMA_REPLICA
Commit 9cf811b4 by Nilu
Options

removing emojis and disabling manage billing, if managed by another team

parent 4184f77d
Showing with 103 additions and 55 deletions
cmsWebApp/src/performa/orm/HiringTeam.java
...@@ -5,6 +5,7 @@ import com.stripe.model.Coupon; ...@@ -5,6 +5,7 @@ import com.stripe.model.Coupon;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;
import oneit.logging.LoggingArea; import oneit.logging.LoggingArea;
import oneit.objstore.FieldWriteability;
import oneit.objstore.ValidationContext; import oneit.objstore.ValidationContext;
import oneit.objstore.rdbms.filters.EqualsFilter; import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.utils.DateDiff; import oneit.utils.DateDiff;
...@@ -149,4 +150,26 @@ public class HiringTeam extends BaseHiringTeam ...@@ -149,4 +150,26 @@ public class HiringTeam extends BaseHiringTeam
{ {
return getAvailableCredits() > getUsedCredits() || !getHasCap() || (getHasCap() && getMaxCap() > getUsedCredits()); return getAvailableCredits() > getUsedCredits() || !getHasCap() || (getHasCap() && getMaxCap() > getUsedCredits());
} }
@Override
public FieldWriteability getWriteability_ManageOwnBilling()
{
if(!getManageOwnBilling())
{
return FieldWriteability.NOT_IN_GUI;
}
return super.getWriteability_ManageOwnBilling();
}
@Override
public FieldWriteability getWriteability_BillingTeam()
{
if(!getManageOwnBilling())
{
return FieldWriteability.NOT_IN_GUI;
}
return super.getWriteability_ManageOwnBilling();
}
} }
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/billing.jsp
...@@ -31,8 +31,10 @@ ...@@ -31,8 +31,10 @@
<div class="main-content-area"> <div class="main-content-area">
<oneit:form name="hiringTeamTilte" method="post" enctype="multipart/form-data"> <oneit:form name="hiringTeamTilte" method="post" enctype="multipart/form-data">
<h1 class="page-title page-title-with-arrow"> <h1 class="page-title page-title-with-arrow">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList).toMap() %>" > requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList)
.mapEntry("cancelProcess", true)
.toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" /> <img src="images/arrow-left-prev_blue.svg" />
</oneit:button> </oneit:button>
<%= hiringTeam.getHiringTeamName() %> <%= hiringTeam.getHiringTeamName() %>
......
cmsWebApp/webroot/extensions/adminportal/edit_card.jsp
...@@ -22,8 +22,10 @@ ...@@ -22,8 +22,10 @@
<oneit:form name="hiringTeamTilte" method="post" enctype="multipart/form-data"> <oneit:form name="hiringTeamTilte" method="post" enctype="multipart/form-data">
<h1 class="page-title page-title-with-arrow"> <h1 class="page-title page-title-with-arrow">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList).toMap() %>" > requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList)
.mapEntry("cancelProcess", true)
.toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" /> <img src="images/arrow-left-prev_blue.svg" />
</oneit:button> </oneit:button>
<%= hiringTeam.getHiringTeamName() %> <%= hiringTeam.getHiringTeamName() %>
......
cmsWebApp/webroot/extensions/adminportal/inc/my_company_tabs.jsp
...@@ -11,9 +11,13 @@ ...@@ -11,9 +11,13 @@
String secondPage = WebUtils.getSamePageInRenderMode(request, "ManagePlan"); String secondPage = WebUtils.getSamePageInRenderMode(request, "ManagePlan");
String thirdPage = WebUtils.getSamePageInRenderMode(request, "Billing"); String thirdPage = WebUtils.getSamePageInRenderMode(request, "Billing");
String forthPage = WebUtils.getSamePageInRenderMode(request, "Invoices"); String forthPage = WebUtils.getSamePageInRenderMode(request, "Invoices");
HiringTeam hiringTeam = (HiringTeam) process.getAttribute("HiringTeam");
SecUser loggedInUser = SecUser.getTXUser(transaction); SecUser loggedInUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
boolean ownBilling = hiringTeam.getManageOwnBilling();
String disabled = ownBilling ? "false" : "true";
String disabledClass = ownBilling ? "" : "billing-disabled";
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
...@@ -30,27 +34,28 @@ ...@@ -30,27 +34,28 @@
if(companyUser.hasRole(RoleType.BILLING)) if(companyUser.hasRole(RoleType.BILLING))
{ {
%> %>
<li class="<%= tabNumber == "2" ? "active" : ""%>">
<oneit:recalcClass htmlTag="li" classScript="hiringTeam.getManageOwnBilling() ? tabNumber == '2' ? 'show active' : 'show' : 'hide'" hiringTeam="<%= hiringTeam %>" tabNumber="<%= tabNumber %>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.toMap() %>"> .toMap() %>">
Manage Plan Manage Plan
</oneit:button> </oneit:button>
</li> </oneit:recalcClass>
<li class="<%= tabNumber == "3" ? "active" : ""%>"> <oneit:recalcClass htmlTag="li" classScript="hiringTeam.getManageOwnBilling() ? tabNumber == '3' ? 'show active' : 'show' : 'hide'" hiringTeam="<%= hiringTeam %>" tabNumber="<%= tabNumber %>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
.toMap() %>"> .toMap() %>">
Billing Billing
</oneit:button> </oneit:button>
</li> </oneit:recalcClass>
<li class="<%= tabNumber == "4" ? "active" : ""%>"> <oneit:recalcClass htmlTag="li" classScript="hiringTeam.getManageOwnBilling() ? tabNumber == '4' ? 'show active' : 'show' : 'hide'" hiringTeam="<%= hiringTeam %>" tabNumber="<%= tabNumber %>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", forthPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", forthPage)
.toMap() %>"> .toMap() %>">
Invoices Invoices
</oneit:button> </oneit:button>
</li> </oneit:recalcClass>
<% <%
} }
%> %>
......
cmsWebApp/webroot/extensions/adminportal/invoices.jsp
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
<div class="main-content-area"> <div class="main-content-area">
<oneit:form name="editCompany" method="post" enctype="multipart/form-data"> <oneit:form name="editCompany" method="post" enctype="multipart/form-data">
<h1 class="page-title page-title-with-arrow"> <h1 class="page-title page-title-with-arrow">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" > requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("cancelProcess", true)
.toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" /> <img src="images/arrow-left-prev_blue.svg" />
</oneit:button> </oneit:button>
<%= hiringTeam.getHiringTeamName() %> <%= hiringTeam.getHiringTeamName() %>
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
...@@ -91,8 +91,10 @@ ...@@ -91,8 +91,10 @@
<oneit:form name="editCompany" method="post" enctype="multipart/form-data"> <oneit:form name="editCompany" method="post" enctype="multipart/form-data">
<h1 class="page-title page-title-with-arrow"> <h1 class="page-title page-title-with-arrow">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList).toMap() %>" > requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList)
.mapEntry("cancelProcess", true)
.toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" /> <img src="images/arrow-left-prev_blue.svg" />
</oneit:button> </oneit:button>
<%= hiringTeam.getHiringTeamName() %> <%= hiringTeam.getHiringTeamName() %>
......
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
...@@ -39,7 +39,9 @@ ...@@ -39,7 +39,9 @@
<h1 class="page-title page-title-with-arrow"> <h1 class="page-title page-title-with-arrow">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" > requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("cancelProcess", true)
.toMap() %>">
<img src="images/arrow-left-prev_blue.svg" /> <img src="images/arrow-left-prev_blue.svg" />
</oneit:button> </oneit:button>
<%= hiringTeam.getHiringTeamName() %> <%= hiringTeam.getHiringTeamName() %>
...@@ -101,39 +103,46 @@ ...@@ -101,39 +103,46 @@
</oneit:recalcClass> </oneit:recalcClass>
</div> </div>
</div> </div>
</div> </div>
<div class="form-brack-line-sub"></div> <%
<div class="form-group row"> if(company.getHiringTeamsCount() > 1)
<div class="col-md-6"> {
<label><oneit:label GUIName="Will this team manage its own billing?" /></label> %>
</div> <div class="form-brack-line-sub"></div>
<div class="col-md-6"> <div class="form-group row">
<oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>"> <div class="col-md-6">
<label><oneit:label GUIName="Which team will manage the billing?"/></label> <label><oneit:label GUIName="Will this team manage its own billing?" /></label>
</oneit:recalcClass> </div>
</div> <div class="col-md-6">
</div> <oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>">
<div class="form-group row"> <label><oneit:label GUIName="Which team will manage the billing?"/></label>
<div class="col-md-6"> </oneit:recalcClass>
<div class="radio radio-primary second-radio-primary oneit-radio"> </div>
<label >
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="ManageOwnBilling" value="true"/>Yes
</label>
</div> </div>
<div class="radio radio-primary second-radio-primary oneit-radio"> <div class="form-group row">
<label> <div class="col-md-6">
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="ManageOwnBilling" value="false"/>No <div class="radio radio-primary second-radio-primary oneit-radio">
</label> <label >
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="ManageOwnBilling" value="true"/>Yes
</label>
</div>
<div class="radio radio-primary second-radio-primary oneit-radio">
<label>
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="ManageOwnBilling" value="false"/>No
</label>
</div>
</div>
<div class="col-md-6">
<oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>">
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= hiringTeam %>" assocName="BillingTeam" options="<%= Utils.getOtherHiringTeams(hiringTeam) %>"/>
</div>
</oneit:recalcClass>
</div>
</div> </div>
</div> <%
<div class="col-md-6"> }
<oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>"> %>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= hiringTeam %>" assocName="BillingTeam" options="<%= Utils.getOtherHiringTeams(hiringTeam) %>"/>
</div>
</oneit:recalcClass>
</div>
</div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group row"> <div class="form-group row">
......
cmsWebApp/webroot/extensions/adminportal/replace_card.jsp
...@@ -22,8 +22,10 @@ ...@@ -22,8 +22,10 @@
<oneit:form name="hiringTeamTilte" method="post" enctype="multipart/form-data"> <oneit:form name="hiringTeamTilte" method="post" enctype="multipart/form-data">
<h1 class="page-title page-title-with-arrow"> <h1 class="page-title page-title-with-arrow">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList).toMap() %>" > requestAttribs="<%= CollectionUtils.mapEntry("nextPage", hiringTeamList)
.mapEntry("cancelProcess", true)
.toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" /> <img src="images/arrow-left-prev_blue.svg" />
</oneit:button> </oneit:button>
<%= hiringTeam.getHiringTeamName() %> <%= hiringTeam.getHiringTeamName() %>
......
cmsWebApp/webroot/extensions/adminportal/reset_password_sent.jsp
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="main-box-layout login-box"> <div class="main-box-layout login-box">
<div> <div>
<p> <p>
Sent! Check your email now.<span><img class="smile-face smaller-face" src="<%= request.getContextPath() %>/images/smile-face.png" /></span> Sent! Check your email now.
</p> </p>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/applicantportal/messages/messagesOverride.txt
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
#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 = A verification email has been sent to you. Please check your email.
#alreadyApplied = You have already applied for this job. #alreadyApplied = You have already applied for this job.
cmsWebApp/webroot/extensions/applicantportal/reset_password_sent.jsp
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="main-box-layout login-box"> <div class="main-box-layout login-box">
<div> <div>
<p> <p>
Sent! Check your email now.<span><img class="smile-face smaller-face"src="images/smile-face.png" /></span> Sent! Check your email now.
</p> </p>
</div> </div>
</div> </div>
......
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