Skip to content

P
PERFORMA_REPLICA
Commit 9328d80f by Nilu
Options

S12523603 # Client - Incoming Issues (raised by Client) #Unable to select Yes… 

S12523603 # Client - Incoming Issues (raised by Client) #Unable to select Yes for Will this Hiring Team manage own billing?
parent 14bf2c2a
Showing with 46 additions and 26 deletions
cmsWebApp/src/performa/orm/HiringTeam.java
......@@ -197,7 +197,7 @@ public class HiringTeam extends BaseHiringTeam
@Override
public FieldWriteability getWriteability_ManageOwnBilling()
{
if(!getManageOwnBilling() || (getManageOwnBilling() && getBillingTeamsCount() > 0))
if(getManageOwnBilling() && getBillingTeamsCount() > 0)
{
return FieldWriteability.NOT_IN_GUI;
}
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
......@@ -94,20 +94,20 @@
if ($(".manage-plan-hidden-info").is(":visible")){
if(!$(".choose-plan-item.active").length){
$("a ").each(function(){
if ( !$(this).parents(".choose-plan-wrap").length ) {
if($(this).prop("tagName") === "A"){
$(this).prop("onclick", null).off("click");
$(this).css("cursor","arrow").click(function(){
PopupCoupon.setContent($("#force-to-choose-popup"));
PopupCoupon.open();
return false;
});
}
if ( !$(this).parents(".choose-plan-wrap").length ) {
if($(this).prop("tagName") === "A"){
$(this).prop("onclick", null).off("click");
$(this).css("cursor","arrow").click(function(){
PopupCoupon.setContent($("#force-to-choose-popup"));
PopupCoupon.open();
return false;
});
}
}
});
}
}
}
}
function paymentPlanChanged()
......@@ -471,11 +471,11 @@
<div class="change-plan-content">
<h3>Alert!</h3>
<div class="upgrade-info">
<span>You must select your plan before continue. <br>Try again</span>
<span>Please select a plan.</span>
</div>
</div>
<div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button">Close & Retry</a>
<a class="invalid-coupon-close-button popup-no-button">Ok</a>
</div>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
......@@ -124,21 +124,13 @@
<%
if(company.getHiringTeamsCount() > 1)
{
if(!hiringTeam.getManageOwnBilling())
{
%>
<div class="form-brack-line-sub"></div>
<oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>">
<div class="warning-box">
Billing has been disabled for this team as it is included in <%= hiringTeam.getBilledByTeam()%>.
</div>
<%
}
else
{
%>
<div class="form-brack-line-sub"></div>
<%
}
%>
</oneit:recalcClass>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Will this team manage its own billing?" /></label>
......@@ -207,7 +199,35 @@
<oneit:ormEnum obj="<%= hiringTeam %>" attributeName="TimeZone" cssClass="form-control"/>
</div>
</div>
--%>
--%>
<div id="manage-own-billing-alert" >
<div class="change-plan-content">
<h3>Alert!</h3>
<div class="upgrade-info">
<span>
Any prior Jobs you have created are applied to the Hiring Team previously used for Billing.<br/>
All future Jobs will be applied to a new subscription for this Hiring Team.
</span>
</div>
</div>
<div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button">Ok</a>
</div>
</div>
<div id="manage-other-billing-alert" >
<div class="change-plan-content">
<h3>Alert!</h3>
<div class="upgrade-info">
<span>
Your current Subscription for this Hiring Team will be ended and any unused jobs on your current subscription will be forfeited.<br/>
Any Jobs that you have used above the allowance in your prior subscription will be invoiced at next invoice date.
</span>
</div>
</div>
<div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button">Ok</a>
</div>
</div>
<div class="text-center form-group">
<oneit:button value="Save Updates" name="saveCompany" cssClass="btn btn-primary largeBtn"
......
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