fix(server): fix migrations and seeds dir (#101)

fix: use the docker server image layer in migration image

.env.example

@@ -0,0 +1,34 @@
+# Mail
+MAIL_HOST=
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_PORT=
+MAIL_SECURE=
+MAIL_FROM_NAME=
+MAIL_FROM_ADDRESS=
+
+# Database
+DB_USER=
+DB_HOST=
+DB_PASSWORD=
+DB_CHARSET=
+
+# System database
+SYSTEM_DB_NAME=bigcapital_system
+
+# Tenants databases
+TENANT_DB_NAME_PERFIX=bigcapital_tenant_
+
+# MongoDB
+MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
+
+# Authentication
+JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
+
+# Application
+BASE_URL=https://bigcapital.ly
+CONTACT_US_MAIL=support@bigcapital.ly
+
+# Agendash
+AGENDASH_AUTH_USER=agendash
+AGENDASH_AUTH_PASSWORD=123123

.github/workflows/build-deploy-container.yml

@@ -0,0 +1,81 @@
+# This workflow will build a docker container, publish it to Github Registry.
+name: Build and Deploy Docker Container
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  WEBAPP_IMAGE_NAME: bigcapital/bigcapital-webapp
+  SERVER_IMAGE_NAME: bigcapital/bigcapital-server
+
+jobs:
+  build-publish-webapp:
+    name: Build and deploy webapp container
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Login to Container registry.
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GH_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+            images: ${{ env.REGISTRY }}/${{ env.WEBAPP_IMAGE_NAME }}
+
+      # Builds and push the Docker image.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+            context: .
+            file: ./packages/webapp/Dockerfile
+            push: true
+            tags: ghcr.io/bigcapitalhq/webapp:latest
+            labels: ${{ steps.meta.outputs.labels }}
+
+      # Send notification to Slack channel.
+      - name: Slack Notification built and published webapp container successfully.
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+
+  build-publish-server:
+    name: Build and deploy server container
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Login to Container registry.
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
+
+      # Builds and push the Docker image.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./packages/server/Dockerfile
+          push: true
+          tags: ghcr.io/bigcapitalhq/server:latest
+          labels: ${{ steps.meta.outputs.labels }}
+
+      # Send notification to Slack channel.
+      - name: Slack Notification built and published server container successfully.
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/docker-build.yml

@@ -1,64 +0,0 @@
-# This workflow will build a docker container, publish it to Google Container Registry, and deploy it to GKE when a release is created
-#
-# To configure this workflow:
-#
-# 1. Ensure that your repository contains the necessary configuration for your Google Kubernetes Engine cluster, including deployment.yml, kustomization.yml, service.yml, etc.
-#
-# 2. Set up secrets in your workspace: GKE_PROJECT with the name of the project and GKE_SA_KEY with the Base64 encoded JSON service account key (https://github.com/GoogleCloudPlatform/github-actions/tree/docs/service-account-key/setup-gcloud#inputs).
-#
-# 3. Change the values for the GKE_ZONE, GKE_CLUSTER, IMAGE, and DEPLOYMENT_NAME environment variables (below).
-#
-# For more support on how to run the workflow, please visit https://github.com/google-github-actions/setup-gcloud/tree/master/example-workflows/gke
-
-name: Build and Deploy Docker Container
-
-on:
-  release:
-    types: [created]
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: abouhuolia/bigcapital-webapp
-
-jobs:
-  setup-build-publish-deploy:
-    name: Setup, Build, Publish, and Deploy
-    runs-on: ubuntu-latest
-    environment: production
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    # Login to Container registry.
-    - name: Log in to the Container registry
-      uses: docker/login-action@v1
-      with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GH_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-      with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-    # Builds and push the Docker image.
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v2
-      with:
-          context: .
-          file: ./packages/webapp/Dockerfile
-          push: true
-          tags: ghcr.io/bigcapitalhq/webapp:latest
-          labels: ${{ steps.meta.outputs.labels }}
-    # Send notification to Slack channel.
-    - name: Slack Notification built and published successfully.
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-        
-        
-

.gitignore

@@ -1 +1,3 @@
-node_modules/
+node_modules/
+data
+.env

.vercelignore

@@ -1,5 +0,0 @@
-/*
-!package.json
-!package-lock.json
-!yarn.lock
-!packages/webapp

CHANGELOG.md

@@ -2,31 +2,69 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [1.7.4-rc.2] - 20-04-2022
+## [0.8.1] - 26-03-2023
+
+`@bigcaptial/monorepo`
+
+### Added 
+* add docker compose for development env. by @abouolia
+
+`@bigcapital/webapp`
+
+### Fixes
+* fix: hide the project name entry if the feature was not enabled. by @abouolia
+* fix: labels of add money in/out don't appear. by @abouolia
+* fix: accounts chart lags when scrolling down. by @abouolia
+* fix: the inconsistent style of quick customer/vendor drawer. by @abouolia
+* fix: add an icon to duplicate item of items context menu. by @abouolia
+* fix: account form issues. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/86
+
+### Added
+* Optimize the design of setup organization page. by @abouolia 
+
+`@bigcapital/server`
+
+### Added
+* bigcapital CLI commands by @abouolia
+* deprecate the subscription module. @abouolia
+
+### Fixes
+* fix: Validate the max depth level of the parent account. by @abouolia
+
+## [0.7.6] - 23-04-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
- - `BIG-374` Refactoring sidebar men with ability permissions and feature control on each item.
 
-## [1.7.3-rc.2] - 15-04-2022
+- `BIG-374` Refactoring sidebar men with ability permissions and feature control on each item.
+
+## [0.7.5] - 20-04-2022
+
+### Fixed.
+
+- `BIG-378` Reports drawers columns css conflict.
+
+## [0.7.3] - 15-04-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
-  - `BIG-372` Activate branches and warehouses dialog reloading once activating.
-  - `BIG-373` Issue general ledger report select specific account.
-  - `BIG-377` Make readonly details entries as oneline with tooltip for more details.
 
-## [1.7.2-rc.2] - 04-04-2022
+- `BIG-372` Activate branches and warehouses dialog reloading once activating.
+- `BIG-373` Issue general ledger report select specific account.
+- `BIG-377` Make readonly details entries as oneline with tooltip for more details.
+
+## [0.7.2] - 04-04-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
-  - Add the missing Arabic localization.
-  - Subscription plans modifications.
 
-## [1.7.1-rc.2] - 30-03-2022
+- Add the missing Arabic localization.
+- Subscription plans modifications.
+
+## [0.7.1] - 30-03-2022
 
 `@bigcapital/webapp`
 
@@ -57,7 +95,7 @@ All notable changes to Bigcapital server-side will be in this file.
   - `BIG-341` Refactoring expenses services for smaller classes.
   - `BIG-342` Assign default currency as base currency when create customer, vendor or expense transaction.
 
-## [1.7.0-rc.1] - 24-03-2022
+## [0.7.0] - 24-03-2022
 
 `@bigcapital/webapp`
 
@@ -89,23 +127,26 @@ All notable changes to Bigcapital server-side will be in this file.
  - Integrate financial reports with multiply branches.
  - Integrate inventory reports with multiply warehouses.
 
-## [1.6.3] - 21-02-2022
+## [0.6.3] - 21-02-2022
 
 `@bigcapital/webapp`
 
 ### Fixed
- - `BIG-337` Display billing page once the organization subscription is inactive.
 
-## [1.6.2] - 19-02-2022
+- `BIG-337` Display billing page once the organization subscription is inactive.
+
+## [0.6.2] - 19-02-2022
 
 ### Fixed
- - fix syled components dependency with imported as default components.
 
-## [1.6.0] - 18-02-2022
+- fix syled components dependency with imported as default components.
+
+## [0.6.0] - 18-02-2022
 
 `@bigcapital/webapp`
 
 ### Added
+
 - Balance sheet comparison of previous period (PP).
 - Balance sheet comparison of previous year (PY).
 - Balance sheet percentage analysis columns and rows basis.
@@ -113,11 +154,12 @@ All notable changes to Bigcapital server-side will be in this file.
 - Profit & loss sheet comparison of previous year (PY).
 - Profit & loss sheet percentage analysis columns, rows, income and expenses basis.
 
-## [1.5.8] - 13-01-2022
+## [0.5.8] - 13-01-2022
 
 `@bigcapital/webapp`
 
 ### Added
+
 - Add payment receive PDF print.
 - Add credit note PDF print.
 
@@ -139,7 +181,7 @@ All notable changes to Bigcapital server-side will be in this file.
 - Profit & loss sheet comparison of previous year (PY).
 - Profit & loss sheet percentage analysis columns, rows, income and expenses basis.
 
-## [1.5.3] - 03-01-2020
+## [0.5.3] - 03-01-2020
 
 `@bigcapital/webapp`
 
@@ -148,7 +190,7 @@ All notable changes to Bigcapital server-side will be in this file.
 - Localize the global errors.
 - Expand account name column on trial balance sheet.
 
-## [1.5.0] - 20-12-2021
+## [0.5.0] - 20-12-2021
 
 `@bigcapital/webapp`
 
@@ -170,7 +212,7 @@ All notable changes to Bigcapital server-side will be in this file.
 - Dashboard meta boot and authenticated user request query.
 - Optimize Arabic localization.
 
-## [1.4.0] - 11-09-2021
+## [0.4.0] - 11-09-2021
 
 `@bigcapital/webapp`
 
@@ -191,7 +233,7 @@ fix: BIG-144 - Typo adjustment dialog success message.
 fix: BIG-148 - Items entries ordered by index.
 fix: BIG-132 AR/AP aging summary report filter by none transactions/zero contacts.
 
-## [1.2.0-RC] - 03-09-2021
+## [0.2.0] - 03-09-2021
 
 `@bigcapital/webapp`
 

LICENSE

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

README.md

@@ -22,10 +22,10 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
 # Resources
 
 - [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
-- [Discord](https://discord.gg/s3ARzDcf) - Ask for help.
-- [Bug Tracker](https://github.com/bigcapital/bigcapital/issues) - Notify us new bugs.
-- [Source Code](https://github.com/bigcapital/bigcapital) - Github repo.
+- [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
+- [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
+- [Source Code](https://github.com/bigcapitalhq/bigcapital) - Github repo.
 
 # Changlog
 
-Please see [Releases](https://github.com/bigcapital/bigcapital) for more information what has changed recently.
+Please see [Releases](https://github.com/bigcapitalhq/bigcapital/releases) for more information what has changed recently.

docker-compose.prod.yml

@@ -0,0 +1,116 @@
+# This is a production version of the Bigcapital docker-compose.yml file.
+
+version: '3.3'
+
+services:
+  nginx:
+    container_name: bigcapital-nginx-gateway
+    build:
+      context: ./docker/nginx
+      args:
+        - SERVER_PROXY_PORT=3000
+        - WEB_SSL=false
+        - SELF_SIGNED=false
+    volumes:
+      - ./data/logs/nginx/:/var/log/nginx
+      - ./docker/certbot/certs/:/var/certs
+    ports:
+      - "80:80"
+      - "443:443"
+    tty: true
+    depends_on:
+      - server
+      - webapp
+
+  webapp: 
+    container_name: bigcapital-webapp
+    image: ghcr.io/bigcapitalhq/webapp:latest
+
+  server:
+    container_name: bigcapital-server
+    image: ghcr.io/bigcapitalhq/server:latest
+    links:
+      - mysql
+      - mongo
+      - redis
+    depends_on:
+      - mysql
+      - mongo
+      - redis
+    environment:
+      # Mail
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_USERNAME=${MAIL_USERNAM}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_SECURE=${MAIL_SECURE}
+      - MAIL_FROM_NAME=${MAIL_FROM_NAME}
+      - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS}
+
+      # Database
+      - DB_HOST=mysql
+      - DB_USER=${DB_USER}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - DB_CHARSET=${DB_CHARSET}
+
+      # System database
+      - SYSTEM_DB_NAME=${SYSTEM_DB_NAME}
+
+      # Tenants databases
+      - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
+
+      # Authentication
+      - JWT_SECRET=${JWT_SECRET}
+
+      # MongoDB 
+      - MONGODB_DATABASE_URL=mongodb://mongo/bigcapital
+
+      # Application
+      - BASE_URL=${BASE_URL}
+
+      # Agendash
+      - AGENDASH_AUTH_USER=${AGENDASH_AUTH_USER}
+      - AGENDASH_AUTH_PASSWORD=${AGENDASH_AUTH_PASSWORD}
+
+  database_migration:
+    container_name: bigcapital-database-migration
+    build:
+      context: ./
+      dockerfile: docker/migration/Dockerfile
+      args:
+        - DB_HOST=mysql
+        - DB_USER=${DB_USER}
+        - DB_PASSWORD=${DB_PASSWORD}
+        - DB_CHARSET=${DB_CHARSET}
+        - SYSTEM_DB_NAME=${SYSTEM_DB_NAME}
+
+  mysql:
+    container_name: bigcapital-mysql
+    build:
+      context: ./docker/mysql
+      args:
+        - MYSQL_DATABASE=${SYSTEM_DB_NAME}
+        - MYSQL_USER=${DB_NAME}
+        - MYSQL_PASSWORD=${DB_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+    volumes:
+      - ./data/mysql/:/var/lib/mysql
+    expose:
+      - '3306'
+
+  mongo:
+    container_name: bigcapital-mongo 
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - ./data/mongo/:/var/lib/mongodb
+
+  redis:
+    container_name: bigcapital-redis
+    build:
+      context: ./docker/redis
+    expose:
+      - "6379"
+    volumes:
+      - ./data/redis:/data

docker-compose.yml

@@ -0,0 +1,39 @@
+# WARNING!
+# This is a development version of THE Bigcapital docker-compose.yml file.
+# Avoid using this file in your production environment.
+# We're exposing here sensitive ports and mounting code volumes for rapid development and debugging of the server stack.
+
+version: '3.3'
+
+services:
+  mysql:
+    build:
+      context: ./docker/mysql
+      args:
+        - MYSQL_DATABASE=${SYSTEM_DB_NAME}
+        - MYSQL_USER=${DB_NAME}
+        - MYSQL_PASSWORD=${DB_PASSWORD}
+        - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+    volumes:
+      - ./data/mysql/:/var/lib/mysql
+    expose:
+      - '3306'
+    ports:
+      - '3306:3306'
+
+  mongo:
+    build: ./docker/mongo
+    expose:
+      - '27017'
+    volumes:
+      - ./data/mongo/:/var/lib/mongodb
+    ports:
+      - '27017:27017'
+
+  redis:
+    build:
+      context: ./docker/redis
+    expose:
+      - "6379"
+    volumes:
+      - ./data/redis:/data

docker/migration/Dockerfile

@@ -0,0 +1,38 @@
+FROM ghcr.io/bigcapitalhq/server:latest as build
+
+ARG DB_HOST= \
+  DB_USER= \
+  DB_PASSWORD= \
+  DB_CHARSET= \
+  # System database.
+  SYSTEM_DB_NAME= \
+  SYSTEM_DB_PASSWORD= \
+  SYSTEM_DB_USER= \
+  SYSTEM_DB_HOST= \
+  SYSTEM_DB_CHARSET=
+
+ENV DB_HOST=$DB_HOST \
+  DB_USER=$DB_USER \
+  DB_PASSWORD=$DB_PASSWORD \
+  DB_CHARSET=$DB_CHARSET \
+  # System database.
+  SYSTEM_DB_HOST=$SYSTEM_DB_HOST \
+  SYSTEM_DB_USER=$SYSTEM_DB_USER \
+  SYSTEM_DB_PASSWORD=$SYSTEM_DB_PASSWORD \
+  SYSTEM_DB_NAME=$SYSTEM_DB_NAME \
+  SYSTEM_DB_CHARSET=$SYSTEM_DB_CHARSET
+
+USER root
+RUN apk update && \
+  apk upgrade && \
+  apk add git
+
+RUN apk add --no-cache bash
+
+# Change working dir to the server package.
+WORKDIR /app/packages/server
+
+RUN git clone https://github.com/vishnubob/wait-for-it.git
+
+# Once we listen the mysql port run the migration task.
+CMD ["./wait-for-it/wait-for-it.sh", "mysql:3306", "--", "node", "./build/commands.js", "system:migrate:latest"]

docker/mongo/Dockerfile

@@ -0,0 +1 @@
+FROM mongo:5.0

docker/mysql/Dockerfile

@@ -0,0 +1,18 @@
+FROM mysql:5.7
+
+ADD my.cnf /etc/mysql/conf.d/my.cnf
+
+RUN chown -R mysql:root /var/lib/mysql/
+
+ARG MYSQL_DATABASE=default_database
+ARG MYSQL_USER=default_user
+ARG MYSQL_PASSWORD=secret
+ARG MYSQL_ROOT_PASSWORD=root
+
+ENV MYSQL_DATABASE=$MYSQL_DATABASE
+ENV MYSQL_USER=$MYSQL_USER
+ENV MYSQL_PASSWORD=$MYSQL_PASSWORD
+ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+
+CMD ["mysqld"]
+EXPOSE 3306

docker/mysql/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+bind-address = 0.0.0.0

docker/nginx/Dockerfile

@@ -0,0 +1,21 @@
+FROM nginx:1.11
+
+RUN mkdir /etc/nginx/sites-available && rm /etc/nginx/conf.d/default.conf
+ADD nginx.conf /etc/nginx/
+
+COPY scripts /root/scripts/
+COPY certs /etc/ssl/
+
+COPY sites /etc/nginx/templates
+
+ARG SERVER_PROXY_PORT=3000
+ARG WEB_SSL=false
+ARG SELF_SIGNED=false
+
+ENV SERVER_PROXY_PORT=$SERVER_PROXY_PORT
+ENV WEB_SSL=$WEB_SSL
+ENV SELF_SIGNED=$SELF_SIGNED
+
+RUN /bin/bash /root/scripts/build-nginx.sh
+
+CMD nginx

docker/nginx/nginx.conf

@@ -0,0 +1,33 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+daemon off;
+
+events {
+  worker_connections  2048;
+  use epoll;
+}
+
+http {
+  server_tokens off;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 15;
+  types_hash_max_size 2048;
+  client_max_body_size 20M;
+  open_file_cache max=100;
+  gzip on;
+  gzip_disable "msie6";
+
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/sites-available/*;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
+}

docker/nginx/scripts/build-nginx.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for conf in /etc/nginx/templates/*.conf; do
+  mv $conf "/etc/nginx/sites-available/"$(basename $conf) > /dev/null
+done
+
+for template in /etc/nginx/templates/*.template; do
+  envsubst < $template > "/etc/nginx/sites-available/"$(basename $template)".conf"
+done

docker/nginx/sites/server.template

@@ -0,0 +1,16 @@
+server {
+  listen 80 default_server;
+
+  location /api {
+    proxy_pass http://server:${SERVER_PROXY_PORT};
+  }
+
+  location / {
+    proxy_pass http://webapp;
+  }
+
+  location /.well-known/acme-challenge/ {
+    root /var/www/letsencrypt/;
+    log_not_found off;
+  }
+}

docker/redis/Dockerfile

@@ -0,0 +1,5 @@
+FROM redis:4.0
+
+COPY redis.conf /usr/local/etc/redis/redis.conf
+
+CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]

docker/redis/redis.conf

@@ -0,0 +1,48 @@
+daemonize no
+pidfile /var/run/redis.pid
+port 6379
+tcp-backlog 511
+timeout 0
+tcp-keepalive 0
+loglevel notice
+logfile ""
+databases 16
+save 900 1
+save 300 10
+save 60 10000
+stop-writes-on-bgsave-error yes
+rdbcompression yes
+rdbchecksum yes
+dbfilename dump.rdb
+slave-serve-stale-data yes
+slave-read-only yes
+repl-diskless-sync no
+repl-diskless-sync-delay 5
+repl-disable-tcp-nodelay no
+slave-priority 100
+appendonly no
+appendfilename "appendonly.aof"
+appendfsync everysec
+no-appendfsync-on-rewrite no
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+aof-load-truncated yes
+lua-time-limit 5000
+slowlog-log-slower-than 10000
+slowlog-max-len 128
+latency-monitor-threshold 0
+notify-keyspace-events ""
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+set-max-intset-entries 512
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+hll-sparse-max-bytes 3000
+activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+hz 10
+aof-rewrite-incremental-fsync yes

package.json

@@ -9,6 +9,7 @@
     "build:webapp": "lerna run build --scope \"@bigcapital/webapp\"",
     "dev:server": "lerna run dev --scope \"@bigcapital/server\"",
     "build:server": "lerna run build --scope \"@bigcapital/server\"",
+    "serve:server": "lerna run serve --scope \"@bigcapital/server\"",
     "prepare": "husky install"
   },
   "workspaces": [

packages/server/.env.example

@@ -1,41 +0,0 @@
-MAIL_HOST=smtp.mailtrap.io
-MAIL_USERNAME=842f331d3dc005
-MAIL_PASSWORD=172f97b34f1a17
-MAIL_PORT=587
-MAIL_SECURE=false
-MAIL_FROM_NAME=Bigcapital
-MAIL_FROM_ADDRESS=noreply@sender.bigcapital.ly
-
-SYSTEM_DB_CLIENT=mysql
-SYSTEM_DB_HOST=127.0.0.1
-SYSTEM_DB_USER=root
-SYSTEM_DB_PASSWORD=root
-SYSTEM_DB_NAME=bigcapital_system
-SYSTEM_MIGRATIONS_DIR=./src/system/migrations
-SYSTEM_SEEDS_DIR=./src/system/seeds
-
-TENANT_DB_CLIENT=mysql
-TENANT_DB_NAME_PERFIX=bigcapital_tenant_
-TENANT_DB_HOST=127.0.0.1
-TENANT_DB_PASSWORD=root
-TENANT_DB_USER=root
-TENANT_DB_CHARSET=utf8
-TENANT_MIGRATIONS_DIR=src/database/migrations
-TENANT_SEEDS_DIR=src/database/seeds/core
-
-DB_MANAGER_SUPER_USER=root
-DB_MANAGER_SUPER_PASSWORD=root
-
-MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
-
-JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
-
-CONTACT_US_MAIL=support@bigcapital.ly
-BASE_URL=https://bigcapital.ly
-
-LICENSES_AUTH_USER=root
-LICENSES_AUTH_PASSWORD=root
-
-AGENDASH_AUTH_USER=agendash
-AGENDASH_AUTH_PASSWORD=123123
-BROWSER_WS_ENDPOINT=ws://localhost:4080/

packages/server/Dockerfile

@@ -0,0 +1,93 @@
+FROM node:14.20-alpine as build
+
+USER root
+
+ARG MAIL_HOST= \
+  MAIL_USERNAME= \
+  MAIL_PASSWORD= \
+  MAIL_PORT= \
+  MAIL_SECURE= \
+  MAIL_FROM_NAME= \
+  MAIL_FROM_ADDRESS= \
+  # Database
+  DB_HOST= \
+  DB_USER= \
+  DB_PASSWORD= \
+  DB_CHARSET= \
+  # System database.
+  SYSTEM_DB_NAME= \
+  SYSTEM_DB_PASSWORD= \
+  SYSTEM_DB_USER= \
+  SYSTEM_DB_HOST= \
+  SYSTEM_DB_CHARSET= \
+  # Tenant databases.
+  TENANT_DB_USER= \
+  TENANT_DB_PASSWORD= \
+  TENANT_DB_HOST= \
+  TENANT_DB_NAME_PERFIX= \
+  TENANT_DB_CHARSET= \
+  # MongoDB
+  MONGODB_DATABASE_URL= \
+  # Authentication
+  JWT_SECRET= \
+  # Application
+  BASE_URL= \
+  # Agendash
+  AGENDASH_AUTH_USER=agendash \
+  AGENDASH_AUTH_PASSWORD=123123 
+
+ENV MAIL_HOST=$MAIL_HOST \
+  MAIL_USERNAME=$MAIL_USERNAME \
+  MAIL_PASSWORD=$MAIL_PASSWORD \
+  MAIL_PORT=$MAIL_PORT \
+  MAIL_SECURE=$MAIL_SECURE \
+  MAIL_FROM_NAME=$MAIL_FROM_NAME \
+  MAIL_FROM_ADDRESS=$MAIL_FROM_ADDRESS \
+  # Database
+  DB_HOST=$DB_HOST \
+  DB_USER=$DB_USER \
+  DB_PASSWORD=$DB_PASSWORD \
+  DB_CHARSET=$DB_CHARSET \
+  # System database.
+  SYSTEM_DB_HOST=$SYSTEM_DB_HOST \
+  SYSTEM_DB_USER=$SYSTEM_DB_USER \
+  SYSTEM_DB_PASSWORD=$SYSTEM_DB_PASSWORD \
+  SYSTEM_DB_NAME=$SYSTEM_DB_NAME \
+  SYSTEM_DB_CHARSET=$SYSTEM_DB_CHARSET \
+  # Tenant databases.
+  TENANT_DB_NAME_PERFIX=$TENANT_DB_NAME_PERFIX \
+  TENANT_DB_HOST=$TENANT_DB_HOST \
+  TENANT_DB_PASSWORD=$TENANT_DB_PASSWORD \
+  TENANT_DB_USER=$TENANT_DB_USER \
+  TENANT_DB_CHARSET=$TENANT_DB_CHARSET \
+  # Authentication
+  JWT_SECRET=$JWT_SECRET \
+  # Agendash
+  AGENDASH_AUTH_USER=$AGENDASH_AUTH_USER \
+  AGENDASH_AUTH_PASSWORD=$AGENDASH_AUTH_PASSWORD \
+  # MongoDB
+  MONGODB_DATABASE_URL=$MONGODB_DATABASE_URL \
+  # Application
+  BASE_URL=$BASE_URL
+
+# Create app directory.
+WORKDIR /app
+
+RUN chown node:node /
+
+# Copy application dependency manifests to the container image.
+COPY ./package*.json ./
+COPY ./packages/server/package*.json ./packages/server/
+
+COPY ./lerna.json ./lerna.json
+
+# Install app dependencies for production.
+RUN npm install
+RUN npm run bootstrap
+
+COPY --chown=node:node ./packages/server ./packages/server
+
+# # Creates a "dist" folder with the production build
+RUN npm run build:server --skip-nx-cache
+
+CMD [ "node", "./packages/server/build/index.js" ]

packages/server/package.json

@@ -11,6 +11,7 @@
     "build:app": "cross-env NODE_ENV=production webpack --config scripts/webpack.config.js",
     "build:commands": "cross-env NODE_ENV=production webpack --config scripts/webpack.cli.js",
     "build": "npm-run-all build:*",
+    "serve": "node ./build/index.js",
     "lint:fix": "eslint --fix ./**/*.ts"
   },
   "author": "Ahmed Bouhuolia, <a.bouhuolia@gmail.com>",

