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

Merge branch 'FINERACT-53' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2016-07-29 15:05:22 +05:30
parent a232d1b1ae fd3b6323a4
commit a01d3e1fcc
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java
+8 -5
View File
@@ -273,12 +273,15 @@ public class LoansApiResource {
// for JLG loan both client and group details are required // for JLG loan both client and group details are required
if (templateType.equals("individual") || templateType.equals("jlg")) { if (templateType.equals("individual") || templateType.equals("jlg")) {
final LoanAccountData loanAccountClientDetails = this.loanReadPlatformService.retrieveClientDetailsTemplate(clientId); if(clientId == null) {
newLoanAccount = newLoanAccount == null ? LoanAccountData.emptyTemplate() : newLoanAccount;
} else {
final LoanAccountData loanAccountClientDetails = this.loanReadPlatformService.retrieveClientDetailsTemplate(clientId);
officeId = loanAccountClientDetails.officeId(); officeId = loanAccountClientDetails.officeId();
newLoanAccount = newLoanAccount == null ? loanAccountClientDetails : LoanAccountData.populateClientDefaults(newLoanAccount,
newLoanAccount = newLoanAccount == null ? loanAccountClientDetails : LoanAccountData.populateClientDefaults(newLoanAccount, loanAccountClientDetails);
loanAccountClientDetails); }
// if it's JLG loan add group details // if it's JLG loan add group details
if (templateType.equals("jlg")) { if (templateType.equals("jlg")) {
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanAccountData.java
+10
View File
@@ -1557,4 +1557,14 @@ public class LoanAccountData {
return (this.repaymentFrequencyType.getId().intValue() == PeriodFrequencyType.MONTHS.getValue()); return (this.repaymentFrequencyType.getId().intValue() == PeriodFrequencyType.MONTHS.getValue());
} }
/**
* Used to produce a {@link LoanAccountData} with only collateral options for now.
*
* @return {@link LoanAccountData} object
*/
public static LoanAccountData emptyTemplate() {
final Collection<CodeValueData> loanCollateralOptions = null;
return LoanAccountData.collateralTemplate(loanCollateralOptions);
}
} }