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

mutiple-withdraw-charges-fineract-1386

Browse Source
This commit is contained in:
rrpawar96
2021-10-09 08:02:31 +08:00
committed by Petri Tuomola
parent d0cadc6ac9
commit bcdf9df136
2 changed files with 0 additions and 24 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
-17
View File
@@ -2583,14 +2583,6 @@ public class SavingsAccount extends AbstractPersistableCustom {
throw new PlatformApiDataValidationException(dataValidationErrors); throw new PlatformApiDataValidationException(dataValidationErrors);
} }
// Only one withdrawal fee is supported per account
if (savingsAccountCharge.isWithdrawalFee()) {
if (this.isWithDrawalFeeExists()) {
baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("multiple.withdrawal.fee.per.account.not.supported");
throw new PlatformApiDataValidationException(dataValidationErrors);
}
}
// Only one annual fee is supported per account // Only one annual fee is supported per account
if (savingsAccountCharge.isAnnualFee()) { if (savingsAccountCharge.isAnnualFee()) {
if (this.isAnnualFeeExists()) { if (this.isAnnualFeeExists()) {
@@ -2619,15 +2611,6 @@ public class SavingsAccount extends AbstractPersistableCustom {
} }
private boolean isWithDrawalFeeExists() {
for (SavingsAccountCharge charge : this.charges()) {
if (charge.isWithdrawalFee()) {
return true;
}
}
return false;
}
private boolean isAnnualFeeExists() { private boolean isAnnualFeeExists() {
for (SavingsAccountCharge charge : this.charges()) { for (SavingsAccountCharge charge : this.charges()) {
if (charge.isAnnualFee()) { if (charge.isAnnualFee()) {
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountChargeAssembler.java
-7
View File
@@ -176,13 +176,6 @@ public class SavingsAccountChargeAssembler {
.failWithCodeNoParameterAddedToErrorCode("currency.and.charge.currency.not.same"); .failWithCodeNoParameterAddedToErrorCode("currency.and.charge.currency.not.same");
} }
if (charge.isWithdrawalFee()) {
if (isOneWithdrawalPresent) {
baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("multiple.withdrawal.fee.per.account.not.supported");
}
isOneWithdrawalPresent = true;
}
if (charge.isAnnualFee()) { if (charge.isAnnualFee()) {
if (isOneAnnualPresent) { if (isOneAnnualPresent) {
baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("multiple.annual.fee.per.account.not.supported"); baseDataValidator.reset().failWithCodeNoParameterAddedToErrorCode("multiple.annual.fee.per.account.not.supported");