packages/server/src/api/controllers/Accounts.ts

@@ -9,6 +9,7 @@ import DynamicListingService from '@/services/DynamicListing/DynamicListService'
 import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AccountsApplication } from '@/services/Accounts/AccountsApplication';
+import { MAX_ACCOUNTS_CHART_DEPTH } from 'services/Accounts/constants';
 
 @Service()
 export default class AccountsController extends BaseController {
@@ -494,6 +495,22 @@ export default class AccountsController extends BaseController {
           }
         );
       }
+      if (error.errorType === 'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL') {
+        return res.boom.badRequest(
+          'The parent account exceeded the depth level of accounts chart.',
+          {
+            errors: [
+              {
+                type: 'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL',
+                code: 1500,
+                data: {
+                  maxDepth: MAX_ACCOUNTS_CHART_DEPTH,
+                },
+              },
+            ],
+          }
+        );
+      }
     }
     next(error);
   }

packages/server/src/api/controllers/Organization.ts

@@ -6,7 +6,6 @@ import { check, ValidationChain } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import JWTAuth from '@/api/middleware/jwtAuth';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
 import OrganizationService from '@/services/Organization/OrganizationService';
 import {
@@ -24,7 +23,7 @@ const ACCEPTED_LOCATIONS = ['libya'];
 @Service()
 export default class OrganizationController extends BaseController {
   @Inject()
-  organizationService: OrganizationService;
+  private organizationService: OrganizationService;
 
   /**
    * Router constructor.
@@ -32,13 +31,10 @@ export default class OrganizationController extends BaseController {
   router() {
     const router = Router();
 
-    // Should before build tenant database the user be authorized and
-    // most important than that, should be subscribed to any plan.
     router.use(JWTAuth);
     router.use(AttachCurrentTenantUser);
     router.use(TenancyMiddleware);
 
-    router.use('/build', SubscriptionMiddleware('main'));
     router.post(
       '/build',
       this.organizationValidationSchema,

packages/server/src/api/controllers/Setup.ts

@@ -1,102 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { check, ValidationChain } from 'express-validator';
-import BaseController from './BaseController';
-import SetupService from '@/services/Setup/SetupService';
-import { Inject, Service } from 'typedi';
-import { IOrganizationSetupDTO } from '@/interfaces';
-import { ServiceError } from '@/exceptions';
-// Middlewares
-import JWTAuth from '@/api/middleware/jwtAuth';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
-import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import EnsureTenantIsInitialized from '@/api/middleware/EnsureTenantIsInitialized';
-import SettingsMiddleware from '@/api/middleware/SettingsMiddleware';
-
-@Service()
-export default class SetupController extends BaseController {
-  @Inject()
-  setupService: SetupService;
-
-  router() {
-    const router = Router('/setup');
-
-    router.use(JWTAuth);
-    router.use(AttachCurrentTenantUser);
-    router.use(TenancyMiddleware);
-    router.use(SubscriptionMiddleware('main'));
-    router.use(EnsureTenantIsInitialized);
-    router.use(SettingsMiddleware);
-    router.post(
-      '/organization',
-      this.organizationSetupSchema,
-      this.validationResult,
-      this.asyncMiddleware(this.organizationSetup.bind(this)),
-      this.handleServiceErrors
-    );
-    return router;
-  }
-
-  /**
-   * Organization setup schema.
-   */
-  private get organizationSetupSchema(): ValidationChain[] {
-    return [
-      check('organization_name').exists().trim(),
-      check('base_currency').exists(),
-      check('time_zone').exists(),
-      check('fiscal_year').exists(),
-      check('industry').optional(),
-    ];
-  }
-
-  /**
-   * Organization setup.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns
-   */
-  async organizationSetup(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const setupDTO: IOrganizationSetupDTO = this.matchedBodyData(req);
-
-    try {
-      await this.setupService.organizationSetup(tenantId, setupDTO);
-
-      return res.status(200).send({
-        message: 'The setup settings set successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Handles service errors.
-   * @param {Error} error
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  handleServiceErrors(
-    error: Error,
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (error instanceof ServiceError) {
-      if (error.errorType === 'TENANT_IS_ALREADY_SETUPED') {
-        return res.status(400).send({
-          errors: [{ type: 'TENANT_IS_ALREADY_SETUPED', code: 1000 }],
-        });
-      }
-      if (error.errorType === 'BASE_CURRENCY_INVALID') {
-        return res.status(400).send({
-          errors: [{ type: 'BASE_CURRENCY_INVALID', code: 110 }],
-        });
-      }
-    }
-    next(error);
-  }
-}

packages/server/src/api/controllers/Subscription/Licenses.ts

@@ -1,250 +0,0 @@
-import { Service, Inject } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { check, oneOf, ValidationChain } from 'express-validator';
-import basicAuth from 'express-basic-auth';
-import config from '@/config';
-import { License } from '@/system/models';
-import { ServiceError } from '@/exceptions';
-import BaseController from '@/api/controllers/BaseController';
-import LicenseService from '@/services/Payment/License';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import { ILicensesFilter, ISendLicenseDTO } from '@/interfaces';
-
-@Service()
-export default class LicensesController extends BaseController {
-  @Inject()
-  licenseService: LicenseService;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use(
-      basicAuth({
-        users: {
-          [config.licensesAuth.user]: config.licensesAuth.password,
-        },
-        challenge: true,
-      })
-    );
-    router.post(
-      '/generate',
-      this.generateLicenseSchema,
-      this.validationResult,
-      asyncMiddleware(this.generateLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.post(
-      '/disable/:licenseId',
-      this.validationResult,
-      asyncMiddleware(this.disableLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.post(
-      '/send',
-      this.sendLicenseSchemaValidation,
-      this.validationResult,
-      asyncMiddleware(this.sendLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.delete(
-      '/:licenseId',
-      asyncMiddleware(this.deleteLicense.bind(this)),
-      this.catchServiceErrors,
-    );
-    router.get('/', asyncMiddleware(this.listLicenses.bind(this)));
-    return router;
-  }
-
-  /**
-   * Generate license validation schema.
-   */
-  get generateLicenseSchema(): ValidationChain[] {
-    return [
-      check('loop').exists().isNumeric().toInt(),
-      check('period').exists().isNumeric().toInt(),
-      check('period_interval')
-        .exists()
-        .isIn(['month', 'months', 'year', 'years', 'day', 'days']),
-      check('plan_slug').exists().trim().escape(),
-    ];
-  }
-
-  /**
-   * Specific license validation schema.
-   */
-  get specificLicenseSchema(): ValidationChain[] {
-    return [
-      oneOf(
-        [check('license_id').exists().isNumeric().toInt()],
-        [check('license_code').exists().isNumeric().toInt()]
-      ),
-    ];
-  }
-
-  /**
-   * Send license validation schema.
-   */
-  get sendLicenseSchemaValidation(): ValidationChain[] {
-    return [
-      check('period').exists().isNumeric(),
-      check('period_interval').exists().trim().escape(),
-      check('plan_slug').exists().trim().escape(),
-      oneOf([
-        check('phone_number').exists().trim().escape(),
-        check('email').exists().trim().escape(),
-      ]),
-    ];
-  }
-
-  /**
-   * Generate licenses codes with given period in bulk.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async generateLicense(req: Request, res: Response, next: Function) {
-    const { loop = 10, period, periodInterval, planSlug } = this.matchedBodyData(
-      req
-    );
-
-    try {
-      await this.licenseService.generateLicenses(
-        loop,
-        period,
-        periodInterval,
-        planSlug
-      );
-      return res.status(200).send({
-        code: 100,
-        type: 'LICENSEES.GENERATED.SUCCESSFULLY',
-        message: 'The licenses have been generated successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Disable the given license on the storage.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async disableLicense(req: Request, res: Response, next: Function) {
-    const { licenseId } = req.params;
-
-    try {
-      await this.licenseService.disableLicense(licenseId);
-
-      return res.status(200).send({ license_id: licenseId });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given license code on the storage.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async deleteLicense(req: Request, res: Response, next: Function) {
-    const { licenseId } = req.params;
-
-    try {
-      await this.licenseService.deleteLicense(licenseId);
-
-      return res.status(200).send({ license_id: licenseId });
-    } catch (error) {
-      next(error)
-    }
-  }
-
-  /**
-   * Send license code in the given period to the customer via email or phone number
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async sendLicense(req: Request, res: Response, next: Function) {
-    const sendLicenseDTO: ISendLicenseDTO = this.matchedBodyData(req);
-
-    try {
-      await this.licenseService.sendLicenseToCustomer(sendLicenseDTO);
-
-      return res.status(200).send({
-        status: 100,
-        code: 'LICENSE.CODE.SENT',
-        message: 'The license has been sent to the given customer.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Listing licenses.
-   * @param {Request} req
-   * @param {Response} res
-   */
-  async listLicenses(req: Request, res: Response) {
-    const filter: ILicensesFilter = {
-      disabled: false,
-      used: false,
-      sent: false,
-      active: false,
-      ...req.query,
-    };
-    const licenses = await License.query().onBuild((builder) => {
-      builder.modify('filter', filter);
-      builder.orderBy('createdAt', 'ASC');
-    });
-    return res.status(200).send({ licenses });
-  }
-
-  /**
-   * Catches all service errors.
-   */
-  catchServiceErrors(error, req: Request, res: Response, next: NextFunction) {
-    if (error instanceof ServiceError) {
-      if (error.errorType === 'PLAN_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [{
-            type: 'PLAN.NOT.FOUND',
-            code: 100,
-            message: 'The given plan not found.',
-        }],
-        });
-      }
-      if (error.errorType === 'LICENSE_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [{
-            type: 'LICENSE_NOT_FOUND',
-            code: 200,
-            message: 'The given license id not found.'
-          }],
-        });
-      }
-      if (error.errorType === 'LICENSE_ALREADY_DISABLED') {
-        return res.status(400).send({
-          errors: [{
-            type: 'LICENSE.ALREADY.DISABLED',
-            code: 200, 
-            message: 'License is already disabled.'
-          }],
-        });
-      }
-      if (error.errorType === 'NO_AVALIABLE_LICENSE_CODE') {
-        return res.status(400).send({
-          status: 110,
-          message: 'There is no licenses availiable right now with the given period and plan.',
-          code: 'NO.AVALIABLE.LICENSE.CODE',
-        });
-      }
-    }
-    next(error);
-  }
-}

packages/server/src/api/controllers/Subscription/PaymentMethod.ts

@@ -1,31 +0,0 @@
-import { Inject } from 'typedi';
-import { Request, Response } from 'express';
-import { Plan } from '@/system/models';
-import BaseController from '@/api/controllers/BaseController';
-import SubscriptionService from '@/services/Subscription/SubscriptionService';
-
-export default class PaymentMethodController extends BaseController {
-  @Inject()
-  subscriptionService: SubscriptionService;
-
-  /**
-   * Validate the given plan slug exists on the storage.
-   * 
-   * @param {Request} req 
-   * @param {Response} res 
-   * @param {NextFunction} next
-   * 
-   * @return {Response|void}
-   */
-  async validatePlanSlugExistance(req: Request, res: Response, next: Function) {
-    const { planSlug } = this.matchedBodyData(req);
-    const foundPlan = await Plan.query().where('slug', planSlug).first();
-
-    if (!foundPlan) {
-      return res.status(400).send({
-        errors: [{ type: 'PLAN.SLUG.NOT.EXISTS', code: 110 }],
-      });
-    }
-    next();
-  }
-}

packages/server/src/api/controllers/Subscription/PaymentViaLicense.ts

@@ -1,125 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Router, Request, Response } from 'express';
-import { check } from 'express-validator';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import PaymentMethodController from '@/api/controllers/Subscription/PaymentMethod';
-import {
-  NotAllowedChangeSubscriptionPlan,
-  NoPaymentModelWithPricedPlan,
-  PaymentAmountInvalidWithPlan,
-  PaymentInputInvalid,
-  VoucherCodeRequired,
-} from '@/exceptions';
-import { ILicensePaymentModel } from '@/interfaces';
-import instance from 'tsyringe/dist/typings/dependency-container';
-
-@Service()
-export default class PaymentViaLicenseController extends PaymentMethodController {
-  @Inject('logger')
-  logger: any;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.post(
-      '/payment',
-      this.paymentViaLicenseSchema,
-      this.validationResult,
-      asyncMiddleware(this.validatePlanSlugExistance.bind(this)),
-      asyncMiddleware(this.paymentViaLicense.bind(this)),
-      this.handleErrors,
-    );
-    return router;
-  }
-
-  /**
-   * Payment via license validation schema.
-   */
-  get paymentViaLicenseSchema() {
-    return [
-      check('plan_slug').exists().trim().escape(),
-      check('license_code').exists().trim().escape(),
-    ];
-  }
-
-  /**
-   * Handle the subscription payment via license code.
-   * @param {Request} req
-   * @param {Response} res
-   * @return {Response}
-   */
-  async paymentViaLicense(req: Request, res: Response, next: Function) {
-    const { planSlug, licenseCode } = this.matchedBodyData(req);
-    const { tenant } = req;
-
-    try {
-      const licenseModel: ILicensePaymentModel = { licenseCode };
-
-      await this.subscriptionService.subscriptionViaLicense(
-        tenant.id,
-        planSlug,
-        licenseModel
-      );
-
-      return res.status(200).send({
-        type: 'success',
-        code: 'PAYMENT.SUCCESSFULLY.MADE',
-        message: 'Payment via license has been made successfully.',
-      });
-    } catch (exception) {
-      next(exception);
-    }
-  }
-
-  /**
-   * Handle service errors.
-   * @param {Error} error
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private handleErrors(
-    exception: Error,
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const errorReasons = [];
-
-    if (exception instanceof VoucherCodeRequired) {
-      errorReasons.push({
-        type: 'VOUCHER_CODE_REQUIRED',
-        code: 100,
-      });
-    }
-    if (exception instanceof NoPaymentModelWithPricedPlan) {
-      errorReasons.push({
-        type: 'NO_PAYMENT_WITH_PRICED_PLAN',
-        code: 140,
-      });
-    }
-    if (exception instanceof NotAllowedChangeSubscriptionPlan) {
-      errorReasons.push({
-        type: 'NOT.ALLOWED.RENEW.SUBSCRIPTION.WHILE.ACTIVE',
-        code: 120,
-      });
-    }
-    if (errorReasons.length > 0) {
-      return res.status(400).send({ errors: errorReasons });
-    }
-    if (exception instanceof PaymentInputInvalid) {
-      return res.status(400).send({
-        errors: [{ type: 'LICENSE.CODE.IS.INVALID', code: 120 }],
-      });
-    }
-    if (exception instanceof PaymentAmountInvalidWithPlan) {
-      return res.status(400).send({
-        errors: [{ type: 'LICENSE.NOT.FOR.GIVEN.PLAN' }],
-      });
-    }
-    next(exception);
-  }
-}

packages/server/src/api/controllers/Subscription/index.ts

@@ -1,49 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { Container, Service, Inject } from 'typedi';
-import JWTAuth from '@/api/middleware/jwtAuth';
-import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import PaymentViaLicenseController from '@/api/controllers/Subscription/PaymentViaLicense';
-import SubscriptionService from '@/services/Subscription/SubscriptionService';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-
-@Service()
-export default class SubscriptionController {
-  @Inject()
-  subscriptionService: SubscriptionService;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.use(JWTAuth);
-    router.use(AttachCurrentTenantUser);
-    router.use(TenancyMiddleware);
-
-    router.use('/license', Container.get(PaymentViaLicenseController).router());
-    router.get('/', asyncMiddleware(this.getSubscriptions.bind(this)));
-
-    return router;
-  }
-
-  /**
-   * Retrieve all subscriptions of the authenticated user's tenant.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  async getSubscriptions(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-
-    try {
-      const subscriptions = await this.subscriptionService.getSubscriptions(
-        tenantId
-      );
-      return res.status(200).send({ subscriptions });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

packages/server/src/api/index.ts

@@ -4,7 +4,6 @@ import { Container } from 'typedi';
 // Middlewares
 import JWTAuth from '@/api/middleware/jwtAuth';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
 import EnsureTenantIsInitialized from '@/api/middleware/EnsureTenantIsInitialized';
 import SettingsMiddleware from '@/api/middleware/SettingsMiddleware';
@@ -37,8 +36,6 @@ import Resources from './controllers/Resources';
 import ExchangeRates from '@/api/controllers/ExchangeRates';
 import Media from '@/api/controllers/Media';
 import Ping from '@/api/controllers/Ping';
-import Subscription from '@/api/controllers/Subscription';
-import Licenses from '@/api/controllers/Subscription/Licenses';
 import InventoryAdjustments from '@/api/controllers/Inventory/InventoryAdjustments';
 import asyncRenderMiddleware from './middleware/AsyncRenderMiddleware';
 import Jobs from './controllers/Jobs';
@@ -69,8 +66,6 @@ export default () => {
 
   app.use('/auth', Container.get(Authentication).router());
   app.use('/invite', Container.get(InviteUsers).nonAuthRouter());
-  app.use('/licenses', Container.get(Licenses).router());
-  app.use('/subscription', Container.get(Subscription).router());
   app.use('/organization', Container.get(Organization).router());
   app.use('/ping', Container.get(Ping).router());
   app.use('/jobs', Container.get(Jobs).router());
@@ -83,7 +78,6 @@ export default () => {
   dashboard.use(JWTAuth);
   dashboard.use(AttachCurrentTenantUser);
   dashboard.use(TenancyMiddleware);
-  dashboard.use(SubscriptionMiddleware('main'));
   dashboard.use(EnsureTenantIsInitialized);
   dashboard.use(SettingsMiddleware);
   dashboard.use(I18nAuthenticatedMiddlware);

packages/server/src/api/middleware/SubscriptionMiddleware.ts

@@ -1,41 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import { Container } from 'typedi';
-
-export default (subscriptionSlug = 'main') => async (
-  req: Request,
-  res: Response,
-  next: NextFunction
-) => {
-  const { tenant, tenantId } = req;
-  const Logger = Container.get('logger');
-  const { subscriptionRepository } = Container.get('repositories');
-
-  if (!tenant) {
-    throw new Error('Should load `TenancyMiddlware` before this middleware.');
-  }
-  Logger.info('[subscription_middleware] trying get tenant main subscription.');
-  const subscription = await subscriptionRepository.getBySlugInTenant(
-    subscriptionSlug,
-    tenantId
-  );
-  // Validate in case there is no any already subscription.
-  if (!subscription) {
-    Logger.info('[subscription_middleware] tenant has no subscription.', {
-      tenantId,
-    });
-    return res.boom.badRequest('Tenant has no subscription.', {
-      errors: [{ type: 'TENANT.HAS.NO.SUBSCRIPTION' }],
-    });
-  }
-  // Validate in case the subscription is inactive.
-  else if (subscription.inactive()) {
-    Logger.info(
-      '[subscription_middleware] tenant main subscription is expired.',
-      { tenantId }
-    );
-    return res.boom.badRequest(null, {
-      errors: [{ type: 'ORGANIZATION.SUBSCRIPTION.INACTIVE' }],
-    });
-  }
-  next();
-};

packages/server/src/config/index.ts

@@ -1,13 +1,7 @@
 import dotenv from 'dotenv';
+import path from 'path';
 
-// Set the NODE_ENV to 'development' by default
-// process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-const envFound = dotenv.config();
-if (envFound.error) {
-  // This error should crash whole process
-  throw new Error("⚠️  Couldn't find .env file  ⚠️");
-}
+dotenv.config();
 
 module.exports = {
   /**
@@ -19,36 +13,36 @@ module.exports = {
    * System database configuration.
    */
   system: {
-    db_client: process.env.SYSTEM_DB_CLIENT,
-    db_host: process.env.SYSTEM_DB_HOST,
-    db_user: process.env.SYSTEM_DB_USER,
-    db_password: process.env.SYSTEM_DB_PASSWORD,
+    db_client: process.env.SYSTEM_DB_CLIENT || process.env.DB_CLIENT || 'mysql',
+    db_host: process.env.SYSTEM_DB_HOST || process.env.DB_HOST,
+    db_user: process.env.SYSTEM_DB_USER || process.env.DB_USER,
+    db_password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
     db_name: process.env.SYSTEM_DB_NAME,
-    charset: process.env.SYSTEM_DB_CHARSET,
-    migrations_dir: process.env.SYSTEM_MIGRATIONS_DIR,
-    seeds_dir: process.env.SYSTEM_SEEDS_DIR,
+    charset: process.env.SYSTEM_DB_CHARSET || process.env.DB_CHARSET,
+    migrations_dir: path.join(global.__root_dir, './src/system/migrations'),
+    seeds_dir: path.join(global.__root_dir, './src/system/seeds'),
   },
 
   /**
    * Tenant database configuration.
    */
   tenant: {
-    db_client: process.env.TENANT_DB_CLIENT,
+    db_client: process.env.TENANT_DB_CLIENT || process.env.DB_CLIENT || 'mysql',
     db_name_prefix: process.env.TENANT_DB_NAME_PERFIX,
-    db_host: process.env.TENANT_DB_HOST,
-    db_user: process.env.TENANT_DB_USER,
-    db_password: process.env.TENANT_DB_PASSWORD,
-    charset: process.env.TENANT_DB_CHARSET,
-    migrations_dir: process.env.TENANT_MIGRATIONS_DIR,
-    seeds_dir: process.env.TENANT_SEEDS_DIR,
+    db_host: process.env.TENANT_DB_HOST || process.env.DB_HOST,
+    db_user: process.env.TENANT_DB_USER || process.env.DB_USER,
+    db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD,
+    charset: process.env.TENANT_DB_CHARSET || process.env.DB_CHARSET,
+    migrations_dir: path.join(global.__root_dir, './src/database/migrations'),
+    seeds_dir: path.join(global.__root_dir, './src/database/seeds/core'),
   },
 
   /**
    * Databases manager config.
    */
   manager: {
-    superUser: process.env.DB_MANAGER_SUPER_USER,
-    superPassword: process.env.DB_MANAGER_SUPER_PASSWORD,
+    superUser: process.env.SYSTEM_DB_USER || process.env.DB_USER,
+    superPassword: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
   },
 
   /**
@@ -119,14 +113,6 @@ module.exports = {
     prefix: '/api',
   },
 
-  /**
-   * Licenses api basic authentication.
-   */
-  licensesAuth: {
-    user: process.env.LICENSES_AUTH_USER,
-    password: process.env.LICENSES_AUTH_PASSWORD,
-  },
-
   /**
    * Redis storage configuration.
    */

packages/server/src/exceptions/NoPaymentModelWithPricedPlan.ts

@@ -1,8 +0,0 @@
-
-
-export default class NoPaymentModelWithPricedPlan {
-
-  constructor() {
-    
-  }
-}

packages/server/src/exceptions/NotAllowedChangeSubscriptionPlan.ts

@@ -1,8 +0,0 @@
-
-
-export default class NotAllowedChangeSubscriptionPlan {
-
-  constructor() {
-    this.name = "NotAllowedChangeSubscriptionPlan";
-  }
-}

packages/server/src/exceptions/PaymentAmountInvalidWithPlan.ts

@@ -1,7 +0,0 @@
-
-
-export default class PaymentAmountInvalidWithPlan{
-  constructor() {
-    
-  }
-}

packages/server/src/exceptions/PaymentInputInvalid.ts

@@ -1,3 +0,0 @@
-export default class PaymentInputInvalid {
-  constructor() {}
-}

packages/server/src/exceptions/VoucherCodeRequired.ts

@@ -1,5 +0,0 @@
-export default class VoucherCodeRequired {
-  constructor() {
-    this.name = 'VoucherCodeRequired';
-  }
-}

packages/server/src/exceptions/index.ts

@@ -1,25 +1,15 @@
-import NotAllowedChangeSubscriptionPlan from './NotAllowedChangeSubscriptionPlan';
 import ServiceError from './ServiceError';
 import ServiceErrors from './ServiceErrors';
-import NoPaymentModelWithPricedPlan from './NoPaymentModelWithPricedPlan';
-import PaymentInputInvalid from './PaymentInputInvalid';
-import PaymentAmountInvalidWithPlan from './PaymentAmountInvalidWithPlan';
 import TenantAlreadyInitialized from './TenantAlreadyInitialized';
 import TenantAlreadySeeded from './TenantAlreadySeeded';
 import TenantDBAlreadyExists from './TenantDBAlreadyExists';
 import TenantDatabaseNotBuilt from './TenantDatabaseNotBuilt';
-import VoucherCodeRequired from './VoucherCodeRequired';
 
 export {
-  NotAllowedChangeSubscriptionPlan,
-  NoPaymentModelWithPricedPlan,
-  PaymentAmountInvalidWithPlan,
   ServiceError,
   ServiceErrors,
-  PaymentInputInvalid,
   TenantAlreadyInitialized,
   TenantAlreadySeeded,
   TenantDBAlreadyExists,
   TenantDatabaseNotBuilt,
-  VoucherCodeRequired,
-};
+};

