Commit 25c73b5a by Nilu

S13099459 # Client - Incoming Issues (raised by Client) #Coupon problem

parent ab63f7e2
...@@ -32,7 +32,7 @@ public class ApplyCouponFP extends SaveFP ...@@ -32,7 +32,7 @@ public class ApplyCouponFP extends SaveFP
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction(); ObjectTransaction objTran = process.getTransaction();
HiringTeam hiringTeam = (HiringTeam) process.getAttribute("HiringTeam"); HiringTeam hiringTeam = (HiringTeam) process.getAttribute("HiringTeam");
LogMgr.log(HiringTeam.LOG, LogLevel.PROCESSING1, "Inside ApplyCouponFP for ", hiringTeam ); LogMgr.log(HiringTeam.LOG, LogLevel.PROCESSING1, "Inside ApplyCouponFP for ", hiringTeam );
if(hiringTeam.getCoupon() != null && hiringTeam.getCoupon().getCouponCode().equals(hiringTeam.getCouponCode())) if(hiringTeam.getCoupon() != null && hiringTeam.getCoupon().getCouponCode().equals(hiringTeam.getCouponCode()))
...@@ -46,7 +46,8 @@ public class ApplyCouponFP extends SaveFP ...@@ -46,7 +46,8 @@ public class ApplyCouponFP extends SaveFP
.andCouponCode(new EqualsFilter<>(hiringTeam.getCouponCode())) .andCouponCode(new EqualsFilter<>(hiringTeam.getCouponCode()))
.search(objTran); .search(objTran);
if(coupon != null && coupon.getValid()) // only allowing coupons with percentage off
if(coupon != null && coupon.getValid() && coupon.getPercentOff() != null)
{ {
StripeUtils.applyCoupon(hiringTeam); StripeUtils.applyCoupon(hiringTeam);
...@@ -81,7 +82,7 @@ public class ApplyCouponFP extends SaveFP ...@@ -81,7 +82,7 @@ public class ApplyCouponFP extends SaveFP
hiringTeam.setCouponExpiryDate(DateDiff.add(new Date(), Calendar.MONTH, stripeCoupon.getDurationInMonths())); hiringTeam.setCouponExpiryDate(DateDiff.add(new Date(), Calendar.MONTH, stripeCoupon.getDurationInMonths()));
} }
hiringTeam.setCoupon(stripeCoupon); hiringTeam.setCoupon(stripeCoupon);
} }
else else
{ {
......
package performa.orm; package performa.orm;
import java.io.*;
import java.util.*;
import oneit.appservices.config.*;
import oneit.logging.*;
import oneit.objstore.*;
import oneit.utils.*;
import performa.orm.types.*;
public class StripeCoupon extends BaseStripeCoupon public class StripeCoupon extends BaseStripeCoupon
{ {
...@@ -24,6 +10,4 @@ public class StripeCoupon extends BaseStripeCoupon ...@@ -24,6 +10,4 @@ public class StripeCoupon extends BaseStripeCoupon
{ {
// Do not add any code to this, always put it in initialiseNewObject // Do not add any code to this, always put it in initialiseNewObject
} }
} }
\ 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