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

Merge pull request #1402 from chandrikamohith/MIFOSX-2049

Browse Source 
MIFOSX-2049 Able to withdraw from savings account when overdraft limi…
This commit is contained in:
pramod
2015-08-27 11:35:20 +05:30
parent 21cc6e946d b89daf38a8
commit 2d9fc6dca4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountAssembler.java
+2 -2
View File
@@ -216,7 +216,7 @@ public class SavingsAccountAssembler {
allowOverdraft = product.isAllowOverdraft(); allowOverdraft = product.isAllowOverdraft();
} }
BigDecimal overdraftLimit = null; BigDecimal overdraftLimit = BigDecimal.ZERO;
if (command.parameterExists(overdraftLimitParamName)) { if (command.parameterExists(overdraftLimitParamName)) {
overdraftLimit = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(overdraftLimitParamName); overdraftLimit = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(overdraftLimitParamName);
} else { } else {
@@ -230,7 +230,7 @@ public class SavingsAccountAssembler {
enforceMinRequiredBalance = product.isMinRequiredBalanceEnforced(); enforceMinRequiredBalance = product.isMinRequiredBalanceEnforced();
} }
BigDecimal minRequiredBalance = null; BigDecimal minRequiredBalance = BigDecimal.ZERO;
if (command.parameterExists(minRequiredBalanceParamName)) { if (command.parameterExists(minRequiredBalanceParamName)) {
minRequiredBalance = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(minRequiredBalanceParamName); minRequiredBalance = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(minRequiredBalanceParamName);
} else { } else {
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProductAssembler.java
+8 -2
View File
@@ -123,14 +123,20 @@ public class SavingsProductAssembler {
allowOverdraft = command.booleanPrimitiveValueOfParameterNamed(allowOverdraftParamName); allowOverdraft = command.booleanPrimitiveValueOfParameterNamed(allowOverdraftParamName);
} }
final BigDecimal overdraftLimit = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(overdraftLimitParamName); BigDecimal overdraftLimit = BigDecimal.ZERO;
if(command.parameterExists(overdraftLimitParamName)){
overdraftLimit = command.bigDecimalValueOfParameterNamed(overdraftLimitParamName);
}
boolean enforceMinRequiredBalance = false; boolean enforceMinRequiredBalance = false;
if (command.parameterExists(enforceMinRequiredBalanceParamName)) { if (command.parameterExists(enforceMinRequiredBalanceParamName)) {
enforceMinRequiredBalance = command.booleanPrimitiveValueOfParameterNamed(enforceMinRequiredBalanceParamName); enforceMinRequiredBalance = command.booleanPrimitiveValueOfParameterNamed(enforceMinRequiredBalanceParamName);
} }
final BigDecimal minRequiredBalance = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(minRequiredBalanceParamName); BigDecimal minRequiredBalance = BigDecimal.ZERO;
if(command.parameterExists(minRequiredBalanceParamName)){
minRequiredBalance = command.bigDecimalValueOfParameterNamed(minRequiredBalanceParamName);
}
final BigDecimal minBalanceForInterestCalculation = command final BigDecimal minBalanceForInterestCalculation = command
.bigDecimalValueOfParameterNamedDefaultToNullIfZero(minBalanceForInterestCalculationParamName); .bigDecimalValueOfParameterNamedDefaultToNullIfZero(minBalanceForInterestCalculationParamName);