packages/server/src/jobs/MailNotificationSubscribeEnd.ts

@@ -1,34 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class MailNotificationSubscribeEnd {
-  /**
-   * Job handler.
-   * @param {Job} job -
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(
-      `Send mail notification subscription end soon - started: ${job.attrs.data}`
-    );
-
-    try {
-      subscriptionService.mailMessages.sendRemainingTrialPeriod(
-        phoneNumber,
-        remainingDays
-      );
-      Logger.info(
-        `Send mail notification subscription end soon - finished: ${job.attrs.data}`
-      );
-    } catch (error) {
-      Logger.info(
-        `Send mail notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`
-      );
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/MailNotificationTrialEnd.ts

@@ -1,34 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class MailNotificationTrialEnd {
-  /**
-   *
-   * @param {Job} job -
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(
-      `Send mail notification subscription end soon - started: ${job.attrs.data}`
-    );
-
-    try {
-      subscriptionService.mailMessages.sendRemainingTrialPeriod(
-        phoneNumber,
-        remainingDays
-      );
-      Logger.info(
-        `Send mail notification subscription end soon - finished: ${job.attrs.data}`
-      );
-    } catch (error) {
-      Logger.info(
-        `Send mail notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`
-      );
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/SMSNotificationSubscribeEnd.ts

@@ -1,28 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class SMSNotificationSubscribeEnd {
-
-  /**
-   * 
-   * @param {Job}job 
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(`Send SMS notification subscription end soon - started: ${job.attrs.data}`);
-
-    try {
-      subscriptionService.smsMessages.sendRemainingSubscriptionPeriod(
-        phoneNumber, remainingDays,
-      );
-      Logger.info(`Send SMS notification subscription end soon - finished: ${job.attrs.data}`);
-    } catch(error) {
-      Logger.info(`Send SMS notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`);
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/SMSNotificationTrialEnd.ts

@@ -1,28 +0,0 @@
-import Container from 'typedi';
-import SubscriptionService from '@/services/Subscription/Subscription';
-
-export default class SMSNotificationTrialEnd {
-
-  /**
-   * 
-   * @param {Job}job 
-   */
-  handler(job) {
-    const { tenantId, phoneNumber, remainingDays } = job.attrs.data;
-
-    const subscriptionService = Container.get(SubscriptionService);
-    const Logger = Container.get('logger');
-
-    Logger.info(`Send notification subscription end soon - started: ${job.attrs.data}`);
-
-    try {
-      subscriptionService.smsMessages.sendRemainingTrialPeriod(
-        phoneNumber, remainingDays,
-      );
-      Logger.info(`Send notification subscription end soon - finished: ${job.attrs.data}`);
-    } catch(error) {
-      Logger.info(`Send notification subscription end soon - failed: ${job.attrs.data}, error: ${e}`);
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/SendLicenseEmail.ts

@@ -1,33 +0,0 @@
-import { Container } from 'typedi';
-import LicenseService from '@/services/Payment/License';
-
-export default class SendLicenseViaEmailJob {
-  /**
-   * Constructor method.
-   * @param agenda 
-   */
-  constructor(agenda) {
-    agenda.define(
-      'send-license-via-email',
-      { priority: 'high', concurrency: 1, },
-      this.handler,
-    );
-  }
-
-  public async handler(job, done: Function): Promise<void> {
-    const Logger = Container.get('logger');
-    const licenseService = Container.get(LicenseService);
-    const { email, licenseCode } = job.attrs.data;
-
-    Logger.info(`[send_license_via_mail] started: ${job.attrs.data}`);
-
-    try {
-      await licenseService.mailMessages.sendMailLicense(licenseCode, email);
-      Logger.info(`[send_license_via_mail] completed: ${job.attrs.data}`);
-      done();
-    } catch(e) {
-      Logger.error(`[send_license_via_mail] ${job.attrs.data}, error: ${e}`);
-      done(e);  
-    } 
-  }
-}

packages/server/src/jobs/SendLicensePhone.ts

@@ -1,33 +0,0 @@
-import { Container } from 'typedi';
-import LicenseService from '@/services/Payment/License';
-
-export default class SendLicenseViaPhoneJob {
-  /**
-   * Constructor method.
-   */
-  constructor(agenda) {
-    agenda.define(
-      'send-license-via-phone',
-      { priority: 'high', concurrency: 1, },
-      this.handler,
-    );
-  }
-
-  public async handler(job, done: Function): Promise<void> {
-    const { phoneNumber, licenseCode } = job.attrs.data;
-
-    const Logger = Container.get('logger');
-    const licenseService = Container.get(LicenseService);
-
-    Logger.debug(`Send license via phone number - started: ${job.attrs.data}`);
-
-    try {
-      await licenseService.smsMessages.sendLicenseSMSMessage(phoneNumber, licenseCode);
-      Logger.debug(`Send license via phone number - completed: ${job.attrs.data}`);
-      done();
-    } catch(e) {
-      Logger.error(`Send license via phone number: ${job.attrs.data}, error: ${e}`);
-      done(e);  
-    }
-  }
-}

packages/server/src/loaders/jobs.ts

@@ -4,12 +4,6 @@ import WelcomeSMSJob from 'jobs/WelcomeSMS';
 import ResetPasswordMailJob from 'jobs/ResetPasswordMail';
 import ComputeItemCost from 'jobs/ComputeItemCost';
 import RewriteInvoicesJournalEntries from 'jobs/writeInvoicesJEntries';
-import SendLicenseViaPhoneJob from 'jobs/SendLicensePhone';
-import SendLicenseViaEmailJob from 'jobs/SendLicenseEmail';
-import SendSMSNotificationSubscribeEnd from 'jobs/SMSNotificationSubscribeEnd';
-import SendSMSNotificationTrialEnd from 'jobs/SMSNotificationTrialEnd';
-import SendMailNotificationSubscribeEnd from 'jobs/MailNotificationSubscribeEnd';
-import SendMailNotificationTrialEnd from 'jobs/MailNotificationTrialEnd';
 import UserInviteMailJob from 'jobs/UserInviteMail';
 import OrganizationSetupJob from 'jobs/OrganizationSetup';
 import OrganizationUpgrade from 'jobs/OrganizationUpgrade';
@@ -20,33 +14,11 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
   new WelcomeSMSJob(agenda);
   new UserInviteMailJob(agenda);
-  new SendLicenseViaEmailJob(agenda);
-  new SendLicenseViaPhoneJob(agenda);
   new ComputeItemCost(agenda);
   new RewriteInvoicesJournalEntries(agenda);
   new OrganizationSetupJob(agenda);
   new OrganizationUpgrade(agenda);
   new SmsNotification(agenda);
 
-  agenda.define(
-    'send-sms-notification-subscribe-end',
-    { priority: 'nromal', concurrency: 1, },
-    new SendSMSNotificationSubscribeEnd().handler,
-  );
-  agenda.define(
-    'send-sms-notification-trial-end',
-    { priority: 'normal', concurrency: 1, },
-    new SendSMSNotificationTrialEnd().handler,
-  );
-  agenda.define(
-    'send-mail-notification-subscribe-end',
-    { priority: 'high', concurrency: 1, },
-    new SendMailNotificationSubscribeEnd().handler
-  );
-  agenda.define(
-    'send-mail-notification-trial-end',
-    { priority: 'high', concurrency: 1, },
-    new SendMailNotificationTrialEnd().handler
-  );
   agenda.start();
 };

packages/server/src/loaders/systemRepositories.ts

@@ -1,7 +1,6 @@
 import Container from 'typedi';
 import {
   SystemUserRepository,
-  SubscriptionRepository,
   TenantRepository,
 } from '@/system/repositories';
 
@@ -11,7 +10,6 @@ export default () => {
 
   return {
     systemUserRepository: new SystemUserRepository(knex, cache),
-    subscriptionRepository: new SubscriptionRepository(knex, cache),
     tenantRepository: new TenantRepository(knex, cache),
   };
 }

packages/server/src/server.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
-import '@/config';
 import './before';
+import '@/config';
 
 import express from 'express';
 import loadersFactory from 'loaders';

packages/server/src/services/Accounts/CommandAccountValidators.ts

@@ -3,7 +3,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import { ServiceError } from '@/exceptions';
 import { IAccountDTO, IAccount, IAccountCreateDTO } from '@/interfaces';
 import AccountTypesUtils from '@/lib/AccountTypes';
-import { ERRORS } from './constants';
+import { ERRORS, MAX_ACCOUNTS_CHART_DEPTH } from './constants';
 
 @Service()
 export class CommandAccountValidators {
@@ -154,13 +154,13 @@ export class CommandAccountValidators {
    * parent account.
    * @param  {IAccountCreateDTO} accountDTO
    * @param  {IAccount} parentAccount
-   * @param  {string} baseCurrency - 
+   * @param  {string} baseCurrency -
    * @throws {ServiceError(ERRORS.ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT)}
    */
   public validateCurrentSameParentAccount = (
     accountDTO: IAccountCreateDTO,
     parentAccount: IAccount,
-    baseCurrency: string,
+    baseCurrency: string
   ) => {
     // If the account DTO currency not assigned and the parent account has no base currency.
     if (
@@ -208,4 +208,24 @@ export class CommandAccountValidators {
     }
     return account;
   }
+
+  /**
+   * Validates the max depth level of accounts chart.
+   * @param {numebr} tenantId - Tenant id.
+   * @param {number} parentAccountId - Parent account id.
+   */
+  public async validateMaxParentAccountDepthLevels(
+    tenantId: number,
+    parentAccountId: number
+  ) {
+    const { accountRepository } = this.tenancy.repositories(tenantId);
+
+    const accountsGraph = await accountRepository.getDependencyGraph();
+
+    const parentDependantsIds = accountsGraph.dependantsOf(parentAccountId);
+
+    if (parentDependantsIds.length >= MAX_ACCOUNTS_CHART_DEPTH) {
+      throw new ServiceError(ERRORS.PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL);
+    }
+  }
 }

packages/server/src/services/Accounts/CreateAccount.ts

@@ -70,6 +70,11 @@ export class CreateAccount {
         parentAccount,
         baseCurrency
       );
+      // Validates the max depth level of accounts chart.
+      await this.validator.validateMaxParentAccountDepthLevels(
+        tenantId,
+        accountDTO.parentAccountId
+      );
     }
     // Validates the given account type supports the multi-currency.
     this.validator.validateAccountTypeSupportCurrency(accountDTO, baseCurrency);

packages/server/src/services/Accounts/GetAccounts.ts

@@ -5,6 +5,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { AccountTransformer } from './AccountTransform';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
+import { flatToNestedArray } from '@/utils';
 
 @Service()
 export class GetAccounts {
@@ -53,11 +54,17 @@ export class GetAccounts {
       builder.modify('inactiveMode', filter.inactiveMode);
     });
     // Retrievs the formatted accounts collection.
-    const transformedAccounts = await this.transformer.transform(
+    const preTransformedAccounts = await this.transformer.transform(
       tenantId,
       accounts,
       new AccountTransformer()
     );
+    // Transform accounts to nested array.
+    const transformedAccounts = flatToNestedArray(preTransformedAccounts, {
+      id: 'id',
+      parentId: 'parentAccountId',
+    });
+
     return {
       accounts: transformedAccounts,
       filterMeta: dynamicList.getResponseMeta(),

packages/server/src/services/Accounts/constants.ts

@@ -13,8 +13,12 @@ export const ERRORS = {
   CLOSE_ACCOUNT_AND_TO_ACCOUNT_NOT_SAME_TYPE:
     'close_account_and_to_account_not_same_type',
   ACCOUNTS_NOT_FOUND: 'accounts_not_found',
-  ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY: 'ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY',
-  ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT: 'ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT',
+  ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY:
+    'ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY',
+  ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT:
+    'ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT',
+  PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL:
+    'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL',
 };
 
 // Default views columns.
@@ -27,6 +31,8 @@ export const DEFAULT_VIEW_COLUMNS = [
   { key: 'currencyCode', label: 'Currency' },
 ];
 
+export const MAX_ACCOUNTS_CHART_DEPTH = 5;
+
 // Accounts default views.
 export const DEFAULT_VIEWS = [
   {
@@ -43,7 +49,12 @@ export const DEFAULT_VIEWS = [
     slug: 'liabilities',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'liability' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'liability',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -52,7 +63,12 @@ export const DEFAULT_VIEWS = [
     slug: 'equity',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'equity' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'equity',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -61,7 +77,12 @@ export const DEFAULT_VIEWS = [
     slug: 'income',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'income' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'income',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -70,7 +91,12 @@ export const DEFAULT_VIEWS = [
     slug: 'expenses',
     rolesLogicExpression: '1',
     roles: [
-      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'expense' },
+      {
+        fieldKey: 'root_type',
+        index: 1,
+        comparator: 'equals',
+        value: 'expense',
+      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },

packages/server/src/services/Organization/OrganizationService.ts

@@ -150,7 +150,6 @@ export default class OrganizationService {
   public async currentOrganization(tenantId: number): Promise<ITenant> {
     const tenant = await Tenant.query()
       .findById(tenantId)
-      .withGraphFetched('subscriptions')
       .withGraphFetched('metadata');
 
     this.throwIfTenantNotExists(tenant);

packages/server/src/services/Payment/License.ts

@@ -1,185 +0,0 @@
-import { Service, Container, Inject } from 'typedi';
-import cryptoRandomString from 'crypto-random-string';
-import { times } from 'lodash';
-import { License, Plan } from '@/system/models';
-import { ILicense, ISendLicenseDTO } from '@/interfaces';
-import LicenseMailMessages from '@/services/Payment/LicenseMailMessages';
-import LicenseSMSMessages from '@/services/Payment/LicenseSMSMessages';
-import { ServiceError } from '@/exceptions';
-
-const ERRORS = {
-  PLAN_NOT_FOUND: 'PLAN_NOT_FOUND',
-  LICENSE_NOT_FOUND: 'LICENSE_NOT_FOUND',
-  LICENSE_ALREADY_DISABLED: 'LICENSE_ALREADY_DISABLED',
-  NO_AVALIABLE_LICENSE_CODE: 'NO_AVALIABLE_LICENSE_CODE',
-};
-
-@Service()
-export default class LicenseService {
-  @Inject()
-  smsMessages: LicenseSMSMessages;
-
-  @Inject()
-  mailMessages: LicenseMailMessages;
-
-  /**
-   * Validate the plan existance on the storage.
-   * @param {number} tenantId -
-   * @param {string} planSlug - Plan slug.
-   */
-  private async getPlanOrThrowError(planSlug: string) {
-    const foundPlan = await Plan.query().where('slug', planSlug).first();
-
-    if (!foundPlan) {
-      throw new ServiceError(ERRORS.PLAN_NOT_FOUND);
-    }
-    return foundPlan;
-  }
-
-  /**
-   * Valdiate the license existance on the storage.
-   * @param {number} licenseId - License id.
-   */
-  private async getLicenseOrThrowError(licenseId: number) {
-    const foundLicense = await License.query().findById(licenseId);
-
-    if (!foundLicense) {
-      throw new ServiceError(ERRORS.LICENSE_NOT_FOUND);
-    }
-    return foundLicense;
-  }
-
-  /**
-   * Validates whether the license id is disabled.
-   * @param {ILicense} license
-   */
-  private validateNotDisabledLicense(license: ILicense) {
-    if (license.disabledAt) {
-      throw new ServiceError(ERRORS.LICENSE_ALREADY_DISABLED);
-    }
-  }
-
-  /**
-   * Generates the license code in the given period.
-   * @param  {number} licensePeriod
-   * @return {Promise<ILicense>}
-   */
-  public async generateLicense(
-    licensePeriod: number,
-    periodInterval: string = 'days',
-    planSlug: string
-  ): ILicense {
-    let licenseCode: string;
-    let repeat: boolean = true;
-
-    // Retrieve plan or throw not found error.
-    const plan = await this.getPlanOrThrowError(planSlug);
-
-    while (repeat) {
-      licenseCode = cryptoRandomString({ length: 10, type: 'numeric' });
-      const foundLicenses = await License.query().where(
-        'license_code',
-        licenseCode
-      );
-
-      if (foundLicenses.length === 0) {
-        repeat = false;
-      }
-    }
-    return License.query().insert({
-      licenseCode,
-      licensePeriod,
-      periodInterval,
-      planId: plan.id,
-    });
-  }
-
-  /**
-   * Generates licenses.
-   * @param {number} loop
-   * @param {number} licensePeriod
-   * @param {string} periodInterval
-   * @param {number} planId
-   */
-  public async generateLicenses(
-    loop = 1,
-    licensePeriod: number,
-    periodInterval: string = 'days',
-    planSlug: string
-  ) {
-    const asyncOpers: Promise<any>[] = [];
-
-    times(loop, () => {
-      const generateOper = this.generateLicense(
-        licensePeriod,
-        periodInterval,
-        planSlug
-      );
-      asyncOpers.push(generateOper);
-    });
-    return Promise.all(asyncOpers);
-  }
-
-  /**
-   * Disables the given license id on the storage.
-   * @param  {string} licenseSlug - License slug.
-   * @return {Promise}
-   */
-  public async disableLicense(licenseId: number) {
-    const license = await this.getLicenseOrThrowError(licenseId);
-
-    this.validateNotDisabledLicense(license);
-
-    return License.markLicenseAsDisabled(license.id, 'id');
-  }
-
-  /**
-   * Deletes the given license id from the storage.
-   * @param licenseSlug {string} - License slug.
-   */
-  public async deleteLicense(licenseSlug: string) {
-    const license = await this.getPlanOrThrowError(licenseSlug);
-
-    return License.query().where('id', license.id).delete();
-  }
-
-  /**
-   * Sends license code to the given customer via SMS or mail message.
-   * @param {string} licenseCode - License code.
-   * @param {string} phoneNumber - Phone number.
-   * @param {string} email - Email address.
-   */
-  public async sendLicenseToCustomer(sendLicense: ISendLicenseDTO) {
-    const agenda = Container.get('agenda');
-    const { phoneNumber, email, period, periodInterval } = sendLicense;
-
-    // Retreive plan details byt the given plan slug.
-    const plan = await this.getPlanOrThrowError(sendLicense.planSlug);
-
-    const license = await License.query()
-      .modify('filterActiveLicense')
-      .where('license_period', period)
-      .where('period_interval', periodInterval)
-      .where('plan_id', plan.id)
-      .first();
-
-    if (!license) {
-      throw new ServiceError(ERRORS.NO_AVALIABLE_LICENSE_CODE)
-    }
-    // Mark the license as used.
-    await License.markLicenseAsSent(license.licenseCode);
-
-    if (sendLicense.email) {
-      await agenda.schedule('1 second', 'send-license-via-email', {
-        licenseCode: license.licenseCode,
-        email,
-      });
-    }
-    if (phoneNumber) {
-      await agenda.schedule('1 second', 'send-license-via-phone', {
-        licenseCode: license.licenseCode,
-        phoneNumber,
-      });
-    }
-  }
-}

packages/server/src/services/Payment/LicenseMailMessages.ts

@@ -1,26 +0,0 @@
-import { Container } from 'typedi';
-import Mail from '@/lib/Mail';
-import config from '@/config';
-export default class SubscriptionMailMessages {
-  /**
-   * Send license code to the given mail address.
-   * @param {string} licenseCode 
-   * @param {email} email 
-   */
-  public async sendMailLicense(licenseCode: string, email: string) {
-    const Logger = Container.get('logger');
-    
-    const mail = new Mail()
-      .setView('mail/LicenseReceive.html')
-      .setSubject('Bigcapital - License code')
-      .setTo(email)
-      .setData({
-        licenseCode,
-        successEmail: config.customerSuccess.email,
-        successPhoneNumber: config.customerSuccess.phoneNumber,
-      });
-    
-    await mail.send();
-    Logger.info('[license_mail] sent successfully.');
-  }
-}

packages/server/src/services/Payment/LicensePaymentMethod.ts

@@ -1,67 +0,0 @@
-import { License } from '@/system/models';
-import PaymentMethod from '@/services/Payment/PaymentMethod';
-import { Plan } from '@/system/models';
-import { IPaymentMethod, ILicensePaymentModel } from '@/interfaces';
-import {
-  PaymentInputInvalid,
-  PaymentAmountInvalidWithPlan,
-  VoucherCodeRequired,
-} from '@/exceptions';
-
-export default class LicensePaymentMethod
-  extends PaymentMethod
-  implements IPaymentMethod
-{
-  /**
-   * Payment subscription of organization via license code.
-   * @param {ILicensePaymentModel} licensePaymentModel -
-   */
-  public async payment(licensePaymentModel: ILicensePaymentModel, plan: Plan) {
-    this.validateLicensePaymentModel(licensePaymentModel);
-
-    const license = await this.getLicenseOrThrowInvalid(licensePaymentModel);
-    this.validatePaymentAmountWithPlan(license, plan);
-
-    // Mark the license code as used.
-    return License.markLicenseAsUsed(licensePaymentModel.licenseCode);
-  }
-
-  /**
-   * Validates the license code activation on the storage.
-   * @param {ILicensePaymentModel} licensePaymentModel -
-   */
-  private async getLicenseOrThrowInvalid(
-    licensePaymentModel: ILicensePaymentModel
-  ) {
-    const foundLicense = await License.query()
-      .modify('filterActiveLicense')
-      .where('license_code', licensePaymentModel.licenseCode)
-      .first();
-
-    if (!foundLicense) {
-      throw new PaymentInputInvalid();
-    }
-    return foundLicense;
-  }
-
-  /**
-   * Validates the payment amount with given plan price.
-   * @param {License} license
-   * @param {Plan} plan
-   */
-  private validatePaymentAmountWithPlan(license: License, plan: Plan) {
-    if (license.planId !== plan.id) {
-      throw new PaymentAmountInvalidWithPlan();
-    }
-  }
-
-  /**
-   * Validate voucher payload.
-   * @param {ILicensePaymentModel} licenseModel -
-   */
-  private validateLicensePaymentModel(licenseModel: ILicensePaymentModel) {
-    if (!licenseModel || !licenseModel.licenseCode) {
-      throw new VoucherCodeRequired();
-    }
-  }
-}

packages/server/src/services/Payment/LicenseSMSMessages.ts

@@ -1,17 +0,0 @@
-import { Container, Inject } from 'typedi';
-import SMSClient from '@/services/SMSClient';
-
-export default class SubscriptionSMSMessages {
-  @Inject('SMSClient')
-  smsClient: SMSClient;
-
-  /**
-   * Sends license code to the given phone number via SMS message.
-   * @param {string} phoneNumber 
-   * @param {string} licenseCode 
-   */
-  public async sendLicenseSMSMessage(phoneNumber: string, licenseCode: string) {
-    const message: string = `Your license card number: ${licenseCode}. If you need any help please contact us. Bigcapital.`;
-    return this.smsClient.sendMessage(phoneNumber, message);
-  }
-}

packages/server/src/services/Payment/PaymentMethod.ts

@@ -1,6 +0,0 @@
-import moment from 'moment';
-import { IPaymentModel } from '@/interfaces';
-
-export default class PaymentMethod implements IPaymentModel {
-
-}

packages/server/src/services/Payment/index.ts

@@ -1,22 +0,0 @@
-import { IPaymentMethod, IPaymentContext } from "interfaces";
-import { Plan } from '@/system/models';
-
-export default class PaymentContext<PaymentModel> implements IPaymentContext{
-  paymentMethod: IPaymentMethod;
-
-  /**
-   * Constructor method. 
-   * @param {IPaymentMethod} paymentMethod 
-   */
-  constructor(paymentMethod: IPaymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  /**
-   * 
-   * @param {<PaymentModel>} paymentModel 
-   */
-  makePayment(paymentModel: PaymentModel, plan: Plan) {
-    return this.paymentMethod.payment(paymentModel, plan);
-  }
-}

packages/server/src/services/Subscription/MailMessages.ts

@@ -1,30 +0,0 @@
-import { Service } from "typedi";
-
-@Service()
-export default class SubscriptionMailMessages {
-  /**
-   * 
-   * @param phoneNumber 
-   * @param remainingDays 
-   */
-  public async sendRemainingSubscriptionPeriod(phoneNumber: string, remainingDays: number) {
-    const message: string = `
-      Your remaining subscription is ${remainingDays} days,
-      please renew your subscription before expire.
-    `;
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-
-  /**
-   * 
-   * @param phoneNumber 
-   * @param remainingDays 
-   */
-  public async sendRemainingTrialPeriod(phoneNumber: string, remainingDays: number) {
-    const message: string = `
-      Your remaining free trial is ${remainingDays} days,
-      please subscription before ends, if you have any quation to contact us.`;
-
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-}

packages/server/src/services/Subscription/SMSMessages.ts

@@ -1,40 +0,0 @@
-import { Service, Inject } from 'typedi';
-import SMSClient from '@/services/SMSClient';
-
-@Service()
-export default class SubscriptionSMSMessages {
-  @Inject('SMSClient')
-  smsClient: SMSClient;
-
-  /**
-   * Send remaining subscription period SMS message.
-   * @param {string} phoneNumber -
-   * @param {number} remainingDays -
-   */
-  public async sendRemainingSubscriptionPeriod(
-    phoneNumber: string,
-    remainingDays: number
-  ): Promise<void> {
-    const message: string = `
-      Your remaining subscription is ${remainingDays} days,
-      please renew your subscription before expire.
-    `;
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-
-  /**
-   * Send remaining trial period SMS message.
-   * @param {string} phoneNumber -
-   * @param {number} remainingDays -
-   */
-  public async sendRemainingTrialPeriod(
-    phoneNumber: string,
-    remainingDays: number
-  ): Promise<void> {
-    const message: string = `
-      Your remaining free trial is ${remainingDays} days,
-      please subscription before ends, if you have any quation to contact us.`;
-
-    this.smsClient.sendMessage(phoneNumber, message);
-  }
-}

packages/server/src/services/Subscription/Subscription.ts

@@ -1,80 +0,0 @@
-import { Inject } from 'typedi';
-import { Tenant, Plan } from '@/system/models';
-import { IPaymentContext } from '@/interfaces';
-import { NotAllowedChangeSubscriptionPlan } from '@/exceptions';
-
-export default class Subscription<PaymentModel> {
-  paymentContext: IPaymentContext | null;
-
-  @Inject('logger')
-  logger: any;
-
-  /**
-   * Constructor method.
-   * @param {IPaymentContext}
-   */
-  constructor(payment?: IPaymentContext) {
-    this.paymentContext = payment;
-  }
-
-  /**
-   * Give the tenant a new subscription.
-   * @param {Tenant} tenant
-   * @param {Plan} plan
-   * @param {string} invoiceInterval
-   * @param {number} invoicePeriod
-   * @param {string} subscriptionSlug
-   */
-  protected async newSubscribtion(
-    tenant,
-    plan,
-    invoiceInterval: string,
-    invoicePeriod: number,
-    subscriptionSlug: string = 'main'
-  ) {
-    const subscription = await tenant
-      .$relatedQuery('subscriptions')
-      .modify('subscriptionBySlug', subscriptionSlug)
-      .first();
-
-    // No allowed to re-new the the subscription while the subscription is active.
-    if (subscription && subscription.active()) {
-      throw new NotAllowedChangeSubscriptionPlan();
-
-      // In case there is already subscription associated to the given tenant renew it.
-    } else if (subscription && subscription.inactive()) {
-      await subscription.renew(invoiceInterval, invoicePeriod);
-
-      // No stored past tenant subscriptions create new one.
-    } else {
-      await tenant.newSubscription(
-        plan.id,
-        invoiceInterval,
-        invoicePeriod,
-        subscriptionSlug
-      );
-    }
-  }
-
-  /**
-   * Subscripe to the given plan.
-   * @param {Plan} plan
-   * @throws {NotAllowedChangeSubscriptionPlan}
-   */
-  public async subscribe(
-    tenant: Tenant,
-    plan: Plan,
-    paymentModel?: PaymentModel,
-    subscriptionSlug: string = 'main'
-  ) {
-    await this.paymentContext.makePayment(paymentModel, plan);
-
-    return this.newSubscribtion(
-      tenant,
-      plan,
-      plan.invoiceInterval,
-      plan.invoicePeriod,
-      subscriptionSlug
-    );
-  }
-}

packages/server/src/services/Subscription/SubscriptionPeriod.ts

@@ -1,41 +0,0 @@
-import moment from 'moment';
-
-export default class SubscriptionPeriod {
-  start: Date;
-  end: Date;
-  interval: string;
-  count: number;
-
-  /**
-   * Constructor method.
-   * @param {string} interval -
-   * @param {number} count -
-   * @param {Date} start -
-   */
-  constructor(interval: string = 'month', count: number, start?: Date) {
-    this.interval = interval;
-    this.count = count;
-    this.start = start;
-
-    if (!start) {
-      this.start = moment().toDate();
-    }
-    this.end = moment(start).add(count, interval).toDate();
-  }
-
-  getStartDate() {
-    return this.start;
-  }
-
-  getEndDate() {
-    return this.end;
-  }
-
-  getInterval() {
-    return this.interval;
-  }
-
-  getIntervalCount() {
-    return this.interval;
-  }
-}

packages/server/src/services/Subscription/SubscriptionService.ts

@@ -1,69 +0,0 @@
-import { Service, Inject } from 'typedi';
-import { Plan, PlanSubscription, Tenant } from '@/system/models';
-import Subscription from '@/services/Subscription/Subscription';
-import LicensePaymentMethod from '@/services/Payment/LicensePaymentMethod';
-import PaymentContext from '@/services/Payment';
-import SubscriptionSMSMessages from '@/services/Subscription/SMSMessages';
-import SubscriptionMailMessages from '@/services/Subscription/MailMessages';
-import { ILicensePaymentModel } from '@/interfaces';
-import SubscriptionViaLicense from './SubscriptionViaLicense';
-
-@Service()
-export default class SubscriptionService {
-  @Inject()
-  smsMessages: SubscriptionSMSMessages;
-
-  @Inject()
-  mailMessages: SubscriptionMailMessages;
-
-  @Inject('logger')
-  logger: any;
-
-  @Inject('repositories')
-  sysRepositories: any;
-
-  /**
-   * Handles the payment process via license code and than subscribe to
-   * the given tenant.
-   * @param {number} tenantId
-   * @param {String} planSlug
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  public async subscriptionViaLicense(
-    tenantId: number,
-    planSlug: string,
-    paymentModel: ILicensePaymentModel,
-    subscriptionSlug: string = 'main'
-  ) {
-    // Retrieve plan details.
-    const plan = await Plan.query().findOne('slug', planSlug);
-
-    // Retrieve tenant details.
-    const tenant = await Tenant.query().findById(tenantId);
-
-    // License payment method.
-    const paymentViaLicense = new LicensePaymentMethod();
-
-    // Payment context.
-    const paymentContext = new PaymentContext(paymentViaLicense);
-
-    // Subscription.
-    const subscription = new SubscriptionViaLicense(paymentContext);
-
-    // Subscribe.
-    await subscription.subscribe(tenant, plan, paymentModel, subscriptionSlug);
-  }
-
-  /**
-   * Retrieve all subscription of the given tenant.
-   * @param {number} tenantId
-   */
-  public async getSubscriptions(tenantId: number) {
-    const subscriptions = await PlanSubscription.query().where(
-      'tenant_id',
-      tenantId
-    );
-    return subscriptions;
-  }
-}

packages/server/src/services/Subscription/SubscriptionViaLicense.ts

@@ -1,54 +0,0 @@
-import { License, Tenant, Plan } from '@/system/models';
-import Subscription from './Subscription';
-import { PaymentModel } from '@/interfaces';
-
-export default class SubscriptionViaLicense extends Subscription<PaymentModel> {
-  /**
-   * Subscripe to the given plan.
-   * @param {Plan} plan
-   * @throws {NotAllowedChangeSubscriptionPlan}
-   */
-  public async subscribe(
-    tenant: Tenant,
-    plan: Plan,
-    paymentModel?: PaymentModel,
-    subscriptionSlug: string = 'main'
-  ): Promise<void> {
-    await this.paymentContext.makePayment(paymentModel, plan);
-
-    return this.newSubscriptionFromLicense(
-      tenant,
-      plan,
-      paymentModel.licenseCode,
-      subscriptionSlug
-    );
-  }
-
-  /**
-   * New subscription from the given license.
-   * @param {Tanant} tenant 
-   * @param {Plab} plan 
-   * @param {string} licenseCode 
-   * @param {string} subscriptionSlug 
-   * @returns {Promise<void>}
-   */
-  private async newSubscriptionFromLicense(
-    tenant,
-    plan,
-    licenseCode: string,
-    subscriptionSlug: string = 'main'
-  ): Promise<void> {
-    // License information.
-    const licenseInfo = await License.query().findOne(
-      'licenseCode',
-      licenseCode
-    );
-    return this.newSubscribtion(
-      tenant,
-      plan,
-      licenseInfo.periodInterval,
-      licenseInfo.licensePeriod,
-      subscriptionSlug
-    );
-  }
-}

packages/server/src/system/migrations/20200527091642_create_subscriptions_plans_table.js

@@ -1,22 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscriptions_plans', table => {
-    table.increments();
-
-    table.string('name');
-    table.string('description');
-    table.decimal('price');
-    table.string('currency', 3);
-
-    table.integer('trial_period');
-    table.string('trial_interval');
-    
-    table.integer('invoice_period');
-    table.string('invoice_interval');
-    table.timestamps();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscriptions_plans')
-};

packages/server/src/system/migrations/20200823234134_create_plans_table.js

@@ -1,30 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_plans', table => {
-    table.increments();
-    table.string('slug');
-    table.string('name');
-    table.string('desc');
-    table.boolean('active');
-
-    table.decimal('price').unsigned();
-    table.string('currency', 3);
-
-    table.decimal('trial_period').nullable();
-    table.string('trial_interval').nullable();
-
-    table.decimal('invoice_period').nullable();
-    table.string('invoice_interval').nullable();
-
-    table.integer('index').unsigned();
-    table.timestamps();
-  }).then(() => {
-    return knex.seed.run({
-      specific: 'seed_subscriptions_plans.js',
-    });
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_plans')
-};

packages/server/src/system/migrations/20200823234434_create_subscription_plan_feature.js

@@ -1,15 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_plan_features', table => {
-    table.increments();
-    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
-    table.string('slug');
-    table.string('name');
-    table.string('description');
-    table.timestamps();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_plan_features');
-};

packages/server/src/system/migrations/20200823234636_create_subscription_plan_subscription.js

@@ -1,22 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_plan_subscriptions', table => {
-    table.increments('id');
-    table.string('slug');
-
-    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
-    table.bigInteger('tenant_id').unsigned().index().references('id').inTable('tenants');
-
-    table.dateTime('starts_at').nullable();
-    table.dateTime('ends_at').nullable();
-
-    table.dateTime('cancels_at').nullable();
-    table.dateTime('canceled_at').nullable();
-
-    table.timestamps();
-  });
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_plan_subscriptions');
-};

packages/server/src/system/migrations/20200823235339_create_subscription_licenses_table.js

@@ -1,22 +0,0 @@
-
-exports.up = function(knex) {
-  return knex.schema.createTable('subscription_licenses', (table) => {
-    table.increments();
-
-    table.string('license_code').unique().index();
-    table.integer('plan_id').unsigned().index().references('id').inTable('subscription_plans');
-
-    table.integer('license_period').unsigned();
-    table.string('period_interval');
-
-    table.dateTime('sent_at').index();
-    table.dateTime('disabled_at').index();
-    table.dateTime('used_at').index();
-
-    table.timestamps();
-  })
-};
-
-exports.down = function(knex) {
-  return knex.schema.dropTableIfExists('subscription_licenses');
-};

packages/server/src/system/models/Subscriptions/License.ts

@@ -1,129 +0,0 @@
-import { Model, mixin } from 'objection';
-import moment from 'moment';
-import SystemModel from '@/system/models/SystemModel';
-
-export default class License extends SystemModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'subscription_licenses';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      // Filters active licenses.
-      filterActiveLicense(query) {
-        query.where('disabled_at', null);
-        query.where('used_at', null);
-      },
-
-      // Find license by its code or id.
-      findByCodeOrId(query, id, code) {
-        if (id) {
-          query.where('id', id);
-        }
-        if (code) {
-          query.where('license_code', code);
-        }
-      },
-
-      // Filters licenses list.
-      filter(builder, licensesFilter) {
-        if (licensesFilter.active) {
-          builder.modify('filterActiveLicense');
-        }
-        if (licensesFilter.disabled) {
-          builder.whereNot('disabled_at', null);
-        }
-        if (licensesFilter.used) {
-          builder.whereNot('used_at', null);
-        }
-        if (licensesFilter.sent) {
-          builder.whereNot('sent_at', null);
-        }
-      },
-    };
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const Plan = require('system/models/Subscriptions/Plan');
-
-    return {
-      plan: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Plan.default,
-        join: {
-          from: 'subscription_licenses.planId',
-          to: 'subscriptions_plans.id',
-        },
-      },
-    };
-  }
-
-  /**
-   * Deletes the given license code from the storage.
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  static deleteLicense(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).delete();
-  }
-
-  /**
-   * Marks the given license code as disabled on the storage.
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  static markLicenseAsDisabled(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).patch({
-      disabled_at: moment().toMySqlDateTime(),
-    });
-  }
-
-  /**
-   * Marks the given license code as sent on the storage.
-   * @param {string} licenseCode
-   */
-  static markLicenseAsSent(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).patch({
-      sent_at: moment().toMySqlDateTime(),
-    });
-  }
-
-  /**
-   * Marks the given license code as used on the storage.
-   * @param {string} licenseCode
-   * @return {Promise}
-   */
-  static markLicenseAsUsed(licenseCode, viaAttribute = 'license_code') {
-    return this.query().where(viaAttribute, licenseCode).patch({
-      used_at: moment().toMySqlDateTime(),
-    });
-  }
-
-  /**
-   *
-   * @param {IIPlan} plan
-   * @return {boolean}
-   */
-  isEqualPlanPeriod(plan) {
-    return (
-      this.invoicePeriod === plan.invoiceInterval &&
-      license.licensePeriod === license.periodInterval
-    );
-  }
-}

packages/server/src/system/models/Subscriptions/Plan.ts

@@ -1,82 +0,0 @@
-import { Model, mixin } from 'objection';
-import SystemModel from '@/system/models/SystemModel';
-import { PlanSubscription } from '..';
-
-export default class Plan extends mixin(SystemModel) {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'subscription_plans';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Defined virtual attributes.
-   */
-  static get virtualAttributes() {
-    return ['isFree', 'hasTrial'];
-  }
-
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      getFeatureBySlug(builder, featureSlug) {
-        builder.where('slug', featureSlug);
-      },
-    };
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const PlanSubscription = require('system/models/Subscriptions/PlanSubscription');
-
-    return {
-      /**
-       * The plan may have many subscriptions.
-       */
-      subscriptions: {
-        relation: Model.HasManyRelation,
-        modelClass: PlanSubscription.default,
-        join: {
-          from: 'subscription_plans.id',
-          to: 'subscription_plan_subscriptions.planId',
-        },
-      }
-    };
-  }
-
-  /**
-   * Check if plan is free.
-   * @return {boolean}
-   */
-  isFree() {
-    return this.price <= 0;
-  }
-
-  /**
-   * Check if plan is paid.
-   * @return {boolean}
-   */
-  isPaid() {
-    return !this.isFree();
-  }
-
-  /**
-   * Check if plan has trial.
-   * @return {boolean}
-   */
-  hasTrial() {
-    return this.trialPeriod && this.trialInterval;
-  }
-}

packages/server/src/system/models/Subscriptions/PlanFeature.ts

@@ -1,36 +0,0 @@
-import { Model, mixin } from 'objection';
-import SystemModel from '@/system/models/SystemModel';
-
-export default class PlanFeature extends mixin(SystemModel) {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'subscriptions.plan_features';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  static get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const Plan = require('system/models/Subscriptions/Plan');
-
-    return {
-      plan: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Plan.default,
-        join: {
-          from: 'subscriptions.plan_features.planId',
-          to: 'subscriptions.plans.id',
-        },
-      },
-    };
-  }
-}

packages/server/src/system/models/Subscriptions/PlanSubscription.ts

@@ -1,164 +0,0 @@
-import { Model, mixin } from 'objection';
-import SystemModel from '@/system/models/SystemModel';
-import moment from 'moment';
-import SubscriptionPeriod from '@/services/Subscription/SubscriptionPeriod';
-
-export default class PlanSubscription extends mixin(SystemModel) {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'subscription_plan_subscriptions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Defined virtual attributes.
-   */
-  static get virtualAttributes() {
-    return ['active', 'inactive', 'ended', 'onTrial'];
-  }
-
-  /**
-   * Modifiers queries.
-   */
-  static get modifiers() {
-    return {
-      activeSubscriptions(builder) {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
-        const now = moment().format(dateFormat);
-
-        builder.where('ends_at', '>', now);
-        builder.where('trial_ends_at', '>', now);
-      },
-
-      inactiveSubscriptions() {
-        builder.modify('endedTrial');
-        builder.modify('endedPeriod');
-      },
-
-      subscriptionBySlug(builder, subscriptionSlug) {
-        builder.where('slug', subscriptionSlug);
-      },
-
-      endedTrial(builder) {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
-        const endDate = moment().format(dateFormat);
-
-        builder.where('ends_at', '<=', endDate);
-      },
-
-      endedPeriod(builder) {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
-        const endDate = moment().format(dateFormat);
-
-        builder.where('trial_ends_at', '<=', endDate);
-      },
-    };
-  }
-
-  /**
-   * Relations mappings.
-   */
-  static get relationMappings() {
-    const Tenant = require('system/models/Tenant');
-    const Plan = require('system/models/Subscriptions/Plan');
-
-    return {
-      /**
-       * Plan subscription belongs to tenant.
-       */
-      tenant: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Tenant.default,
-        join: {
-          from: 'subscription_plan_subscriptions.tenantId',
-          to: 'tenants.id',
-        },
-      },
-
-      /**
-       * Plan description belongs to plan.
-       */
-      plan: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Plan.default,
-        join: {
-          from: 'subscription_plan_subscriptions.planId',
-          to: 'subscription_plans.id',
-        },
-      },
-    };
-  }
-
-  /**
-   * Check if subscription is active.
-   * @return {Boolean}
-   */
-  active() {
-    return !this.ended() || this.onTrial();
-  }
-
-  /**
-   * Check if subscription is inactive.
-   * @return {Boolean}
-   */
-  inactive() {
-    return !this.active();
-  }
-
-  /**
-   * Check if subscription period has ended.
-   * @return {Boolean}
-   */
-  ended() {
-    return this.endsAt ? moment().isAfter(this.endsAt) : false;
-  }
-
-  /**
-   * Check if subscription is currently on trial.
-   * @return {Boolean}
-   */
-  onTrial() {
-    return this.trailEndsAt ? moment().isAfter(this.trailEndsAt) : false;
-  }
-
-  /**
-   * Set new period from the given details.
-   * @param {string} invoiceInterval
-   * @param {number} invoicePeriod
-   * @param {string} start
-   *
-   * @return {Object}
-   */
-  static setNewPeriod(invoiceInterval, invoicePeriod, start) {
-    const period = new SubscriptionPeriod(
-      invoiceInterval,
-      invoicePeriod,
-      start,
-    );
-
-    const startsAt = period.getStartDate();
-    const endsAt = period.getEndDate();
-
-    return { startsAt, endsAt };
-  }
-
-  /**
-   * Renews subscription period.
-   * @Promise
-   */
-  renew(invoiceInterval, invoicePeriod) {
-    const { startsAt, endsAt } = PlanSubscription.setNewPeriod(
-      invoiceInterval,
-      invoicePeriod,
-    );
-    return this.$query().update({ startsAt, endsAt });
-  }
-}

