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

Merge pull request #1163 from pramodn02/develop

Browse Source 
MIFOSX-1709 : corrected condition to add and delete guarantor
This commit is contained in:
Vishwas Babu A J
2014-12-04 08:35:43 -08:00
parent d69e2de0ac 65d9ca11bf
commit 09e2d04a6e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
+4 -2
View File
@@ -105,7 +105,7 @@ public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements Guaranto
GuarantorFundStatusType.ACTIVE.getValue(), guarantorCommand.getAmount()); GuarantorFundStatusType.ACTIVE.getValue(), guarantorCommand.getAmount());
guarantorFundingDetails.add(fundingDetails); guarantorFundingDetails.add(fundingDetails);
if (loan.isDisbursed() || loan.isApproved() if (loan.isDisbursed() || loan.isApproved()
|| (loan.getGuaranteeAmount() != null || loan.loanProduct().isHoldGuaranteeFundsEnabled())) { && (loan.getGuaranteeAmount() != null || loan.loanProduct().isHoldGuaranteeFundsEnabled())) {
this.guarantorDomainService.assignGuarantor(fundingDetails, LocalDate.now()); this.guarantorDomainService.assignGuarantor(fundingDetails, LocalDate.now());
loan.updateGuaranteeAmount(fundingDetails.getAmount()); loan.updateGuaranteeAmount(fundingDetails.getAmount());
} }
@@ -232,7 +232,9 @@ public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements Guaranto
if (guarantorForDelete == null || (guarantorFundingId == null && !guarantorForDelete.getGuarantorFundDetails().isEmpty())) { throw new GuarantorNotFoundException( if (guarantorForDelete == null || (guarantorFundingId == null && !guarantorForDelete.getGuarantorFundDetails().isEmpty())) { throw new GuarantorNotFoundException(
loanId, guarantorId, guarantorFundingId); } loanId, guarantorId, guarantorFundingId); }
CommandProcessingResult commandProcessingResult = removeGuarantor(guarantorForDelete, loanId, guarantorFundingId); CommandProcessingResult commandProcessingResult = removeGuarantor(guarantorForDelete, loanId, guarantorFundingId);
this.guarantorDomainService.validateGuarantorBusinessRules(loan); if (loan.isApproved() || loan.isDisbursed()) {
this.guarantorDomainService.validateGuarantorBusinessRules(loan);
}
return commandProcessingResult; return commandProcessingResult;
} }