You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/05/05 12:22:30 UTC
[1/2] incubator-fineract git commit: bulk jlg loan bug fixes
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 00e785860 -> 5c9729af3
bulk jlg loan bug fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/7e3b04cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/7e3b04cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/7e3b04cc
Branch: refs/heads/develop
Commit: 7e3b04ccd13bd3e2e55b8d8a9940d577747b7f09
Parents: 8baf9f4
Author: nazeer1100126 <na...@confluxtechnologies.com>
Authored: Wed May 3 14:33:42 2017 +0530
Committer: nazeer1100126 <na...@confluxtechnologies.com>
Committed: Wed May 3 14:33:42 2017 +0530
----------------------------------------------------------------------
.../fineract/portfolio/loanproduct/data/LoanProductData.java | 3 +--
.../loanproduct/service/LoanProductReadPlatformServiceImpl.java | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/7e3b04cc/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java
index 44ade21..d95fcce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java
@@ -187,7 +187,7 @@ public class LoanProductData {
/**
* Used when returning lookup information about loan product for dropdowns.
*/
- public static LoanProductData lookup(final Long id, final String name) {
+ public static LoanProductData lookup(final Long id, final String name, final Boolean multiDisburseLoan ) {
final String shortName = null;
final String description = null;
final CurrencyData currency = null;
@@ -241,7 +241,6 @@ public class LoanProductData {
final LocalDate closeDate = null;
final String status = null;
final String externalId = null;
- final Boolean multiDisburseLoan = null;
final Integer maxTrancheCount = null;
final BigDecimal outstandingLoanBalance = null;
final LoanProductGuaranteeData productGuaranteeData = null;
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/7e3b04cc/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
index 6e416e7..903503d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
@@ -469,7 +469,7 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo
private static final class LoanProductLookupMapper implements RowMapper<LoanProductData> {
public String schema() {
- return "lp.id as id, lp.name as name from m_product_loan lp";
+ return "lp.id as id, lp.name as name, lp.allow_multiple_disbursals as multiDisburseLoan from m_product_loan lp";
}
public String activeOnlySchema() {
@@ -494,8 +494,9 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo
final Long id = rs.getLong("id");
final String name = rs.getString("name");
+ final Boolean multiDisburseLoan = rs.getBoolean("multiDisburseLoan");
- return LoanProductData.lookup(id, name);
+ return LoanProductData.lookup(id, name, multiDisburseLoan);
}
}
[2/2] incubator-fineract git commit: Merge branch 'bulk_jlg' into
develop
Posted by na...@apache.org.
Merge branch 'bulk_jlg' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/5c9729af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/5c9729af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/5c9729af
Branch: refs/heads/develop
Commit: 5c9729af3cc170fdf0059906e5e2554a33a65245
Parents: 00e7858 7e3b04c
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Fri May 5 17:52:09 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Fri May 5 17:52:09 2017 +0530
----------------------------------------------------------------------
.../fineract/portfolio/loanproduct/data/LoanProductData.java | 3 +--
.../loanproduct/service/LoanProductReadPlatformServiceImpl.java | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------