packages/server/src/system/models/Tenant.ts

@@ -1,10 +1,8 @@
 import moment from 'moment';
 import { Model } from 'objection';
 import uniqid from 'uniqid';
-import SubscriptionPeriod from '@/services/Subscription/SubscriptionPeriod';
 import BaseModel from 'models/Model';
 import TenantMetadata from './TenantMetadata';
-import PlanSubscription from './Subscriptions/PlanSubscription';
 
 export default class Tenant extends BaseModel {
   /**
@@ -49,33 +47,13 @@ export default class Tenant extends BaseModel {
     return !!this.upgradeJobId;
   }
 
-  /**
-   * Query modifiers.
-   */
-  static modifiers() {
-    return {
-      subscriptions(builder) {
-        builder.withGraphFetched('subscriptions');
-      },
-    };
-  }
-
   /**
    * Relations mappings.
    */
   static get relationMappings() {
-    const PlanSubscription = require('./Subscriptions/PlanSubscription');
     const TenantMetadata = require('./TenantMetadata');
 
     return {
-      subscriptions: {
-        relation: Model.HasManyRelation,
-        modelClass: PlanSubscription.default,
-        join: {
-          from: 'tenants.id',
-          to: 'subscription_plan_subscriptions.tenantId',
-        },
-      },
       metadata: {
         relation: Model.HasOneRelation,
         modelClass: TenantMetadata.default,
@@ -86,55 +64,6 @@ export default class Tenant extends BaseModel {
       },
     };
   }
-
-  /**
-   * Retrieve the subscribed plans ids.
-   * @return {number[]}
-   */
-  async subscribedPlansIds() {
-    const { subscriptions } = this;
-    return chain(subscriptions).map('planId').unq();
-  }
-
-  /**
-   * 
-   * @param {*} planId 
-   * @param {*} invoiceInterval 
-   * @param {*} invoicePeriod 
-   * @param {*} subscriptionSlug 
-   * @returns 
-   */
-  newSubscription(planId, invoiceInterval, invoicePeriod, subscriptionSlug) {
-    return Tenant.newSubscription(
-      this.id,
-      planId,
-      invoiceInterval,
-      invoicePeriod,
-      subscriptionSlug,
-    );
-  }
-
-  /**
-   * Records a new subscription for the associated tenant.
-   */
-  static newSubscription(
-    tenantId,
-    planId,
-    invoiceInterval,
-    invoicePeriod,
-    subscriptionSlug
-  ) {
-    const period = new SubscriptionPeriod(invoiceInterval, invoicePeriod);
-
-    return PlanSubscription.query().insert({
-      tenantId,
-      slug: subscriptionSlug,
-      planId,
-      startsAt: period.getStartDate(),
-      endsAt: period.getEndDate(),
-    });
-  }
-
   /**
    * Creates a new tenant with random organization id.
    */
@@ -185,9 +114,9 @@ export default class Tenant extends BaseModel {
 
   /**
    * Marks the given tenant as upgrading.
-   * @param {number} tenantId 
-   * @param {string} upgradeJobId 
-   * @returns 
+   * @param {number} tenantId
+   * @param {string} upgradeJobId
+   * @returns
    */
   static markAsUpgrading(tenantId, upgradeJobId) {
     return this.query().update({ upgradeJobId }).where({ id: tenantId });
@@ -195,8 +124,8 @@ export default class Tenant extends BaseModel {
 
   /**
    * Markes the given tenant as upgraded.
-   * @param {number} tenantId 
-   * @returns 
+   * @param {number} tenantId
+   * @returns
    */
   static markAsUpgraded(tenantId) {
     return this.query().update({ upgradeJobId: null }).where({ id: tenantId });

packages/server/src/system/models/index.ts

@@ -1,22 +1,7 @@
-
-import Plan from './Subscriptions/Plan';
-import PlanFeature from './Subscriptions/PlanFeature';
-import PlanSubscription from './Subscriptions/PlanSubscription';
-import License from './Subscriptions/License';
 import Tenant from './Tenant';
 import TenantMetadata from './TenantMetadata';
 import SystemUser from './SystemUser';
 import PasswordReset from './PasswordReset';
 import Invite from './Invite';
 
-export {
-  Plan,
-  PlanFeature,
-  PlanSubscription,
-  License,
-  Tenant,
-  TenantMetadata,
-  SystemUser,
-  PasswordReset,
-  Invite,
-}
+export { Tenant, TenantMetadata, SystemUser, PasswordReset, Invite };

packages/server/src/system/repositories/SubscriptionRepository.ts

@@ -1,26 +0,0 @@
-import SystemRepository from '@/system/repositories/SystemRepository';
-import { PlanSubscription } from '@/system/models';
-
-export default class SubscriptionRepository extends SystemRepository {
-  /**
-   * Gets the repository's model.
-   */
-  get model() {
-    return PlanSubscription.bindKnex(this.knex);
-  }
-
-  /**
-   * Retrieve subscription from a given slug in specific tenant.
-   * @param {string} slug
-   * @param {number} tenantId
-   */
-  getBySlugInTenant(slug: string, tenantId: number) {
-    const cacheKey = this.getCacheKey('getBySlugInTenant', slug, tenantId);
-
-    return this.cache.get(cacheKey, () => {
-      return PlanSubscription.query()
-        .findOne('slug', slug)
-        .where('tenant_id', tenantId);
-    });
-  }
-}

packages/server/src/system/repositories/index.ts

@@ -1,9 +1,4 @@
 import SystemUserRepository from '@/system/repositories/SystemUserRepository';
-import SubscriptionRepository from '@/system/repositories/SubscriptionRepository';
 import TenantRepository from '@/system/repositories/TenantRepository';
 
-export {
-  SystemUserRepository,
-  SubscriptionRepository,
-  TenantRepository,
-};
+export { SystemUserRepository, TenantRepository };

packages/server/src/system/seeds/seed_subscriptions_plans.js

@@ -1,66 +0,0 @@
-
-exports.seed = (knex) => {
-  // Deletes ALL existing entries
-  return knex('subscription_plans').del()
-    .then(() => {
-      // Inserts seed entries
-      return knex('subscription_plans').insert([
-        {
-          name: 'Essentials',
-          slug: 'essentials-monthly',
-          price: 100,
-          active: true,
-          currency: 'LYD',
-          trial_period: 7,
-          trial_interval: 'days',
-        },
-        {
-          name: 'Essentials',
-          slug: 'essentials-yearly',
-          price: 1200,
-          active: true,
-          currency: 'LYD',
-          trial_period: 12,
-          trial_interval: 'months',
-        },
-        {
-          name: 'Pro',
-          slug: 'pro-monthly',
-          price: 200,
-          active: true,
-          currency: 'LYD',
-          trial_period: 1,
-          trial_interval: 'months',
-        },
-        {
-          name: 'Pro',
-          slug: 'pro-yearly',
-          price: 500,
-          active: true,
-          currency: 'LYD',
-          invoice_period: 12,
-          invoice_interval: 'month',
-          index: 2,
-        },
-        {
-          name: 'Plus',
-          slug: 'plus-monthly',
-          price: 200,
-          active: true,
-          currency: 'LYD',
-          trial_period: 1,
-          trial_interval: 'months',
-        },
-        {
-          name: 'Plus',
-          slug: 'plus-yearly',
-          price: 500,
-          active: true,
-          currency: 'LYD',
-          invoice_period: 12,
-          invoice_interval: 'month',
-          index: 2,
-        },
-      ]);
-    });
-};

packages/webapp/package-lock.json

@@ -33,25 +33,25 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.20.14",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
-      "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw=="
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+      "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="
     },
     "@babel/core": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
-      "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
       "requires": {
-        "@ampproject/remapping": "^2.1.0",
+        "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.0",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.12",
-        "@babel/types": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -60,12 +60,13 @@
       }
     },
     "@babel/generator": {
-      "version": "7.20.14",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
-      "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
       "requires": {
-        "@babel/types": "^7.20.7",
+        "@babel/types": "^7.21.0",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       }
     },
@@ -114,14 +115,14 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz",
-      "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz",
+      "integrity": "sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
+        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-member-expression-to-functions": "^7.21.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
         "@babel/helper-replace-supers": "^7.20.7",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
@@ -129,12 +130,12 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz",
-      "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz",
+      "integrity": "sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.2.1"
+        "regexpu-core": "^5.3.1"
       }
     },
     "@babel/helper-define-polyfill-provider": {
@@ -164,12 +165,12 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -181,11 +182,11 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz",
-      "integrity": "sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
+      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
       "requires": {
-        "@babel/types": "^7.20.7"
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/helper-module-imports": {
@@ -197,9 +198,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
-      "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-module-imports": "^7.18.6",
@@ -207,8 +208,8 @@
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.10",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.2",
+        "@babel/types": "^7.21.2"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -283,9 +284,9 @@
       "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.20.5",
@@ -299,13 +300,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
-      "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
       "requires": {
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.13",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/highlight": {
@@ -319,9 +320,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.20.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
-      "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -362,11 +363,11 @@
       }
     },
     "@babel/plugin-proposal-class-static-block": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz",
-      "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
+      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.20.7",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
@@ -457,9 +458,9 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz",
-      "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
@@ -476,12 +477,12 @@
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz",
-      "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
+      "integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.20.5",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
@@ -520,11 +521,11 @@
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-      "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz",
+      "integrity": "sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
@@ -674,22 +675,22 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.20.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz",
-      "integrity": "sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
+      "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz",
-      "integrity": "sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
+      "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-compilation-targets": "^7.20.7",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-replace-supers": "^7.20.7",
@@ -750,11 +751,11 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz",
+      "integrity": "sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-transform-function-name": {
@@ -793,11 +794,11 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz",
-      "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz",
+      "integrity": "sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.20.11",
+        "@babel/helper-module-transforms": "^7.21.2",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-simple-access": "^7.20.2"
       }
@@ -881,15 +882,15 @@
       }
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz",
-      "integrity": "sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz",
+      "integrity": "sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-module-imports": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-jsx": "^7.18.6",
-        "@babel/types": "^7.20.7"
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/plugin-transform-react-jsx-development": {
@@ -901,11 +902,11 @@
       }
     },
     "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz",
-      "integrity": "sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.21.0.tgz",
+      "integrity": "sha512-f/Eq+79JEu+KUANFks9UZCcvydOOGMgF7jBrcwjHa5jTZD8JivnhCJYvmlhR/WTXBWonDExPoW0eO/CR4QJirA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-transform-react-jsx-source": {
@@ -1002,11 +1003,11 @@
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz",
-      "integrity": "sha512-O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz",
+      "integrity": "sha512-xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.20.12",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-typescript": "^7.20.0"
       }
@@ -1150,17 +1151,17 @@
       "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
     },
     "@babel/runtime": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz",
