FINERACT-2015: Fix saving account with withdrawal fee
This commit is contained in:
committed by
Adam Saghy
parent
7faaf96246
commit
840f95c88f
+4
-2
@@ -1346,11 +1346,13 @@ public class SavingsAccount extends AbstractAuditableWithUTCDateTimeCustom<Long>
|
||||
|
||||
if (charge.isEnablePaymentType() && charge.isEnableFreeWithdrawal()) { // discount transaction to
|
||||
// specific paymentType
|
||||
if (paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
|
||||
if (paymentDetail != null && paymentDetail.getPaymentType() != null
|
||||
&& paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
|
||||
resetFreeChargeDaysCount(charge, transactionAmount, transactionDate, refNo);
|
||||
}
|
||||
} else if (charge.isEnablePaymentType()) { // normal charge-transaction to specific paymentType
|
||||
if (paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
|
||||
if (paymentDetail != null && paymentDetail.getPaymentType() != null
|
||||
&& paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
|
||||
charge.updateWithdralFeeAmount(transactionAmount);
|
||||
this.payCharge(charge, charge.getAmountOutstanding(this.getCurrency()), transactionDate, backdatedTxnsAllowedTill,
|
||||
refNo);
|
||||
|
||||
Reference in New Issue
Block a user