[GitHub] ebenezergraham removed a comment on issue #4: Unit and component Tests, Rest and command updates and Bug Fixes
ebenezergraham removed a comment on issue #4: Unit and component Tests,Rest and command updates and Bug Fixes URL: https://github.com/apache/fineract-cn-notifications/pull/4#issuecomment-414883232 @awasum In an attempt to clean up this repository I messed up my original fork and so I have deleted it and created this one. But the good news is that now I under how to properly squash commits :smile: This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham closed pull request #4: Unit and component Tests, Rest and command updates and Bug Fixes
ebenezergraham closed pull request #4: Unit and component Tests,Rest and command updates and Bug Fixes URL: https://github.com/apache/fineract-cn-notifications/pull/4 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham opened a new pull request #5: Unit and component Tests, Rest and command updates and Bug Fixes
ebenezergraham opened a new pull request #5: Unit and component Tests,Rest and command updates and Bug Fixes URL: https://github.com/apache/fineract-cn-notifications/pull/5 Added dependencies to shared Gradle file Created new group IDs for SMS and Email management Added creation and finding operations to the client manager Created modified Email and SMS configuration domain objects Created SMS and Email pages to support fims operations Created Post and Get Constants for creating and retrieving Configuration entitiies Created Unit tests for Email and SMS confiurations objects Created component tests to test SMS and Email services Created Domain Object Generator to help with testing Created Command and command handlers, created mappers and refacted repositories Grouped the Email and SMS service inside the notification service Created SQL scripts the repository and added sample configuration data This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham closed pull request #2: Delete .travis.yml
ebenezergraham closed pull request #2: Delete .travis.yml URL: https://github.com/apache/fineract-cn-notifications/pull/2 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham closed pull request #3: Delete system-analysis.mdj
ebenezergraham closed pull request #3: Delete system-analysis.mdj URL: https://github.com/apache/fineract-cn-notifications/pull/3 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham commented on issue #4: Unit and component Tests, Rest and command updates and Bug Fixes
ebenezergraham commented on issue #4: Unit and component Tests,Rest and command updates and Bug Fixes URL: https://github.com/apache/fineract-cn-notifications/pull/4#issuecomment-414883232 @awasum In an attempt to clean up this repository I messed up my original fork and so I have deleted it and created this one. But the good news is that now I under how to properly squash commits :smile: This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham opened a new pull request #4: Unit and component Tests, Rest and command updates and Bug Fixes
ebenezergraham opened a new pull request #4: Unit and component Tests,Rest and command updates and Bug Fixes URL: https://github.com/apache/fineract-cn-notifications/pull/4 added dependencies to shared Gradle file Created new group IDs for SMS and Email management Added creation and finding operations to the client manager Created modified Email and SMS configuration domain objects Created SMS and Email pages to support fims operations Created Post and Get Constants for creating and retrieving Configuration entitiies Created Unit tests for Email and SMS confiurations objects Created component tests to test SMS and Email services Created Domain Object Generator to help with testing Created Command and command handlers, created mappers and refacted repositories Grouped the Email and SMS service inside the notification service Created SQL scripts the repository and added sample configuration data This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[2/3] fineract git commit: Merge branch 'community-app-1863' of https://github.com/tonic889/incubator-fineract into tonic889-community-app-1863
Merge branch 'community-app-1863' of https://github.com/tonic889/incubator-fineract into tonic889-community-app-1863 Project: http://git-wip-us.apache.org/repos/asf/fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/9642e0e3 Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/9642e0e3 Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/9642e0e3 Branch: refs/heads/develop Commit: 9642e0e38384efd12d5e8ef868512dc59102bf21 Parents: e29e37e fbf9d1e Author: conradsp Authored: Tue Aug 21 15:24:06 2018 -0500 Committer: conradsp Committed: Tue Aug 21 15:24:06 2018 -0500 -- .../data/AccountSummaryCollectionData.java | 22 +++- .../data/GuarantorAccountSummaryData.java | 70 +++ ...ilsReadPlatformServiceJpaRepositoryImpl.java | 117 ++- 3 files changed, 202 insertions(+), 7 deletions(-) --
[1/3] fineract git commit: FINERACT-642 Include Guarantor Accounts in Client Accounts Overview
Repository: fineract
Updated Branches:
refs/heads/develop e29e37ebb -> 9398afda4
FINERACT-642 Include Guarantor Accounts in Client Accounts Overview
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/fbf9d1e7
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/fbf9d1e7
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/fbf9d1e7
Branch: refs/heads/develop
Commit: fbf9d1e7d0fe2d3b9519f2e9ffe1785c04009473
Parents: d2b3411
Author: tonic889
Authored: Sat Apr 28 20:26:56 2018 -0400
Committer: tonic889
Committed: Mon Aug 6 22:54:31 2018 -0400
--
.../data/AccountSummaryCollectionData.java | 22 +++-
.../data/GuarantorAccountSummaryData.java | 70 +++
...ilsReadPlatformServiceJpaRepositoryImpl.java | 117 ++-
3 files changed, 202 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/fineract/blob/fbf9d1e7/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
--
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
index f4faaca..80de9a5 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
@@ -29,27 +29,34 @@ public class AccountSummaryCollectionData {
private final Collection loanAccounts;
private final Collection savingsAccounts;
private final Collection shareAccounts ;
+private final Collection guarantorAccounts;
private final Collection memberLoanAccounts;
private final Collection memberSavingsAccounts;
-
+private final Collection
memberGuarantorAccounts;
+
public AccountSummaryCollectionData(final
Collection loanAccounts,
-final Collection savingsAccounts, final
Collection shareAccounts) {
+final Collection savingsAccounts, final
Collection shareAccounts,
+final Collection guarantorAccounts) {
this.loanAccounts = defaultLoanAccountsIfEmpty(loanAccounts);
this.savingsAccounts = defaultSavingsAccountsIfEmpty(savingsAccounts);
this.shareAccounts = defaultShareAccountsIfEmpty(shareAccounts) ;
+this.guarantorAccounts = guarantorAccounts;
this.memberLoanAccounts = null;
this.memberSavingsAccounts = null;
+this.memberGuarantorAccounts = null;
}
public AccountSummaryCollectionData(final
Collection loanAccounts,
-final Collection savingsAccounts, final
Collection memberLoanAccounts,
-final Collection memberSavingsAccounts)
{
+final Collection savingsAccounts, final
Collection guarantorAccounts, final
Collection memberLoanAccounts,
+final Collection memberSavingsAccounts,
final Collection memberGuarantorAccounts) {
this.loanAccounts = defaultLoanAccountsIfEmpty(loanAccounts);
this.savingsAccounts = defaultSavingsAccountsIfEmpty(savingsAccounts);
+this.guarantorAccounts = guarantorAccounts;
this.shareAccounts = null ;
this.memberLoanAccounts =
defaultLoanAccountsIfEmpty(memberLoanAccounts);
this.memberSavingsAccounts =
defaultSavingsAccountsIfEmpty(memberSavingsAccounts);
+this.memberGuarantorAccounts =
defaultGuarantorAccountsIfEmpty(memberGuarantorAccounts);
}
private Collection
defaultLoanAccountsIfEmpty(final Collection collection)
{
@@ -76,4 +83,11 @@ public class AccountSummaryCollectionData {
return returnCollection;
}
+private Collection
defaultGuarantorAccountsIfEmpty(final Collection
collection) {
+Collection returnCollection = null;
+if (collection != null && !collection.isEmpty()) {
+returnCollection = collection;
+}
+return returnCollection;
+}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/fineract/blob/fbf9d1e7/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/GuarantorAccountSummaryData.java
--
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/GuarantorAccountSummaryData.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/GuarantorAccountSummaryData.java
new file mode 100644
index 000..64f444e
--- /dev/null
+++
[GitHub] fineract pull request #452: fineract changes for community app bug 1863
Github user asfgit closed the pull request at: https://github.com/apache/fineract/pull/452 ---
[3/3] fineract git commit: Merge branch 'tonic889-community-app-1863' into develop
Merge branch 'tonic889-community-app-1863' into develop Project: http://git-wip-us.apache.org/repos/asf/fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/9398afda Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/9398afda Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/9398afda Branch: refs/heads/develop Commit: 9398afda4d4996ab35ccf5d18316e24fa315e8b7 Parents: e29e37e 9642e0e Author: conradsp Authored: Tue Aug 21 15:45:27 2018 -0500 Committer: conradsp Committed: Tue Aug 21 15:45:27 2018 -0500 -- .../data/AccountSummaryCollectionData.java | 22 +++- .../data/GuarantorAccountSummaryData.java | 70 +++ ...ilsReadPlatformServiceJpaRepositoryImpl.java | 117 ++- 3 files changed, 202 insertions(+), 7 deletions(-) --
[2/2] fineract git commit: Merge branch 'conradsp-fix-integration-tests' into develop
Merge branch 'conradsp-fix-integration-tests' into develop Project: http://git-wip-us.apache.org/repos/asf/fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/e29e37eb Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/e29e37eb Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/e29e37eb Branch: refs/heads/develop Commit: e29e37ebbc9832487a515718104b3ad531519b52 Parents: 2a3aaec 693c7f2 Author: conradsp Authored: Tue Aug 21 15:18:47 2018 -0500 Committer: conradsp Committed: Tue Aug 21 15:18:47 2018 -0500 -- .../client/ClientEntityImportHandlerTest.java | 4 +- .../loan/LoanImportHandlerTest.java | 51 +++- .../office/OfficeImportHandlerTest.java | 6 +-- .../savings/SavingsImportHandlerTest.java | 14 +++--- ..._force_password_reset_in_c_configuration.sql | 6 ++- 5 files changed, 44 insertions(+), 37 deletions(-) --
[1/2] fineract git commit: Fixes for integration tests
Repository: fineract
Updated Branches:
refs/heads/develop 2a3aaecf6 -> e29e37ebb
Fixes for integration tests
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/693c7f2c
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/693c7f2c
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/693c7f2c
Branch: refs/heads/develop
Commit: 693c7f2c9c92c354cbe437a13093fe66a4b18c88
Parents: 2a3aaec
Author: conradsp
Authored: Tue Aug 21 14:47:04 2018 -0500
Committer: conradsp
Committed: Tue Aug 21 14:47:04 2018 -0500
--
.../client/ClientEntityImportHandlerTest.java | 4 +-
.../loan/LoanImportHandlerTest.java | 51 +++-
.../office/OfficeImportHandlerTest.java | 6 +--
.../savings/SavingsImportHandlerTest.java | 14 +++---
..._force_password_reset_in_c_configuration.sql | 6 ++-
5 files changed, 44 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/fineract/blob/693c7f2c/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
--
diff --git
a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
index 95174e2..ee5e734 100644
---
a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
+++
b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
@@ -115,10 +115,10 @@ public class ClientEntityImportHandlerTest {
firstClientRow.createCell(ClientEntityConstants.SUBMITTED_ON_COL).setCellValue(submittedDate);
firstClientRow.createCell(ClientEntityConstants.ADDRESS_ENABLED).setCellValue("False");
-File directory=new
File(System.getProperty("user.home")+"\\Fineract\\bulkimport\\integration_tests\\importhandler\\client")
;
+File directory=new
File(System.getProperty("user.home")+File.separator+"Fineract"+File.separator+"bulkimport"+File.separator+"integration_tests"+File.separator+"importhandler"+File.separator+"client")
;
if (!directory.exists())
directory.mkdirs();
-File file= new File(directory+"\\ClientEntity.xls");
+File file= new File(directory+File.separator+"ClientEntity.xls");
OutputStream outputStream=new FileOutputStream(file);
workbook.write(outputStream);
outputStream.close();
http://git-wip-us.apache.org/repos/asf/fineract/blob/693c7f2c/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
--
diff --git
a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
index 66a3539..91bb0bd 100644
---
a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
+++
b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
@@ -80,27 +80,28 @@ public class LoanImportHandlerTest {
Integer outcome_staff_creation
=staffHelper.createStaff(requestSpec,responseSpec);
Assert.assertNotNull("Could not create staff",outcome_staff_creation);
-LoanTransactionHelper loanTransactionHelper=new
LoanTransactionHelper(requestSpec,responseSpec);
-LoanProductTestBuilder loanProductTestBuilder=new
LoanProductTestBuilder();
-String jsonLoanProduct=loanProductTestBuilder.build(null);
-Integer
outcome_lp_creaion=loanTransactionHelper.getLoanProductId(jsonLoanProduct);
-Assert.assertNotNull("Could not create Loan Product"
,outcome_lp_creaion);
-
-FundsResourceHandler fundsResourceHandler=new FundsResourceHandler();
-String jsonFund="{\n" +
-"\t\"name\":
\""+Utils.randomNameGenerator("Fund_Name",9)+"\"\n" +
-"}";
-Integer
outcome_fund_creation=fundsResourceHandler.createFund(jsonFund,requestSpec,responseSpec);
-Assert.assertNotNull("Could not create Fund" ,outcome_fund_creation);
-
-PaymentTypeHelper
[GitHub] ebenezergraham opened a new pull request #20: Integrating the notification service
ebenezergraham opened a new pull request #20: Integrating the notification service URL: https://github.com/apache/fineract-cn-demo-server/pull/20 1 Added the repository to the initial-setup and pull-all scripts 2 Added notification service dependency to the Gradle file 3 Created an instance of the notification manager 4 Wrote the start and tear down methods 5 Created a listener class for the notification service 6 Added a notification role and gave it customer read permission 7 Created a notification admin user for notification operations File changes to be committed: modified: build.gradle modified: scripts/Unix/initial-setup.sh modified: scripts/Unix/pull-all.sh modified: scripts/windows/initial-setup.bat modified: scripts/windows/pull-all.bat modified: src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java new file: src/main/java/org/apache/fineract/cn/dev/listener/NotificationListener.java This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ebenezergraham closed pull request #19: Integrating the notification service
ebenezergraham closed pull request #19: Integrating the notification service
URL: https://github.com/apache/fineract-cn-demo-server/pull/19
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.gradle b/build.gradle
index 2bb5f04..688288c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,6 +50,7 @@ ext.versions = [
fineractcndeposit : '0.1.0-BUILD-SNAPSHOT',
fineractcnteller: '0.1.0-BUILD-SNAPSHOT',
fineractcnreporting : '0.1.0-BUILD-SNAPSHOT',
+fineractcnnotification : '0.1.0-BUILD-SNAPSHOT',
kuelapcheques : '0.1.0-BUILD-SNAPSHOT',
fineractcnpayroll : '0.1.0-BUILD-SNAPSHOT',
fineractcngroup : '0.1.0-BUILD-SNAPSHOT',
@@ -110,6 +111,7 @@ dependencies {
[group: 'org.apache.fineract.cn.cheques', name: 'api', version:
versions.kuelapcheques],
[group: 'org.apache.fineract.cn.payroll', name: 'api', version:
versions.fineractcnpayroll],
[group: 'org.apache.fineract.cn.group', name: 'api', version:
versions.fineractcngroup],
+[group: 'org.apache.fineract.cn.notification', name: 'api',
version: versions.fineractcnnotification],
[group: 'org.apache.fineract.cn.anubis', name: 'api', version:
versions.frameworkanubis],
[group: 'org.apache.fineract.cn.anubis', name: 'test', version:
versions.frameworkanubis],
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index e55870a..06efa14 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -58,7 +58,7 @@ cd ..
# exit tools directory
cd ..
-get_modules fineract-cn-anubis fineract-cn-identity
fineract-cn-permitted-feign-client fineract-cn-provisioner fineract-cn-rhythm
fineract-cn-template fineract-cn-office fineract-cn-customer fineract-cn-group
fineract-cn-accounting fineract-cn-portfolio
fineract-cn-deposit-account-management fineract-cn-cheques fineract-cn-payroll
fineract-cn-teller fineract-cn-reporting
+get_modules fineract-cn-anubis fineract-cn-identity
fineract-cn-permitted-feign-client fineract-cn-provisioner fineract-cn-rhythm
fineract-cn-template fineract-cn-office fineract-cn-customer fineract-cn-group
fineract-cn-accounting fineract-cn-portfolio
fineract-cn-deposit-account-management fineract-cn-cheques fineract-cn-payroll
fineract-cn-teller fineract-cn-reporting fineract-cn-notifications
mkdir integration-tests
cd integration-tests
diff --git a/scripts/Unix/pull-all.sh b/scripts/Unix/pull-all.sh
index 8559490..514daf5 100644
--- a/scripts/Unix/pull-all.sh
+++ b/scripts/Unix/pull-all.sh
@@ -46,7 +46,7 @@ get_modules fineract-cn-crypto
get_modules fineract-cn-anubis fineract-cn-identity
fineract-cn-permitted-feign-client fineract-cn-provisioner fineract-cn-rhythm \
fineract-cn-template fineract-cn-office fineract-cn-customer fineract-cn-group
fineract-cn-accounting \
-fineract-cn-portfolio fineract-cn-deposit-account-management
fineract-cn-cheques fineract-cn-payroll fineract-cn-teller fineract-cn-reporting
+fineract-cn-portfolio fineract-cn-deposit-account-management
fineract-cn-cheques fineract-cn-payroll fineract-cn-teller
fineract-cn-reporting fineract-cn-notifications
(
cd integration-tests
diff --git a/scripts/windows/initial-setup.bat
b/scripts/windows/initial-setup.bat
index 8bea82b..eddc999 100644
--- a/scripts/windows/initial-setup.bat
+++ b/scripts/windows/initial-setup.bat
@@ -258,6 +258,15 @@ CALL gradlew publishToMavenLocal
TIMEOUT /T 5
cd ..
+REM initialize notifications
+git clone https://github.com/%githubAccount%/fineract-cn-notifications.git
+cd notifications
+git remote add upstream
https://github.com/ebenezergraham/fineract-cn-notifications.git
+git checkout develop
+CALL gradlew publishToMavenLocal
+TIMEOUT /T 5
+cd ..
+
mkdir integration-tests
cd integration-tests
diff --git a/scripts/windows/pull-all.bat b/scripts/windows/pull-all.bat
index dc3799b..2a5b703 100644
--- a/scripts/windows/pull-all.bat
+++ b/scripts/windows/pull-all.bat
@@ -243,6 +243,15 @@ git push origin develop
TIMEOUT /T 5
cd ..
+REM pull notifications
+cd notifications
+git checkout develop
+git pull upstream develop
+CALL gradlew publishToMavenLocal
+git push origin develop
+TIMEOUT /T 5
+cd ..
+
cd integration-tests
REM pull service-starter
diff --git a/src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
b/src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
index 8995a2b..7aa2f95 100644
--- a/src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
+++ b/src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
@@ -24,16 +24,14 @@
import org.apache.fineract.cn.accounting.importer.AccountImporter;
import
[GitHub] therajanmaurya commented on issue #19: added payroll api support
therajanmaurya commented on issue #19: added payroll api support URL: https://github.com/apache/fineract-cn-mobile/pull/19#issuecomment-414637211 Fix Conflicts. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] therajanmaurya closed pull request #14: feat : list and search tellers
therajanmaurya closed pull request #14: feat : list and search tellers
URL: https://github.com/apache/fineract-cn-mobile/pull/14
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 29c2de8..d8f1f46 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -19,4 +19,5 @@
public static final String ROLES = "role.json";
public static final String LEDGER_PAGE = "ledgerPage.json";
public static final String ACCOUNT_PAGE = "accountsPage.json";
+public static final String TELLER = "teller.json";
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index c510bc1..70ccafb 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -15,6 +15,7 @@
import org.apache.fineract.data.models.loan.LoanAccountPage;
import org.apache.fineract.data.models.payment.PlannedPaymentPage;
import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.data.models.teller.Teller;
import java.util.List;
@@ -89,4 +90,8 @@ public static AccountPage getAccountPage() {
return testDataFactory.getObjectTypePojo(AccountPage.class,
FakeJsonName.ACCOUNT_PAGE);
}
+public static List getTeller() {
+return testDataFactory.getListTypePojo(new TypeToken>() {
+}, FakeJsonName.TELLER);
+}
}
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerTeller.kt
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerTeller.kt
new file mode 100644
index 000..898ad3b
--- /dev/null
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerTeller.kt
@@ -0,0 +1,30 @@
+package org.apache.fineract.data.datamanager
+
+import io.reactivex.Observable
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Function
+import org.apache.fineract.data.local.PreferencesHelper
+import org.apache.fineract.data.models.teller.Teller
+import org.apache.fineract.data.remote.BaseApiManager
+import javax.inject.Inject
+import org.apache.fineract.FakeRemoteDataSource
+import org.apache.fineract.data.datamanager.api.DataManagerAuth
+import org.apache.fineract.data.datamanager.api.FineractBaseDataManager
+import javax.inject.Singleton
+
+@Singleton
+class DataManagerTeller @Inject constructor(val baseManagerApi: BaseApiManager,
+dataManagerAuth: DataManagerAuth,
+val preferencesHelper:
PreferencesHelper)
+: FineractBaseDataManager(dataManagerAuth, preferencesHelper) {
+
+fun getTellers(): Observable> =
+
baseManagerApi.tellerService.getTellerList(preferencesHelper.tenantIdentifier)
+.onErrorResumeNext(Function>>
+{ Observable.just(FakeRemoteDataSource.getTeller()) })
+
+fun findTeller(tellerCode: String): Observable =
baseManagerApi.tellerService
+.searchTeller(preferencesHelper.tenantIdentifier, tellerCode)
+.onErrorResumeNext(Function>
+{ Observable.just(FakeRemoteDataSource.getTeller()[0]) })
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/apache/fineract/data/models/teller/Teller.kt
b/app/src/main/java/org/apache/fineract/data/models/teller/Teller.kt
new file mode 100644
index 000..61bb53e
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/data/models/teller/Teller.kt
@@ -0,0 +1,44 @@
+package org.apache.fineract.data.models.teller
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.android.parcel.Parcelize
+import java.math.BigDecimal
+
+@Parcelize
+data class Teller(
+
+@SerializedName("code") val code: String? = null,
+@SerializedName("password") val password: String? = null,
+@SerializedName("cashdrawLimit") val cashdrawLimit: BigDecimal? = null,
+@SerializedName("tellerAccountIdentifier") val
tellerAccountIdentifier: String? = null,
+@SerializedName("vaultAccountIdentifier") val vaultAccountIdentifier:
String? = null,
+@SerializedName("chequesReceivableAccount") val
chequesReceivableAccount: String? = null,
+@SerializedName("cashOverShortAccount") val cashOverShortAccount:
String? = null,
+@SerializedName("denominationRequired") val denominationRequired:
Boolean = false,
+@SerializedName("assignedEmployee") val
[fineract-cn-mobile] branch development updated: fix: move files to .github
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git The following commit(s) were added to refs/heads/development by this push: new 9664b79 fix: move files to .github 9664b79 is described below commit 9664b7980ad2f30ed1616758c81dda3d095882ea Author: Mohak AuthorDate: Fri Jul 27 17:00:00 2018 +0530 fix: move files to .github --- COMMIT_STYLE.md => .github/COMMIT_STYLE.md | 0 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/COMMIT_STYLE.md b/.github/COMMIT_STYLE.md similarity index 100% rename from COMMIT_STYLE.md rename to .github/COMMIT_STYLE.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md
[GitHub] therajanmaurya closed pull request #18: fix: move files to .github
therajanmaurya closed pull request #18: fix: move files to .github URL: https://github.com/apache/fineract-cn-mobile/pull/18 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/COMMIT_STYLE.md b/.github/COMMIT_STYLE.md similarity index 100% rename from COMMIT_STYLE.md rename to .github/COMMIT_STYLE.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] therajanmaurya closed pull request #20: fix: visibilty issue in ledger
therajanmaurya closed pull request #20: fix: visibilty issue in ledger
URL: https://github.com/apache/fineract-cn-mobile/pull/20
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
index 5086b40..3b9e5a4 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
@@ -39,9 +39,9 @@ class LedgerPresenter @Inject constructor(@ApplicationContext
context: Context,
if (ledgerPage.ledgers != null) {
if (ledgerPage.ledgers.isEmpty()) {
-mvpView.showLedgers(ledgerPage.ledgers)
-} else {
mvpView.showEmptyLedgers()
+} else {
+mvpView.showLedgers(ledgerPage.ledgers)
}
}
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[fineract-cn-mobile] branch development updated: fix: visibilty issue in ledger
This is an automated email from the ASF dual-hosted git repository.
rajanmaurya154 pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git
The following commit(s) were added to refs/heads/development by this push:
new 6ed81b6 fix: visibilty issue in ledger
6ed81b6 is described below
commit 6ed81b6ee207720eef6b97151bceab45244586ea
Author: Mohak
AuthorDate: Fri Aug 3 22:53:50 2018 +0530
fix: visibilty issue in ledger
---
.../apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
index 5086b40..3b9e5a4 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
@@ -39,9 +39,9 @@ class LedgerPresenter @Inject constructor(@ApplicationContext
context: Context,
if (ledgerPage.ledgers != null) {
if (ledgerPage.ledgers.isEmpty()) {
-mvpView.showLedgers(ledgerPage.ledgers)
-} else {
mvpView.showEmptyLedgers()
+} else {
+mvpView.showLedgers(ledgerPage.ledgers)
}
}