-      "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
+      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
       "requires": {
         "regenerator-runtime": "^0.13.11"
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.13.tgz",
-      "integrity": "sha512-p39/6rmY9uvlzRiLZBIB3G9/EBr66LBMcYm7fIDeSBNdRjF2AGD3rFZucUyAgGHC2N+7DdLvVi33uTjSE44FIw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.21.0.tgz",
+      "integrity": "sha512-TDD4UJzos3JJtM+tHX+w2Uc+KWj7GV+VKKFdMVd2Rx8sdA19hcc3P3AHFYd5LVOw+pYuSd5lICC3gm52B6Rwxw==",
       "requires": {
         "core-js-pure": "^3.25.1",
         "regenerator-runtime": "^0.13.11"
@@ -1177,26 +1178,26 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
-      "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
+      "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.1",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.13",
-        "@babel/types": "^7.20.7",
+        "@babel/parser": "^7.21.2",
+        "@babel/types": "^7.21.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+      "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
       "requires": {
         "@babel/helper-string-parser": "^7.19.4",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -1237,9 +1238,9 @@
       }
     },
     "@blueprintjs/colors": {
-      "version": "4.1.14",
-      "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.14.tgz",
-      "integrity": "sha512-MT++a/OSGui8tMpo5dEogrTV/PJCsHuhXTmdsGQtzivlLwBAp1XKe/Np4vaX6seJqRgR0oyXgS9kVvomCl463Q=="
+      "version": "4.1.19",
+      "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.19.tgz",
+      "integrity": "sha512-x5mDo4Ue9rAdbMHvOm0dNru9MSZqgs9Dd/l/2rgjzottthjsq1XjkiVae6evX4EGNM0I/bZKjTT8ccvqCqn4yw=="
     },
     "@blueprintjs/core": {
       "version": "3.54.0",
@@ -1918,9 +1919,9 @@
       "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
     },
     "@reduxjs/toolkit": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.2.tgz",
-      "integrity": "sha512-5ZAZ7hwAKWSii5T6NTPmgIBUqyVdlDs+6JjThz6J6dmHLDm6zCzv2OjHIFAi3Vvs1qjmXU0bm6eBojukYXjVMQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.3.tgz",
+      "integrity": "sha512-GU2TNBQVofL09VGmuSioNPQIu6Ml0YLf4EJhgj0AvBadRlCGzUWet8372LjvO4fqKZF2vH1xU0htAa7BrK9pZg==",
       "requires": {
         "immer": "^9.0.16",
         "redux": "^4.2.0",
@@ -2389,9 +2390,9 @@
       }
     },
     "@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+      "version": "1.17.10",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz",
