Merge pull request #2379 from logoutdhaval/fineract-1645

FINERACT-1645:Invalid Balance after Interest posting with withdrawal fee
2022-06-25 14:40:53 +05:30
parent 74e43ab623 44e1e44785
commit 7e680729fc
2 changed files with 50 additions and 1 deletions
@@ -155,7 +155,7 @@ public final class SavingsAccountTransactionData implements Serializable {
    }

    public boolean isWithdrawalFeeAndNotReversed() {
-        return this.transactionType.isWithdrawalFee() && isNotReversed();
+        return this.transactionType.isFeeDeduction() && isNotReversed();
    }

    public boolean isPayCharge() {
@@ -186,6 +186,10 @@ public final class SavingsAccountTransactionData implements Serializable {
        return Money.of(currency, this.runningBalance);
    }

+    public Money getRunningBalance(final MonetaryCurrency currency) {
+        return Money.of(currency, this.runningBalance);
+    }
+
    public boolean isDepositAndNotReversed() {
        return this.transactionType.isDeposit() && isNotReversed();
    }