From 4c9ccd2d53e18f90ba7f158b2abe3af8d07e741e Mon Sep 17 00:00:00 2001 From: Madhukar Date: Wed, 4 Jun 2014 09:23:27 +0530 Subject: [PATCH] MIFOSX-1267 and fix for view loan audit entry --- .../commands/service/AuditReadPlatformServiceImpl.java | 2 +- .../loanaccount/api/LoanTransactionsApiResource.java | 2 +- .../portfolio/loanaccount/data/LoanAccountData.java | 4 ++++ .../portfolio/loanaccount/data/LoanSummaryData.java | 4 ++++ .../loanaccount/service/LoanReadPlatformService.java | 2 ++ .../service/LoanReadPlatformServiceImpl.java | 10 ++++++++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java index e52967e0c..769cf2dcd 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java @@ -379,7 +379,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { if (entityName.equalsIgnoreCase("LOAN") || entityName.equalsIgnoreCase("LOANPRODUCT")) { final String[] enumTypes = { "loanTermFrequencyType", "termFrequencyType", "repaymentFrequencyType", "amortizationType", - "interestType", "interestCalculationPeriodType", "interestRateFrequencyType", "loanType", "accountingRule" }; + "interestType", "interestCalculationPeriodType", "interestRateFrequencyType", "accountingRule" }; for (final String typeName : enumTypes) { if (commandAsJsonMap.containsKey(typeName)) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanTransactionsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanTransactionsApiResource.java index a5f95935d..b5eaff264 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanTransactionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoanTransactionsApiResource.java @@ -83,7 +83,7 @@ public class LoanTransactionsApiResource { } else if (is(commandParam, "waiveinterest")) { transactionData = this.loanReadPlatformService.retrieveWaiveInterestDetails(loanId); } else if (is(commandParam, "writeoff")) { - transactionData = this.loanReadPlatformService.retrieveNewClosureDetails(); + transactionData = this.loanReadPlatformService.retrieveLoanWriteoffTemplate(loanId); } else if (is(commandParam, "close-rescheduled")) { transactionData = this.loanReadPlatformService.retrieveNewClosureDetails(); } else if (is(commandParam, "close")) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java index e6118d103..92d306e19 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java @@ -1145,5 +1145,9 @@ public class LoanAccountData { public Long loanProductId() { return this.loanProductId; } + + public BigDecimal getTotalOutstandingAmount(){ + return this.summary.getTotalOutstanding(); + } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanSummaryData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanSummaryData.java index d874cb5aa..8c3362b2b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanSummaryData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanSummaryData.java @@ -98,4 +98,8 @@ public class LoanSummaryData { this.totalOverdue = totalOverdue; this.overdueSinceDate = overdueSinceDate; } + + public BigDecimal getTotalOutstanding() { + return this.totalOutstanding; + } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java index 20e4bf9cb..b4c133790 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java @@ -82,4 +82,6 @@ public interface LoanReadPlatformService { Collection retriveScheduleAccrualData(); LoanTransactionData retrieveRecoveryPaymentTemplate(Long loanId); + + LoanTransactionData retrieveLoanWriteoffTemplate(Long loanId); } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 12321a46d..503303718 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -1389,4 +1389,14 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { } + @Override + public LoanTransactionData retrieveLoanWriteoffTemplate(final Long loanId) { + + final LoanAccountData loan = this.retrieveOne(loanId); + + final LoanTransactionEnumData transactionType = LoanEnumerations.transactionType(LoanTransactionType.WRITEOFF); + return new LoanTransactionData(null, null, null, transactionType, null, loan.currency(), DateUtils.getLocalDateOfTenant(), + loan.getTotalOutstandingAmount(), null, null, null, null, null, null, null, null); + } + } \ No newline at end of file