+      "integrity": "sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==",
       "requires": {
         "@types/node": "*"
       }
@@ -2568,9 +2569,9 @@
       "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
     },
     "@types/node": {
-      "version": "14.18.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz",
-      "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="
+      "version": "14.18.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.37.tgz",
+      "integrity": "sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -2588,9 +2589,9 @@
       "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
     },
     "@types/ramda": {
-      "version": "0.28.22",
-      "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.28.22.tgz",
-      "integrity": "sha512-DoIfh0sBxrL/aqADk+SGrfjJT9cB8modg+4NRlF7/Tfg4N2+KBEkAgpYYzrjiZxxR5YzWizjfVrTEdVDwYK7xQ==",
+      "version": "0.28.23",
+      "resolved": "https://registry.npmjs.org/@types/ramda/-/ramda-0.28.23.tgz",
+      "integrity": "sha512-9TYWiwkew+mCMsL7jZ+kkzy6QXn8PL5/SKmBPmjgUlTpkokZWTBr+OhiIUDztpAEbslWyt24NNfEmZUBFmnXig==",
       "requires": {
         "ts-toolbelt": "^6.15.1"
       }
@@ -2614,9 +2615,9 @@
       }
     },
     "@types/react-dom": {
-      "version": "16.9.17",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.17.tgz",
-      "integrity": "sha512-qSRyxEsrm5btPXnowDOs5jSkgT8ldAA0j6Qp+otHUh+xHzy3sXmgNfyhucZjAjkgpdAUw9rJe0QRtX/l+yaS4g==",
+      "version": "16.9.18",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.18.tgz",
+      "integrity": "sha512-lmNARUX3+rNF/nmoAFqasG0jAA7q6MeGZK/fdeLwY3kAA4NPgHHrG5bNQe2B5xmD4B+x6Z6h0rEJQ7MEEgQxsw==",
       "dev": true,
       "requires": {
         "@types/react": "^16"
@@ -2710,9 +2711,9 @@
           }
         },
         "@types/react-dom": {
-          "version": "18.0.10",
-          "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz",
-          "integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==",
+          "version": "18.0.11",
+          "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz",
+          "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==",
           "requires": {
             "@types/react": "*"
           }
@@ -2862,30 +2863,30 @@
       }
     },
     "@ucast/core": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@ucast/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-sXKbvQiagjFh2JCpaHUa64P4UdJbOxYeC5xiZFn8y6iYdb0WkismduE+RmiJrIjw/eLDYmIEXiQeIYYowmkcAw=="
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@ucast/core/-/core-1.10.2.tgz",
+      "integrity": "sha512-ons5CwXZ/51wrUPfoduC+cO7AS1/wRb0ybpQJ9RrssossDxVy4t49QxWoWgfBDvVKsz9VXzBk9z0wqTdZ+Cq8g=="
     },
     "@ucast/js": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@ucast/js/-/js-3.0.2.tgz",
