Skip to content

P
PERFORMA_REPLICA
Commit ae68d1ae by Nilu
Options

S12994794 # Client - Incoming Issues (raised by Client) #Old card displayed 

S12995584 # Client - Incoming Issues (raised by Client) #Card not updated
parent 01cad418
Showing with 56 additions and 60 deletions
cmsWebApp/src/performa/form/ReplaceCardFP.java
......@@ -15,7 +15,6 @@ import oneit.servlets.process.ORMProcessState;
import oneit.servlets.process.SaveFP;
import oneit.utils.BusinessException;
import oneit.utils.StringUtils;
import oneit.utils.parsers.FieldException;
import performa.orm.HiringTeam;
import performa.utils.StripeUtils;
......@@ -51,25 +50,22 @@ public class ReplaceCardFP extends SaveFP
throw new BusinessException("Updating card details failed, Please contact adminstrator for more info.");
}
try
HiringTeam hiringTeam = (HiringTeam)process.getAttribute("HiringTeam");
Card card = StripeUtils.updateCardDetails(hiringTeam, token);
LogMgr.log(LOG, LogLevel.PROCESSING1,"In ReplaceCardFP replacing card details of hiringTeam: ", hiringTeam, " card : " , card );
if (card != null)
{
HiringTeam hiringTeam = (HiringTeam)process.getAttribute("HiringTeam");
Card card = StripeUtils.updateCardDetails(hiringTeam, token);
LogMgr.log(LOG, LogLevel.PROCESSING1,"In ReplaceCardFP replacing card details of hiringTeam: ", hiringTeam, " card : " , card );
if (card != null)
{
hiringTeam.setNameOnCard(card.getName());
hiringTeam.setCardPostCode(card.getAddressZip());
hiringTeam.setCardID(card.getId());
LogMgr.log(LOG, LogLevel.PROCESSING1,"In ReplaceCardFP card details updated of hiring team: ", hiringTeam);
}
hiringTeam.setNameOnCard(card.getName());
hiringTeam.setCardPostCode(card.getAddressZip());
hiringTeam.setCardID(card.getId());
LogMgr.log(LOG, LogLevel.PROCESSING1,"In ReplaceCardFP card details updated of hiring team: ", hiringTeam);
}
catch(StorageException | FieldException e)
else
{
LogMgr.log(LOG, LogLevel.PROCESSING1, e, "Error while replacing stripe card details");
throw new BusinessException("Replacing card details failed, Please contact adminstrator for more info.");
}
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/UpdateCardFP.java
......@@ -36,7 +36,7 @@ public class UpdateCardFP extends SaveFP
}
public static void updateCardDetails(ORMProcessState process, SubmissionDetails submission) throws FieldException
public static void updateCardDetails(ORMProcessState process, SubmissionDetails submission) throws FieldException, BusinessException
{
try
{
......@@ -77,6 +77,8 @@ public class UpdateCardFP extends SaveFP
catch (StripeException e)
{
LogMgr.log(LOG, LogLevel.PROCESSING1, e, "Error while updating card details of user");
throw new BusinessException("Updating card details failed, Please contact adminstrator for more info.");
}
}
}
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/edit_card.jsp
......@@ -32,11 +32,31 @@
</h1>
</oneit:form>
<div class="my-company-area">
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
<oneit:form name="editCompany" method="post" enctype="multipart/form-data">
<div style="padding-left: 15px; padding-right: 15px;">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="form-group hide">
<input type="hidden" name="expiry-date" />
</div>
<div class="form-group hide">
<input type="hidden" name="holder-name" />
</div>
<div class="form-group hide">
<input type="hidden" name="address-zip" />
</div>
</div>
</div>
<oneit:button value="Pay" name="updateCard" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).toMap())
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>'/>
</oneit:form>
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
<oneit:dynInclude page="/extensions/adminportal/inc/my_company_tabs.jsp" TabNumber="3" data="<%= CollectionUtils.EMPTY_MAP%>"/>
......@@ -81,27 +101,6 @@
</div>
</div>
</oneit:form>
<oneit:form name="editCompany" 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="expiry-date" />
</div>
<div class="form-group hide">
<input type="hidden" name="holder-name" />
</div>
<div class="form-group hide">
<input type="hidden" name="address-zip" />
</div>
</div>
</div>
<oneit:button value="Pay" name="updateCard" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).toMap())
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>'/>
</oneit:form>
<script src="https://js.stripe.com/v2/"></script>
<script src="https://js.stripe.com/v3/"></script>
<script>
......
cmsWebApp/webroot/extensions/adminportal/replace_card.jsp
......@@ -32,14 +32,26 @@
</h1>
</oneit:form>
<div class="my-company-area">
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
<oneit:form name="editCompany" 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>
<div style="padding-left: 15px; padding-right: 15px;">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
<oneit:button value="Pay" name="replaceCard" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).toMap())
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>'/>
</oneit:form>
<oneit:form name="makePayment" method="post" enctype="multipart/form-data">
<oneit:dynInclude page="/extensions/adminportal/inc/my_company_tabs.jsp" TabNumber="3" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="company-content-area">
<!-- Tab panes -->
<div class="tab-content">
......@@ -81,21 +93,6 @@
</div>
</div>
</oneit:form>
<oneit:form name="editCompany" 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="replaceCard" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).toMap())
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
.toMap() %>'/>
</oneit:form>
<script src="https://js.stripe.com/v3/"></script>
<script>
var stripePubKey = '<%= MakePaymentFP.STRIPE_PUB_KEY %>';
......
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