Skip to content

P
PERFORMA_REPLICA
Commit b496ffe8 by Saliya Randunu
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 9e5dd0a4
Showing with 74 additions and 10 deletions
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
...@@ -76,6 +76,8 @@ ...@@ -76,6 +76,8 @@
$(".invalid-coupon-close-button").on("click",function(){ $(".invalid-coupon-close-button").on("click",function(){
PopupCoupon.close(); PopupCoupon.close();
});
$(".alert-close-button").on("click",function(){
PopupAlert.close(); PopupAlert.close();
}); });
...@@ -109,9 +111,20 @@ ...@@ -109,9 +111,20 @@
if($(this).prop("tagName") === "A"){ if($(this).prop("tagName") === "A"){
$(this).prop("onclick", null).off("click"); $(this).prop("onclick", null).off("click");
$(this).css("cursor","arrow").click(function(){ $(this).css("cursor","arrow").click(function(){
if ($(this).hasClass("invalid-coupon-close-button")){
PopupCoupon.close();
}
else if ($(this).hasClass("alert-close-button")){
PopupAlert.close();
}
else if ($(this).hasClass("change-plan-no-button")){
Popup.close();
}else{
PopupAlert.setContent($("#force-to-choose-popup")); PopupAlert.setContent($("#force-to-choose-popup"));
PopupAlert.open(); PopupAlert.open();
return false; return false;
}
}); });
} }
...@@ -486,7 +499,7 @@ ...@@ -486,7 +499,7 @@
</div> </div>
</div> </div>
<div class="change-plan-button"> <div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button">Ok</a> <a class="alert-close-button popup-no-button">Ok</a>
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
...@@ -20,14 +20,21 @@ ...@@ -20,14 +20,21 @@
<script type="text/javascript"> <script type="text/javascript">
var PopupAlert = null; var PopupAlert = null;
var PopupMsg = null;
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form#editCompany"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form#editCompany"), {'recalcOnError':true});
PopupMsg = new jBox('Modal', {
id : "msg-pop",
overlay : true,
width :600, height : 450
});
PopupAlert = new jBox('Modal', { PopupAlert = new jBox('Modal', {
id : "alert-pop", id : "alert-pop",
overlay : true, overlay : true,
width :600, height : 450 width : 350, height : 320
}); });
...@@ -45,21 +52,53 @@ ...@@ -45,21 +52,53 @@
if (currSelected!==$(this).val()){ if (currSelected!==$(this).val()){
if($(this).val()==='true'){ if($(this).val()==='true'){
PopupAlert.setContent($("#manage-own-billing-alert")); PopupMsg.setContent($("#manage-own-billing-alert"));
PopupAlert.open(); PopupMsg.open();
}else{ }else{
PopupAlert.setContent($("#manage-other-billing-alert")); PopupMsg.setContent($("#manage-other-billing-alert"));
PopupAlert.open(); PopupMsg.open();
} }
currSelected = $(this).val(); currSelected = $(this).val();
disableOutSideLinks();
} }
}); });
$(".popup-no-button").on("click",function(){ $(".own-billing-alert-close-button").on("click",function(){
PopupMsg.close();
});
$(".force-alert-close-button").on("click",function(){
PopupAlert.close();
});
});
function disableOutSideLinks(){
$("a ").each(function(){
if ( !$(this).parents(".form-content-wrap").length) {
if($(this).prop("tagName") === "A"){
$(this).prop("onclick", null).off("click");
$(this).css("cursor","arrow").click(function(){
if ($(this).hasClass("own-billing-alert-close-button")){
PopupMsg.close();
}
else if ($(this).hasClass("force-alert-close-button")){
PopupAlert.close(); PopupAlert.close();
}else{
PopupAlert.setContent($("#force-to-choose-popup"));
PopupAlert.open();
return false;
}
}); });
}
}
}); });
}
</script> </script>
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places&key=AIzaSyCaBh-MsMb8BBYJD_NcFzoCmygQbt5-QSw"></script> <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places&key=AIzaSyCaBh-MsMb8BBYJD_NcFzoCmygQbt5-QSw"></script>
<oneit:script> <oneit:script>
...@@ -89,7 +128,7 @@ ...@@ -89,7 +128,7 @@
<div class="company-content-area"> <div class="company-content-area">
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content form-content-wrap">
<div class="tab-pane active" id="company-detail"> <div class="tab-pane active" id="company-detail">
<div class="tabpage-title"> <div class="tabpage-title">
<label class="label-20">Team Details</label> <label class="label-20">Team Details</label>
...@@ -241,7 +280,7 @@ ...@@ -241,7 +280,7 @@
</div> </div>
</div> </div>
<div class="change-plan-button"> <div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button" href="javascript:void(0)">Ok</a> <a class="own-billing-alert-close-button popup-no-button" href="javascript:void(0)">Ok</a>
</div> </div>
</div> </div>
<div id="manage-other-billing-alert" class="hidden-pop" > <div id="manage-other-billing-alert" class="hidden-pop" >
...@@ -255,7 +294,19 @@ ...@@ -255,7 +294,19 @@
</div> </div>
</div> </div>
<div class="change-plan-button"> <div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button" href="javascript:void(0)">Ok</a> <a class="own-billing-alert-close-button popup-no-button" href="javascript:void(0)">Ok</a>
</div>
</div>
<div id="force-to-choose-popup" class="hidden-pop" >
<div class="change-plan-content">
<h3>Alert!</h3>
<div class="upgrade-info">
<span>Please save before continue.</span>
</div>
</div>
<div class="change-plan-button">
<a class="force-alert-close-button popup-no-button">Ok</a>
</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