Skip to content

P
PERFORMA_REPLICA
Commit 35c96cad by Saliya Randunu
Options

S12523741 # Client - Incoming Issues (raised by Client) #UX is not forcing selection of a Plan

parent 76f004ae
Showing with 73 additions and 15 deletions
cmsWebApp/webroot/css/common.css
......@@ -6200,6 +6200,18 @@ label, label .label-title span {
.manage-plan-hidden-info {display: none; }
.oneit-radio.checked .manage-plan-hidden-info {display: block;}
.overlayx {
display: none;
width: 100%;
height: 100%;
min-height: 100%;
position: fixed; /* Stay in place */
z-index: 1000; /* Sit on top */
left: 0;
top: 0;
background-color: transparent;
}
.subscription-billed {
height: 60px;
width: 100%;
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
......@@ -38,6 +38,7 @@
%>
<script type="text/javascript">
var Popup = null;
var PopupCoupon = null;
$(document).ready(function()
{
setTabingSideBarHeight();
......@@ -50,14 +51,16 @@
width : 600, height : 640
});
var isinvliadCoupon = getParameterByName("invalidcoupon");
if (isinvliadCoupon==='true'){
PopupCoupon = new jBox('Modal', {
id : "change-plan",
overlay : true, content : $("#invalid-coupon-popup") ,
overlay : true,
width : 500, height : 400
});
var isinvliadCoupon = getParameterByName("invalidcoupon");
if (isinvliadCoupon==='true'){
PopupCoupon.setContent($("#invalid-coupon-popup"));
PopupCoupon.open();
}
......@@ -77,14 +80,42 @@
$(".manage-plan-row input").on("change", function(){
setTabingSideBarHeight();
});
disableOutSideWhileChoosePlan();
$(document).on("click",".plan-selection input",function(e)
{
disableOutSideWhileChoosePlan();
});
});
function disableOutSideWhileChoosePlan(){
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;
});
}
}
});
}
}
}
function paymentPlanChanged()
{
$("#savePaymentPlan").click();
}
</script>
<div class="overlayx"></div>
<div class="container-fluid">
<div class="row content">
<div class="main-content-area">
......@@ -110,6 +141,7 @@
<div class="company-content-area">
<!-- Tab panes -->
<div class="tab-content">
<div class="choose-plan-wrap">
<div class="tab-pane active" id="company-detail">
<div>
<div class="tabpage-title manage-plan">
......@@ -156,7 +188,7 @@
<div class="rectangle-5">
<div class="manage-plan-row">
<div class="radio">
<label>
<label class="plan-selection">
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="IsPPJ" value="true" onchange="paymentPlanChanged()"/>
</label>
</div>
......@@ -191,7 +223,7 @@
<div class="rectangle-5">
<div class="manage-plan-row">
<div class="radio">
<label>
<label class="plan-selection">
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="IsPPJ" value="false"/>
</label>
</div>
......@@ -421,14 +453,6 @@
Looking to cancel your account? Please <a href="http://www.talentology.com/">contact us.</a>
</div>
</div>
</div>
</div>
</div>
</oneit:form>
</div>
</div>
</div>
<div id="invalid-coupon-popup" style="display:none" >
<div class="change-plan-content">
......@@ -443,5 +467,27 @@
</div>
</div>
<div id="force-to-choose-popup" style="display:none" >
<div class="change-plan-content">
<h3>Alert!</h3>
<div class="upgrade-info">
<span>You must select your plan before continue. <br>Try again</span>
</div>
</div>
<div class="change-plan-button">
<a class="invalid-coupon-close-button popup-no-button">Close & Retry</a>
</div>
</div>
</div>
</div>
</div>
</div>
</oneit:form>
</div>
</div>
</div>
</oneit:dynIncluded>
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