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 2016/09/06 07:06:44 UTC
[1/2] incubator-fineract git commit: [MIFOSX-2731] Combined both
savings charges and penalties into charges dropdown
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 9e68c4d5b -> 19c0defe4
[MIFOSX-2731] Combined both savings charges and penalties into charges dropdown
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/95ebe210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/95ebe210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/95ebe210
Branch: refs/heads/develop
Commit: 95ebe210ee3bfef742f785cef37514b19234f93f
Parents: ca1aded
Author: Vishwa <vi...@confluxtechnologies.com>
Authored: Thu Sep 1 11:05:40 2016 +0530
Committer: Vishwa <vi...@confluxtechnologies.com>
Committed: Thu Sep 1 11:05:40 2016 +0530
----------------------------------------------------------------------
.../fineract/portfolio/savings/api/SavingsProductsApiResource.java | 2 +-
.../savings/service/SavingsAccountReadPlatformServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/95ebe210/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java
index 567d401..843013a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResource.java
@@ -254,7 +254,7 @@ public class SavingsProductsApiResource {
.retrieveAccountMappingOptionsForSavingsProducts();
// charges
- final boolean feeChargesOnly = true;
+ final boolean feeChargesOnly = false;
Collection<ChargeData> chargeOptions = this.chargeReadPlatformService.retrieveSavingsProductApplicableCharges(feeChargesOnly);
chargeOptions = CollectionUtils.isEmpty(chargeOptions) ? null : chargeOptions;
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/95ebe210/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
index c4e3bce..fc6c5cb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java
@@ -677,7 +677,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead
final Collection<SavingsAccountTransactionData> transactions = null;
final Collection<SavingsAccountChargeData> charges = null;
- final boolean feeChargesOnly = true;
+ final boolean feeChargesOnly = false;
final Collection<ChargeData> chargeOptions = this.chargeReadPlatformService
.retrieveSavingsProductApplicableCharges(feeChargesOnly);
[2/2] incubator-fineract git commit: Merge branch 'MIFOSX-2731' into
develop
Posted by na...@apache.org.
Merge branch 'MIFOSX-2731' 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/19c0defe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/19c0defe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/19c0defe
Branch: refs/heads/develop
Commit: 19c0defe4473409084d9ba113c885b48709e8cc8
Parents: 9e68c4d 95ebe21
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Tue Sep 6 12:31:41 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Tue Sep 6 12:31:41 2016 +0530
----------------------------------------------------------------------
.../fineract/portfolio/savings/api/SavingsProductsApiResource.java | 2 +-
.../savings/service/SavingsAccountReadPlatformServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------