diff --git a/.theia/settings.json b/.theia/settings.json index e6ca1a0a8..45dc91839 100644 --- a/.theia/settings.json +++ b/.theia/settings.json @@ -5,4 +5,4 @@ "**/.settings": true, "**/.factorypath": true } -} \ No newline at end of file +} diff --git a/APACHE_LICENSETEXT.md b/APACHE_LICENSETEXT.md index cfdff80a5..4eacb6431 100644 --- a/APACHE_LICENSETEXT.md +++ b/APACHE_LICENSETEXT.md @@ -13,4 +13,4 @@ software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations -under the License. \ No newline at end of file +under the License. diff --git a/README.md b/README.md index 6384d3566..f84d2628f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Apache Fineract: A Platform for Microfinance [![Build Status](https://travis-ci.org/apache/fineract.svg?branch=develop)](https://travis-ci.org/apache/fineract) [![Docker Hub](https://img.shields.io/docker/pulls/apache/fineract.svg?logo=Docker)](https://hub.docker.com/r/apache/fineract) [![Docker Build](https://img.shields.io/docker/cloud/build/apache/fineract.svg?logo=Docker)](https://hub.docker.com/r/apache/fineract/builds) +Apache Fineract: A Platform for Microfinance [![Build Status](https://travis-ci.org/apache/fineract.svg?branch=develop)](https://travis-ci.org/apache/fineract) [![Docker Hub](https://img.shields.io/docker/pulls/apache/fineract.svg?logo=Docker)](https://hub.docker.com/r/apache/fineract) [![Docker Build](https://img.shields.io/docker/cloud/build/apache/fineract.svg?logo=Docker)](https://hub.docker.com/r/apache/fineract/builds) ============ Fineract is a mature platform with open APIs that provides a reliable, robust, and affordable core banking solution for financial institutions offering services to the world’s 2 billion underbanked and unbanked. @@ -59,7 +59,7 @@ The tenants database connection details are configured [via environment variable Instructions to build a WAR file ============ 1. Clone the repository or download and extract the archive file to your local directory. -2. Run `./gradlew clean bootWar` to build a traditional WAR file which will be created at `build/libs` directory. +2. Run `./gradlew clean bootWar` to build a traditional WAR file which will be created at `build/libs` directory. 3. Deploy this WAR to your Tomcat v9 Servlet Container. We recommend using the JAR instead of the WAR file deployment, because it's much easier. @@ -80,19 +80,19 @@ Run the following commands, very similarly to how [.travis.yml](.travis.yml) doe Instructions to run and debug in Eclipse IDE ============ -It is possible to run Fineract in Eclipse IDE and also to debug Fineract using Eclipse's debugging facilities. +It is possible to run Fineract in Eclipse IDE and also to debug Fineract using Eclipse's debugging facilities. To do this, you need to create the Eclipse project files and import the project into an Eclipse workspace: 1. Create Eclipse project files into the Fineract project by running `./gradlew cleanEclipse eclipse` 2. Import the fineract-provider project into your Eclipse workspace (File->Import->General->Existing Projects into Workspace, choose root directory fineract/fineract-provider) 3. Do a clean build of the project in Eclipse (Project->Clean...) -3. Run / debug Fineract by right clicking on org.apache.fineract.ServerApplication class and choosing Run As / Debug As -> Java Application. All normal Eclipse debugging features (breakpoints, watchpoints etc) should work as expected. +3. Run / debug Fineract by right clicking on org.apache.fineract.ServerApplication class and choosing Run As / Debug As -> Java Application. All normal Eclipse debugging features (breakpoints, watchpoints etc) should work as expected. If you change the project settings (dependencies etc) in Gradle, you should redo step 1 and refresh the project in Eclipse. You can also use Eclipse Junit support to run tests in Eclipse (Run As->Junit Test) -Finally, modifying source code in Eclipse automatically triggers hot code replace to a running instance, allowing you to immediately test your changes +Finally, modifying source code in Eclipse automatically triggers hot code replace to a running instance, allowing you to immediately test your changes Instructions to run using Docker and docker-compose @@ -206,7 +206,7 @@ Instructions to run Apache RAT (Release Audit Tool) Checkstyle and Spotless ============ -This project enforces its code conventions using [checkstyle.xml](fineract-provider/config/checkstyle/checkstyle.xml) through Checkstyle and [fineract-formatting-preferences.xml](config/fineract-formatting-preferences.xml) through Spotless. They are configured to run automatically during the normal Gradle build, and fail if there are any violations detected. You can run the following command to automatically fix spotless violations: +This project enforces its code conventions using [checkstyle.xml](fineract-provider/config/checkstyle/checkstyle.xml) through Checkstyle and [fineract-formatting-preferences.xml](config/fineract-formatting-preferences.xml) through Spotless. They are configured to run automatically during the normal Gradle build, and fail if there are any violations detected. You can run the following command to automatically fix spotless violations: `./gradlew spotlessApply` @@ -216,8 +216,8 @@ You can also check for Spotless violations (only; but normally don't have to, be `./gradlew spotlessCheck` -We recommend that you configure your favourite Java IDE to match those conventions. For Eclipse, you can go to -Window > Java > Code Style and import our [config/fineractdev-formatter.xml](config/fineractdev-formatter.xml) under formatter section and [config/fineractdev-cleanup.xml](config/fineractdev-cleanup.xml) under Clean up section. The same fineractdev-formatter.xml configuration file (that can be used in Eclipse IDE) is also used by Spotless to both check for violations and autoformat code on the CLI. +We recommend that you configure your favourite Java IDE to match those conventions. For Eclipse, you can go to +Window > Java > Code Style and import our [config/fineractdev-formatter.xml](config/fineractdev-formatter.xml) under formatter section and [config/fineractdev-cleanup.xml](config/fineractdev-cleanup.xml) under Clean up section. The same fineractdev-formatter.xml configuration file (that can be used in Eclipse IDE) is also used by Spotless to both check for violations and autoformat code on the CLI. You could also use Checkstyle directly in your IDE (but you don't neccesarily have to, it may just be more convenient for you). For Eclipse, use https://checkstyle.org/eclipse-cs/ and load our checkstyle.xml into it, for IntelliJ you can use [CheckStyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea). @@ -278,7 +278,7 @@ Online Demos * [fineract.dev](https://www.fineract.dev) always runs the latest version of this code * [demo.mifos.io](https://demo.mifos.io) A demo account is provided for users to experience the functionality of the Community App. Users can use "mifos" for USERNAME and "password" for PASSWORD (without quotation marks). -* [Swagger-UI Demo video](https://www.youtube.com/watch?v=FlVd-0YAo6c) This is a demo video for Swagger-UI documentation, more information [here](https://github.com/apache/fineract#swagger-ui-documentation). +* [Swagger-UI Demo video](https://www.youtube.com/watch?v=FlVd-0YAo6c) This is a demo video for Swagger-UI documentation, more information [here](https://github.com/apache/fineract#swagger-ui-documentation). @@ -298,10 +298,10 @@ Video Demonstration Apache Fineract / Mifos X Demo (November 2016) - -Swagger-UI Documentation +Swagger-UI Documentation ============ -We use Swagger-UI to generate and maintain our API documentation, you can see the demo video [here](https://www.youtube.com/watch?v=FlVd-0YAo6c) or a live version +We use Swagger-UI to generate and maintain our API documentation, you can see the demo video [here](https://www.youtube.com/watch?v=FlVd-0YAo6c) or a live version [here](https://demo.fineract.dev/fineract-provider/swagger-ui/index.html). If you interested to know more about Swagger-UI you can check their [website](https://swagger.io/). Governance and Policies @@ -393,15 +393,15 @@ IMPORTANT: Do not set your GPG secrets in one of the project gradle.properties a The release command would look then look like this: ``` -./gradlew -Pfineract.release clean build +./gradlew -Pfineract.release clean build ``` 2. Another way to provide these parameters are via project parameters on the command line. A release command would then look like this: ``` -./gradlew -Pfineract.release -Psigning.gnupg.keyName=7890ABCD -Psigning.gnupg.passphrase=secret clean build +./gradlew -Pfineract.release -Psigning.gnupg.keyName=7890ABCD -Psigning.gnupg.passphrase=secret clean build ``` -NOTE: Let's assume your GPG key ID would be "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890ABCD" then you have to use the last 8 characters (i. e. "7890ABCD") for the signing plugin property "signing.gnupg.keyName". +NOTE: Let's assume your GPG key ID would be "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890ABCD" then you have to use the last 8 characters (i. e. "7890ABCD") for the signing plugin property "signing.gnupg.keyName". Above tasks will create the following files in folder build/distributions: diff --git a/docker-compose.yml b/docker-compose.yml index c5704a41f..45b290fba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: build: context: . target: fineract - ports: + ports: - 8443:8443 depends_on: - fineractmysql @@ -49,7 +49,7 @@ services: - fineract_tenants_driver=org.drizzle.jdbc.DrizzleDriver - fineract_tenants_url=jdbc:mysql:thin://fineractmysql:3306/fineract_tenants - fineract_tenants_uid=root - - fineract_tenants_pwd=skdcnwauicn2ucnaecasdsajdnizucawencascdca + - fineract_tenants_pwd=skdcnwauicn2ucnaecasdsajdnizucawencascdca - FINERACT_DEFAULT_TENANTDB_HOSTNAME=fineractmysql - FINERACT_DEFAULT_TENANTDB_PORT=3306 - FINERACT_DEFAULT_TENANTDB_UID=root diff --git a/docker/server.xml b/docker/server.xml index 3968e887e..6eb3c6f34 100644 --- a/docker/server.xml +++ b/docker/server.xml @@ -70,7 +70,7 @@ Either JSSE or OpenSSL style configuration may be used regardless of the SSLImplementation selected. JSSE style configuration is used below. --> - - diff --git a/docs/developers/swagger/client.md b/docs/developers/swagger/client.md index c5cc952c1..8bf163beb 100644 --- a/docs/developers/swagger/client.md +++ b/docs/developers/swagger/client.md @@ -29,10 +29,10 @@ Swagger Codegen provides several options to customize the generated code. [Here] - Open the [config.json.template](https://github.com/apache/fineract/blob/develop/fineract-provider/config/swagger/config.json.template) file - Customize options - Build the project again as mentioned in **Generate API Client Code** section - + ## Customize using Mustache Templates -Swagger Codegen uses Mustache Templates for generating the client library. For additional customizations you can add/edit custom templates inside the `fineract-provider/config/swagger/templates` folder. +Swagger Codegen uses Mustache Templates for generating the client library. For additional customizations you can add/edit custom templates inside the `fineract-provider/config/swagger/templates` folder. Make sure you are following the supported templates. Otherwise, the generated code will not build correctly. diff --git a/docs/interoperation/specification/json/bulk_payer_post_request.json b/docs/interoperation/specification/json/bulk_payer_post_request.json index 08ab59638..4c958c28b 100644 --- a/docs/interoperation/specification/json/bulk_payer_post_request.json +++ b/docs/interoperation/specification/json/bulk_payer_post_request.json @@ -57,4 +57,3 @@ "note": "From Mats", // optional, String(1..128) "expiration": "2017-11-15T22:17:28.985-01:00" // optional, ISO 8601 } - diff --git a/docs/system-architecture/css/toc-0.1.2/History.md b/docs/system-architecture/css/toc-0.1.2/History.md index 1ff3baef4..c2d6be1e9 100644 --- a/docs/system-architecture/css/toc-0.1.2/History.md +++ b/docs/system-architecture/css/toc-0.1.2/History.md @@ -1,19 +1,19 @@ -0.1.2 / 2013-04-08 +0.1.2 / 2013-04-08 ================== * optimized scroll function. fixes #15 * migrated to grunt for building * fixed tabs on docs/index -0.1.1 / 2012-10-05 +0.1.1 / 2012-10-05 ================== * updated example * code cleanup, fixed onHighlight, removed console.log * Add headerText and itemClass options -0.1.0 / 2012-07-05 +0.1.0 / 2012-07-05 ================== * added smoosh to Makefile @@ -24,7 +24,7 @@ * adds another option to customize the header link text * updated site -0.0.3 / 2012-04-06 +0.0.3 / 2012-04-06 ================== * fixed smooth scrolling in firefox @@ -37,7 +37,7 @@ * updated site * 0.0.2 - updated docs -0.0.1 / 2012-02-25 +0.0.1 / 2012-02-25 ================== * updated docs/site diff --git a/docs/system-architecture/css/toc-0.1.2/README.md b/docs/system-architecture/css/toc-0.1.2/README.md index 176f0b94a..6a7cd6472 100644 --- a/docs/system-architecture/css/toc-0.1.2/README.md +++ b/docs/system-architecture/css/toc-0.1.2/README.md @@ -1,5 +1,5 @@ #TOC -[TOC](http://projects.jga.me/toc/) is a jQuery plugin for automatically generating a table of contents. +[TOC](http://projects.jga.me/toc/) is a jQuery plugin for automatically generating a table of contents. For more information, check out the [documentation](http://projects.jga.me/toc/). diff --git a/docs/system-architecture/css/toc-0.1.2/docs/index.md b/docs/system-architecture/css/toc-0.1.2/docs/index.md index 06380d75a..7d7f49d23 100644 --- a/docs/system-architecture/css/toc-0.1.2/docs/index.md +++ b/docs/system-architecture/css/toc-0.1.2/docs/index.md @@ -17,75 +17,75 @@ TOC is a jQuery plugin that will automatically generate a table of contents for ##Usage - `javascript - $('#toc').toc(); + `javascript + $('#toc').toc(); ###Options Defaults shown below - `javascript - $('#toc').toc({ - 'selectors': 'h1,h2,h3', //elements to use as headings - 'container': 'body', //element to find all selectors in - 'smoothScrolling': true, //enable or disable smooth scrolling on click - 'prefix': 'toc', //prefix for anchor tags and class names - 'onHighlight': function(el) {}, //called when a new section is highlighted - 'highlightOnScroll': true, //add class to heading that is currently in focus - 'highlightOffset': 100, //offset to trigger the next headline - 'anchorName': function(i, heading, prefix) { //custom function for anchor name - return prefix+i; - }, - 'headerText': function(i, heading, $heading) { //custom function building the header-item text - return $heading.text(); - }, - 'itemClass': function(i, heading, $heading, prefix) { // custom function for item class - return $heading[0].tagName.toLowerCase(); - } - }); + `javascript + $('#toc').toc({ + 'selectors': 'h1,h2,h3', //elements to use as headings + 'container': 'body', //element to find all selectors in + 'smoothScrolling': true, //enable or disable smooth scrolling on click + 'prefix': 'toc', //prefix for anchor tags and class names + 'onHighlight': function(el) {}, //called when a new section is highlighted + 'highlightOnScroll': true, //add class to heading that is currently in focus + 'highlightOffset': 100, //offset to trigger the next headline + 'anchorName': function(i, heading, prefix) { //custom function for anchor name + return prefix+i; + }, + 'headerText': function(i, heading, $heading) { //custom function building the header-item text + return $heading.text(); + }, + 'itemClass': function(i, heading, $heading, prefix) { // custom function for item class + return $heading[0].tagName.toLowerCase(); + } + }); ##Example CSS - `css - #toc { - top: 0px; - left: 0px; - height: 100%; - position: fixed; - background: #333; - box-shadow: inset -5px 0 5px 0px #000; - width: 150px; - padding-top: 20px; - color: #fff; - } + `css + #toc { + top: 0px; + left: 0px; + height: 100%; + position: fixed; + background: #333; + box-shadow: inset -5px 0 5px 0px #000; + width: 150px; + padding-top: 20px; + color: #fff; + } - #toc ul { - margin: 0; - padding: 0; - list-style: none; - } + #toc ul { + margin: 0; + padding: 0; + list-style: none; + } - #toc li { - padding: 5px 10px; - } + #toc li { + padding: 5px 10px; + } - #toc a { - color: #fff; - text-decoration: none; - display: block; - } + #toc a { + color: #fff; + text-decoration: none; + display: block; + } - #toc .toc-h2 { - padding-left: 10px; - } + #toc .toc-h2 { + padding-left: 10px; + } - #toc .toc-h3 { - padding-left: 20px; - } + #toc .toc-h3 { + padding-left: 20px; + } - #toc .toc-active { - background: #336699; - box-shadow: inset -5px 0px 10px -5px #000; - } + #toc .toc-active { + background: #336699; + box-shadow: inset -5px 0px 10px -5px #000; + } ##History diff --git a/docs/system-architecture/diagrams/command-query.xml b/docs/system-architecture/diagrams/command-query.xml index f2441921b..58e492b4e 100644 --- a/docs/system-architecture/diagrams/command-query.xml +++ b/docs/system-architecture/diagrams/command-query.xml @@ -1 +1 @@ - \ No newline at end of file + diff --git a/docs/system-architecture/diagrams/platform-categories.xml b/docs/system-architecture/diagrams/platform-categories.xml index f63b81734..040bcf0ea 100644 --- a/docs/system-architecture/diagrams/platform-categories.xml +++ b/docs/system-architecture/diagrams/platform-categories.xml @@ -1 +1 @@ - \ No newline at end of file + diff --git a/docs/system-architecture/diagrams/platform-systemview.xml b/docs/system-architecture/diagrams/platform-systemview.xml index 9fba16124..9f68d774d 100644 --- a/docs/system-architecture/diagrams/platform-systemview.xml +++ b/docs/system-architecture/diagrams/platform-systemview.xml @@ -1 +1 @@ - \ No newline at end of file + diff --git a/fineract-db/docker/01-databases.sql b/fineract-db/docker/01-databases.sql index 084a21b28..4643f2cf7 100644 --- a/fineract-db/docker/01-databases.sql +++ b/fineract-db/docker/01-databases.sql @@ -22,4 +22,4 @@ CREATE DATABASE IF NOT EXISTS `fineract_tenants`; CREATE DATABASE IF NOT EXISTS `fineract_default`; # create root user and grant rights -GRANT ALL ON *.* TO 'root'@'%'; \ No newline at end of file +GRANT ALL ON *.* TO 'root'@'%'; diff --git a/fineract-db/mifospltaform-tenants-first-time-install.sql b/fineract-db/mifospltaform-tenants-first-time-install.sql index c97c507c2..37d26d091 100644 --- a/fineract-db/mifospltaform-tenants-first-time-install.sql +++ b/fineract-db/mifospltaform-tenants-first-time-install.sql @@ -116,7 +116,7 @@ CREATE TABLE `tenants` ( LOCK TABLES `tenants` WRITE; /*!40000 ALTER TABLE `tenants` DISABLE KEYS */; -INSERT INTO `tenants` VALUES +INSERT INTO `tenants` VALUES (1,'default','default','fineract_default','Asia/Kolkata',NULL,NULL,NULL,NULL,'localhost','3306','root','mysql',1,5,30000,1,60,1,50,1,40,20,10,60,34000,60000); /*!40000 ALTER TABLE `tenants` ENABLE KEYS */; UNLOCK TABLES; diff --git a/fineract-db/multi-tenant-demo-backups/ceda/README.md b/fineract-db/multi-tenant-demo-backups/ceda/README.md index 6424923f7..0df4ab89d 100644 --- a/fineract-db/multi-tenant-demo-backups/ceda/README.md +++ b/fineract-db/multi-tenant-demo-backups/ceda/README.md @@ -6,4 +6,4 @@ This demo database contains: - DDL of latest schema - Minimum reference data required for deployment of platform - Customisatons for CEDA on m_code/m_code_value tables, extra datatables for client and loan data capture -- Extra reports over and beyond core reports customisation for CEDA operations \ No newline at end of file +- Extra reports over and beyond core reports customisation for CEDA operations diff --git a/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql b/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql index e255ea66e..7c30d33e2 100644 --- a/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql +++ b/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql @@ -264,7 +264,7 @@ from x_registered_table r; -- ==== Chart of Accounts ===== truncate `acc_gl_account`; -INSERT INTO `acc_gl_account` VALUES +INSERT INTO `acc_gl_account` VALUES (1,'Petty Cash Balances',NULL,'11100',0,1,2,1,NULL), (2,'Cash in Valut 1',NULL,'11101',0,1,1,1,NULL), (3,'Bank Balances',NULL,'11200',0,1,2,1,NULL), @@ -360,4 +360,4 @@ INSERT INTO `acc_gl_account` VALUES (94,'Modem',NULL,'42902',0,1,1,5,NULL), (95,'Meals',NULL,'42903',0,1,1,5,NULL), (96,'Transportation',NULL,'42904',0,1,1,5,NULL), -(97,'Miscellaneous',NULL,'42905',0,1,1,5,NULL); \ No newline at end of file +(97,'Miscellaneous',NULL,'42905',0,1,1,5,NULL); diff --git a/fineract-db/multi-tenant-demo-backups/ceda/ceda-user-office-product-setup.sql b/fineract-db/multi-tenant-demo-backups/ceda/ceda-user-office-product-setup.sql index 1ca0ed684..d8cf4a817 100644 --- a/fineract-db/multi-tenant-demo-backups/ceda/ceda-user-office-product-setup.sql +++ b/fineract-db/multi-tenant-demo-backups/ceda/ceda-user-office-product-setup.sql @@ -46,7 +46,7 @@ INSERT INTO `m_appuser` `nonexpired_credentials`, `enabled`) VALUES -(0, 1, 'keithwoodlock', 'Keith', 'Woodlock', +(0, 1, 'keithwoodlock', 'Keith', 'Woodlock', '4f607e9b6cffbe7d3db92d4bfa3391c7aa751727b4ea29d08fddf9dd72e6e7e3', 'keithwoodlock@gmail.com', 0, 1, 1, 1, 1); INSERT INTO `m_appuser_role` @@ -61,7 +61,7 @@ INSERT INTO `m_office` `external_id`, `name`, `opening_date`) -VALUES +VALUES (1, '.2.', 2, 'Uganda (Kampala)', '2009-01-01'); @@ -114,10 +114,10 @@ INSERT INTO `m_product_loan` `accounting_type`, `loan_transaction_strategy_id`) VALUES -('UGX', 2, 1000000.000000, 0, 1000000000000.000000, null , 'Kampala Product (with cash accounting)', -'Typical Kampala loan product with cash accounting enabled for testing.', null , +('UGX', 2, 1000000.000000, 0, 1000000000000.000000, null , 'Kampala Product (with cash accounting)', +'Typical Kampala loan product with cash accounting enabled for testing.', null , 24.000000, 3, 24.000000, 1, 1, 1, 2, 12, 1, 2, 2); -- mapping of that loan product to GL Accounts -INSERT INTO `acc_product_mapping` -VALUES (1,4,1,1,1),(2,8,1,1,2),(3,34,1,1,3),(4,37,1,1,4),(5,35,1,1,5),(6,97,1,1,6); \ No newline at end of file +INSERT INTO `acc_product_mapping` +VALUES (1,4,1,1,1),(2,8,1,1,2),(3,34,1,1,3),(4,37,1,1,4),(5,35,1,1,5),(6,97,1,1,6); diff --git a/fineract-db/multi-tenant-demo-backups/default-demo/README.md b/fineract-db/multi-tenant-demo-backups/default-demo/README.md index 6cdf3ec1a..df78ab1f6 100644 --- a/fineract-db/multi-tenant-demo-backups/default-demo/README.md +++ b/fineract-db/multi-tenant-demo-backups/default-demo/README.md @@ -12,4 +12,4 @@ This demo database contains: - Its mandatory to have at least one role when creating new users so we have one role created by default called 'Super user' which has the special permission 'Full Authorisation'. Any user with this role can do anything in the system. - Its required to have at least one application user setup so remaining setup can be done through ui so we have on application user created by default with username 'quipo' with a password of 'quipo'. Application users must be associated with an office and a role so this user is associated with 'Latam HO' and 'Super user' role allowing this user to do any operation in any office(branch). -Minimum amount of data to support api-docs interaction. \ No newline at end of file +Minimum amount of data to support api-docs interaction. diff --git a/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql b/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql index cdaa53cbe..c8f6059b7 100644 --- a/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql +++ b/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql @@ -44,8 +44,8 @@ join m_code_value mv on mv.code_id = mc.id where mc.`code_name` = "YesNo"; INSERT INTO `m_code` -(`code_name`, `is_system_defined`) -VALUES +(`code_name`, `is_system_defined`) +VALUES ('Education',1); INSERT INTO `m_code_value`(`code_id`,`code_value`,`order_position`) @@ -141,7 +141,7 @@ from x_registered_table r; -- ==== Chart of Accounts ===== truncate `acc_gl_account`; -INSERT INTO `acc_gl_account` VALUES +INSERT INTO `acc_gl_account` VALUES (1,'Petty Cash Balances',NULL,'11100',0,1,2,1,NULL), (2,'Cash in Valut 1',NULL,'11101',0,1,1,1,NULL), (3,'Bank Balances',NULL,'11200',0,1,2,1,NULL), @@ -237,4 +237,4 @@ INSERT INTO `acc_gl_account` VALUES (94,'Modem',NULL,'42902',0,1,1,5,NULL), (95,'Meals',NULL,'42903',0,1,1,5,NULL), (96,'Transportation',NULL,'42904',0,1,1,5,NULL), -(97,'Miscellaneous',NULL,'42905',0,1,1,5,NULL); \ No newline at end of file +(97,'Miscellaneous',NULL,'42905',0,1,1,5,NULL); diff --git a/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql b/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql index 9a0982f80..62e74bdbb 100644 --- a/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql +++ b/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql @@ -55,4 +55,4 @@ CREATE TABLE `risk_analysis` ( `fi_repayment_capacity` decimal(19,6) DEFAULT NULL, PRIMARY KEY (`client_id`), CONSTRAINT `FK_risk_analysis_1` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; diff --git a/fineract-db/multi-tenant-demo-backups/latam-demo/README.md b/fineract-db/multi-tenant-demo-backups/latam-demo/README.md index f75fffe23..df8fe91a7 100644 --- a/fineract-db/multi-tenant-demo-backups/latam-demo/README.md +++ b/fineract-db/multi-tenant-demo-backups/latam-demo/README.md @@ -13,4 +13,4 @@ This demo database contains: - Configuration - No 'additional data' through the 'datatables' approach is setup - One 'code' is setup called 'Client Identifier' with default values of {'Passport number'} - (required for Client Identity Document functionalty) - - Enable/Disable configuration has one entry named 'maker-checker' to allow people to enable disable this feature at global level. It is off or disabled by default. \ No newline at end of file + - Enable/Disable configuration has one entry named 'maker-checker' to allow people to enable disable this feature at global level. It is off or disabled by default. diff --git a/fineract-db/multi-tenant-demo-backups/latam-demo/datatables-on-latam-demo.sql b/fineract-db/multi-tenant-demo-backups/latam-demo/datatables-on-latam-demo.sql index ed0d38814..553abd425 100644 --- a/fineract-db/multi-tenant-demo-backups/latam-demo/datatables-on-latam-demo.sql +++ b/fineract-db/multi-tenant-demo-backups/latam-demo/datatables-on-latam-demo.sql @@ -65,4 +65,4 @@ INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_ INSERT INTO `mifostenant-latam`.`m_code` (`code_name`, `is_system_defined`) VALUES ('Education', 1); -INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_position`) VALUES (3, 'Primary', 1); INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_position`) VALUES (3, 'Secondary', 2); INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_position`) VALUES (3, 'University', 3); \ No newline at end of file +INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_position`) VALUES (3, 'Primary', 1); INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_position`) VALUES (3, 'Secondary', 2); INSERT INTO `mifostenant-latam`.`m_code_value` (`code_id`, `code_value`, `order_position`) VALUES (3, 'University', 3); diff --git a/fineract-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql b/fineract-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql index e407abc74..9c5ba1890 100644 --- a/fineract-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql +++ b/fineract-db/old-schema-files/0001a-mifosplatform-core-ddl-latest.sql @@ -613,27 +613,27 @@ CREATE TABLE `m_loan_arrears_aging` ( ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; CREATE TABLE `m_guarantor` ( - `id` BIGINT NOT NULL AUTO_INCREMENT, - `loan_id` BIGINT NOT NULL, + `id` BIGINT NOT NULL AUTO_INCREMENT, + `loan_id` BIGINT NOT NULL, `client_reln_cv_id` INT DEFAULT NULL, - `type_enum` SMALLINT NOT NULL, - `entity_id` BIGINT NULL DEFAULT NULL, - `firstname` VARCHAR(50) NULL DEFAULT NULL, - `lastname` VARCHAR(50) NULL DEFAULT NULL, - `dob` DATE NULL DEFAULT NULL, - `address_line_1` VARCHAR(500) NULL DEFAULT NULL, - `address_line_2` VARCHAR(500) NULL DEFAULT NULL, - `city` VARCHAR(50) NULL DEFAULT NULL, - `state` VARCHAR(50) NULL DEFAULT NULL, - `country` VARCHAR(50) NULL DEFAULT NULL, - `zip` VARCHAR(20) NULL DEFAULT NULL, - `house_phone_number` VARCHAR(20) NULL DEFAULT NULL, - `mobile_number` VARCHAR(20) NULL DEFAULT NULL, - `comment` VARCHAR(500) NULL DEFAULT NULL, - PRIMARY KEY (`id`), - INDEX `FK_m_guarantor_m_loan` (`loan_id`), + `type_enum` SMALLINT NOT NULL, + `entity_id` BIGINT NULL DEFAULT NULL, + `firstname` VARCHAR(50) NULL DEFAULT NULL, + `lastname` VARCHAR(50) NULL DEFAULT NULL, + `dob` DATE NULL DEFAULT NULL, + `address_line_1` VARCHAR(500) NULL DEFAULT NULL, + `address_line_2` VARCHAR(500) NULL DEFAULT NULL, + `city` VARCHAR(50) NULL DEFAULT NULL, + `state` VARCHAR(50) NULL DEFAULT NULL, + `country` VARCHAR(50) NULL DEFAULT NULL, + `zip` VARCHAR(20) NULL DEFAULT NULL, + `house_phone_number` VARCHAR(20) NULL DEFAULT NULL, + `mobile_number` VARCHAR(20) NULL DEFAULT NULL, + `comment` VARCHAR(500) NULL DEFAULT NULL, + PRIMARY KEY (`id`), + INDEX `FK_m_guarantor_m_loan` (`loan_id`), CONSTRAINT `FK_m_guarantor_m_code_value` FOREIGN KEY (`client_reln_cv_id`) REFERENCES `m_code_value` (`id`) - CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`) + CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; CREATE TABLE `m_loan_charge` ( @@ -963,4 +963,4 @@ CREATE TABLE `stretchy_report_parameter` ( PRIMARY KEY (`report_id`,`parameter_id`), UNIQUE KEY `report_id_name_UNIQUE` (`report_id`,`report_parameter_name`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; --- =========== end of reporting related tables ============ \ No newline at end of file +-- =========== end of reporting related tables ============ diff --git a/fineract-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql b/fineract-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql index 8da52daa0..6795b0796 100644 --- a/fineract-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql +++ b/fineract-db/old-schema-files/0002-mifosx-base-reference-data-utf8.sql @@ -29,11 +29,11 @@ VALUES INSERT INTO `c_configuration` (`name`, `enabled`) -VALUES +VALUES ('maker-checker', 0); -INSERT INTO `r_enum_value` -VALUES +INSERT INTO `r_enum_value` +VALUES ('amortization_method_enum',0,'Equal principle payments','Equal principle payments'), ('amortization_method_enum',1,'Equal installments','Equal installments'), ('interest_calculated_in_period_enum',0,'Daily','Daily'), @@ -67,42 +67,42 @@ VALUES ('term_period_frequency_enum',2,'Months','Months'), ('term_period_frequency_enum',3,'Years','Years'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '1', 'Disbursement', 'Disbursement'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '2', 'Repayment', 'Repayment'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '3', 'Contra', 'Contra'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '4', 'Waive Interest', 'Waive Interest'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '5', 'Repayment At Disbursement', 'Repayment At Disbursement'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '6', 'Write-Off', 'Write-Off'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '7', 'Marked for Rescheduling', 'Marked for Rescheduling'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '8', 'Recovery Repayment', 'Recovery Repayment'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '9', 'Waive Charges', 'Waive Charges'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '10', 'Apply Charges', 'Apply Charges'); -INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) +INSERT INTO `r_enum_value` (`enum_name`, `enum_id`, `enum_message_property`, `enum_value`) VALUES ('transaction_type_enum', '11', 'Apply Interest', 'Apply Interest'); INSERT INTO `m_currency` (`id`,`code`,`decimal_places`,`display_symbol`,`name`, `internationalized_name_code`) -VALUES +VALUES (1,'AED',2,NULL,'UAE Dirham','currency.AED'), (2,'AFN',2,NULL,'Afghanistan Afghani','currency.AFN'), (3,'ALL',2,NULL,'Albanian Lek','currency.ALL'), @@ -268,24 +268,24 @@ VALUES (163,'ZWD',2,NULL,'Zimbabwe Dollar','currency.ZWD'); -- ======== end of currencies == -INSERT INTO `m_organisation_currency` (`id`, `code`, `decimal_places`, `name`, `display_symbol`, `internationalized_name_code`) +INSERT INTO `m_organisation_currency` (`id`, `code`, `decimal_places`, `name`, `display_symbol`, `internationalized_name_code`) VALUES (21,'USD',2,'US Dollar','$','currency.USD'); -INSERT INTO `m_office` (`id`, `parent_id`, `hierarchy`, `external_id`, `name`, `opening_date`) -VALUES +INSERT INTO `m_office` (`id`, `parent_id`, `hierarchy`, `external_id`, `name`, `opening_date`) +VALUES (1,NULL,'.','1','Head Office','2009-01-01'); -INSERT INTO `m_group_level` (`id`, `parent_id`, `super_parent`, `level_name`, `recursable`, `can_have_clients`) +INSERT INTO `m_group_level` (`id`, `parent_id`, `super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (1, NULL, 1, 'Center', 1, 0); -INSERT INTO `m_group_level` (`id`, `parent_id`, `super_parent`, `level_name`, `recursable`, `can_have_clients`) +INSERT INTO `m_group_level` (`id`, `parent_id`, `super_parent`, `level_name`, `recursable`, `can_have_clients`) VALUES (2, 1, 0, 'Group', 0, 1); -- create single code and code value for client identifiers INSERT INTO `m_code` -(`code_name`, `is_system_defined`) -VALUES +(`code_name`, `is_system_defined`) +VALUES ('Customer Identifier',1), ('LoanCollateral',1), ('LoanPurpose',1), @@ -314,27 +314,27 @@ from m_code mc where mc.`code_name` = "Customer Identifier"; -- Adding a few Default Guarantor Relationships -insert into m_code_value (code_id,code_value,order_position) - select id,"Spouse",0 - from m_code - where m_code.code_name="GuarantorRelationship"; +insert into m_code_value (code_id,code_value,order_position) + select id,"Spouse",0 + from m_code + where m_code.code_name="GuarantorRelationship"; -insert into m_code_value (code_id,code_value,order_position) - select id,"Parent",0 - from m_code - where m_code.code_name="GuarantorRelationship"; +insert into m_code_value (code_id,code_value,order_position) + select id,"Parent",0 + from m_code + where m_code.code_name="GuarantorRelationship"; -insert into m_code_value (code_id,code_value,order_position) - select id,"Sibling",0 - from m_code - where m_code.code_name="GuarantorRelationship"; +insert into m_code_value (code_id,code_value,order_position) + select id,"Sibling",0 + from m_code + where m_code.code_name="GuarantorRelationship"; -insert into m_code_value (code_id,code_value,order_position) - select id,"Business Associate",0 - from m_code - where m_code.code_name="GuarantorRelationship"; +insert into m_code_value (code_id,code_value,order_position) + select id,"Business Associate",0 + from m_code + where m_code.code_name="GuarantorRelationship"; -insert into m_code_value (code_id,code_value,order_position) - select id,"Other",0 - from m_code - where m_code.code_name="GuarantorRelationship"; \ No newline at end of file +insert into m_code_value (code_id,code_value,order_position) + select id,"Other",0 + from m_code + where m_code.code_name="GuarantorRelationship"; diff --git a/fineract-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql b/fineract-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql index 404f619df..33b82e572 100644 --- a/fineract-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql +++ b/fineract-db/old-schema-files/0003-mifosx-permissions-and-authorisation-utf8.sql @@ -33,7 +33,7 @@ If you had other roles set up with specific permissions you will have to set up -- truncate `x_registered_table`; INSERT INTO `m_permission` -(`grouping`,`code`,`entity_name`,`action_name`,`can_maker_checker`) VALUES +(`grouping`,`code`,`entity_name`,`action_name`,`can_maker_checker`) VALUES ('special','ALL_FUNCTIONS',NULL,NULL,0), ('special','ALL_FUNCTIONS_READ',NULL,NULL,0), ('special', 'CHECKER_SUPER_USER', NULL, NULL, '0'), @@ -296,19 +296,19 @@ INSERT INTO `m_permission` ('transaction_savings', 'CALCULATEINTEREST_SAVINGSACCOUNT_CHECKER', 'SAVINGSACCOUNT', 'CALCULATEINTEREST', '0'); -- == accounting related permissions -INSERT INTO `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`) VALUES +INSERT INTO `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`) VALUES ('accounting', 'CREATE_GLACCOUNT', 'GLACCOUNT', 'CREATE', 1), ('accounting', 'UPDATE_GLACCOUNT', 'GLACCOUNT', 'UPDATE', 1), ('accounting', 'DELETE_GLACCOUNT', 'GLACCOUNT', 'DELETE', 1), ('accounting', 'CREATE_GLCLOSURE', 'GLCLOSURE', 'CREATE', 1), ('accounting', 'UPDATE_GLCLOSURE', 'GLCLOSURE', 'UPDATE', 1), -('accounting', 'DELETE_GLCLOSURE', 'GLCLOSURE', 'DELETE', 1), +('accounting', 'DELETE_GLCLOSURE', 'GLCLOSURE', 'DELETE', 1), ('accounting', 'CREATE_JOURNALENTRY', 'JOURNALENTRY', 'CREATE', 1), ('accounting', 'REVERSE_JOURNALENTRY', 'JOURNALENTRY', 'REVERSE', 1); -INSERT INTO `m_role` (`id`, `name`, `description`) -VALUES +INSERT INTO `m_role` (`id`, `name`, `description`) +VALUES (1,'Super user','This role provides all application permissions.'); /* role 1 is super user, give it ALL_FUNCTIONS */ @@ -317,9 +317,9 @@ select 1, id from m_permission where code = 'ALL_FUNCTIONS'; -INSERT INTO `m_appuser` (`id`, `office_id`, `username`, `firstname`, `lastname`, `password`, `email`, -`firsttime_login_remaining`, `nonexpired`, `nonlocked`, `nonexpired_credentials`, `enabled`) -VALUES +INSERT INTO `m_appuser` (`id`, `office_id`, `username`, `firstname`, `lastname`, `password`, `email`, +`firsttime_login_remaining`, `nonexpired`, `nonlocked`, `nonexpired_credentials`, `enabled`) +VALUES (1,1,'mifos','App','Administrator','5787039480429368bf94732aacc771cd0a3ea02bcf504ffe1185ab94213bc63a','demomfi@mifos.org','\0','','','',''); @@ -350,4 +350,4 @@ from x_registered_table r; /* regardless of inserted permission settings above, no permissions (transactions) are preselected as being part of the maker-checker process so, just set the flag to false... the end-user can decide which permissions should be maker-checkerable */ -update m_permission set can_maker_checker = false; \ No newline at end of file +update m_permission set can_maker_checker = false; diff --git a/fineract-db/old-schema-files/0004-mifosx-core-reports-utf8.sql b/fineract-db/old-schema-files/0004-mifosx-core-reports-utf8.sql index aa6c6b120..df41999a5 100644 --- a/fineract-db/old-schema-files/0004-mifosx-core-reports-utf8.sql +++ b/fineract-db/old-schema-files/0004-mifosx-core-reports-utf8.sql @@ -28,4 +28,3 @@ INSERT INTO `stretchy_report_parameter` VALUES (1,5,NULL),(2,5,NULL),(2,6,NULL), insert into m_permission(grouping, `code`, entity_name, action_name, can_maker_checker) select 'report', concat('READ_', r.report_name), r.report_name, 'READ', false from stretchy_report r; - diff --git a/kubernetes/fineractmysql-configmap.yml b/kubernetes/fineractmysql-configmap.yml index 2f55518d5..80b3796b1 100644 --- a/kubernetes/fineractmysql-configmap.yml +++ b/kubernetes/fineractmysql-configmap.yml @@ -30,4 +30,4 @@ data: CREATE DATABASE IF NOT EXISTS `fineract_default`; # create root user and grant rights - GRANT ALL ON *.* TO 'root'@'%'; \ No newline at end of file + GRANT ALL ON *.* TO 'root'@'%';