CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

Merge branch 'Fineract-521' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-11-20 15:54:39 +05:30
parent 585a791b4e 81b2ba1c31
commit b2aeb81be1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
+8 -3
View File
@@ -1148,9 +1148,7 @@ public class SavingsAccount extends AbstractPersistableCustom<Long> {
final List<ApiParameterError> dataValidationErrors = new ArrayList<>(); final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors) final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors)
.resource(depositAccountType().resourceName() + transactionAction); .resource(depositAccountType().resourceName() + transactionAction);
if (this.allowOverdraft) { if (!this.allowOverdraft) {
baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("results.in.balance.exceeding.overdraft.limit");
} else {
baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("results.in.balance.going.negative"); baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("results.in.balance.going.negative");
} }
if (!dataValidationErrors.isEmpty()) { throw new PlatformApiDataValidationException(dataValidationErrors); } if (!dataValidationErrors.isEmpty()) { throw new PlatformApiDataValidationException(dataValidationErrors); }
@@ -1160,6 +1158,13 @@ public class SavingsAccount extends AbstractPersistableCustom<Long> {
lastSavingsDate = transaction.transactionLocalDate(); lastSavingsDate = transaction.transactionLocalDate();
} }
BigDecimal withdrawalFee = null;
BigDecimal transactionAmount = null;
if(isOverdraft()) {
if (runningBalance.minus(minRequiredBalance).isLessThanZero()) { throw new InsufficientAccountBalanceException(
"transactionAmount", getAccountBalance(), withdrawalFee, transactionAmount); }
}
} }
protected boolean isAccountLocked(final LocalDate transactionDate) { protected boolean isAccountLocked(final LocalDate transactionDate) {