Commit bad6fb3b by Nilu

S14084587 # Client - Incoming Issues (raised by Client) #Coupon problems

parent 809cdf1c
...@@ -79,7 +79,7 @@ public class StripeUtils ...@@ -79,7 +79,7 @@ public class StripeUtils
{ {
if(hiringTeam.getStripeReference() == null) if(hiringTeam.getStripeReference() == null)
{ {
createCustomer(hiringTeam.getAddedByUser().getDefaultHiringTeam()); createCustomer(hiringTeam);
} }
Customer customer = Customer.retrieve(hiringTeam.getStripeReference()); Customer customer = Customer.retrieve(hiringTeam.getStripeReference());
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
String currencyFormat = Utils.getCurrencyFormat(hiringTeam); String currencyFormat = Utils.getCurrencyFormat(hiringTeam);
boolean firstTime = hiringTeam.getIsPPJ() == null || (!hiringTeam.getIsPPJ() && hiringTeam.getPaymentPlan() == null); boolean firstTime = hiringTeam.getIsPPJ() == null || (!hiringTeam.getIsPPJ() && hiringTeam.getPaymentPlan() == null);
String nextPage = firstTime ? homePage : WebUtils.getSamePageInRenderMode(request, "ManagePlan"); String samePage = WebUtils.getSamePageInRenderMode(request, "ManagePlan");
String nextPage = firstTime ? homePage : samePage;
%> %>
<style> <style>
.select-button input[type=radio] { .select-button input[type=radio] {
...@@ -196,7 +197,7 @@ ...@@ -196,7 +197,7 @@
<div class="apply-coupon"> <div class="apply-coupon">
<oneit:ormInput obj="<%= hiringTeam %>" type="text" attributeName="CouponCode" placeholder="Coupon Code" cssClass="form-control" /> <oneit:ormInput obj="<%= hiringTeam %>" type="text" attributeName="CouponCode" placeholder="Coupon Code" cssClass="form-control" />
<oneit:button value="APPLY" name="applyCoupon" cssClass="btn btn-input-inside" <oneit:button value="APPLY" name="applyCoupon" cssClass="btn btn-input-inside"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", samePage)
.mapEntry ("restartProcess", Boolean.TRUE) .mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).toMap()) .mapEntry ("procParams", CollectionUtils.mapEntry("HiringTeam", hiringTeam).toMap())
.mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam")) .mapEntry ("attribNamesToRestore", Collections.singleton("HiringTeam"))
......
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