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

Merge pull request #1387 from chandrikamohith/MIFOSX-2037

Browse Source 
MIFOSX-2037 Payment type is getting displayed in Individual collectio…
This commit is contained in:
Vishwas Babu A J
2015-05-18 14:55:27 -07:00
parent acf3c74f37 298f3384cf
commit d7e301c5d4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/data/IndividualCollectionSheetData.java
+4 -4
View File
@@ -8,7 +8,7 @@ package org.mifosplatform.portfolio.collectionsheet.data;
import java.util.Collection; import java.util.Collection;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.mifosplatform.infrastructure.codes.data.CodeValueData; import org.mifosplatform.portfolio.paymenttype.data.PaymentTypeData;
/** /**
* Immutable data object for collection sheet. * Immutable data object for collection sheet.
@@ -21,15 +21,15 @@ public class IndividualCollectionSheetData {
private final Collection<IndividualClientData> clients; private final Collection<IndividualClientData> clients;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final Collection<CodeValueData> paymentTypeOptions; private final Collection<PaymentTypeData> paymentTypeOptions;
public static IndividualCollectionSheetData instance(final LocalDate date, final Collection<IndividualClientData> clients, public static IndividualCollectionSheetData instance(final LocalDate date, final Collection<IndividualClientData> clients,
final Collection<CodeValueData> paymentTypeOptions) { final Collection<PaymentTypeData> paymentTypeOptions) {
return new IndividualCollectionSheetData(date, clients, paymentTypeOptions); return new IndividualCollectionSheetData(date, clients, paymentTypeOptions);
} }
private IndividualCollectionSheetData(final LocalDate dueDate, final Collection<IndividualClientData> clients, private IndividualCollectionSheetData(final LocalDate dueDate, final Collection<IndividualClientData> clients,
final Collection<CodeValueData> paymentTypeOptions) { final Collection<PaymentTypeData> paymentTypeOptions) {
this.dueDate = dueDate; this.dueDate = dueDate;
this.clients = clients; this.clients = clients;
this.paymentTypeOptions = paymentTypeOptions; this.paymentTypeOptions = paymentTypeOptions;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java
+2 -3
View File
@@ -673,9 +673,8 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe
// merge savings data into loan data // merge savings data into loan data
mergeLoanData(collectionSheetFlatDatas, (List<IndividualClientData>) clientData); mergeLoanData(collectionSheetFlatDatas, (List<IndividualClientData>) clientData);
Collection<CodeValueData> paymentOptions = this.codeValueReadPlatformService final Collection<PaymentTypeData> paymentOptions = this.paymentTypeReadPlatformService.retrieveAllPaymentTypes();
.retrieveCodeValuesByCode(PaymentDetailConstants.paymentTypeCodeName);
return IndividualCollectionSheetData.instance(transactionDate, clientData, paymentOptions); return IndividualCollectionSheetData.instance(transactionDate, clientData, paymentOptions);