Fineract-521

2017-09-19 18:39:48 +05:30
parent df16dc3cad
commit e81d810b24
1 changed files with 13 additions and 1 deletions
@@ -1085,13 +1085,21 @@ public class SavingsAccount extends AbstractPersistableCustom<Long> {

            // deal with potential minRequiredBalance and
            // enforceMinRequiredBalance
-            if (!isException && transaction.canProcessBalanceCheck()) {
+            if (!isException && transaction.canProcessBalanceCheck() && !isOverdraft()) {
                if (runningBalance.minus(minRequiredBalance).isLessThanZero()) { throw new InsufficientAccountBalanceException(
                        "transactionAmount", getAccountBalance(), withdrawalFee, transactionAmount); }
            }
            lastSavingsDate = transaction.transactionLocalDate();

        }
+        
+        //In overdraft cases, minRequiredBalance can be in violation after interest posting
+        //and should be checked after processing all transactions
+        if(isOverdraft()) {
+	        	if (runningBalance.minus(minRequiredBalance).isLessThanZero()) { throw new InsufficientAccountBalanceException(
+	                    "transactionAmount", getAccountBalance(), withdrawalFee, transactionAmount); }
+        }
+        
 		if (this.getSavingsHoldAmount().compareTo(BigDecimal.ZERO) == 1) {
 			if (runningBalance.minus(this.getSavingsHoldAmount()).isLessThanZero()) {
 				throw new InsufficientAccountBalanceException("transactionAmount", getAccountBalance(), withdrawalFee,
@@ -3048,5 +3056,9 @@ public class SavingsAccount extends AbstractPersistableCustom<Long> {
    public void releaseAmount(BigDecimal amount) {
        this.savingsOnHoldAmount = getSavingsHoldAmount().subtract(amount);
    }
+    
+    private boolean isOverdraft() {
+    		return allowOverdraft;
+    }

 }