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

fix issues around loan.

Browse Source
This commit is contained in:
Keith Woodlock
2012-08-18 11:21:18 +01:00
parent e21e0e9a2f
commit ccfd8a09e0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-db/0001a-mifos-platform-base-ddl-schema.sql
-1
View File
@@ -385,7 +385,6 @@ CREATE TABLE `m_loan` (
UNIQUE KEY `m_id` (`external_id`), UNIQUE KEY `m_id` (`external_id`),
KEY `FKB6F935D87179A0CB` (`client_id`), KEY `FKB6F935D87179A0CB` (`client_id`),
KEY `FKB6F935D8C8D4B434` (`product_id`), KEY `FKB6F935D8C8D4B434` (`product_id`),
KEY `FK7C885878B1147D1` (`loan_status_id`),
KEY `FK7C885877240145` (`fund_id`), KEY `FK7C885877240145` (`fund_id`),
KEY `FK_loan_ltp_strategy` (`loan_transaction_strategy_id`), KEY `FK_loan_ltp_strategy` (`loan_transaction_strategy_id`),
CONSTRAINT `FK_loan_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`), CONSTRAINT `FK_loan_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`),
mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
+6 -1
View File
@@ -203,7 +203,12 @@ public class Loan extends AbstractAuditableCustom<AppUser, Long> {
final LocalDate interestChargedFromDate, final LocalDate interestChargedFromDate,
final LoanLifecycleStateMachine lifecycleStateMachine) { final LoanLifecycleStateMachine lifecycleStateMachine) {
LoanStatus statusEnum = lifecycleStateMachine.transition(LoanEvent.LOAN_CREATED, LoanStatus.fromInt(this.loanStatus)); LoanStatus from = null;
if (this.loanStatus != null) {
from = LoanStatus.fromInt(this.loanStatus);
}
LoanStatus statusEnum = lifecycleStateMachine.transition(LoanEvent.LOAN_CREATED, from);
this.loanStatus = statusEnum.getValue(); this.loanStatus = statusEnum.getValue();
this.termFrequency = loanTermFrequency; this.termFrequency = loanTermFrequency;
mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java
+1 -1
View File
@@ -593,7 +593,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
return " tr.id as id, tr.transaction_type_enum as transactionType, tr.transaction_date as `date`, tr.amount as total, " return " tr.id as id, tr.transaction_type_enum as transactionType, tr.transaction_date as `date`, tr.amount as total, "
+ " l.currency_code as currencyCode, l.currency_digits as currencyDigits, rc.`name` as currencyName, rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode " + " l.currency_code as currencyCode, l.currency_digits as currencyDigits, rc.`name` as currencyName, rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode "
+ " from m_loan l " + " from m_loan l "
+ " join m_transaction tr on tr.loan_id = l.id" + " join m_loan_transaction tr on tr.loan_id = l.id"
+ " join m_currency rc on rc.`code` = l.currency_code "; + " join m_currency rc on rc.`code` = l.currency_code ";
} }