Skip to content

P
PERFORMA_REPLICA
Commit a83e831a by Nilu
Options

added J014 screen

parent f9fc4e3a
Showing with 204 additions and 85 deletions
cmsWebApp/src/performa/utils/WebUtils.java
......@@ -26,6 +26,9 @@ public class WebUtils
public static final String APPLY_JOB = "ApplyJob";
public static final String JOB_APPLICATION = "JobApplication";
public static final String JOB_PAYMENT = "JobPayment";
public static final String CARD_PAYMENT = "CardPayment";
public static final String REPLACE_CARD = "ReplaceCard";
public static final String EDIT_CARD = "EditCard";
public static final String CREATED_JOB = "CreatedJob";
public static final String EDIT_JOB = "EditJob";
public static final String JOBS = "Jobs";
......@@ -149,6 +152,9 @@ public class WebUtils
renderMode.equals(JOB_MATCH) ||
renderMode.equals(JOB_REVIEW) ||
renderMode.equals(JOB_PAYMENT) ||
renderMode.equals(CARD_PAYMENT) ||
renderMode.equals(REPLACE_CARD) ||
renderMode.equals(EDIT_CARD) ||
renderMode.equals(CREATED_JOB);
}
......
cmsWebApp/webroot/css/common.css
......@@ -810,7 +810,7 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
margin-bottom: 15px;
}
.form-page-area {
padding: 65px 13.5%;
padding: 65px 10.5%;
background: #fff;
float: left;
width: 100%;
......@@ -5423,13 +5423,13 @@ label, label .label-title span {
.company-content-area .fileLink{
display: none;
}
.company-content-area .grey-area{
.company-content-area .grey-area, .billing-content-area .grey-area{
background-color: #EFF0F2;
border-radius: 2px;
padding: 5% 10%;
margin-top: 10px;
}
.company-content-area .line-break{
.company-content-area .line-break, .billing-content-area .line-break{
border: solid 1px #EFF0F2;
display: inline-block;
width: 100%;
......@@ -5444,10 +5444,10 @@ label, label .label-title span {
.label-14{
font-size: 14px;
}
.company-content-area .bold{
.company-content-area .bold, .billing-content-area .bold{
font-family: "Usual-Medium";
}
.company-content-area .large-btn{
.company-content-area .large-btn, .line-break .large-btn{
width: 50%;
height: 60px;
border-radius: 100px;
......@@ -6137,3 +6137,7 @@ input{
font-size: 12px;
line-height: 16px;
}
.card-payment label{
font-family: "Usual-Regular";
}
cmsWebApp/webroot/extensions/adminportal/GeneralConfig_adminPortal.xml
......@@ -43,6 +43,8 @@
<RenderMode name="JobPayment" preIncludeJSP="extensions/adminportal/job_payment.jsp"/>
<RenderMode name="CardPayment" preIncludeJSP="extensions/adminportal/card_payment.jsp"/>
<RenderMode name="CreatedJob" preIncludeJSP="extensions/adminportal/created_job.jsp"/>
<RenderMode name="ReplaceCard" preIncludeJSP="extensions/adminportal/replace_card_payment.jsp"/>
<RenderMode name="EditCard" preIncludeJSP="extensions/adminportal/edit_card_payment.jsp"/>
</NODE>
</MAP>
......
cmsWebApp/webroot/extensions/adminportal/card_payment.jsp
......@@ -5,64 +5,43 @@
<oneit:dynIncluded>
<%
SecUser loggedInUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Company company = companyUser.getCompany();
String nextPage = WebUtils.getSamePageInRenderMode(request, "CardPayment");
%>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="container-fluid">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<h1 class="page-title">Enter Payment Details</h1>
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="form-group hide">
<input type="hidden" name="stripe-token-id" />
</div>
<div class="main-created-job card-payment">
<h1 class="page-title select-payment-optio">
Enter Payment Details
</h1>
<div class="form-page-area">
<div class="tabpage-title">
<label class="label-20">Payment</label><br/>
<span id="card-errors" style="color: #eb1c26; font-size: 15px;"></span>
</div>
<%
if(company.getCardID() != null)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/existing_card.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= false %>" IsReplace="<%= false %>"/>
<%
}
else
{
%>
<div>
<label class="label-14">Your card details will be saved for future billing</label>
</div>
<oneit:dynInclude page="/extensions/adminportal/inc/card_details.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" Company="<%= company %>"/>
<%
}
%>
</div>
</div>
<oneit:button value="Pay" name="savePayment" cssClass="btn btn-primary btn-lg" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.toMap() %>'/>
</div>
</oneit:form>
<form action="/charge" method="post" id="payment-form">
<div class="form-row">
<label for="card-element">
Credit or debit card
</label>
<div id="card-element">
a Stripe Element will be inserted here.
</div>
<div id="card-number">
a Stripe Element will be inserted here.
</div>
<div id="card-expiry">
a Stripe Element will be inserted here.
</div>
<div id="card-cvc">
a Stripe Element will be inserted here.
</div>
Used to display Element errors
<div id="card-errors" role="alert"></div>
</div>
<button>Submit Payment</button>
</form>
<script src="https://js.stripe.com/v3/"></script>
<script>
var stripePubKey = '<%= MakePaymentFP.STRIPE_PUB_KEY %>';
</script>
<oneit:script>
<!-- MUST be included after initializing stripePubKey -->
<oneit:script src="/scripts/performaStripe.js"/>
</oneit:script>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/edit_card.jsp
......@@ -21,9 +21,6 @@
});
</script>
<div class="container-fluid">
<div class="row content">
<div class="main-content-area">
<h1 class="page-title">My Hiring Team</h1>
<div class="my-company-area">
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
......@@ -58,8 +55,16 @@
<label class="label-14 bold">Edit Card</label><br/>
<label class="label-14">Your card details will be saved for future billing</label>
</div>
<div class="grey-area">
<oneit:dynInclude page="/extensions/adminportal/inc/card_details.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= true %>" IsReplace="<%= false %>"/>
<div class="form-group">
<oneit:button value="Save Card" name="updateCard" cssClass="btn btn-primary btn-green large-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Company", company)
.toMap() %>" />
</div>
</div>
</div>
</div>
</div>
......@@ -92,7 +97,4 @@
<oneit:script src="/scripts/updateCardStripe.js"/>
</oneit:script>
</div>
</div>
</div>
</div>
</oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/edit_card_payment.jsp 0 → 100644
<%@ page extends="oneit.servlets.jsp.JSPInclude" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<oneit:dynIncluded>
<%
SecUser loggedInUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Company company = companyUser.getCompany();
String nextPage = WebUtils.getSamePageInRenderMode(request, "CardPayment");
%>
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
<div class="main-created-job card-payment">
<h1 class="page-title select-payment-optio">
Enter Payment Details
</h1>
<div class="form-page-area billing-content-area">
<div class="tabpage-title">
<label class="label-20">Payment</label><br/>
<span id="card-errors" style="color: #eb1c26; font-size: 15px;"></span>
</div>
<%
if(company.getCardID() != null)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/existing_card.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= true %>" IsReplace="<%= false %>"/>
<%
}
%>
<div>
<div>
<label class="label-14 bold">Edit Card</label><br/>
<label class="label-14">Your card details will be saved for future billing</label>
</div>
<div class="grey-area">
<oneit:dynInclude page="/extensions/adminportal/inc/card_details.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= true %>" IsReplace="<%= false %>"/>
</div>
</div>
</div>
</div>
</oneit:form>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="form-group hide">
<input type="hidden" name="stripe-token-id" />
</div>
</div>
</div>
<oneit:button value="Pay" name="savePayment" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.toMap() %>'/>
</oneit:form>
<script src="https://js.stripe.com/v3/"></script>
<script>
var stripePubKey = '<%= MakePaymentFP.STRIPE_PUB_KEY %>';
</script>
<oneit:script>
<!-- MUST be included after initializing stripePubKey -->
<oneit:script src="/scripts/performaStripe.js"/>
</oneit:script>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/inc/card_details.jsp
......@@ -50,9 +50,6 @@
});
});
</script>
<div class="grey-area">
<div class="form-group">
<label>Card Number</label>
<%
......@@ -60,7 +57,6 @@
{
%>
<input type="text" name="cardNumber" value="<%= company.getCardNumber() %>" class="form-control" readonly>
<%
}
else
......@@ -119,13 +115,5 @@
<oneit:ormInput obj="<%= company %>" type="text" attributeName="CardPostCode" cssClass="form-control" id="PostCode" />
</div>
</div>
<div class="form-group">
<oneit:button value="Save Card" name="updateCard" cssClass="btn btn-primary btn-green large-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Company", company)
.toMap() %>" />
</div>
<input type="hidden" name="expiration-date" />
</div>
</oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
......@@ -31,6 +31,7 @@
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB) + "&fromJob=true";
String jobsPage = WebUtils.getSamePageInRenderMode(request, "Page");
String fromPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_PAYMENT);
String paymentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CARD_PAYMENT);
%>
<script type="text/javascript">
$(document).ready(function()
......@@ -44,7 +45,7 @@
function validate() {
var empty = false;
$('input[required]').each(function() {
$('input').each(function() {
if ($( this ).val() == '') {
empty = true;
}
......@@ -70,6 +71,7 @@
<div class="a-label-row annual-plan">
Annual Plan
</div>
<div class="a-label-row payment-optio-text">
<p>Hire for any role, save up to $995.00 / mo</p>
</div>
......@@ -78,7 +80,7 @@
<div class="active-jobs-per-mont">
Active Jobs Per Month
</div>
<oneit:ormInput type="number" obj="<%= company %>" attributeName="PaymentJobCount" required="true"
<oneit:ormInput type="number" obj="<%= company %>" attributeName="PaymentJobCount"
min="<%= minCount %>" max="<%= maxCount %>" step="1" cssClass="payment-paln-count"/>
</div>
<div class="col-md-6 col-sm-6 col-xs-6 text-left">
......@@ -140,7 +142,8 @@
</div>
</div>
<div class="col-md-6 col-sm-6 col-xs-6">
<oneit:button value="Select Plan" name="" cssClass="btn pay-only-job-btn"/>
<oneit:button value="Pay for this job only" name="gotoPage" cssClass="btn pay-only-job-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", paymentPage).toMap() %>" />
</div>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/replace_card.jsp
......@@ -21,9 +21,6 @@
});
</script>
<div class="container-fluid">
<div class="row content">
<div class="main-content-area">
<h1 class="page-title">My Hiring Team</h1>
<div class="my-company-area">
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
......@@ -58,8 +55,16 @@
<label class="label-14 bold">Replace Card</label><br/>
<label class="label-14">Your card details will be saved for future billing</label>
</div>
<div class="grey-area">
<oneit:dynInclude page="/extensions/adminportal/inc/card_details.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= false %>" IsReplace="<%= true %>"/>
<div class="form-group">
<oneit:button value="Save Card" name="updateCard" cssClass="btn btn-primary btn-green large-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Company", company)
.toMap() %>" />
</div>
</div>
</div>
</div>
</div>
......@@ -85,7 +90,4 @@
<oneit:script src="/scripts/performaStripe.js"/>
</oneit:script>
</div>
</div>
</div>
</div>
</oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/replace_card_payment.jsp 0 → 100644
<%@ page extends="oneit.servlets.jsp.JSPInclude" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<oneit:dynIncluded>
<%
SecUser loggedInUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Company company = companyUser.getCompany();
String nextPage = WebUtils.getSamePageInRenderMode(request, "CardPayment");
%>
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
<div class="main-created-job card-payment">
<h1 class="page-title select-payment-optio">
Enter Payment Details
</h1>
<div class="form-page-area billing-content-area">
<div class="tabpage-title">
<label class="label-20">Payment</label><br/>
<span id="card-errors" style="color: #eb1c26; font-size: 15px;"></span>
</div>
<%
if(company.getCardID() != null)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/existing_card.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= false %>" IsReplace="<%= true %>"/>
<%
}
%>
<div>
<div>
<label class="label-14 bold">Replace Card</label><br/>
<label class="label-14">Your card details will be saved for future billing</label>
</div>
<div class="grey-area">
<oneit:dynInclude page="/extensions/adminportal/inc/card_details.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
Company="<%= company %>" IsEdit="<%= false %>" IsReplace="<%= true %>"/>
</div>
</div>
</div>
</div>
</oneit:form>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="form-group hide">
<input type="hidden" name="stripe-token-id" />
</div>
</div>
</div>
<oneit:button value="Pay" name="savePayment" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.toMap() %>'/>
</oneit:form>
<script src="https://js.stripe.com/v3/"></script>
<script>
var stripePubKey = '<%= MakePaymentFP.STRIPE_PUB_KEY %>';
</script>
<oneit:script>
<!-- MUST be included after initializing stripePubKey -->
<oneit:script src="/scripts/performaStripe.js"/>
</oneit:script>
</oneit:dynIncluded>
\ No newline at end of file
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