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

Merge pull request #909 from erikbarbara/MIFOSX-709

Browse Source 
MIFOSX-709: adding functionality to prevent closing of client with overd...
This commit is contained in:
Vishwas Babu A J
2014-05-15 12:33:17 +05:30
parent 363ca7dc0e ab23a26ab2
commit b2771704f6
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+4 -1
View File
@@ -426,7 +426,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
ClientApiConstants.CLIENT_CLOSURE_REASON, closureReasonId); ClientApiConstants.CLIENT_CLOSURE_REASON, closureReasonId);
if (ClientStatus.fromInt(client.getStatus()).isClosed()) { if (ClientStatus.fromInt(client.getStatus()).isClosed()) {
final String errorMessage = "Client is alread closed."; final String errorMessage = "Client is already closed.";
throw new InvalidClientStateTransitionException("close", "is.already.closed", errorMessage); throw new InvalidClientStateTransitionException("close", "is.already.closed", errorMessage);
} else if (ClientStatus.fromInt(client.getStatus()).isUnderTransfer()) { } else if (ClientStatus.fromInt(client.getStatus()).isUnderTransfer()) {
final String errorMessage = "Cannot Close a Client under Transfer"; final String errorMessage = "Cannot Close a Client under Transfer";
@@ -456,6 +456,9 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
} else if (loanStatus.isAwaitingDisbursal()) { } else if (loanStatus.isAwaitingDisbursal()) {
final String errorMessage = "Client cannot be closed because of non-closed loans."; final String errorMessage = "Client cannot be closed because of non-closed loans.";
throw new InvalidClientStateTransitionException("close", "loan.non-closed", errorMessage); throw new InvalidClientStateTransitionException("close", "loan.non-closed", errorMessage);
} else if (loanStatus.isOverpaid()) {
final String errorMessage = "Client cannot be closed because of overpaid loans.";
throw new InvalidClientStateTransitionException("close", "loan.non-closed", errorMessage);
} }
} }
final List<SavingsAccount> clientSavingAccounts = this.savingsRepository.findSavingAccountByClientId(clientId); final List<SavingsAccount> clientSavingAccounts = this.savingsRepository.findSavingAccountByClientId(clientId);
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/LoanStatusMapper.java
+4
View File
@@ -36,4 +36,8 @@ public class LoanStatusMapper {
public boolean isClosed() { public boolean isClosed() {
return Integer.valueOf(600).equals(this.statusId) || isWithdrawnByClient() || isRejected(); return Integer.valueOf(600).equals(this.statusId) || isWithdrawnByClient() || isRejected();
} }
public boolean isOverpaid() {
return Integer.valueOf(700).equals(this.statusId);
}
} }