Skip to content

Commit 99a8e92

Browse files
danishjamal104danishjamal104
authored
Merge pull request #57 from openMF/development
contains fineract-1363,1364,1365,1366,1369,1370 fixes
2 parents fab8421 + 0887a59 commit 99a8e92

File tree

1,223 files changed

+3582
-2655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,223 files changed

+3582
-2655
lines changed

‎README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To use library in your gradle project follow the steps below:
2020
2. Add the dependency
2121
```groovy
2222
dependencies {
23-
def client_Version = "replace with version number"
23+
def client_Version = "2.02"
2424
implementation "com.github.openMF:fineract-client:$client_Version"
2525
}
2626
```
@@ -43,7 +43,7 @@ To use the library in your Maven project, follow the steps below:
4343
<dependency>
4444
<groupId>com.github.openMF</groupId>
4545
<artifactId>fineract-client</artifactId>
46-
<version>2.0.0</version>
46+
<version>2.0.2</version>
4747
</dependency>
4848
```
4949

@@ -63,8 +63,12 @@ public class Main {
6363
.basicAuth("mifos", "password")
6464
.tenant("default")
6565
.build();
66-
String body = "{\"username\": \"mifos\", \"password\": \"password\"}";
67-
client.authentication.authenticate(false, body)
66+
67+
PostAuthenticationRequest body = new PostAuthenticationRequest();
68+
body.setUsername("mifos");
69+
body.setPassword("password");
70+
71+
client.authentication.authenticate(body, false)
6872
.observeOn(Schedulers.newThread()) // use scheduler based on different scenarios, in case of android use 'AndroidSchedulers.mainThread()'
6973
.subscribeOn(Schedulers.io())
7074
.subscribe(new Subscriber<PostAuthenticationResponse> (){

‎docs/AppUser.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Name | Type | Description | Notes
2323
**lastTimePasswordUpdated** | [**Date**](Date.md) | | [optional]
2424
**passwordNeverExpires** | **Boolean** | | [optional]
2525
**appUserClientMappings** | [**List&lt;AppUserClientMapping&gt;**](AppUserClientMapping.md) | | [optional]
26-
**authorities** | [**List&lt;GrantedAuthority&gt;**](GrantedAuthority.md) | | [optional]
27-
**displayName** | **String** | | [optional]
28-
**selfServiceUser** | **Boolean** | | [optional]
29-
**systemUser** | **Boolean** | | [optional]
3026
**staffId** | **Long** | | [optional]
3127
**staffDisplayName** | **String** | | [optional]
3228
**notEnabled** | **Boolean** | | [optional]
29+
**selfServiceUser** | **Boolean** | | [optional]
30+
**systemUser** | **Boolean** | | [optional]
31+
**displayName** | **String** | | [optional]
32+
**authorities** | [**List&lt;GrantedAuthority&gt;**](GrantedAuthority.md) | | [optional]
3333
**_new** | **Boolean** | | [optional]
3434

3535

‎docs/AuthenticationHttpBasicApi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Method | HTTP request | Description
1010

1111
## authenticate
1212

13-
> PostAuthenticationResponse authenticate(returnClientList, body)
13+
> PostAuthenticationResponse authenticate(postAuthenticationRequest, returnClientList)
1414
1515
Verify authentication
1616

@@ -44,10 +44,10 @@ public class Example {
4444
//tenantid.setApiKeyPrefix("Token");
4545

4646
AuthenticationHttpBasicApi apiInstance = new AuthenticationHttpBasicApi(defaultClient);
47+
PostAuthenticationRequest postAuthenticationRequest = new PostAuthenticationRequest(); // PostAuthenticationRequest |
4748
Boolean returnClientList = false; // Boolean |
48-
String body = "body_example"; // String |
4949
try {
50-
PostAuthenticationResponse result = apiInstance.authenticate(returnClientList, body);
50+
PostAuthenticationResponse result = apiInstance.authenticate(postAuthenticationRequest, returnClientList);
5151
System.out.println(result);
5252
} catch (ApiException e) {
5353
System.err.println("Exception when calling AuthenticationHttpBasicApi#authenticate");
@@ -65,8 +65,8 @@ public class Example {
6565

6666
Name | Type | Description | Notes
6767
------------- | ------------- | ------------- | -------------
68+
**postAuthenticationRequest** | [**PostAuthenticationRequest**](PostAuthenticationRequest.md)| |
6869
**returnClientList** | **Boolean**| | [optional] [default to false]
69-
**body** | **String**| | [optional]
7070

7171
### Return type
7272

‎docs/BodyPart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Name | Type | Description | Notes
1111
**mediaType** | [**BodyPartMediaType**](BodyPartMediaType.md) | | [optional]
1212
**parent** | [**MultiPart**](MultiPart.md) | | [optional]
1313
**providers** | [**Object**](.md) | | [optional]
14-
**contentDisposition** | [**ContentDisposition**](ContentDisposition.md) | | [optional]
1514
**parameterizedHeaders** | [**Map&lt;String, List&lt;ParameterizedHeader&gt;&gt;**](List.md) | | [optional]
15+
**contentDisposition** | [**ContentDisposition**](ContentDisposition.md) | | [optional]
1616

1717

1818

‎docs/Charge.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ Name | Type | Description | Notes
2121
**maxCap** | [**BigDecimal**](BigDecimal.md) | | [optional]
2222
**account** | [**GLAccount**](GLAccount.md) | | [optional]
2323
**taxGroup** | [**TaxGroup**](TaxGroup.md) | | [optional]
24-
**loanCharge** | **Boolean** | | [optional]
25-
**clientCharge** | **Boolean** | | [optional]
26-
**feeOnMonthDay** | [**ChargeFeeOnMonthDay**](ChargeFeeOnMonthDay.md) | | [optional]
24+
**percentageOfDisbursementAmount** | **Boolean** | | [optional]
2725
**allowedSavingsChargeCalculationType** | **Boolean** | | [optional]
2826
**allowedClientChargeCalculationType** | **Boolean** | | [optional]
29-
**percentageOfDisbursementAmount** | **Boolean** | | [optional]
30-
**annualFee** | **Boolean** | | [optional]
31-
**monthlyFee** | **Boolean** | | [optional]
32-
**savingsCharge** | **Boolean** | | [optional]
33-
**allowedLoanChargeTime** | **Boolean** | | [optional]
34-
**allowedClientChargeTime** | **Boolean** | | [optional]
3527
**allowedSavingsChargeTime** | **Boolean** | | [optional]
3628
**percentageOfApprovedAmount** | **Boolean** | | [optional]
3729
**overdueInstallment** | **Boolean** | | [optional]
3830
**disbursementCharge** | **Boolean** | | [optional]
31+
**loanCharge** | **Boolean** | | [optional]
32+
**clientCharge** | **Boolean** | | [optional]
33+
**allowedLoanChargeTime** | **Boolean** | | [optional]
34+
**allowedClientChargeTime** | **Boolean** | | [optional]
35+
**annualFee** | **Boolean** | | [optional]
36+
**monthlyFee** | **Boolean** | | [optional]
37+
**savingsCharge** | **Boolean** | | [optional]
38+
**feeOnMonthDay** | [**ChargeFeeOnMonthDay**](ChargeFeeOnMonthDay.md) | | [optional]
3939
**_new** | **Boolean** | | [optional]
4040

4141

‎docs/Client.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ Name | Type | Description | Notes
2727
**legalForm** | **Integer** | | [optional]
2828
**reopenedDate** | [**Date**](Date.md) | | [optional]
2929
**proposedTransferDate** | [**Date**](Date.md) | | [optional]
30-
**closed** | **Boolean** | | [optional]
31-
**active** | **Boolean** | | [optional]
32-
**pending** | **Boolean** | | [optional]
33-
**rejected** | **Boolean** | | [optional]
34-
**activationLocalDate** | [**Date**](Date.md) | | [optional]
3530
**transferInProgress** | **Boolean** | | [optional]
3631
**transferOnHold** | **Boolean** | | [optional]
3732
**notPending** | **Boolean** | | [optional]
3833
**transferInProgressOrOnHold** | **Boolean** | | [optional]
3934
**notActive** | **Boolean** | | [optional]
35+
**closed** | **Boolean** | | [optional]
36+
**active** | **Boolean** | | [optional]
37+
**rejected** | **Boolean** | | [optional]
38+
**pending** | **Boolean** | | [optional]
4039
**officeJoiningLocalDate** | [**Date**](Date.md) | | [optional]
41-
**withdrawn** | **Boolean** | | [optional]
4240
**notStaff** | **Boolean** | | [optional]
41+
**withdrawn** | **Boolean** | | [optional]
4342
**rejectedDate** | [**Date**](Date.md) | | [optional]
43+
**activationLocalDate** | [**Date**](Date.md) | | [optional]
4444
**_new** | **Boolean** | | [optional]
4545

4646

‎docs/CommandWrapper.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Name | Type | Description | Notes
2323
**update** | **Boolean** | | [optional]
2424
**create** | **Boolean** | | [optional]
2525
**createDatatable** | **Boolean** | | [optional]
26+
**delete** | **Boolean** | | [optional]
2627
**deleteDatatable** | **Boolean** | | [optional]
2728
**updateDatatable** | **Boolean** | | [optional]
2829
**datatableResource** | **Boolean** | | [optional]
@@ -34,7 +35,6 @@ Name | Type | Description | Notes
3435
**noteResource** | **Boolean** | | [optional]
3536
**cacheResource** | **Boolean** | | [optional]
3637
**updateOperation** | **Boolean** | | [optional]
37-
**delete** | **Boolean** | | [optional]
3838
**deleteOperation** | **Boolean** | | [optional]
3939
**surveyResource** | **Boolean** | | [optional]
4040
**registerSurvey** | **Boolean** | | [optional]

‎docs/DataTablesApi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Name | Type | Description | Notes
100100

101101
## createDatatableEntry
102102

103-
> PostDataTablesAppTableIdResponse createDatatableEntry(datatable, apptableId, postDataTablesAppTableIdRequest)
103+
> PostDataTablesAppTableIdResponse createDatatableEntry(datatable, apptableId, body)
104104
105105
Create Entry in Data Table
106106

@@ -136,9 +136,9 @@ public class Example {
136136
DataTablesApi apiInstance = new DataTablesApi(defaultClient);
137137
String datatable = "datatable_example"; // String | datatable
138138
Long apptableId = 56L; // Long | apptableId
139-
PostDataTablesAppTableIdRequest postDataTablesAppTableIdRequest = new PostDataTablesAppTableIdRequest(); // PostDataTablesAppTableIdRequest |
139+
String body = "body_example"; // String | { \"BusinessDescription\": \"Livestock sales\", \"Comment\": \"First comment made\", \"Education_cv\": \"Primary\", \"Gender_cd\": 6, \"HighestRatePaid\": 8.5, \"NextVisit\": \"01 October 2012\", \"YearsinBusiness\": 5, \"dateFormat\": \"dd MMMM yyyy\", \"locale\": \"en\" }
140140
try {
141-
PostDataTablesAppTableIdResponse result = apiInstance.createDatatableEntry(datatable, apptableId, postDataTablesAppTableIdRequest);
141+
PostDataTablesAppTableIdResponse result = apiInstance.createDatatableEntry(datatable, apptableId, body);
142142
System.out.println(result);
143143
} catch (ApiException e) {
144144
System.err.println("Exception when calling DataTablesApi#createDatatableEntry");
@@ -158,7 +158,7 @@ Name | Type | Description | Notes
158158
------------- | ------------- | ------------- | -------------
159159
**datatable** | **String**| datatable |
160160
**apptableId** | **Long**| apptableId |
161-
**postDataTablesAppTableIdRequest** | [**PostDataTablesAppTableIdRequest**](PostDataTablesAppTableIdRequest.md)| |
161+
**body** | **String**| { \&quot;BusinessDescription\&quot;: \&quot;Livestock sales\&quot;, \&quot;Comment\&quot;: \&quot;First comment made\&quot;, \&quot;Education_cv\&quot;: \&quot;Primary\&quot;, \&quot;Gender_cd\&quot;: 6, \&quot;HighestRatePaid\&quot;: 8.5, \&quot;NextVisit\&quot;: \&quot;01 October 2012\&quot;, \&quot;YearsinBusiness\&quot;: 5, \&quot;dateFormat\&quot;: \&quot;dd MMMM yyyy\&quot;, \&quot;locale\&quot;: \&quot;en\&quot; } |
162162

163163
### Return type
164164

‎docs/FormDataBodyPart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ Name | Type | Description | Notes
1111
**mediaType** | [**BodyPartMediaType**](BodyPartMediaType.md) | | [optional]
1212
**parent** | [**MultiPart**](MultiPart.md) | | [optional]
1313
**providers** | [**Object**](.md) | | [optional]
14+
**simple** | **Boolean** | | [optional]
1415
**name** | **String** | | [optional]
1516
**value** | **String** | | [optional]
16-
**simple** | **Boolean** | | [optional]
17-
**contentDisposition** | [**ContentDisposition**](ContentDisposition.md) | | [optional]
1817
**formDataContentDisposition** | [**FormDataContentDisposition**](FormDataContentDisposition.md) | | [optional]
18+
**contentDisposition** | [**ContentDisposition**](ContentDisposition.md) | | [optional]
1919
**parameterizedHeaders** | [**Map&lt;String, List&lt;ParameterizedHeader&gt;&gt;**](List.md) | | [optional]
2020

2121

‎docs/GLAccount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Name | Type | Description | Notes
1414
**manualEntriesAllowed** | **Boolean** | | [optional]
1515
**type** | **Integer** | | [optional]
1616
**usage** | **Integer** | | [optional]
17-
**detailAccount** | **Boolean** | | [optional]
1817
**headerAccount** | **Boolean** | | [optional]
18+
**detailAccount** | **Boolean** | | [optional]
1919
**_new** | **Boolean** | | [optional]
2020

2121

0 commit comments

Comments
 (0)