Skip to content

P
PERFORMA_REPLICA
Commit 678e69b4 by chenith
Options

J006: payment plan details updated.

parent 0466906a
Showing with 73 additions and 16 deletions
cmsWebApp/src/performa/form/SaveJobFP.java
...@@ -108,7 +108,7 @@ public class SaveJobFP extends SaveFP ...@@ -108,7 +108,7 @@ public class SaveJobFP extends SaveFP
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Company company = companyUser.getCompany(); Company company = companyUser.getCompany();
BusinessObjectParser.assertFieldCondition(company.getPaymentPlan() != null, job , Company.SINGLEREFERENCE_PaymentPlan, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(company.getSelectedPaymentPlan()!= null, job , Company.SINGLEREFERENCE_PaymentPlan, "mandatory", exceptions, true, request);
} }
super.validate(process, submission, exceptions, params); super.validate(process, submission, exceptions, params);
......
cmsWebApp/src/performa/orm/Company.java
...@@ -8,6 +8,7 @@ import oneit.objstore.rdbms.filters.IsNotNullFilter; ...@@ -8,6 +8,7 @@ import oneit.objstore.rdbms.filters.IsNotNullFilter;
import oneit.security.SecUser; import oneit.security.SecUser;
import oneit.utils.CollectionUtils; import oneit.utils.CollectionUtils;
import oneit.utils.StringUtils; import oneit.utils.StringUtils;
import oneit.utils.math.NullArith;
import oneit.utils.parsers.FieldException; import oneit.utils.parsers.FieldException;
...@@ -97,9 +98,37 @@ public class Company extends BaseCompany ...@@ -97,9 +98,37 @@ public class Company extends BaseCompany
public Double getPaymentPlanAmount() public Double getPaymentPlanAmount()
{ {
if(getSelectedPaymentPlan()!=null) PaymentPlan selectedPaymentPlan = getSelectedPaymentPlan();
if(selectedPaymentPlan!=null)
{
return selectedPaymentPlan.getAmount();
}
return null;
}
public Double getPerJobPaymentPlanAmount()
{
PaymentPlan selectedPaymentPlan = getSelectedPaymentPlan();
if(selectedPaymentPlan!=null)
{
return NullArith.divide(selectedPaymentPlan.getAmount(), selectedPaymentPlan.getActiveJobCount());
}
return null;
}
public Double getPaymentPlanSaveAmount()
{
PaymentPlan selectedPaymentPlan = getSelectedPaymentPlan();
if(selectedPaymentPlan!=null)
{ {
return getSelectedPaymentPlan().getAmount(); return selectedPaymentPlan.getPerMonthSaveAmount();
} }
return null; return null;
......
cmsWebApp/src/performa/orm/PaymentPlan.java
package performa.orm; package performa.orm;
import oneit.utils.math.NullArith;
public class PaymentPlan extends BasePaymentPlan public class PaymentPlan extends BasePaymentPlan
{ {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
public static final Double PER_PER_JOB_AMOUNT = 499D;
// This constructor should not be called // This constructor should not be called
public PaymentPlan () public PaymentPlan ()
...@@ -11,6 +14,7 @@ public class PaymentPlan extends BasePaymentPlan ...@@ -11,6 +14,7 @@ public class PaymentPlan extends BasePaymentPlan
// Do not add any code to this, always put it in initialiseNewObject // Do not add any code to this, always put it in initialiseNewObject
} }
@Override @Override
public String getToString() public String getToString()
{ {
...@@ -21,4 +25,15 @@ public class PaymentPlan extends BasePaymentPlan ...@@ -21,4 +25,15 @@ public class PaymentPlan extends BasePaymentPlan
return super.getToString(); return super.getToString();
} }
public Double getPerMonthSaveAmount()
{
if(getActiveJobCount()!=null)
{
return NullArith.subtract(NullArith.multiply(getActiveJobCount(), PER_PER_JOB_AMOUNT, 0D), getAmount(), 0D);
}
return null;
}
} }
\ No newline at end of file
cmsWebApp/webroot/css/common.css
...@@ -5983,7 +5983,7 @@ input{ ...@@ -5983,7 +5983,7 @@ input{
font-family: "Usual-Light"; font-family: "Usual-Light";
font-size: 40px; font-size: 40px;
font-weight: 300; font-weight: 300;
/*line-height: 48px;*/ display: inline-block;
text-align: center; text-align: center;
} }
...@@ -5997,6 +5997,10 @@ input{ ...@@ -5997,6 +5997,10 @@ input{
color: #8D8D8D; color: #8D8D8D;
font-family: "Usual-Light"; font-family: "Usual-Light";
font-size: 12px; font-size: 12px;
display: inline-block;
text-align: left;
vertical-align: middle;
margin-right: 6px;
} }
.per-job { .per-job {
...@@ -6047,4 +6051,7 @@ input{ ...@@ -6047,4 +6051,7 @@ input{
.payment-paln-count{ .payment-paln-count{
width: 75px; width: 75px;
font-size: 24px;
text-align: center;
margin-top: 6px;
} }
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
...@@ -56,22 +56,18 @@ ...@@ -56,22 +56,18 @@
<p>Hire for any role, save up to $995.00 / mo</p> <p>Hire for any role, save up to $995.00 / mo</p>
</div> </div>
<div class="a-label-row payment-type-row"> <div class="a-label-row payment-type-row">
<div class="col-md-2 col-sm-2 col-xs-2 text-right"> <div class="col-md-6 col-sm-6 col-xs-6 text-right">
</div>
<div class="col-md-2 col-sm-2 col-xs-2 text-right">
<div class="active-jobs-per-mont"> <div class="active-jobs-per-mont">
Active Jobs Per Month Active Jobs Per Month
</div> </div>
</div>
<div class="col-md-2 col-sm-2 col-xs-2">
<oneit:ormInput type="number" obj="<%= company %>" attributeName="PaymentJobCount" <oneit:ormInput type="number" obj="<%= company %>" attributeName="PaymentJobCount"
min="<%= minCount %>" max="<%= maxCount %>" step="1" cssClass="form-control payment-paln-count"/> min="<%= minCount %>" max="<%= maxCount %>" step="1" cssClass="payment-paln-count"/>
</div> </div>
<div class="col-md-4 col-sm-4 col-xs-4 text-right"> <div class="col-md-6 col-sm-6 col-xs-6 text-left">
<oneit:recalcClass htmlTag="span" classScript="company.getPaymentPlanAmount()!=null ? 'show': 'hide'" company="<%= company %>"> <oneit:recalcClass htmlTag="span" classScript="company.getPerJobPaymentPlanAmount()!=null ? 'show': 'hide'" company="<%= company %>">
<div > <div >
<span class="payment-amt text-right"> <span class="payment-amt text-right">
<oneit:recalc mode="Currency" script="company.getPaymentPlanAmount()" company="<%= company %>" nullValue=""/> <oneit:recalc mode="Currency" script="company.getPerJobPaymentPlanAmount()" company="<%= company %>" nullValue=""/>
</span> </span>
<span class="text-left"> <span class="text-left">
<p class="per-job"> <p class="per-job">
...@@ -80,10 +76,11 @@ ...@@ -80,10 +76,11 @@
</span> </span>
</div> </div>
</oneit:recalcClass> </oneit:recalcClass>
</div>
<div class="col-md-2 col-sm-2 col-xs-2 text-right">
</div> </div>
</div> </div>
<oneit:recalcClass htmlTag="span" classScript="company.getPaymentPlanAmount()!=null ? 'show': 'hide'" company="<%= company %>">
<div class="a-label-row text-center"> <div class="a-label-row text-center">
<oneit:button value="Select Plan" name="saveJob" cssClass="btn btn-primary largeBtn btn-green" <oneit:button value="Select Plan" name="saveJob" cssClass="btn btn-primary largeBtn btn-green"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
...@@ -97,11 +94,18 @@ ...@@ -97,11 +94,18 @@
<div class="col-md-4 col-sm-4 col-xs-4"> <div class="col-md-4 col-sm-4 col-xs-4">
</div> </div>
<div class="col-md-4 col-sm-4 col-xs-4 payment-job-det text-center"> <div class="col-md-4 col-sm-4 col-xs-4 payment-job-det text-center">
$1500.00 Monthly for up to 5 jobs / month Save $995.00 per month <oneit:toString value="<%= PaymentPlan.PER_PER_JOB_AMOUNT %>" mode="Currency"/>
Monthly for up to
<oneit:recalc mode="EscapeHTML" script="company.getPaymentJobCount()" company="<%= company %>" nullValue=""/>
jobs / month
Save
<oneit:recalc mode="Currency" script="company.getPaymentPlanSaveAmount()" company="<%= company %>" nullValue=""/>
per month
</div> </div>
<div class="col-md-4 col-sm-4 col-xs-4"> <div class="col-md-4 col-sm-4 col-xs-4">
</div> </div>
</div> </div>
</oneit:recalcClass>
</div> </div>
<div class="form-page-area payment-optio-sep"> <div class="form-page-area payment-optio-sep">
......
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