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/09/22 08:21:44 UTC
[1/2] fineract git commit: FINERACT-494 Issue when selecting savings
account on client creation page
Repository: fineract
Updated Branches:
refs/heads/develop d857d8b47 -> fcb5ba30c
FINERACT-494 Issue when selecting savings account on client creation page
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/61e6214f
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/61e6214f
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/61e6214f
Branch: refs/heads/develop
Commit: 61e6214fa671e9cbb1cd9a176daf35f585c07aba
Parents: df16dc3
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Sep 13 19:49:45 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Sep 13 19:49:45 2017 +0530
----------------------------------------------------------------------
.../SavingsProductReadPlatformServiceImpl.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/fineract/blob/61e6214f/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java
index 4758b01..fec8a21 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java
@@ -262,14 +262,19 @@ public class SavingsProductReadPlatformServiceImpl implements SavingsProductRead
if (isOverdraftType != null) {
if (inClauseAdded) {
- sql += " and sp.allow_overdraft=?";
+ sql += " and sp.allow_overdraft=? and sp.deposit_type_enum = ?";
} else {
- sql += " where sp.allow_overdraft=?";
+ sql += " where sp.allow_overdraft=? and sp.deposit_type_enum = ?";
}
- return this.jdbcTemplate.query(sql, this.savingsProductLookupsRowMapper, isOverdraftType);
+ return this.jdbcTemplate.query(sql, this.savingsProductLookupsRowMapper, new Object[] {isOverdraftType, DepositAccountType.SAVINGS_DEPOSIT.getValue() });
}
-
- return this.jdbcTemplate.query(sql, this.savingsProductLookupsRowMapper);
+
+ if(inClauseAdded) {
+ sql += " and sp.deposit_type_enum = ?";
+ }else {
+ sql += " where sp.deposit_type_enum = ?";
+ }
+ return this.jdbcTemplate.query(sql, this.savingsProductLookupsRowMapper, new Object[] { DepositAccountType.SAVINGS_DEPOSIT.getValue() });
}
[2/2] fineract git commit: Merge branch 'FINERACT-494' into develop
Posted by na...@apache.org.
Merge branch 'FINERACT-494' into develop
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/fcb5ba30
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/fcb5ba30
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/fcb5ba30
Branch: refs/heads/develop
Commit: fcb5ba30c3a82126a22031a74be4257131d286a5
Parents: d857d8b 61e6214
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Fri Sep 22 13:51:20 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Fri Sep 22 13:51:20 2017 +0530
----------------------------------------------------------------------
.../SavingsProductReadPlatformServiceImpl.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------