-      "integrity": "sha512-zxNkdIPVvqJjHI7D/iK8Aai1+59yqU+N7bpHFodVmiTN7ukeNiGGpNmmSjQgsUw7eNcEBnPrZHNzp5UBxwmaPw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@ucast/js/-/js-3.0.3.tgz",
+      "integrity": "sha512-jBBqt57T5WagkAjqfCIIE5UYVdaXYgGkOFYv2+kjq2AVpZ2RIbwCo/TujJpDlwTVluUI+WpnRpoGU2tSGlEvFQ==",
       "requires": {
         "@ucast/core": "^1.0.0"
       }
     },
     "@ucast/mongo": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@ucast/mongo/-/mongo-2.4.2.tgz",
-      "integrity": "sha512-/zH1TdBJlYGKKD+Wh0oyD+aBvDSWrwHcD8b4tUL9UgHLhzHtkEnMVFuxbw3SRIRsAa01wmy06+LWt+WoZdj1Bw==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@ucast/mongo/-/mongo-2.4.3.tgz",
+      "integrity": "sha512-XcI8LclrHWP83H+7H2anGCEeDq0n+12FU2mXCTz6/Tva9/9ddK/iacvvhCyW6cijAAOILmt0tWplRyRhVyZLsA==",
       "requires": {
         "@ucast/core": "^1.4.1"
       }
     },
     "@ucast/mongo2js": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@ucast/mongo2js/-/mongo2js-1.3.3.tgz",
-      "integrity": "sha512-sBPtMUYg+hRnYeVYKL+ATm8FaRPdlU9PijMhGYKgsPGjV9J4Ks41ytIjGayvKUnBOEhiCaKUUnY4qPeifdqATw==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@ucast/mongo2js/-/mongo2js-1.3.4.tgz",
+      "integrity": "sha512-ahazOr1HtelA5AC1KZ9x0UwPMqqimvfmtSm/PRRSeKKeE5G2SCqTgwiNzO7i9jS8zA3dzXpKVPpXMkcYLnyItA==",
       "requires": {
         "@ucast/core": "^1.6.1",
         "@ucast/js": "^3.0.0",
@@ -4468,9 +4469,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+          "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -4686,9 +4687,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001451",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001451.tgz",
-      "integrity": "sha512-XY7UbUpGRatZzoRft//5xOa69/1iGJRBlrieH6QYrkKLIFn3m7OVEJ81dSrKoy2BnKsdbX5cLrOispZNYo9v2w=="
+      "version": "1.0.30001462",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001462.tgz",
+      "integrity": "sha512-PDd20WuOBPiasZ7KbFnmQRyuLE7cFXW2PVd7dmALzbkUXEP46upAuCDm9eY9vho8fgNMGmbAX92QBZHzcnWIqw=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -5117,22 +5118,22 @@
       }
     },
     "core-js": {
-      "version": "3.27.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz",
-      "integrity": "sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz",
+      "integrity": "sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="
     },
     "core-js-compat": {
-      "version": "3.27.2",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz",
-      "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==",
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz",
+      "integrity": "sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==",
       "requires": {
-        "browserslist": "^4.21.4"
+        "browserslist": "^4.21.5"
       }
     },
     "core-js-pure": {
-      "version": "3.27.2",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.2.tgz",
-      "integrity": "sha512-Cf2jqAbXgWH3VVzjyaaFkY1EBazxugUepGymDoeteyYr9ByX51kD2jdHZlsEF/xnJMyN3Prua7mQuzwMg6Zc9A=="
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.29.0.tgz",
+      "integrity": "sha512-v94gUjN5UTe1n0yN/opTihJ8QBWD2O8i19RfTZR7foONPWArnjB96QA/wk5ozu1mm6ja3udQCzOzwQXTxi3xOQ=="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -5368,9 +5369,9 @@
       "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
     },
     "css-to-react-native": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.1.0.tgz",
-      "integrity": "sha512-AryfkFA29b4I3vG7N4kxFboq15DxwSXzhXM37XNEjwJMgjYIc8BcqfiprpAqX0zadI5PMByEIwAMzXxk5Vcc4g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
       "requires": {
         "camelize": "^1.0.0",
         "css-color-keywords": "^1.0.0",
@@ -5645,9 +5646,9 @@
       }
     },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "requires": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -6020,9 +6021,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.289",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.289.tgz",
-      "integrity": "sha512-relLdMfPBxqGCxy7Gyfm1HcbRPcFUJdlgnCPVgQ23sr1TvUrRJz0/QPoGP0+x41wOVSTN/Wi3w6YDgHiHJGOzg=="
+      "version": "1.4.325",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.325.tgz",
+      "integrity": "sha512-K1C03NT4I7BuzsRdCU5RWkgZxtswnKDYM6/eMhkEXqKu4e5T+ck610x3FPzu1y7HVFSiQKZqP16gnJzPpji1TQ=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -6718,9 +6719,9 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "requires": {
         "estraverse": "^5.1.0"
       },
@@ -8053,9 +8054,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+          "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -8570,11 +8571,11 @@
       }
     },
     "internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "requires": {
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       }
@@ -8662,12 +8663,12 @@
       }
     },
     "is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "is-typed-array": "^1.1.10"
       }
     },
@@ -10633,9 +10634,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
     },
     "minipass": {
       "version": "3.3.6",
@@ -10735,11 +10736,11 @@
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
     },
     "moment-timezone": {
-      "version": "0.5.40",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz",
-      "integrity": "sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg==",
+      "version": "0.5.41",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz",
+      "integrity": "sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg==",
       "requires": {
-        "moment": ">= 2.9.0"
+        "moment": "^2.29.4"
       }
     },
     "move-concurrently": {
@@ -13977,9 +13978,9 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -14134,9 +14135,9 @@
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
     },
     "regexpu-core": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.0.tgz",
-      "integrity": "sha512-ZdhUQlng0RoscyW7jADnUZ25F5eVtHdMyXSb2PiwafvteRAOJUjFoUPEYZSIfP99fBIs3maLIRfpEddT78wAAQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz",
+      "integrity": "sha512-nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==",
       "requires": {
         "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
@@ -15376,9 +15377,9 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
     },
     "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -15429,9 +15430,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+          "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -15800,9 +15801,9 @@
       }
     },
     "styled-components": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.6.tgz",
-      "integrity": "sha512-hGTZquGAaTqhGWldX7hhfzjnIYBZ0IXQXkCYdvF1Sq3DsUaLx6+NTHC5Jj1ooM2F68sBiVz3lvhfwQs/S3l6qg==",
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.8.tgz",
+      "integrity": "sha512-6jQrlvaJQ16uWVVO0rBfApaTPItkqaG32l3746enNZzpMDxMvzmHzj8rHUg39bvVtom0Y8o8ZzWuchEXKGjVsg==",
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/traverse": "^7.4.5",

packages/webapp/package.json

