You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by vo...@apache.org on 2020/06/19 22:04:13 UTC

[fineract] branch develop updated (982d3d3 -> 00a8fee)

This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.


    from 982d3d3  Update dependency gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin to v4.4.1
     new bcac0c0  fixed bug
     new 1c88ad0  modified glim-approval test-case
     new 00a8fee  modification in glim_approval in apiLive.htm

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../integrationtests/common/loans/LoanApplicationTestBuilder.java   | 6 ++++++
 .../integrationtests/common/loans/LoanTransactionHelper.java        | 1 -
 .../service/GLIMAccountInfoWritePlatformServiceImpl.java            | 2 +-
 .../fineract/portfolio/savings/domain/SavingsAccountAssembler.java  | 1 -
 fineract-provider/src/main/resources/static/api-docs/apiLive.htm    | 6 ++++--
 5 files changed, 11 insertions(+), 5 deletions(-)


[fineract] 03/03: modification in glim_approval in apiLive.htm

Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 00a8feea8fe85e0dd51804f73bb6f40c6001f8f5
Author: rrpawar96 <rr...@gmail.com>
AuthorDate: Fri Jun 19 02:27:14 2020 +0530

    modification in glim_approval in apiLive.htm
---
 fineract-provider/src/main/resources/static/api-docs/apiLive.htm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fineract-provider/src/main/resources/static/api-docs/apiLive.htm b/fineract-provider/src/main/resources/static/api-docs/apiLive.htm
index 56636cc..129b099 100644
--- a/fineract-provider/src/main/resources/static/api-docs/apiLive.htm
+++ b/fineract-provider/src/main/resources/static/api-docs/apiLive.htm
@@ -12210,7 +12210,7 @@ Request Body:
         <td><div class="fineractHeading2">Mandatory Fields</div></td>
         </tr>
         <tr class=alt>
-        <td> loanId, approvedOnDate, dateFormat, locale</td>
+        <td> loanId, approvedOnDate, dateFormat, locale, glimPrincipal</td>
         </tr>
       </table>
     </div>
@@ -12230,7 +12230,9 @@ Request Body:
       "dateFormat":"dd MMMM yyyy",
       "locale":"en"
     }
-  ]
+  ],
+"glimPrincipal":1000,
+"locale"="en"
 }
     </code>
 


[fineract] 02/03: modified glim-approval test-case

Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 1c88ad0bd86e3a65f982bc83d4c793ac700b563f
Author: rrpawar96 <rr...@gmail.com>
AuthorDate: Fri Jun 19 17:24:01 2020 +0530

    modified glim-approval test-case
---
 .../integrationtests/common/loans/LoanApplicationTestBuilder.java   | 6 ++++++
 .../integrationtests/common/loans/LoanTransactionHelper.java        | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
index 4d9c7af..487e581 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
@@ -43,6 +43,7 @@ public class LoanApplicationTestBuilder {
     public static final String RBI_INDIA_STRATEGY = "4";
 
     private String principal = "10,000";
+    private String glimPrincipal = "1000";
     private String loanTermFrequency = "";
     private String loanTermFrequencyType = "";
     private String numberOfRepayment = "0";
@@ -116,6 +117,11 @@ public class LoanApplicationTestBuilder {
             map.put("approvalFormData", this.approvalFormData);
         }
 
+        if (this.glimPrincipal != null) {
+            map.put("glimPrincipal", this.glimPrincipal);
+        }
+        map.put("locale", "en_GB");
+
         String approvalFormData = new Gson().toJson(map);
         LOG.info("approvalFormData: {} ", approvalFormData);
         return approvalFormData;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
index 9654eb4..f9312b9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
@@ -237,7 +237,6 @@ public class LoanTransactionHelper {
                 undoLastDisburseJson);
     }
 
-    // glimtesting
     public HashMap approveGlimAccount(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
             final List<Map<String, Object>> approvalFormData, final Integer glimID) {
         String approvalForm = new LoanApplicationTestBuilder() //


[fineract] 01/03: fixed bug

Posted by vo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit bcac0c0e7e602dc1a6edaeba0746cbbf6b4a794b
Author: rrpawar96 <rr...@gmail.com>
AuthorDate: Fri Jun 19 02:03:29 2020 +0530

    fixed bug
---
 .../loanaccount/service/GLIMAccountInfoWritePlatformServiceImpl.java    | 2 +-
 .../fineract/portfolio/savings/domain/SavingsAccountAssembler.java      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoWritePlatformServiceImpl.java
index b5e3c90..23ca795 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoWritePlatformServiceImpl.java
@@ -48,7 +48,7 @@ public class GLIMAccountInfoWritePlatformServiceImpl implements GLIMAccountInfoW
     @Override
     public void addGLIMAccountInfo(String accountNumber, Group group, BigDecimal principalAmount, Long childAccountsCount,
             Boolean isAcceptingChild, Integer loanStatus, BigDecimal applicationId) {
-        childAccountsCount = 2L;
+
         GroupLoanIndividualMonitoringAccount glimAccountInfo = GroupLoanIndividualMonitoringAccount.getInstance(accountNumber, group,
                 principalAmount, childAccountsCount, isAcceptingChild, loanStatus, applicationId);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
index 5c788d1..be1cce6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
@@ -158,7 +158,6 @@ public class SavingsAccountAssembler {
         }
 
         if ((Boolean) command.booleanPrimitiveValueOfParameterNamed("isGSIM") != null) {
-            LOG.info("setting system to gsim");
             if (command.booleanPrimitiveValueOfParameterNamed("isGSIM")) {
                 accountType = AccountType.GSIM;
             }