Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31CEC200C6C for ; Fri, 5 May 2017 14:22:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3048A160BBF; Fri, 5 May 2017 12:22:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 76D0D160B97 for ; Fri, 5 May 2017 14:22:34 +0200 (CEST) Received: (qmail 9090 invoked by uid 500); 5 May 2017 12:22:33 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 9081 invoked by uid 99); 5 May 2017 12:22:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 May 2017 12:22:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 42ECFC0587 for ; Fri, 5 May 2017 12:22:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 48HAtqjyXp7y for ; Fri, 5 May 2017 12:22:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id CB3265F36B for ; Fri, 5 May 2017 12:22:31 +0000 (UTC) Received: (qmail 9078 invoked by uid 99); 5 May 2017 12:22:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 May 2017 12:22:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E92FEE0016; Fri, 5 May 2017 12:22:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nazeer1100126@apache.org To: commits@fineract.incubator.apache.org Date: Fri, 05 May 2017 12:22:30 -0000 Message-Id: <54f3e1d7fcac4df1a8586a45d76411c3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-fineract git commit: bulk jlg loan bug fixes archived-at: Fri, 05 May 2017 12:22:35 -0000 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 Authored: Wed May 3 14:33:42 2017 +0530 Committer: nazeer1100126 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 { 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); } }