@@ -99,7 +99,7 @@
     "yup": "^0.28.1"
   },
   "scripts": {
-    "dev": "craco start",
+    "dev": "PORT=4000 craco start",
     "build": "craco build",
     "test": "node scripts/test.js",
     "storybook": "start-storybook -p 6006"

packages/webapp/src/components/Dashboard/Dashboard.tsx

@@ -14,19 +14,16 @@ import GlobalHotkeys from './GlobalHotkeys';
 import DashboardProvider from './DashboardProvider';
 import DrawersContainer from '@/components/DrawersContainer';
 import AlertsContainer from '@/containers/AlertsContainer';
-import EnsureSubscriptionIsActive from '../Guards/EnsureSubscriptionIsActive';
 
 /**
  * Dashboard preferences.
  */
 function DashboardPreferences() {
   return (
-    <EnsureSubscriptionIsActive>
-      <DashboardSplitPane>
-        <Sidebar />
-        <PreferencesPage />
-      </DashboardSplitPane>
-    </EnsureSubscriptionIsActive>
+    <DashboardSplitPane>
+      <Sidebar />
+      <PreferencesPage />
+    </DashboardSplitPane>
   );
 }
 

packages/webapp/src/components/Dashboard/DashboardBoot.tsx

@@ -7,26 +7,20 @@ import {
 } from '@/hooks/query';
 import { useSplashLoading } from '@/hooks/state';
 import { useWatch, useWatchImmediate, useWhen } from '@/hooks';
-import { useSubscription } from '@/hooks/state';
 import { setCookie, getCookie } from '@/utils';
 
 /**
  * Dashboard meta async booting.
- *  - Fetches the dashboard meta only if the organization subscribe is active.
- *  - Once the dashboard meta query is loading display dashboard splash screen.
+ *  - Fetches the dashboard meta in booting state.
+ *  - Once the dashboard meta query started loading display dashboard splash screen.
  */
 export function useDashboardMetaBoot() {
-  const { isSubscriptionActive } = useSubscription();
-
   const {
     data: dashboardMeta,
     isLoading: isDashboardMetaLoading,
     isSuccess: isDashboardMetaSuccess,
   } = useDashboardMeta({
     keepPreviousData: true,
-
-    // Avoid run the query if the organization subscription is not active.
-    enabled: isSubscriptionActive,
   });
   const [startLoading, stopLoading] = useSplashLoading();
 

packages/webapp/src/components/Dashboard/DashboardBreadcrumbs.tsx

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import {
   CollapsibleList,
   MenuItem,
@@ -7,29 +8,29 @@ import {
   Boundary,
 } from '@blueprintjs/core';
 import withBreadcrumbs from 'react-router-breadcrumbs-hoc';
-import { getDashboardRoutes } from '@/routes/dashboard';
-import { useHistory } from 'react-router-dom';
 
-function DashboardBreadcrumbs({ breadcrumbs }){
+function DashboardBreadcrumbs({ breadcrumbs }) {
   const history = useHistory();
 
-  return(
+  return (
     <CollapsibleList
-     className={Classes.BREADCRUMBS}
-     dropdownTarget={<span className={Classes.BREADCRUMBS_COLLAPSED} />}
-     collapseFrom={Boundary.START}
-     visibleItemCount={0}>
-     {
-      breadcrumbs.map(({ breadcrumb,match })=>{
-        return (<MenuItem
-          key={match.url}
-          icon={'folder-close'}
-          text={breadcrumb}
-          onClick={() => history.push(match.url) } />)
-        })
-     }
+      className={Classes.BREADCRUMBS}
+      dropdownTarget={<span className={Classes.BREADCRUMBS_COLLAPSED} />}
+      collapseFrom={Boundary.START}
+      visibleItemCount={0}
+    >
+      {breadcrumbs.map(({ breadcrumb, match }) => {
+        return (
+          <MenuItem
+            key={match.url}
+            icon={'folder-close'}
+            text={breadcrumb}
+            onClick={() => history.push(match.url)}
+          />
+        );
+      })}
     </CollapsibleList>
-  )
+  );
 }
 
-export default withBreadcrumbs([])(DashboardBreadcrumbs)
+export default withBreadcrumbs([])(DashboardBreadcrumbs);

packages/webapp/src/components/Dashboard/DashboardContentRoute.tsx

@@ -3,15 +3,13 @@ import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
 import { getDashboardRoutes } from '@/routes/dashboard';
-import EnsureSubscriptionsIsActive from '../Guards/EnsureSubscriptionsIsActive';
-import EnsureSubscriptionsIsInactive from '../Guards/EnsureSubscriptionsIsInactive';
 import DashboardPage from './DashboardPage';
 
 /**
  * Dashboard inner route content.
  */
 function DashboardContentRouteContent({ route }) {
-  const content = (
+  return (
     <DashboardPage
       name={route.name}
       Component={route.component}
@@ -23,21 +21,6 @@ function DashboardContentRouteContent({ route }) {
       defaultSearchResource={route.defaultSearchResource}
     />
   );
-  return route.subscriptionActive ? (
-    <EnsureSubscriptionsIsInactive
-      subscriptionTypes={route.subscriptionActive}
-      children={content}
-      redirectTo={'/billing'}
-    />
-  ) : route.subscriptionInactive ? (
-    <EnsureSubscriptionsIsActive
-      subscriptionTypes={route.subscriptionInactive}
-      children={content}
-      redirectTo={'/'}
-    />
-  ) : (
-    content
-  );
 }
 
 /**

packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx

@@ -10,57 +10,19 @@ import {
   Tooltip,
   Position,
 } from '@blueprintjs/core';
-import { FormattedMessage as T } from '@/components';
+import { FormattedMessage as T, Icon, Hint, If } from '@/components';
 
 import DashboardTopbarUser from '@/components/Dashboard/TopbarUser';
 import DashboardBreadcrumbs from '@/components/Dashboard/DashboardBreadcrumbs';
 import DashboardBackLink from '@/components/Dashboard/DashboardBackLink';
-import { Icon, Hint, If } from '@/components';
 
 import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions';
 import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
 import withDashboard from '@/containers/Dashboard/withDashboard';
 
 import QuickNewDropdown from '@/containers/QuickNewDropdown/QuickNewDropdown';
+import { DashboardHamburgerButton, DashboardQuickSearchButton } from './_components';
 import { compose } from '@/utils';
-import withSubscriptions from '@/containers/Subscriptions/withSubscriptions';
-import { useGetUniversalSearchTypeOptions } from '@/containers/UniversalSearch/utils';
-
-function DashboardTopbarSubscriptionMessage() {
-  return (
-    <div class="dashboard__topbar-subscription-msg">
-      <span>
-        <T id={'dashboard.subscription_msg.period_over'} />
-      </span>
-    </div>
-  );
-}
-
-function DashboardHamburgerButton({ ...props }) {
-  return (
-    <Button minimal={true} {...props}>
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="20"
-        height="20"
-        viewBox="0 0 20 20"
-        role="img"
-        focusable="false"
-      >
-        <title>
-          <T id={'menu'} />
-        </title>
-        <path
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-miterlimit="5"
-          stroke-width="2"
-          d="M4 7h15M4 12h15M4 17h15"
-        ></path>
-      </svg>
-    </Button>
-  );
-}
 
 /**
  * Dashboard topbar.
@@ -79,10 +41,6 @@ function DashboardTopbar({
 
   // #withGlobalSearch
   openGlobalSearch,
-
-  // #withSubscriptions
-  isSubscriptionActive,
-  isSubscriptionInactive,
 }) {
   const history = useHistory();
 
@@ -137,28 +95,22 @@ function DashboardTopbar({
       </div>
 
       <div class="dashboard__topbar-right">
-        <If condition={isSubscriptionInactive}>
-          <DashboardTopbarSubscriptionMessage />
-        </If>
-
         <Navbar class="dashboard__topbar-navbar">
           <NavbarGroup>
-            <If condition={isSubscriptionActive}>
-              <DashboardQuickSearchButton
-                onClick={() => openGlobalSearch(true)}
-              />
-              <QuickNewDropdown />
+            <DashboardQuickSearchButton
+              onClick={() => openGlobalSearch(true)}
+            />
+            <QuickNewDropdown />
 
-              <Tooltip
-                content={<T id={'notifications'} />}
-                position={Position.BOTTOM}
-              >
-                <Button
-                  className={Classes.MINIMAL}
-                  icon={<Icon icon={'notification-24'} iconSize={20} />}
-                />
-              </Tooltip>
-            </If>
+            <Tooltip
+              content={<T id={'notifications'} />}
+              position={Position.BOTTOM}
+            >
+              <Button
+                className={Classes.MINIMAL}
+                icon={<Icon icon={'notification-24'} iconSize={20} />}
+              />
+            </Tooltip>
 
             <Button
               className={Classes.MINIMAL}
@@ -186,31 +138,4 @@ export default compose(
     pageHint,
   })),
   withDashboardActions,
-  withSubscriptions(
-    ({ isSubscriptionActive, isSubscriptionInactive }) => ({
-      isSubscriptionActive,
-      isSubscriptionInactive,
-    }),
-    'main',
-  ),
 )(DashboardTopbar);
-
-/**
- * Dashboard quick search button.
- */
-function DashboardQuickSearchButton({ ...rest }) {
-  const searchTypeOptions = useGetUniversalSearchTypeOptions();
-
-  // Can't continue if there is no any search type option.
-  if (searchTypeOptions.length <= 0) {
-    return null;
-  }
-  return (
-    <Button
-      className={Classes.MINIMAL}
-      icon={<Icon icon={'search-24'} iconSize={20} />}
-      text={<T id={'quick_find'} />}
-      {...rest}
-    />
-  );
-}

packages/webapp/src/components/Dashboard/DashboardTopbar/_components.tsx

@@ -0,0 +1,61 @@
+// @ts-nocheck
+import React from 'react';
+import { Button, Classes } from '@blueprintjs/core';
+import { useGetUniversalSearchTypeOptions } from '@/containers/UniversalSearch/utils';
+import { Icon, FormattedMessage as T } from '@/components';
+
+export function DashboardTopbarSubscriptionMessage() {
+  return (
+    <div class="dashboard__topbar-subscription-msg">
+      <span>
+        <T id={'dashboard.subscription_msg.period_over'} />
+      </span>
+    </div>
+  );
+}
+
+export function DashboardHamburgerButton({ ...props }) {
+  return (
+    <Button minimal={true} {...props}>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width="20"
+        height="20"
+        viewBox="0 0 20 20"
+        role="img"
+        focusable="false"
+      >
+        <title>
+          <T id={'menu'} />
+        </title>
+        <path
+          stroke="currentColor"
+          stroke-linecap="round"
+          stroke-miterlimit="5"
+          stroke-width="2"
+          d="M4 7h15M4 12h15M4 17h15"
+        ></path>
+      </svg>
+    </Button>
+  );
+}
+
+/**
+ * Dashboard quick search button.
+ */
+export function DashboardQuickSearchButton({ ...rest }) {
+  const searchTypeOptions = useGetUniversalSearchTypeOptions();
+
+  // Can't continue if there is no any search type option.
+  if (searchTypeOptions.length <= 0) {
+    return null;
+  }
+  return (
+    <Button
+      className={Classes.MINIMAL}
+      icon={<Icon icon={'search-24'} iconSize={20} />}
+      text={<T id={'quick_find'} />}
+      {...rest}
+    />
+  );
+}

packages/webapp/src/components/Dashboard/DashboardTopbar/index.ts

@@ -0,0 +1,3 @@
+import DashboardTopbar from './DashboardTopbar';
+
+export default DashboardTopbar;

packages/webapp/src/components/Dashboard/TopbarUser.tsx

@@ -9,25 +9,21 @@ import {
   Popover,
   Position,
 } from '@blueprintjs/core';
-import { If, FormattedMessage as T } from '@/components';
+import { FormattedMessage as T } from '@/components';
 
-import { firstLettersArgs } from '@/utils';
 import { useAuthActions } from '@/hooks/state';
 
 import withDialogActions from '@/containers/Dialog/withDialogActions';
-import withSubscriptions from '@/containers/Subscriptions/withSubscriptions';
 
 import { useAuthenticatedAccount } from '@/hooks/query';
-import { compose } from '@/utils';
+import { firstLettersArgs, compose } from '@/utils';
 
 /**
  * Dashboard topbar user.
  */
 function DashboardTopbarUser({
+  // #withDialogActions
   openDialog,
-
-  // #withSubscriptions
-  isSubscriptionActive,
 }) {
   const history = useHistory();
   const { setLogout } = useAuthActions();
@@ -62,16 +58,14 @@ function DashboardTopbarUser({
             }
           />
           <MenuDivider />
-          <If condition={isSubscriptionActive}>
-            <MenuItem
-              text={<T id={'keyboard_shortcuts'} />}
-              onClick={onKeyboardShortcut}
-            />
-            <MenuItem
-              text={<T id={'preferences'} />}
-              onClick={() => history.push('/preferences')}
-            />
-          </If>
+          <MenuItem
+            text={<T id={'keyboard_shortcuts'} />}
+            onClick={onKeyboardShortcut}
+          />
+          <MenuItem
+            text={<T id={'preferences'} />}
+            onClick={() => history.push('/preferences')}
+          />
           <MenuItem text={<T id={'logout'} />} onClick={onClickLogout} />
         </Menu>
       }
@@ -87,8 +81,4 @@ function DashboardTopbarUser({
 }
 export default compose(
   withDialogActions,
-  withSubscriptions(
-    ({ isSubscriptionActive }) => ({ isSubscriptionActive }),
-    'main',
-  ),
 )(DashboardTopbarUser);

packages/webapp/src/components/Datatable/TableCell.tsx

@@ -72,6 +72,7 @@ export default function TableCell({ cell, row, index }) {
           [`td-${cell.column.id}`]: cell.column.id,
           [`td-${cellType}-type`]: !!cellType,
         }),
+        tabindex: 0,
         onClick: handleCellClick,
       })}
     >

packages/webapp/src/constants/registerWizard.tsx

@@ -2,9 +2,6 @@
 import intl from 'react-intl-universal';
 
 export const getSetupWizardSteps = () => [
-  {
-    label: intl.get('setup.plan.plans'),
-  },
   {
     label: intl.get('setup.plan.getting_started'),
   },

packages/webapp/src/constants/sidebarMenu.tsx

@@ -5,7 +5,6 @@ import { Features } from '@/constants/features';
 import {
   ISidebarMenuItemType,
   ISidebarMenuOverlayIds,
-  ISidebarSubscriptionAbility,
 } from '@/containers/Dashboard/Sidebar/interfaces';
 import {
   ReportsAction,
@@ -24,9 +23,7 @@ import {
   ManualJournalAction,
   ExpenseAction,
   CashflowAction,
-  ProjectAction,
   PreferencesAbility,
-  SubscriptionBillingAbility,
 } from '@/constants/abilityOption';
 
 export const SidebarMenu = [
@@ -781,19 +778,6 @@ export const SidebarMenu = [
           ability: PreferencesAbility.Mutate,
         },
       },
-      {
-        text: <T id={'billing'} />,
-        href: '/billing',
-        type: ISidebarMenuItemType.Link,
-        subscription: [
-          ISidebarSubscriptionAbility.Expired,
-          ISidebarSubscriptionAbility.Active,
-        ],
-        permission: {
-          subject: AbilitySubject.SubscriptionBilling,
-          ability: SubscriptionBillingAbility.View,
-        },
-      },
     ],
   },
 ];

packages/webapp/src/containers/Authentication/Login.tsx

@@ -43,11 +43,11 @@ export default function Login() {
           <h3>
             <T id={'log_in'} />
           </h3>
-          <T id={'need_bigcapital_account'} />
+          {/* <T id={'need_bigcapital_account'} />
           <Link to="/auth/register">
             {' '}
             <T id={'create_an_account'} />
-          </Link>
+          </Link> */}
         </div>
 
         <Formik

packages/webapp/src/containers/Customers/CustomerForm/CustomerFormFormik.tsx

@@ -4,6 +4,7 @@ import intl from 'react-intl-universal';
 import classNames from 'classnames';
 import { Formik, Form } from 'formik';
 import { Intent } from '@blueprintjs/core';
+import styled from 'styled-components';
 
 import { CLASSES } from '@/constants/classes';
 import { CreateCustomerForm, EditCustomerForm } from './CustomerForm.schema';
@@ -104,9 +105,9 @@ function CustomerFormFormik({
         onSubmit={handleFormSubmit}
       >
         <Form>
-          <div className={classNames(CLASSES.PAGE_FORM_HEADER_PRIMARY)}>
+          <CustomerFormHeaderPrimary>
             <CustomerFormPrimarySection />
-          </div>
+          </CustomerFormHeaderPrimary>
 
           <div className={'page-form__after-priamry-section'}>
             <CustomerFormAfterPrimarySection />
@@ -123,4 +124,12 @@ function CustomerFormFormik({
   );
 }
 
+export const CustomerFormHeaderPrimary = styled.div`
+  padding: 10px 0 0;
+  margin: 0 0 20px;
+  overflow: hidden;
+  border-bottom: 1px solid #e4e4e4;
+  max-width: 1000px;
+`;
+
 export default compose(withCurrentOrganization())(CustomerFormFormik);

packages/webapp/src/containers/Dashboard/Sidebar/SidebarContainer.tsx

@@ -4,7 +4,6 @@ import { Scrollbar } from 'react-scrollbars-custom';
 import classNames from 'classnames';
 
 import withDashboard from '@/containers/Dashboard/withDashboard';
-import withSubscriptions from '@/containers/Subscriptions/withSubscriptions';
 
 import { useObserveSidebarExpendedBodyclass } from './hooks';
 import { compose } from '@/utils';
@@ -19,9 +18,6 @@ function SidebarContainerJSX({
 
   // #withDashboard
   sidebarExpended,
-
-  // #withSubscription
-  isSubscriptionActive,
 }) {
   const sidebarScrollerRef = React.useRef();
 
@@ -51,7 +47,6 @@ function SidebarContainerJSX({
     <div
       className={classNames('sidebar', {
         'sidebar--mini-sidebar': !sidebarExpended,
-        'is-subscription-inactive': !isSubscriptionActive,
       })}
       id="sidebar"
       onMouseLeave={handleSidebarMouseLeave}
@@ -72,8 +67,4 @@ export const SidebarContainer = compose(
   withDashboard(({ sidebarExpended }) => ({
     sidebarExpended,
   })),
-  withSubscriptions(
-    ({ isSubscriptionActive }) => ({ isSubscriptionActive }),
-    'main',
-  ),
 )(SidebarContainerJSX);

packages/webapp/src/containers/Dashboard/Sidebar/SidebarMenu.tsx

@@ -1,14 +1,11 @@
 // @ts-nocheck
 import React from 'react';
 import { Menu } from '@blueprintjs/core';
-import * as R from 'ramda';
 
 import { MenuItem, MenuItemLabel } from '@/components';
 import { ISidebarMenuItemType } from '@/containers/Dashboard/Sidebar/interfaces';
 import { useIsSidebarMenuItemActive } from './hooks';
 
-import withSubscriptions from '@/containers/Subscriptions/withSubscriptions';
-
 /**
  * Sidebar menu item.
  * @returns {JSX.Element}
@@ -55,7 +52,7 @@ function SidebarMenuItemComposer({ item, index }) {
  * Sidebar menu.
  * @returns {JSX.Element}
  */
-function SidebarMenuJSX({ menu }) {
+export function SidebarMenu({ menu }) {
   return (
     <div>
       <Menu className="sidebar-menu">
@@ -66,10 +63,3 @@ function SidebarMenuJSX({ menu }) {
     </div>
   );
 }
-
-export const SidebarMenu = R.compose(
-  withSubscriptions(
-    ({ isSubscriptionActive }) => ({ isSubscriptionActive }),
-    'main',
-  ),
-)(SidebarMenuJSX);