feat: database backup script

.all-contributorsrc

@@ -123,15 +123,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "ccantrell72",
-      "name": "Chris Cantrell",
-      "avatar_url": "https://avatars.githubusercontent.com/u/104120598?v=4",
-      "profile": "http://www.pivoten.com",
-      "contributions": [
-        "bug"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -48,9 +48,6 @@ SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=
 SIGNUP_ALLOWED_EMAILS=
 
-# Sign-up Email Confirmation
-SIGNUP_EMAIL_CONFIRMATION=false
-
 # API rate limit (points,duration,block duration).
 API_RATE_LIMIT=120,60,600
 
@@ -75,17 +72,31 @@ PLAID_ENV=sandbox
 # Your Plaid keys, which can be found in the Plaid Dashboard.
 # https://dashboard.plaid.com/account/keys
 PLAID_CLIENT_ID=
-PLAID_SECRET=
+PLAID_SECRET_DEVELOPMENT=
+PLAID_SECRET_SANDBOX=
+
 PLAID_LINK_WEBHOOK=
 
+# (Optional) Redirect URI settings section
+# Only required for OAuth redirect URI testing (not common on desktop):
+# Sandbox Mode:
+# Set the PLAID_SANDBOX_REDIRECT_URI below to 'http://localhost:3001/oauth-link'.
+# The OAuth redirect flow requires an endpoint on the developer's website
+# that the bank website should redirect to. You will also need to configure
+# this redirect URI for your client ID through the Plaid developer dashboard
+# at https://dashboard.plaid.com/team/api.
+# Development mode:
+# When running in development mode, you must use an https:// url.
+# You will need to configure this https:// redirect URI in the Plaid developer dashboard.
+# Instructions to create a self-signed certificate for localhost can be found at
+# https://github.com/plaid/pattern/blob/master/README.md#testing-oauth.
+# If your system is not set up to run localhost with https://, you will be unable to test
+# the OAuth in development and should leave the PLAID_DEVELOPMENT_REDIRECT_URI blank.
+
+PLAID_SANDBOX_REDIRECT_URI=
+PLAID_DEVELOPMENT_REDIRECT_URI=
+
 # https://docs.lemonsqueezy.com/guides/developer-guide/getting-started#create-an-api-key
 LEMONSQUEEZY_API_KEY=
 LEMONSQUEEZY_STORE_ID=
 LEMONSQUEEZY_WEBHOOK_SECRET=
-
-# S3 documents and attachments 
-S3_REGION=
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_ENDPOINT=
-S3_BUCKET=

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

@@ -6,13 +6,18 @@ on:
   workflow_dispatch:
 
 env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
+  REGISTRY: ghcr.io
-  SERVER_IMAGE_NAME: bigcapitalhq/server
+  WEBAPP_IMAGE_NAME: bigcapital/bigcapital-webapp
+  SERVER_IMAGE_NAME: bigcapital/bigcapital-server
 
 jobs:
   build-publish-webapp:
     strategy:
       fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     name: Build and deploy webapp container
     runs-on: ubuntu-latest
     environment: production
@@ -25,6 +30,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -32,26 +40,27 @@ jobs:
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-            images: ${{ env.WEBAPP_IMAGE_NAME }}
+            images: ${{ env.REGISTRY }}/${{ env.WEBAPP_IMAGE_NAME }}
 
       # Builds and push the Docker image.
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         id: build
         with:
-          context: ./
+          context: .
           file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platform }}
           push: true
+          tags: ghcr.io/bigcapitalhq/webapp:latest
           labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:latest, bigcapitalhq/webapp:${{github.ref_name}}
 
       - name: Export digest
         run: |
@@ -62,7 +71,7 @@ jobs:
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-webapp
+          name: digests-main-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -84,6 +93,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -91,8 +103,9 @@ jobs:
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
 
       # Builds and push the Docker image.
       - name: Build and push Docker image
@@ -101,9 +114,9 @@ jobs:
         with:
           context: ./
           file: ./packages/server/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platform }}
           push: true
-          tags: bigcapitalhq/server:latest, bigcapitalhq/server:${{github.ref_name}}
+          tags: ghcr.io/bigcapitalhq/server:latest
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Export digest
@@ -115,13 +128,13 @@ jobs:
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-server
+          name: digests-main-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
-
+          
       # 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 }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/build-deploy-develop-container.yaml

@@ -1,127 +0,0 @@
-# This workflow will build a docker container, publish it to Github Registry.
-name: Build and Deploy Develop Docker Container
-on:
-  push:
-    branches:
-      - develop
-
-env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
-  SERVER_IMAGE_NAME: bigcapitalhq/server
-
-jobs:
-  build-publish-webapp:
-    strategy:
-      fail-fast: false
-    name: Build and deploy webapp container
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.WEBAPP_IMAGE_NAME }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:develop
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-webapp
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-      # 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: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/server/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: bigcapitalhq/server:develop
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-server
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      # 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 }}

CHANGELOG.md

@@ -2,111 +2,6 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [0.17.0] - 04-06-2024
-
-### New
-
-* feat: Upload and attach documents by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/461
-* feat: Export resource tables to pdf by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/460
-* feat: Build and deploy develop Docker container by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/476
-* feat: Internal docker virtual network by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/478
-
-### Fixes
-
-* fix: Skip send confirmation email if disabled by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/459
-* fix: Lemon Squeezy redirect to base url by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/479
-* fix: Organize Plaid env variables for development and sandbox envs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/480
-* fix: Plaid syncs deposit imports as withdrawals by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/481
-* fix: Validate the s3 configures exist by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/482
-* fix: Run migrations only for initialized tenants by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/484
-
-## [0.16.16] - 
-
-* feat: handle http exceptions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/456
-* feat: add the missing Newrelic env vars to docker-compose.prod file by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/457
-* fix: add the signup email confirmation env var by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/458
-
-## [0.16.14] - 
-
-* fix: Typo in setup wizard by @ccantrell72 in https://github.com/bigcapitalhq/bigcapital/pull/440
-* fix: Showing the real mail address on email confirmation view by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/445
-* fix: Auto-increment setting parsing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/453
-
-## [0.16.12] - 
-
-* feat: Create a manifest list for `webapp` Docker image and push it to DockerHub. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/436
-* feat: Combine arm64 and amd64 in one Github action runner by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/437
-
-## [0.16.11] - 06-05-2024
-
-### improvements
-
-* feat: Export resource data to csv, xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/430
-* feat: User email verification after signing-up. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/426
-
-### Fixes
-* feat(repo): upgrade to latest lerna v8 and pnpm v9 by @benpsnyder in https://github.com/bigcapitalhq/bigcapital/pull/414
-* feat: Update Docker Build-Push Action and Add ARM64 Support by @cloudsbird in https://github.com/bigcapitalhq/bigcapital/pull/412
-* feat: Pushing docker containers by version tag by @cloudsbird in https://github.com/bigcapitalhq/bigcapital/pull/421
-
-## [0.16.10]
-
-* fix: Running migration Docker container on Windows by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/432
-
-## [0.16.9]
-
-* feat: New Relic for tracking by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/429
-
-## [0.16.8]
-
-* feat: Ability to enable/disable the bank connect feature by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/423
-
-## [0.16.6]
-
-* hotfix: fix the subscription plan when subscribe on cloud by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/422
-
-## [0.16.5]
-
-IMPORTANT: If you upgraded to the v0.16 recently you should upgrade to v0.16.4 as soon as possible, because there're some breaking changes affected the sign-in and some users reported couldn't sign-in.
-
-* feat: Seed free subscription to tenants that have no subscription. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/410
-
-## [0.16.3]
-
-* feat: Integrate Lemon Squeezy payment by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/402
-* feat: optimize the onboarding subscription experience. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/404
-* feat: subscription page content by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/405
-* feat: auto subscribe to free plan once signup on community version. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/406
-* chore: add default value to env variable by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/407
-* fix: absolute storage imports path. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/408
-
-## [0.16.0]
-
-* feat: add convert to invoice button on estimate drawer toolbar by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/361
-* feat(webapp): add mark as delivered to action bar of invoice details … by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/360
-* feat(webapp): Dialog to choose the bank service provider by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/378
-* feat: Categorize the bank synced transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/377
-* feat: uncategorize the cashflow transaction by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/381
-* Import resources from csv/xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/382
-* feat(webapp): import resource UI by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/386
-* fix: import resources improvements by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/388
-* feat: add sample sheet to accounts and bank transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/389
-* fix: show the unique row value in the import preview by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/392
-* feat: advanced parser for numeric and boolean import values by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/394
-* feat: validate the given imported sheet whether is empty by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/395
-* feat: linking relation with id in importing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/393
-* feat: Aggregate rows import by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/396
-* feat: clean up the imported temp files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/400
-* feat: add hints to import fields by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/401
-
-## [0.15.0]
-
-* feat: Printing financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/363
-* feat: Convert invoice status after sending mail notification by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/332
-* feat: Bigcapital <> Plaid Integration by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/346
-* fix: Broken transactions by vendor report by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/369
-* fix: Optimize the print style some financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/370
-
 ## [0.14.0] - 30-01-2024
 
 * feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <p align="center">
-    <a href="https://bigcapital.app" target="_blank">
+    <a href="https://bigcapital.ly" target="_blank">
       <img src="https://raw.githubusercontent.com/abouolia/blog/main/public/bigcapital.svg" alt="Bigcapital" width="280" height="75">
     </a>
   </p>
@@ -27,7 +27,7 @@
   </p>
 
   <p align="center">
-    <a href="https://my.bigcapital.app">Bigcapital Cloud</a>
+    <a href="https://app.bigcapital.ly">Bigcapital Cloud</a>
   </p>
 </p>
 
@@ -51,7 +51,7 @@ Bigcapital is available open-source under AGPL license. You can host it on your
 
 ### Docker
 
-To get started with self-hosted with Docker and Docker Compose, take a look at the [Docker guide](https://docs.bigcapital.app/deployment/docker).
+To get started with self-hosted with Docker and Docker Compose, take a look at the [Docker guide](https://docs.bigcapital.ly/deployment/docker).
 
 ## Development
 
@@ -74,7 +74,7 @@ You can integrate Bigcapital API with your system to organize your transactions
 
 # Resources
 
-- [Documentation](https://docs.bigcapital.app/) - Learn how to use.
+- [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
 - [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions.
 - [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
 - [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
@@ -124,7 +124,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/asenawritescode"><img src="https://avatars.githubusercontent.com/u/67445192?v=4?s=100" width="100px;" alt="Asena"/><br /><sub><b>Asena</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aasenawritescode" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://snyder.tech"><img src="https://avatars.githubusercontent.com/u/707567?v=4?s=100" width="100px;" alt="Ben Snyder"/><br /><sub><b>Ben Snyder</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=benpsnyder" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://vederis.id"><img src="https://avatars.githubusercontent.com/u/13505006?v=4?s=100" width="100px;" alt="Vederis Leunardus"/><br /><sub><b>Vederis Leunardus</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=cloudsbird" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.pivoten.com"><img src="https://avatars.githubusercontent.com/u/104120598?v=4?s=100" width="100px;" alt="Chris Cantrell"/><br /><sub><b>Chris Cantrell</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Accantrell72" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

docker-compose.prod.yml

@@ -22,19 +22,15 @@ services:
       - server
       - webapp
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   webapp:
     container_name: bigcapital-webapp
-    image: bigcapitalhq/webapp:latest
+    image: ghcr.io/bigcapitalhq/webapp:latest
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   server:
     container_name: bigcapital-server
-    image: bigcapitalhq/server:latest
+    image: ghcr.io/bigcapitalhq/server:latest
     expose:
       - '3000'
     links:
@@ -86,24 +82,18 @@ services:
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
       - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
 
-      # Sign-up email confirmation
-      - SIGNUP_EMAIL_CONFIRMATION=${SIGNUP_EMAIL_CONFIRMATION}
-
       # Gotenberg (Pdf generator)
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
 
-      # Exchange Rate
-      - EXCHANGE_RATE_SERVICE=${EXCHANGE_RATE_SERVICE}
-      - OPEN_EXCHANGE_RATE_APP_ID-${OPEN_EXCHANGE_RATE_APP_ID}
-
       # Bank Sync
       - BANKING_CONNECT=${BANKING_CONNECT}
 
       # Plaid
       - PLAID_ENV=${PLAID_ENV}
       - PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
-      - PLAID_SECRET=${PLAID_SECRET}
+      - PLAID_SECRET_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
+      - PLAID_SECRET_SANDBOX=${b8cf42b441e110451e2f69ad7e1e9f}
       - PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
 
       # Lemon Squeez
@@ -112,24 +102,6 @@ services:
       - LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET}
       - HOSTED_ON_BIGCAPITAL_CLOUD=${HOSTED_ON_BIGCAPITAL_CLOUD}
 
-      # New Relic matrics tracking.
-      - NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=${NEW_RELIC_DISTRIBUTED_TRACING_ENABLED}
-      - NEW_RELIC_LOG=${NEW_RELIC_LOG}
-      - NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED}
-      - NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}
-      - NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
-
-      # S3
-      - S3_REGION=${S3_REGION}
-      - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
-      - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
-      - S3_ENDPOINT=${S3_ENDPOINT}
-      - S3_BUCKET=${S3_BUCKET}
-    networks:
-      - bigcapital_network
-
   database_migration:
     container_name: bigcapital-database-migration
     build:
@@ -146,8 +118,6 @@ services:
       - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
     depends_on:
       - mysql
-    networks:
-      - bigcapital_network
 
   mysql:
     container_name: bigcapital-mysql
@@ -163,8 +133,6 @@ services:
       - mysql:/var/lib/mysql
     expose:
       - '3306'
-    networks:
-      - bigcapital_network
 
   mongo:
     container_name: bigcapital-mongo
@@ -174,8 +142,6 @@ services:
       - '27017'
     volumes:
       - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network
 
   redis:
     container_name: bigcapital-redis
@@ -186,15 +152,11 @@ services:
       - '6379'
     volumes:
       - redis:/data
-    networks:
-      - bigcapital_network
 
   gotenberg:
     image: gotenberg/gotenberg:7
     expose:
       - '9000'
-    networks:
-      - bigcapital_network
 
 # Volumes
 volumes:
@@ -209,8 +171,3 @@ volumes:
   redis:
     name: bigcapital_prod_redis
     driver: local
-
-# Networks
-networks:
-  bigcapital_network:
-    driver: bridge

docker/migration/Dockerfile

@@ -1,4 +1,4 @@
-FROM bigcapitalhq/server:latest as build
+FROM ghcr.io/bigcapitalhq/server:latest as build
 
 ARG DB_HOST= \
   DB_USER= \
@@ -34,5 +34,7 @@ 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.
+ADD docker/migration/start.sh /
-CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node ./build/commands.js system:migrate:latest && node ./build/commands.js tenants:migrate:latest"
+RUN chmod +x /start.sh
+
+CMD ["/start.sh"]

docker/migration/start.sh

@@ -0,0 +1,5 @@
+# Migrate the master system database.
+./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js system:migrate:latest
+
+# Migrate all tenants.
+./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js tenants:migrate:latest

packages/server/Dockerfile

@@ -78,9 +78,6 @@ ENV MAIL_HOST=$MAIL_HOST \
   SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
   SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS
 
-# New Relic config file.
-ENV NEW_RELIC_NO_CONFIG_FILE=true
-
 # Create app directory.
 WORKDIR /app
 
@@ -92,8 +89,8 @@ RUN npm install -g pnpm
 # Copy application dependency manifests to the container image.
 COPY ./package*.json ./
 COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
-COPY ./lerna.json ./lerna.json
 COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
+COPY ./lerna.json ./lerna.json
 COPY ./packages/server/package*.json ./packages/server/
 
 # Install application dependencies

packages/server/package.json

@@ -20,12 +20,9 @@
     "bigcapital": "./bin/bigcapital.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.576.0",
-    "@aws-sdk/s3-request-presigner": "^3.583.0",
     "@casl/ability": "^5.4.3",
     "@hapi/boom": "^7.4.3",
     "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
-    "@types/express": "^4.17.21",
     "@types/i18n": "^0.8.7",
     "@types/knex": "^0.16.1",
     "@types/mathjs": "^6.0.12",
@@ -76,18 +73,15 @@
     "lru-cache": "^6.0.0",
     "mathjs": "^9.4.0",
     "memory-cache": "^0.2.0",
-    "mime-types": "^2.1.35",
     "moment": "^2.24.0",
     "moment-range": "^4.0.2",
     "moment-timezone": "^0.5.43",
     "mongodb": "^6.1.0",
     "mongoose": "^5.10.0",
     "multer": "1.4.5-lts.1",
-    "multer-s3": "^3.0.1",
     "mustache": "^3.0.3",
     "mysql": "^2.17.1",
     "mysql2": "^1.6.5",
-    "newrelic": "^11.15.0",
     "node-cache": "^4.2.1",
     "nodemailer": "^6.3.0",
     "nodemon": "^1.19.1",
@@ -118,7 +112,6 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.158",
-    "@types/multer": "^1.4.11",
     "@types/ramda": "^0.27.64",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",

packages/server/resources/locales/en.json

@@ -244,7 +244,6 @@
   "account.field.active": "Active",
   "account.field.currency": "Currency",
   "account.field.balance": "Balance",
-  "account.field.bank_balance": "Bank Balance",
   "account.field.parent_account": "Parent Account",
   "account.field.created_at": "Created at",
   "item.field.type": "Item Type",
@@ -332,7 +331,7 @@
   "bill_payment.field.reference_no": "Reference No.",
   "bill_payment.field.description": "Description",
   "bill_payment.field.exchange_rate": "Exchange Rate",
-  "bill_payment.field.note": "Note",
+  "bill_payment.field.statement": "Statement",
   "bill_payment.field.entries.bill": "Bill No.",
   "bill_payment.field.entries.payment_amount": "Payment Amount",
   "bill_payment.field.reference": "Reference No.",
@@ -432,7 +431,6 @@
   "vendor.field.created_at": "Created at",
   "vendor.field.balance": "Balance",
   "vendor.field.status": "Status",
-  "vendor.field.note": "Note",
   "vendor.field.currency": "Currency",
   "vendor.field.status.active": "Active",
   "vendor.field.status.inactive": "Inactive",

packages/server/resources/scss/modules/export-resource-table.scss

@@ -1,38 +0,0 @@
-@import "../base.scss";
-
-body {
-  font-family: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-  font-size: 12px;
-  line-height: 1.4;
-  margin: 0;
-}
-.sheet__title{
-  margin-bottom: 18px;
-}
-.sheet__title h2{
-  line-height: 1;
-  margin-top: 0;
-  margin-bottom: 10px;
-  font-size: 16px;
-}
-.sheet__table {
-  font-size: inherit;
-  line-height: inherit;
-  width: 100%;
-}
-.sheet__table {
-  table-layout: auto;
-  border-collapse: collapse;  
-  width: 100%;
-}
-.sheet__table thead tr th {
-  border-top: 1px solid #000;
-  border-bottom: 1px solid #000;
-  background: #fff;
-  padding: 8px;
-  line-height: 1.2;
-}
-.sheet__table tbody tr td {
-  padding: 4px 8px;
-  border-bottom: 1px solid #CCC;    
-}

packages/server/resources/views/modules/export-resource-table.pug

@@ -1,24 +0,0 @@
-block head
-  style 
-    include ../../css/modules/export-resource-table.css
-
-style.
-  !{customCSS}
-
-block content 
-  .sheet
-    .sheet__title 
-      h2.sheetTitle= sheetTitle
-      p.sheetDesc= sheetDescription
-
-    table.sheet__table
-      thead
-        tr
-          each column in table.columns
-            th(style=column.style class='column--' + column.key)= column.name
-      tbody
-        each row in table.rows
-          tr(class=row.classNames)
-            each cell in row.cells 
-              td(class='cell--' + cell.key)
-                span!= cell.value

packages/server/scripts/gulpConfig.js

@@ -70,10 +70,6 @@ module.exports = {
         src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
         dest: `${RESOURCES_PATH}/css/modules`,
       },
-      {
-        src: `${RESOURCES_PATH}/scss/modules/export-resource-table.scss`,
-        dest: `${RESOURCES_PATH}/css/modules`,
-      },
     ],
     // RTL builds.
     rtl: [

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

@@ -207,6 +207,7 @@ export default class AccountsController extends BaseController {
         tenantId,
         accountDTO
       );
+
       return res.status(200).send({
         id: account.id,
         message: 'The account has been created successfully.',

packages/server/src/api/controllers/Attachments/AttachmentsController.ts

@@ -1,264 +0,0 @@
-import mime from 'mime-types';
-import { Service, Inject } from 'typedi';
-import { Router, Response, NextFunction, Request } from 'express';
-import { body, param } from 'express-validator';
-import BaseController from '@/api/controllers/BaseController';
-import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
-import { AttachmentUploadPipeline } from '@/services/Attachments/S3UploadPipeline';
-
-@Service()
-export class AttachmentsController extends BaseController {
-  @Inject()
-  private attachmentsApplication: AttachmentsApplication;
-
-  @Inject()
-  private uploadPipelineService: AttachmentUploadPipeline;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      this.uploadPipelineService.validateS3Configured,
-      this.uploadPipelineService.uploadPipeline().single('file'),
-      this.validateUploadedFileExistance,
-      this.uploadAttachment.bind(this)
-    );
-    router.delete(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.deleteAttachment.bind(this)
-    );
-    router.get(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachment.bind(this)
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.linkDocument.bind(this)
-    );
-    router.post(
-      '/:id/unlink',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.unlinkDocument.bind(this)
-    );
-    router.get(
-      '/:id/presigned-url',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachmentPresignedUrl.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Validates the upload file existance.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private validateUploadedFileExistance(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (!req.file) {
-      return res.boom.badRequest(null, {
-        errorType: 'FILE_UPLOAD_FAILED',
-        message: 'Now file uploaded.',
-      });
-    }
-    next();
-  }
-
-  /**
-   * Uploads the attachments to S3 and store the file metadata to DB.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private async uploadAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const file = req.file;
-
-    try {
-      const data = await this.attachmentsApplication.upload(tenantId, file);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has uploaded successfully.',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id } = req.params;
-
-    try {
-      const data = await this.attachmentsApplication.get(tenantId, id);
-
-      const byte = await data.Body.transformToByteArray();
-      const extension = mime.extension(data.ContentType);
-      const buffer = Buffer.from(byte);
-
-      res.set(
-        'Content-Disposition',
-        `filename="${req.params.id}.${extension}"`
-      );
-      res.set('Content-Type', data.ContentType);
-      res.send(buffer);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async deleteAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-
-    try {
-      await this.attachmentsApplication.delete(tenantId, documentId);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been delete successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async linkDocument(
-    req: Request,
-    res: Response,
-    next: Function
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async unlinkDocument(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retreives the presigned url of the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachmentPresignedUrl(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { id: documentKey } = req.params;
-
-    try {
-      const presignedUrl = await this.attachmentsApplication.getPresignedUrl(
-        documentKey
-      );
-      return res.status(200).send({ presignedUrl });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -9,8 +9,6 @@ import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import LoginThrottlerMiddleware from '@/api/middleware/LoginThrottlerMiddleware';
 import AuthenticationApplication from '@/services/Authentication/AuthApplication';
 
-import JWTAuth from '@/api/middleware/jwtAuth';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
 @Service()
 export default class AuthenticationController extends BaseController {
   @Inject()
@@ -30,20 +28,6 @@ export default class AuthenticationController extends BaseController {
       asyncMiddleware(this.login.bind(this)),
       this.handlerErrors
     );
-    router.use('/register/verify/resend', JWTAuth);
-    router.use('/register/verify/resend', AttachCurrentTenantUser);
-    router.post(
-      '/register/verify/resend',
-      asyncMiddleware(this.registerVerifyResendMail.bind(this)),
-      this.handlerErrors
-    );
-    router.post(
-      '/register/verify',
-      this.signupVerifySchema,
-      this.validationResult,
-      asyncMiddleware(this.registerVerify.bind(this)),
-      this.handlerErrors
-    );
     router.post(
       '/register',
       this.registerSchema,
@@ -115,17 +99,6 @@ export default class AuthenticationController extends BaseController {
     ];
   }
 
-  private get signupVerifySchema(): ValidationChain[] {
-    return [
-      check('email')
-        .exists()
-        .isString()
-        .isEmail()
-        .isLength({ max: DATATYPES_LENGTH.STRING }),
-      check('token').exists().isString(),
-    ];
-  }
-
   /**
    * Reset password schema.
    * @returns {ValidationChain[]}
@@ -193,58 +166,6 @@ export default class AuthenticationController extends BaseController {
     }
   }
 
-  /**
-   * Verifies the provider user's email after signin-up.
-   * @param {Request} req
-   * @param {Response}| res
-   * @param {Function} next
-   * @returns {Response|void}
-   */
-  private async registerVerify(req: Request, res: Response, next: Function) {
-    const signUpVerifyDTO: { email: string; token: string } =
-      this.matchedBodyData(req);
-
-    try {
-      const user = await this.authApplication.signUpConfirm(
-        signUpVerifyDTO.email,
-        signUpVerifyDTO.token
-      );
-      return res.status(200).send({
-        type: 'success',
-        message: 'The given user has verified successfully',
-        user,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Resends the confirmation email to the user.
-   * @param {Request} req
-   * @param {Response}| res
-   * @param {Function} next
-   */
-  private async registerVerifyResendMail(
-    req: Request,
-    res: Response,
-    next: Function
-  ) {
-    const { user } = req;
-
-    try {
-      const data = await this.authApplication.signUpConfirmResend(user.id);
-
-      return res.status(200).send({
-        type: 'success',
-        message: 'The given user has verified successfully',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Send reset password handler
    * @param {Request} req

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

@@ -84,7 +84,7 @@ export class ExpensesController extends BaseController {
   /**
    * Expense DTO schema.
    */
-  private get expenseDTOSchema() {
+  get expenseDTOSchema() {
     return [
       check('reference_no')
         .optional({ nullable: true })
@@ -130,9 +130,6 @@ export class ExpensesController extends BaseController {
         .optional({ nullable: true })
         .isInt({ max: DATATYPES_LENGTH.INT_10 })
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -186,9 +183,6 @@ export class ExpensesController extends BaseController {
         .optional({ nullable: true })
         .isInt({ max: DATATYPES_LENGTH.INT_10 })
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -275,7 +269,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async deleteExpense(req: Request, res: Response, next: NextFunction) {
+  async deleteExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
     const { id: expenseId } = req.params;
 
@@ -297,11 +291,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async publishExpense(
+  async publishExpense(req: Request, res: Response, next: NextFunction) {
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
     const { tenantId, user } = req;
     const { id: expenseId } = req.params;
 
@@ -323,11 +313,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async getExpensesList(
+  async getExpensesList(req: Request, res: Response, next: NextFunction) {
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
     const { tenantId } = req;
     const filter = {
       sortOrder: 'desc',
@@ -357,7 +343,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async getExpense(req: Request, res: Response, next: NextFunction) {
+  async getExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const { id: expenseId } = req.params;
 

packages/server/src/api/controllers/Export/ExportController.ts

@@ -1,87 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { query } from 'express-validator';
-import BaseController from '@/api/controllers/BaseController';
-import { ServiceError } from '@/exceptions';
-import { ExportApplication } from '@/services/Export/ExportApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { convertAcceptFormatToFormat } from './_utils';
-
-@Service()
-export class ExportController extends BaseController {
-  @Inject()
-  private exportResourceApp: ExportApplication;
-
-  /**
-   * Router constructor method.
-   */
-  public router() {
-    const router = Router();
-
-    router.get(
-      '/',
-      [
-        query('resource').exists(),
-        query('format').isIn(['csv', 'xlsx']).optional(),
-      ],
-      this.validationResult,
-      this.export.bind(this),
-    );
-    return router;
-  }
-
-  /**
-   * Imports xlsx/csv to the given resource type.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
-   */
-  private async export(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const accept = this.accepts(req);
-
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      const applicationFormat = convertAcceptFormatToFormat(acceptType);
-
-      const data = await this.exportResourceApp.export(
-        tenantId,
-        query.resource,
-        applicationFormat
-      );
-      // Retrieves the csv format.
-      if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(data);
-        // Retrieves the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(data);
-        //
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': data.length,
-        });
-        res.send(data);
-      }
-    } catch (error) {
-      next(error);
-    }
-  }
-}

packages/server/src/api/controllers/Export/_utils.ts

@@ -1,13 +0,0 @@
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { ExportFormat } from '@/services/Export/common';
-
-export const convertAcceptFormatToFormat = (accept: string): ExportFormat => {
-  switch (accept) {
-    case ACCEPT_TYPE.APPLICATION_CSV:
-      return ExportFormat.Csv;
-    case ACCEPT_TYPE.APPLICATION_PDF:
-      return ExportFormat.Pdf;
-    case ACCEPT_TYPE.APPLICATION_XLSX:
-      return ExportFormat.Xlsx;
-  }
-};

packages/server/src/api/controllers/Import/ImportController.ts

@@ -16,7 +16,7 @@ export class ImportController extends BaseController {
   /**
    * Router constructor method.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.post(
@@ -240,7 +240,11 @@ export class ImportController extends BaseController {
           errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
         });
       }
+      return res.status(400).send({
+        errors: [{ type: error.errorType }],
+      });
     }
+
     next(error);
   }
 }

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

@@ -77,14 +77,14 @@ export default class ManualJournalsController extends BaseController {
   /**
    * Specific manual journal id param validation schema.
    */
-  private get manualJournalParamSchema() {
+  get manualJournalParamSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Manual journal DTO schema.
    */
-  private get manualJournalValidationSchema() {
+  get manualJournalValidationSchema() {
     return [
       check('date').exists().isISO8601(),
       check('currency_code').optional(),
@@ -148,16 +148,13 @@ export default class ManualJournalsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
   /**
    * Manual journals list validation schema.
    */
-  private get manualJournalsListSchema() {
+  get manualJournalsListSchema() {
     return [
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
@@ -323,7 +320,7 @@ export default class ManualJournalsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private getManualJournalsList = async (
+  getManualJournalsList = async (
     req: Request,
     res: Response,
     next: NextFunction

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

@@ -33,17 +33,17 @@ export default class OrganizationDashboardController extends BaseController {
   }
 
   /**
-   * Detarmines whether the current authed organization to able to change its currency/.
+   *
-   * @param {Request} req
+   * @param req
-   * @param {Response} res
+   * @param res
-   * @param {NextFunction} next
+   * @param next
-   * @returns {Response|void}
+   * @returns
    */
   private async baseCurrencyMutateAbility(
     req: Request,
     res: Response,
     next: Function
-  ): Promise<Response|void> {
+  ) {
     const { tenantId } = req;
 
     try {

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

@@ -29,7 +29,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.createProject.bind(this))
+      asyncMiddleware(this.createProject.bind(this)),
+      this.catchServiceErrors
     );
     router.post(
       '/:id',
@@ -42,7 +43,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.patch(
       '/:projectId/status',
@@ -54,14 +56,16 @@ export class ProjectsController extends BaseController {
           .isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:id',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.getProject.bind(this))
+      asyncMiddleware(this.getProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:projectId/billable/entries',
@@ -72,21 +76,24 @@ export class ProjectsController extends BaseController {
         query('to_date').optional().isISO8601(),
       ],
       this.validationResult,
-      asyncMiddleware(this.projectBillableEntries.bind(this))
+      asyncMiddleware(this.projectBillableEntries.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [],
       this.validationResult,
-      asyncMiddleware(this.getProjects.bind(this))
+      asyncMiddleware(this.getProjects.bind(this)),
+      this.catchServiceErrors
     );
     router.delete(
       '/:id',
       CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.deleteProject.bind(this))
+      asyncMiddleware(this.deleteProject.bind(this)),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -245,4 +252,22 @@ export class ProjectsController extends BaseController {
       next(error);
     }
   };
+
+  /**
+   * Transforms service errors to response.
+   * @param {Error}
+   * @param {Request} req
+   * @param {Response} res
+   * @param {ServiceError} error
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+    }
+    next(error);
+  }
 }

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -118,6 +118,7 @@ export default class BillsController extends BaseController {
       check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
 
       check('entries').isArray({ min: 1 }),
+
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
@@ -147,9 +148,6 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -192,9 +190,6 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isBoolean()
         .toBoolean(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/BillsPayments.ts

@@ -122,9 +122,6 @@ export default class BillsPayments extends BaseController {
       check('entries.*.index').optional().isNumeric().toInt(),
       check('entries.*.bill_id').exists().isNumeric().toInt(),
       check('entries.*.payment_amount').exists().isNumeric().toFloat(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/VendorCredit.ts

@@ -186,9 +186,6 @@ export default class VendorCreditController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -231,9 +228,6 @@ export default class VendorCreditController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/CreditNotes.ts

@@ -236,9 +236,6 @@ export default class PaymentReceivesController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/PaymentReceives.ts

@@ -164,9 +164,6 @@ export default class PaymentReceivesController extends BaseController {
       check('entries.*.index').optional().isNumeric().toInt(),
       check('entries.*.invoice_id').exists().isNumeric().toInt(),
       check('entries.*.payment_amount').exists().isNumeric().toFloat(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/SalesEstimates.ts

@@ -184,9 +184,6 @@ export default class SalesEstimatesController extends BaseController {
       check('note').optional().trim().escape(),
       check('terms_conditions').optional().trim().escape(),
       check('send_to_email').optional().trim().escape(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/SalesInvoices.ts

@@ -36,8 +36,6 @@ export default class SaleInvoicesController extends BaseController {
       [
         ...this.saleInvoiceValidationSchema,
         check('from_estimate_id').optional().isNumeric().toInt(),
-        check('attachments').isArray().optional(),
-        check('attachments.*.key').exists().isString(),
       ],
       this.validationResult,
       asyncMiddleware(this.newSaleInvoice.bind(this)),
@@ -100,8 +98,6 @@ export default class SaleInvoicesController extends BaseController {
       [
         ...this.saleInvoiceValidationSchema,
         ...this.specificSaleInvoiceValidation,
-        check('attachments').isArray().optional(),
-        check('attachments.*.key').exists().isString(),
       ],
       this.validationResult,
       asyncMiddleware(this.editSaleInvoice.bind(this)),

packages/server/src/api/controllers/Sales/SalesReceipts.ts

@@ -158,8 +158,6 @@ export default class SalesReceiptsController extends BaseController {
         .toInt(),
       check('receipt_message').optional().trim().escape(),
       check('statement').optional().trim().escape(),
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

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

@@ -155,7 +155,6 @@ export default class UsersController extends BaseController {
 
     try {
       const user = await this.usersService.getUser(tenantId, userId);
-
       return res.status(200).send({ user });
     } catch (error) {
       next(error);
@@ -230,7 +229,7 @@ export default class UsersController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private catchServiceErrors(
+  catchServiceErrors(
     error: Error,
     req: Request,
     res: Response,

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

@@ -17,7 +17,7 @@ export class WarehousesController extends BaseController {
    *
    * @returns
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.post(

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

@@ -1,6 +1,7 @@
-import { NextFunction, Router, Request, Response } from 'express';
+import { Router } from 'express';
-import { Inject, Service } from 'typedi';
 import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
+import { Request, Response } from 'express';
+import { Inject, Service } from 'typedi';
 import BaseController from '../BaseController';
 import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
 import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
@@ -33,21 +34,14 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async lemonWebhooks(req: Request, res: Response) {
     const data = req.body;
     const signature = req.headers['x-signature'] ?? '';
     const rawBody = req.rawBody;
 
-    try {
+    await this.lemonWebhooksService.handlePostWebhook(rawBody, data, signature);
-      await this.lemonWebhooksService.handlePostWebhook(
+
-        rawBody,
+    return res.status(200).send();
-        data,
-        signature
-      );
-      return res.status(200).send();
-    } catch (error) {
-      next(error);
-    }
   }
 
   /**
@@ -56,25 +50,20 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async plaidWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async plaidWebhooks(req: Request, res: Response) {
     const { tenantId } = req;
+    const {
+      webhook_type: webhookType,
+      webhook_code: webhookCode,
+      item_id: plaidItemId,
+    } = req.body;
 
-    try {
+    await this.plaidApp.webhooks(
-      const {
+      tenantId,
-        webhook_type: webhookType,
+      plaidItemId,
-        webhook_code: webhookCode,
+      webhookType,
-        item_id: plaidItemId,
+      webhookCode
-      } = req.body;
+    );
-
+    return res.status(200).send({ code: 200, message: 'ok' });
-      await this.plaidApp.webhooks(
-        tenantId,
-        plaidItemId,
-        webhookType,
-        webhookCode
-      );
-      return res.status(200).send({ code: 200, message: 'ok' });
-    } catch (error) {
-      next(error);
-    }
   }
 }

packages/server/src/api/exceptions/GlobalErrorException.ts

@@ -1,20 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-
-/**
- * Global error handler.
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function GlobalErrorException(
-  err: Error,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  console.error(err.stack);
-
-  res.status(500);
-  res.boom.badImplementation('', { stack: err.stack });
-}

packages/server/src/api/exceptions/ServiceErrorException.ts

@@ -1,25 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-import { ServiceError } from '@/exceptions';
-
-/**
- * Handles service error exception.
- * @param {Error | ServiceError} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ServiceErrorException(
-  err: Error | ServiceError,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  if (err instanceof ServiceError) {
-    res.boom.badRequest('', {
-      errors: [{ type: err.errorType, message: err.message }],
-      type: 'ServiceError',
-    });
-  } else {
-    next(err);
-  }
-}

packages/server/src/api/index.ts

@@ -61,8 +61,6 @@ import { TaxRatesController } from './controllers/TaxRates/TaxRates';
 import { ImportController } from './controllers/Import/ImportController';
 import { BankingController } from './controllers/Banking/BankingController';
 import { Webhooks } from './controllers/Webhooks/Webhooks';
-import { ExportController } from './controllers/Export/ExportController';
-import { AttachmentsController } from './controllers/Attachments/AttachmentsController';
 
 export default () => {
   const app = Router();
@@ -143,8 +141,6 @@ export default () => {
   dashboard.use('/projects', Container.get(ProjectsController).router());
   dashboard.use('/tax-rates', Container.get(TaxRatesController).router());
   dashboard.use('/import', Container.get(ImportController).router());
-  dashboard.use('/export', Container.get(ExportController).router());
-  dashboard.use('/attachments', Container.get(AttachmentsController).router());
 
   dashboard.use('/', Container.get(ProjectTasksController).router());
   dashboard.use('/', Container.get(ProjectTimesController).router());

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

@@ -10,14 +10,8 @@ import {
   DataError,
 } from 'objection';
 
-/**
+// In this example `res` is an express response object.
- * Handles the Objection error exception.
+export default function ObjectionErrorHandlerMiddleware(
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ObjectionErrorException(
   err: Error,
   req: Request,
   res: Response,
@@ -114,7 +108,6 @@ export function ObjectionErrorException(
       type: 'UnknownDatabaseError',
       data: {},
     });
-  } else {
-    next(err);
   }
+  next(err);
 }

packages/server/src/commands/bigcapital.ts

@@ -71,10 +71,6 @@ function getAllSystemTenants(knex) {
   return knex('tenants');
 }
 
-function getAllInitializedSystemTenants(knex) {
-  return knex('tenants').whereNotNull('initializedAt');
-}
-
 // module.exports = {
 //   log,
 //   success,
@@ -187,7 +183,7 @@ commander
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = await getAllInitializedSystemTenants(sysKnex);
+      const tenants = await getAllSystemTenants(sysKnex);
       const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
 
       if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
@@ -224,6 +220,7 @@ commander
         const oper = migrateTenant(cmd.tenant_id);
         migrateOpers.push(oper);
       }
+
       Promise.all(migrateOpers).then(() => {
         success('All tenants are migrated.');
       });
@@ -283,3 +280,4 @@ commander
       exit(error);
     }
   });
+

packages/server/src/config/index.ts

@@ -55,7 +55,7 @@ module.exports = {
   mail: {
     host: process.env.MAIL_HOST,
     port: process.env.MAIL_PORT,
-    secure: parseBoolean(defaultTo(process.env.MAIL_SECURE, false), false),
+    secure: !!parseInt(process.env.MAIL_SECURE, 10),
     username: process.env.MAIL_USERNAME,
     password: process.env.MAIL_PASSWORD,
     from: process.env.MAIL_FROM_ADDRESS,
@@ -153,16 +153,6 @@ module.exports = {
     ),
   },
 
-  /**
-   * Sign-up email confirmation
-   */
-  signupConfirmation: {
-    enabled: parseBoolean<boolean>(
-      process.env.SIGNUP_EMAIL_CONFIRMATION,
-      false
-    ),
-  },
-
   /**
    * Puppeteer remote browserless connection.
    */
@@ -204,7 +194,10 @@ module.exports = {
   plaid: {
     env: process.env.PLAID_ENV || 'sandbox',
     clientId: process.env.PLAID_CLIENT_ID,
-    secret: process.env.PLAID_SECRET,
+    secretDevelopment: process.env.PLAID_SECRET_DEVELOPMENT,
+    secretSandbox: process.env.PLAID_SECRET_SANDBOX,
+    redirectSandBox: process.env.PLAID_SANDBOX_REDIRECT_URI,
+    redirectDevelopment: process.env.PLAID_DEVELOPMENT_REDIRECT_URI,
     linkWebhook: process.env.PLAID_LINK_WEBHOOK,
   },
 
@@ -215,7 +208,6 @@ module.exports = {
     key: process.env.LEMONSQUEEZY_API_KEY,
     storeId: process.env.LEMONSQUEEZY_STORE_ID,
     webhookSecret: process.env.LEMONSQUEEZY_WEBHOOK_SECRET,
-    redirectTo: `${process.env.BASE_URL}/setup`,
   },
 
   /**
@@ -226,15 +218,4 @@ module.exports = {
     defaultTo(process.env.HOSTED_ON_BIGCAPITAL_CLOUD, false),
     false
   ),
-
-  /**
-   * S3 for documents.
-   */
-  s3: {
-    region: process.env.S3_REGION,
-    accessKeyId: process.env.S3_ACCESS_KEY_ID,
-    secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
-    endpoint: process.env.S3_ENDPOINT,
-    bucket: process.env.S3_BUCKET || 'bigcapital-documents',
-  },
 };

packages/server/src/database/migrations/20231108170207_create_storage_table.js

@@ -11,4 +11,4 @@ exports.up = function (knex) {
 
 exports.down = function (knex) {
   return knex.schema.dropTableIfExists('storage');
-};
+};

packages/server/src/database/migrations/20240604153938_drop_storage_table.js

@@ -1,5 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.dropTableIfExists('storage');
-};
-
-exports.down = function (knex) {};

packages/server/src/database/migrations/20240604153951_create_documents_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('documents', (table) => {
-    table.increments('id').primary();
-    table.string('key').notNullable();
-    table.string('mime_type').notNullable();
-    table.integer('size').unsigned();
-    table.string('origin_name');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('documents');
-};

packages/server/src/database/migrations/20240604154005_create_documents_links_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('document_links', (table) => {
-    table.increments('id').primary();
-    table.string('model_ref').notNullable();
-    table.string('model_id').notNullable();
-    table.integer('document_id').unsigned();
-    table.datetime('expires_at').nullable();
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('document_links');
-};

packages/server/src/interfaces/Account.ts

@@ -164,7 +164,3 @@ export enum TaxRateAction {
   DELETE = 'Delete',
   VIEW = 'View',
 }
-
-export interface CreateAccountParams {
-  ignoreUniqueName: boolean;
-}

packages/server/src/interfaces/Attachments.ts

@@ -1,3 +0,0 @@
-export interface AttachmentLinkDTO {
-  key: string;
-}

packages/server/src/interfaces/Authentication.ts

@@ -66,27 +66,16 @@ export interface IAuthResetedPasswordEventPayload {
   password: string;
 }
 
+
 export interface IAuthSendingResetPassword {
-  user: ISystemUser;
+  user: ISystemUser,
   token: string;
 }
 export interface IAuthSendedResetPassword {
-  user: ISystemUser;
+  user: ISystemUser,
   token: string;
 }
 
-export interface IAuthGetMetaPOJO {
+export interface IAuthGetMetaPOJO  {
   signupDisabled: boolean;
-}
+}
-
-export interface IAuthSignUpVerifingEventPayload {
-  email: string;
-  verifyToken: string;
-  userId: number;
-}
-
-export interface IAuthSignUpVerifiedEventPayload {
-  email: string;
-  verifyToken: string;
-  userId: number;
-}

packages/server/src/interfaces/Bill.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IDynamicListFilterDTO } from './DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IBillLandedCost } from './LandedCost';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IBillDTO {
   vendorId: number;
@@ -21,7 +20,6 @@ export interface IBillDTO {
   warehouseId?: number;
   projectId?: number;
   isInclusiveTax?: boolean;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IBillEditDTO {
@@ -40,7 +38,6 @@ export interface IBillEditDTO {
   branchId?: number;
   warehouseId?: number;
   projectId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IBill {
@@ -108,7 +105,6 @@ export interface IBillsService {
 export interface IBillCreatedPayload {
   tenantId: number;
   bill: IBill;
-  billDTO: IBillDTO;
   billId: number;
   trx: Knex.Transaction;
 }
@@ -130,7 +126,6 @@ export interface IBillEditedPayload {
   billId: number;
   oldBill: IBill;
   bill: IBill;
-  billDTO: IBillDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/BillPayment.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import { IBill } from './Bill';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IBillPaymentEntry {
   id?: number;
@@ -46,7 +45,6 @@ export interface IBillPaymentDTO {
   reference: string;
   entries: IBillPaymentEntryDTO[];
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IBillReceivePageEntry {
@@ -68,7 +66,6 @@ export interface IBillPaymentsService {
 export interface IBillPaymentEventCreatedPayload {
   tenantId: number;
   billPayment: IBillPayment;
-  billPaymentDTO: IBillPaymentDTO;
   billPaymentId: number;
   trx: Knex.Transaction;
 }
@@ -90,7 +87,6 @@ export interface IBillPaymentEventEditedPayload {
   billPaymentId: number;
   billPayment: IBillPayment;
   oldBillPayment: IBillPayment;
-  billPaymentDTO: IBillPaymentDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/CreditNote.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 import { IDynamicListFilter, IItemEntry, IVendorCredit } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ICreditNoteEntryNewDTO {
   index: number;
@@ -22,7 +21,6 @@ export interface ICreditNoteNewDTO {
   entries: ICreditNoteEntryNewDTO[];
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[]
 }
 
 export interface ICreditNoteEditDTO {
@@ -35,7 +33,6 @@ export interface ICreditNoteEditDTO {
   entries: ICreditNoteEntryNewDTO[];
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[]
 }
 
 export interface ICreditNoteEntry extends IItemEntry {}

packages/server/src/interfaces/Expenses.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { ISystemUser } from './User';
 import { IFilterRole } from './DynamicFilter';
 import { IAccount } from './Account';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IPaginationMeta {
   total: number;
@@ -82,7 +81,6 @@ export interface IExpenseCommonDTO {
   categories: IExpenseCategoryDTO[];
 
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IExpenseCreateDTO extends IExpenseCommonDTO {}
@@ -154,7 +152,6 @@ export interface IExpenseCreatedPayload {
   expenseId: number;
   authorizedUser: ISystemUser;
   expense: IExpense;
-  expenseDTO: IExpenseCreateDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/ManualJournal.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IDynamicListFilterDTO } from './DynamicFilter';
 import { ISystemUser } from './User';
 import { IAccount } from './Account';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IManualJournal {
   id?: number;
@@ -57,7 +56,6 @@ export interface IManualJournalDTO {
   publish?: boolean;
   branchId?: number;
   entries: IManualJournalEntryDTO[];
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IManualJournalsFilter extends IDynamicListFilterDTO {
@@ -144,7 +142,6 @@ export interface IManualJournalEventEditedPayload {
   tenantId: number;
   manualJournal: IManualJournal;
   oldManualJournal: IManualJournal;
-  manualJournalDTO: IManualJournalDTO;
   trx: Knex.Transaction;
 }
 export interface IManualJournalEditingPayload {
@@ -164,7 +161,6 @@ export interface IManualJournalEventCreatedPayload {
   tenantId: number;
   manualJournal: IManualJournal;
   manualJournalId: number;
-  manualJournalDTO: IManualJournalDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/Model.ts

@@ -122,26 +122,17 @@ export type IModelMetaCollectionField = IModelMetaCollectionFieldCommon &
 export type IModelMetaRelationField = IModelMetaRelationFieldCommon &
   IModelMetaRelationEnumerationField;
 
-interface IModelPrintMeta{
-  pageTitle: string;
-}
-
 export interface IModelMeta {
   defaultFilterField: string;
   defaultSort: IModelMetaDefaultSort;
 
-  exportable?: boolean;
-  exportFlattenOn?: string;
-
   importable?: boolean;
+
   importAggregator?: string;
   importAggregateOn?: string;
   importAggregateBy?: string;
 
-  print?: IModelPrintMeta;
-
   fields: { [key: string]: IModelMetaField };
-  columns: { [key: string]: IModelMetaColumn };
 }
 
 // ----
@@ -170,22 +161,3 @@ export type IModelMetaField2 = IModelMetaFieldCommon2 &
     | IModelMetaRelationField2
     | IModelMetaCollectionField
   );
-
-export interface ImodelMetaColumnMeta {
-  name: string;
-  accessor?: string;
-  exportable?: boolean;
-}
-
-interface IModelMetaColumnText {
-  type: 'text;';
-}
-
-interface IModelMetaColumnCollection {
-  type: 'collection';
-  collectionOf: 'object';
-  columns: { [key: string]: ImodelMetaColumnMeta & IModelMetaColumnText };
-}
-
-export type IModelMetaColumn = ImodelMetaColumnMeta &
-  (IModelMetaColumnText | IModelMetaColumnCollection);

packages/server/src/interfaces/PaymentReceive.ts

@@ -6,7 +6,6 @@ import {
 } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
 import { ISaleInvoice } from './SaleInvoice';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IPaymentReceive {
   id?: number;
@@ -38,7 +37,6 @@ export interface IPaymentReceiveCreateDTO {
   entries: IPaymentReceiveEntryDTO[];
 
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IPaymentReceiveEditDTO {
@@ -52,7 +50,6 @@ export interface IPaymentReceiveEditDTO {
   statement: string;
   entries: IPaymentReceiveEntryDTO[];
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IPaymentReceiveEntry {
@@ -117,7 +114,6 @@ export interface IPaymentReceiveCreatedPayload {
   paymentReceive: IPaymentReceive;
   paymentReceiveId: number;
   authorizedUser: ISystemUser;
-  paymentReceiveDTO: IPaymentReceiveCreateDTO;
   trx: Knex.Transaction;
 }
 
@@ -126,7 +122,6 @@ export interface IPaymentReceiveEditedPayload {
   paymentReceiveId: number;
   paymentReceive: IPaymentReceive;
   oldPaymentReceive: IPaymentReceive;
-  paymentReceiveDTO: IPaymentReceiveEditDTO;
   authorizedUser: ISystemUser;
   trx: Knex.Transaction;
 }

packages/server/src/interfaces/SaleEstimate.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IDynamicListFilterDTO } from '@/interfaces/DynamicFilter';
 import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ISaleEstimate {
   id?: number;
@@ -39,7 +38,6 @@ export interface ISaleEstimateDTO {
 
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
@@ -72,7 +70,6 @@ export interface ISaleEstimateEditedPayload {
   estimateId: number;
   saleEstimate: ISaleEstimate;
   oldSaleEstimate: ISaleEstimate;
-  estimateDTO: ISaleEstimateDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/SaleInvoice.ts

@@ -3,7 +3,6 @@ import { ISystemUser, IAccount, ITaxTransaction } from '@/interfaces';
 import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
 import { IDynamicListFilter } from '@/interfaces/DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ISaleInvoice {
   id: number;
@@ -65,8 +64,6 @@ export interface ISaleInvoiceDTO {
   branchId?: number | null;
 
   isInclusiveTax?: boolean;
-
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface ISaleInvoiceCreateDTO extends ISaleInvoiceDTO {

packages/server/src/interfaces/SaleReceipt.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 import { IItemEntry } from './ItemEntry';
 import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ISaleReceipt {
   id?: number;
@@ -44,7 +43,6 @@ export interface ISaleReceiptDTO {
   closed: boolean;
   entries: any[];
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface ISalesReceiptsService {
@@ -87,7 +85,6 @@ export interface ISaleReceiptCreatedPayload {
   tenantId: number;
   saleReceipt: ISaleReceipt;
   saleReceiptId: number;
-  saleReceiptDTO: ISaleReceiptDTO;
   trx: Knex.Transaction;
 }
 
@@ -96,7 +93,6 @@ export interface ISaleReceiptEditedPayload {
   oldSaleReceipt: number;
   saleReceipt: ISaleReceipt;
   saleReceiptId: number;
-  saleReceiptDTO: ISaleReceiptDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/User.ts

@@ -11,9 +11,6 @@ export interface ISystemUser extends Model {
   password: string;
   email: string;
 
-  verifyToken: string;
-  verified: boolean;
-
   roleId: number;
   tenantId: number;
 

packages/server/src/interfaces/VendorCredit.ts

@@ -1,6 +1,5 @@
 import { IDynamicListFilter, IItemEntry, IItemEntryDTO } from '@/interfaces';
 import { Knex } from 'knex';
-import { AttachmentLinkDTO } from './Attachments';
 
 export enum VendorCreditAction {
   Create = 'Create',
@@ -62,7 +61,6 @@ export interface IVendorCreditDTO {
 
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IVendorCreditCreateDTO extends IVendorCreditDTO {}
@@ -120,7 +118,6 @@ export interface IVendorCreditEditedPayload {
   oldVendorCredit: IVendorCredit;
   vendorCredit: IVendorCredit;
   vendorCreditId: number;
-  vendorCreditDTO: IVendorCreditEditDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/lib/Plaid/Plaid.ts

@@ -70,7 +70,10 @@ export class PlaidClientWrapper {
       baseOptions: {
         headers: {
           'PLAID-CLIENT-ID': config.plaid.clientId,
-          'PLAID-SECRET': config.plaid.secret,
+          'PLAID-SECRET':
+            config.plaid.env === 'development'
+              ? config.plaid.secretDevelopment
+              : config.plaid.secretSandbox,
           'Plaid-Version': '2020-09-14',
         },
       },

packages/server/src/lib/S3/S3.ts

@@ -1,11 +0,0 @@
-import { S3Client } from '@aws-sdk/client-s3';
-import config from '@/config';
-
-export const s3 = new S3Client({
-  region: config.s3.region,
-  credentials: {
-    accessKeyId: config.s3.accessKeyId,
-    secretAccessKey: config.s3.secretAccessKey,
-  },
-  endpoint: config.s3.endpoint,
-});

packages/server/src/loaders/eventEmitter.ts

@@ -91,17 +91,7 @@ import { SaleEstimateMarkApprovedOnMailSent } from '@/services/Sales/Estimates/s
 import { DeleteCashflowTransactionOnUncategorize } from '@/services/Cashflow/subscribers/DeleteCashflowTransactionOnUncategorize';
 import { PreventDeleteTransactionOnDelete } from '@/services/Cashflow/subscribers/PreventDeleteTransactionsOnDelete';
 import { SubscribeFreeOnSignupCommunity } from '@/services/Subscription/events/SubscribeFreeOnSignupCommunity';
-import { SendVerfiyMailOnSignUp } from '@/services/Authentication/events/SendVerfiyMailOnSignUp';
+
-import { AttachmentsOnSaleInvoiceCreated } from '@/services/Attachments/events/AttachmentsOnSaleInvoice';
-import { AttachmentsOnSaleReceipt } from '@/services/Attachments/events/AttachmentsOnSaleReceipts';
-import { AttachmentsOnManualJournals } from '@/services/Attachments/events/AttachmentsOnManualJournals';
-import { AttachmentsOnExpenses } from '@/services/Attachments/events/AttachmentsOnExpenses';
-import { AttachmentsOnBills } from '@/services/Attachments/events/AttachmentsOnBills';
-import { AttachmentsOnPaymentsReceived } from '@/services/Attachments/events/AttachmentsOnPaymentsReceived';
-import { AttachmentsOnVendorCredits } from '@/services/Attachments/events/AttachmentsOnVendorCredits';
-import { AttachmentsOnCreditNote } from '@/services/Attachments/events/AttachmentsOnCreditNote';
-import { AttachmentsOnBillPayments } from '@/services/Attachments/events/AttachmentsOnPaymentsMade';
-import { AttachmentsOnSaleEstimates } from '@/services/Attachments/events/AttachmentsOnSaleEstimates';
 
 export default () => {
   return new EventPublisher();
@@ -232,19 +222,6 @@ export const susbcribers = () => {
     DeleteCashflowTransactionOnUncategorize,
     PreventDeleteTransactionOnDelete,
 
-    SubscribeFreeOnSignupCommunity,
+    SubscribeFreeOnSignupCommunity
-    SendVerfiyMailOnSignUp,
-
-    // Attachments
-    AttachmentsOnSaleInvoiceCreated,
-    AttachmentsOnSaleEstimates,
-    AttachmentsOnSaleReceipt,
-    AttachmentsOnPaymentsReceived,
-    AttachmentsOnCreditNote,
-    AttachmentsOnVendorCredits,
-    AttachmentsOnBills,
-    AttachmentsOnBillPayments,
-    AttachmentsOnManualJournals,
-    AttachmentsOnExpenses,
   ];
 };

packages/server/src/loaders/express.ts

@@ -17,9 +17,7 @@ import {
 } from '@/api/middleware/JSONResponseTransformer';
 import config from '@/config';
 import path from 'path';
-import { ObjectionErrorException } from '@/api/exceptions/ObjectionErrorException';
+import ObjectionErrorHandlerMiddleware from '@/api/middleware/ObjectionErrorHandlerMiddleware';
-import { ServiceErrorException } from '@/api/exceptions/ServiceErrorException';
-import { GlobalErrorException } from '@/api/exceptions/GlobalErrorException';
 
 export default ({ app }) => {
   // Express configuration.
@@ -32,6 +30,9 @@ export default ({ app }) => {
   // Helmet helps you secure your Express apps by setting various HTTP headers.
   app.use(helmet());
 
+  // Allow to full error stack traces and internal details
+  app.use(errorHandler());
+
   // Boom response objects.
   app.use(boom());
 
@@ -64,10 +65,8 @@ export default ({ app }) => {
   // Agendash application load.
   app.use('/agendash', AgendashController.router());
 
-  // Handles errors.
+  // Handles objectionjs errors.
-  app.use(ObjectionErrorException);
+  app.use(ObjectionErrorHandlerMiddleware);
-  app.use(ServiceErrorException);
-  app.use(GlobalErrorException);
 
   // catch 404 and forward to error handler
   app.use((req: Request, res: Response, next: NextFunction) => {

packages/server/src/loaders/jobs.ts

@@ -12,7 +12,6 @@ import { SaleReceiptMailNotificationJob } from '@/services/Sales/Receipts/SaleRe
 import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob';
 import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob';
 import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob';
-import { SendVerifyMailJob } from '@/services/Authentication/jobs/SendVerifyMailJob';
 
 export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
@@ -28,7 +27,6 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new PaymentReceiveMailNotificationJob(agenda);
   new PlaidFetchTransactionsJob(agenda);
   new ImportDeleteExpiredFilesJobs(agenda);
-  new SendVerifyMailJob(agenda);
 
   agenda.start().then(() => {
     agenda.every('1 hours', 'delete-expired-imported-files', {});

packages/server/src/loaders/tenantModels.ts

@@ -60,10 +60,9 @@ import Time from 'models/Time';
 import Task from 'models/Task';
 import TaxRate from 'models/TaxRate';
 import TaxRateTransaction from 'models/TaxRateTransaction';
+import Attachment from 'models/Attachment';
 import PlaidItem from 'models/PlaidItem';
 import UncategorizedCashflowTransaction from 'models/UncategorizedCashflowTransaction';
-import Document from '@/models/Document';
-import DocumentLink from '@/models/DocumentLink';
 
 export default (knex) => {
   const models = {
@@ -127,10 +126,9 @@ export default (knex) => {
     Task,
     TaxRate,
     TaxRateTransaction,
-    Document,
+    Attachment,
-    DocumentLink,
     PlaidItem,
-    UncategorizedCashflowTransaction,
+    UncategorizedCashflowTransaction
   };
   return mapValues(models, (model) => model.bindKnex(knex));
 };

packages/server/src/models/Account.Settings.ts

@@ -7,10 +7,6 @@ export default {
     sortField: 'name',
   },
   importable: true,
-  exportable: true,
-  print: {
-    pageTitle: 'Chart of Accounts',
-  },
   fields: {
     name: {
       name: 'account.field.name',
@@ -89,56 +85,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    name: {
-      name: 'account.field.name',
-      type: 'text',
-    },
-    code: {
-      name: 'account.field.code',
-      type: 'text',
-    },
-    rootType: {
-      name: 'account.field.root_type',
-      type: 'text',
-      accessor: 'accountRootType',
-    },
-    accountType: {
-      name: 'account.field.type',
-      accessor: 'accountTypeLabel',
-      type: 'text',
-    },
-    accountNormal: {
-      name: 'account.field.normal',
-      accessor: 'accountNormalFormatted',
-    },
-    currencyCode: {
-      name: 'account.field.currency',
-      type: 'text',
-    },
-    bankBalance: {
-      name: 'account.field.bank_balance',
-      accessor: 'bankBalanceFormatted',
-      type: 'text',
-      exportable: true,
-    },
-    balance: {
-      name: 'account.field.balance',
-      accessor: 'formattedAmount',
-    },
-    description: {
-      name: 'account.field.description',
-      type: 'text',
-    },
-    active: {
-      name: 'account.field.active',
-      type: 'boolean',
-    },
-    createdAt: {
-      name: 'account.field.created_at',
-      printable: false,
-    },
-  },
   fields2: {
     name: {
       name: 'account.field.name',

packages/server/src/models/Attachment.ts

@@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel';
 import ModelSetting from './ModelSetting';
 import ModelSearchable from './ModelSearchable';
 
-export default class Document extends mixin(TenantModel, [
+export default class Attachment extends mixin(TenantModel, [
   ModelSetting,
   ModelSearchable,
 ]) {
@@ -11,7 +11,7 @@ export default class Document extends mixin(TenantModel, [
    * Table name
    */
   static get tableName() {
-    return 'documents';
+    return 'storage';
   }
 
   /**

packages/server/src/models/Bill.Settings.ts

@@ -5,14 +5,9 @@ export default {
     sortField: 'bill_date',
   },
   importable: true,
-  exportFlattenOn: 'entries',
-  exportable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'billNumber',
-  print: {
-    pageTitle: 'Bills',
-  },
   fields: {
     vendor: {
       name: 'bill.field.vendor',
@@ -85,89 +80,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    billDate: {
-      name: 'Date',
-      accessor: 'formattedBillDate',
-    },
-    billNumber: {
-      name: 'Bill No.',
-      type: 'text',
-    },
-    referenceNo: {
-      name: 'Reference No.',
-      type: 'text',
-    },
-    dueDate: {
-      name: 'Due Date',
-      type: 'date',
-      accessor: 'formattedDueDate',
-    },
-    vendorId: {
-      name: 'Vendor',
-      accessor: 'vendor.displayName',
-      type: 'text',
-    },
-    amount: {
-      name: 'Amount',
-      accessor: 'formattedAmount',
-    },
-    exchangeRate: {
-      name: 'Exchange Rate',
-      type: 'number',
-      printable: false,
-    },
-    currencyCode: {
-      name: 'Currency Code',
-      type: 'text',
-      printable: false,
-    },
-    dueAmount: {
-      name: 'Due Amount',
-      accessor: 'formattedDueAmount',
-    },
-    paidAmount: {
-      name: 'Paid Amount',
-      accessor: 'formattedPaymentAmount',
-    },
-    note: {
-      name: 'Note',
-      type: 'text',
-      printable: false,
-    },
-    open: {
-      name: 'Open',
-      type: 'boolean',
-      printable: false,
-    },
-    entries: {
-      name: 'Entries',
-      accessor: 'entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        itemName: {
-          name: 'Item Name',
-          accessor: 'item.name',
-        },
-        rate: {
-          name: 'Item Rate',
-          accessor: 'rateFormatted',
-        },
-        quantity: {
-          name: 'Item Quantity',
-          accessor: 'quantityFormatted',
-        },
-        description: {
-          name: 'Item Description',
-        },
-        amount: {
-          name: 'Item Amount',
-          accessor: 'totalFormatted',
-        },
-      },
-    },
-  },
   fields2: {
     billNumber: {
       name: 'Bill No.',
@@ -220,7 +132,7 @@ export default {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: "Matches the item name or code."
         },
         rate: {
           name: 'Rate',

packages/server/src/models/Bill.ts

@@ -403,7 +403,6 @@ export default class Bill extends mixin(TenantModel, [
     const BillLandedCost = require('models/BillLandedCost');
     const Branch = require('models/Branch');
     const TaxRateTransaction = require('models/TaxRateTransaction');
-    const Document = require('models/Document');
 
     return {
       vendor: {
@@ -466,25 +465,6 @@ export default class Bill extends mixin(TenantModel, [
           builder.where('reference_type', 'Bill');
         },
       },
-
-      /**
-       * Bill may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'bills.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'Bill');
-        },
-      },
     };
   }
 

packages/server/src/models/BillPayment.Settings.ts

@@ -4,7 +4,6 @@ export default {
     sortOrder: 'DESC',
     sortField: 'bill_date',
   },
-  exportable: true,
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
@@ -68,50 +67,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    vendor: {
-      name: 'bill_payment.field.vendor',
-      type: 'relation',
-      accessor: 'vendor.displayName',
-    },
-    paymentDate: {
-      name: 'bill_payment.field.payment_date',
-      type: 'date',
-      accessor: 'formattedPaymentDate'
-    },
-    paymentNumber: {
-      name: 'bill_payment.field.payment_number',
-      type: 'text',
-    },
-    paymentAccount: {
-      name: 'bill_payment.field.payment_account',
-      accessor: 'paymentAccount.name',
-      type: 'text',
-    },
-    amount: {
-      name: 'Amount',
-      accessor: 'formattedAmount',
-    },
-    currencyCode: {
-      name: 'Currency Code',
-      type: 'text',
-      printable: false,
-    },
-    exchangeRate: {
-      name: 'bill_payment.field.exchange_rate',
-      type: 'number',
-      printable: false,
-    },
-    statement: {
-      name: 'bill_payment.field.note',
-      type: 'text',
-      printable: false,
-    },
-    reference: {
-      name: 'bill_payment.field.reference',
-      type: 'text',
-    },
-  },
   fields2: {
     vendorId: {
       name: 'bill_payment.field.vendor',
@@ -129,7 +84,7 @@ export default {
       name: 'bill_payment.field.payment_number',
       fieldType: 'text',
       unique: true,
-      importHint: 'The payment number should be unique.',
+      importHint: "The payment number should be unique."
     },
     paymentAccountId: {
       name: 'bill_payment.field.payment_account',
@@ -137,14 +92,14 @@ export default {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'Matches the account name or code.',
+      importHint: "Matches the account name or code."
     },
     exchangeRate: {
       name: 'bill_payment.field.exchange_rate',
       fieldType: 'number',
     },
     statement: {
-      name: 'bill_payment.field.note',
+      name: 'bill_payment.field.statement',
       fieldType: 'text',
     },
     reference: {
@@ -165,7 +120,7 @@ export default {
           relationModel: 'Bill',
           relationImportMatch: 'billNumber',
           required: true,
-          importHint: 'Matches the bill number.',
+          importHint: "Matches the bill number."
         },
         paymentAmount: {
           name: 'bill_payment.field.entries.payment_amount',

packages/server/src/models/BillPayment.ts

@@ -56,7 +56,6 @@ export default class BillPayment extends mixin(TenantModel, [
     const Vendor = require('models/Vendor');
     const Account = require('models/Account');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       entries: {
@@ -115,25 +114,6 @@ export default class BillPayment extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Bill payment may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'bills_payments.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'BillPayment');
-        },
-      },
     };
   }
 

packages/server/src/models/CreditNote.Meta.ts

@@ -12,18 +12,10 @@ export default {
     sortOrder: 'DESC',
     sortField: 'name',
   },
-  exportable: true,
-  exportFlattenOn: 'entries',
-
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'creditNoteNumber',
-
-  print: {
-    pageTitle: 'Credit Notes',
-  },
-
   fields: {
     customer: {
       name: 'credit_note.field.customer',
@@ -89,65 +81,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    customer: {
-      name: 'Customer',
-      accessor: 'customer.displayName',
-    },
-    exchangeRate: {
-      name: 'Exchange Rate',
-      printable: false,
-    },
-    creditNoteDate: {
-      name: 'Credit Note Date',
-      accessor: 'formattedCreditNoteDate'
-    },
-    referenceNo: {
-      name: 'Reference No.',
-    },
-    note: {
-      name: 'Note',
-    },
-    termsConditions: {
-      name: 'Terms & Conditions',
-      printable: false,
-    },
-    creditNoteNumber: {
-      name: 'Credit Note Number',
-      printable: false,
-    },
-    open: {
-      name: 'Open',
-      type: 'boolean',
-      printable: false,
-    },
-    entries: {
-      name: 'Entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        itemName: {
-          name: 'Item Name',
-          accessor: 'item.name',
-        },
-        rate: {
-          name: 'Item Rate',
-          accessor: 'rateFormatted',
-        },
-        quantity: {
-          name: 'Item Quantity',
-          accessor: 'quantityFormatted',
-        },
-        description: {
-          name: 'Item Description',
-        },
-        amount: {
-          name: 'Item Amount',
-          accessor: 'totalFormatted',
-        },
-      },
-    },
-  },
   fields2: {
     customerId: {
       name: 'Customer',

packages/server/src/models/CreditNote.ts

@@ -174,7 +174,6 @@ export default class CreditNote extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Customer = require('models/Customer');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       /**
@@ -234,25 +233,6 @@ export default class CreditNote extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Credit note may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'credit_notes.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'CreditNote');
-        },
-      },
     };
   }
 

packages/server/src/models/Customer.Settings.ts

@@ -1,14 +1,10 @@
 export default {
   importable: true,
-  exportable: true,
   defaultFilterField: 'displayName',
   defaultSort: {
     sortOrder: 'DESC',
     sortField: 'created_at',
   },
-  print: {
-    pageTitle: 'Customers',
-  },
   fields: {
     first_name: {
       name: 'vendor.field.first_name',
@@ -94,159 +90,6 @@ export default {
       },
     },
   },
-  columns: {
-    firstName: {
-      name: 'vendor.field.first_name',
-      type: 'text',
-    },
-    lastName: {
-      name: 'vendor.field.last_name',
-      type: 'text',
-    },
-    displayName: {
-      name: 'vendor.field.display_name',
-      type: 'text',
-    },
-    email: {
-      name: 'vendor.field.email',
-      type: 'text',
-    },
-    workPhone: {
-      name: 'vendor.field.work_phone',
-      type: 'text',
-    },
-    personalPhone: {
-      name: 'vendor.field.personal_phone',
-      type: 'text',
-    },
-    companyName: {
-      name: 'vendor.field.company_name',
-      type: 'text',
-    },
-    website: {
-      name: 'vendor.field.website',
-      type: 'text',
-    },
-    balance: {
-      name: 'vendor.field.balance',
-      type: 'number',
-      accessor: 'formattedBalance',
-    },
-    openingBalance: {
-      name: 'vendor.field.opening_balance',
-      type: 'number',
-      printable: false
-    },
-    openingBalanceAt: {
-      name: 'vendor.field.opening_balance_at',
-      type: 'date',
-      printable: false
-    },
-    currencyCode: {
-      name: 'vendor.field.currency',
-      type: 'text',
-      printable: false
-    },
-    status: {
-      name: 'vendor.field.status',
-      printable: false
-    },
-    note: {
-      name: 'vendor.field.note',
-      printable: false
-    },
-    // Billing Address
-    billingAddress1: {
-      name: 'Billing Address 1',
-      column: 'billing_address1',
-      type: 'text',
-      printable: false
-    },
-    billingAddress2: {
-      name: 'Billing Address 2',
-      column: 'billing_address2',
-      type: 'text',
-      printable: false
-    },
-    billingAddressCity: {
-      name: 'Billing Address City',
-      column: 'billing_address_city',
-      type: 'text',
-      printable: false
-    },
-    billingAddressCountry: {
-      name: 'Billing Address Country',
-      column: 'billing_address_country',
-      type: 'text',
-      printable: false
-    },
-    billingAddressPostcode: {
-      name: 'Billing Address Postcode',
-      column: 'billing_address_postcode',
-      type: 'text',
-      printable: false
-    },
-    billingAddressState: {
-      name: 'Billing Address State',
-      column: 'billing_address_state',
-      type: 'text',
-      printable: false
-    },
-    billingAddressPhone: {
-      name: 'Billing Address Phone',
-      column: 'billing_address_phone',
-      type: 'text',
-      printable: false
-    },
-    // Shipping Address
-    shippingAddress1: {
-      name: 'Shipping Address 1',
-      column: 'shipping_address1',
-      type: 'text',
-      printable: false
-    },
-    shippingAddress2: {
-      name: 'Shipping Address 2',
-      column: 'shipping_address2',
-      type: 'text',
-      printable: false
-    },
-    shippingAddressCity: {
-      name: 'Shipping Address City',
-      column: 'shipping_address_city',
-      type: 'text',
-      printable: false
-    },
-    shippingAddressCountry: {
-      name: 'Shipping Address Country',
-      column: 'shipping_address_country',
-      type: 'text',
-      printable: false
-    },
-    shippingAddressPostcode: {
-      name: 'Shipping Address Postcode',
-      column: 'shipping_address_postcode',
-      type: 'text',
-      printable: false
-    },
-    shippingAddressPhone: {
-      name: 'Shipping Address Phone',
-      column: 'shipping_address_phone',
-      type: 'text',
-      printable: false
-    },
-    shippingAddressState: {
-      name: 'Shipping Address State',
-      column: 'shipping_address_state',
-      type: 'text',
-      printable: false
-    },
-    createdAt: {
-      name: 'vendor.field.created_at',
-      type: 'date',
-      printable: false
-    },
-  },
   fields2: {
     customerType: {
       name: 'Customer Type',

packages/server/src/models/DocumentLink.ts

@@ -1,44 +0,0 @@
-import { Model, mixin } from 'objection';
-import TenantModel from 'models/TenantModel';
-import ModelSetting from './ModelSetting';
-import ModelSearchable from './ModelSearchable';
-
-export default class DocumentLink extends mixin(TenantModel, [
-  ModelSetting,
-  ModelSearchable,
-]) {
-  /**
-   * Table name
-   */
-  static get tableName() {
-    return 'document_links';
-  }
-
-  /**
-   * Model timestamps.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const Document = require('models/Document');
-
-    return {
-      /**
-       * Sale invoice associated entries.
-       */
-      document: {
-        relation: Model.HasOneRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'document_links.documentId',
-          to: 'documents.id',
-        },
-      },
-    };
-  }
-}

packages/server/src/models/Expense.Settings.ts

@@ -8,11 +8,6 @@ export default {
     sortField: 'name',
   },
   importable: true,
-  exportFlattenOn: 'categories',
-  exportable: true,
-  print: {
-    pageTitle: 'Expenses',
-  },
   fields: {
     payment_date: {
       name: 'expense.field.payment_date',
@@ -66,60 +61,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    paymentReceive: {
-      name: 'expense.field.payment_account',
-      type: 'text',
-      accessor: 'paymentAccount.name',
-    },
-    referenceNo: {
-      name: 'expense.field.reference_no',
-      type: 'text',
-    },
-    paymentDate: {
-      name: 'expense.field.payment_date',
-      accessor: 'formattedDate',
-      type: 'date',
-    },
-    currencyCode: {
-      name: 'expense.field.currency_code',
-      type: 'text',
-      printable: false,
-    },
-    exchangeRate: {
-      name: 'expense.field.exchange_rate',
-      type: 'number',
-      printable: false,
-    },
-    description: {
-      name: 'expense.field.description',
-      type: 'text',
-    },
-    categories: {
-      name: 'expense.field.categories',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        expenseAccount: {
-          name: 'expense.field.expense_account',
-          accessor: 'expenseAccount.name',
-        },
-        amount: {
-          name: 'expense.field.amount',
-          accessor: 'amountFormatted',
-        },
-        description: {
-          name: 'expense.field.line_description',
-          type: 'text',
-        },
-      },
-    },
-    publish: {
-      name: 'expense.field.publish',
-      type: 'boolean',
-      printable: false,
-    },
-  },
   fields2: {
     paymentAccountId: {
       name: 'expense.field.payment_account',
@@ -127,7 +68,7 @@ export default {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'Matches the account name or code.',
+      importHint: "Matches the account name or code."
     },
     referenceNo: {
       name: 'expense.field.reference_no',
@@ -161,7 +102,7 @@ export default {
           relationModel: 'Account',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the account name or code.',
+          importHint: "Matches the account name or code."
         },
         amount: {
           name: 'expense.field.amount',

packages/server/src/models/Expense.ts

@@ -180,7 +180,7 @@ export default class Expense extends mixin(TenantModel, [
   static get relationMappings() {
     const Account = require('models/Account');
     const ExpenseCategory = require('models/ExpenseCategory');
-    const Document = require('models/Document');
+    const Media = require('models/Media');
     const Branch = require('models/Branch');
 
     return {
@@ -217,21 +217,21 @@ export default class Expense extends mixin(TenantModel, [
       },
 
       /**
-       * Expense transaction may has many attached attachments.
+       * 
        */
-      attachments: {
+      media: {
         relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
+        modelClass: Media.default,
         join: {
           from: 'expenses_transactions.id',
           through: {
-            from: 'document_links.modelId',
+            from: 'media_links.model_id',
-            to: 'document_links.documentId',
+            to: 'media_links.media_id',
           },
-          to: 'documents.id',
+          to: 'media.id',
         },
         filter(query) {
-          query.where('model_ref', 'Expense');
+          query.where('model_name', 'Expense');
         },
       },
     };

packages/server/src/models/InventoryAdjustment.Settings.ts

@@ -4,54 +4,6 @@ export default {
     sortOrder: 'DESC',
     sortField: 'date',
   },
-  columns: {
-    date: {
-      name: 'inventory_adjustment.field.date',
-      column: 'date',
-      fieldType: 'date',
-      exportable: true,
-    },
-    type: {
-      name: 'inventory_adjustment.field.type',
-      column: 'type',
-      fieldType: 'enumeration',
-      options: [
-        { key: 'increment', name: 'inventory_adjustment.field.type.increment' },
-        { key: 'decrement', name: 'inventory_adjustment.field.type.decrement' },
-      ],
-      exportable: true,
-    },
-    adjustmentAccount: {
-      name: 'inventory_adjustment.field.adjustment_account',
-      type: 'adjustment_account_id',
-      exportable: true,
-    },
-    reason: {
-      name: 'inventory_adjustment.field.reason',
-      type: 'text',
-      exportable: true,
-    },
-    referenceNo: {
-      name: 'inventory_adjustment.field.reference_no',
-      type: 'text',
-      exportable: true,
-    },
-    description: {
-      name: 'inventory_adjustment.field.description',
-      type: 'text',
-      exportable: true,
-    },
-    publishedAt: {
-      name: 'inventory_adjustment.field.published_at',
-      type: 'date',
-      exportable: true,
-    },
-    createdAt: {
-      name: 'inventory_adjustment.field.created_at',
-      type: 'date',
-      exportable: true,
-    },
-  },
   fields: {
     date: {
       name: 'inventory_adjustment.field.date',

packages/server/src/models/Item.Settings.ts

@@ -1,14 +1,10 @@
 export default {
   importable: true,
-  exportable: true,
   defaultFilterField: 'name',
   defaultSort: {
     sortField: 'name',
     sortOrder: 'DESC',
   },
-  print: {
-    pageTitle: 'Items',
-  },
   fields: {
     type: {
       name: 'item.field.type',
@@ -125,106 +121,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    type: {
-      name: 'item.field.type',
-      type: 'text',
-      exportable: true,
-      accessor: 'typeFormatted',
-    },
-    name: {
-      name: 'item.field.name',
-      type: 'text',
-      exportable: true,
-    },
-    code: {
-      name: 'item.field.code',
-      type: 'text',
-      exportable: true,
-    },
-    sellable: {
-      name: 'item.field.sellable',
-      type: 'boolean',
-      exportable: true,
-      printable: false,
-    },
-    purchasable: {
-      name: 'item.field.purchasable',
-      type: 'boolean',
-      exportable: true,
-      printable: false,
-    },
-    sellPrice: {
-      name: 'item.field.cost_price',
-      type: 'number',
-      exportable: true,
-    },
-    costPrice: {
-      name: 'item.field.cost_account',
-      type: 'number',
-      exportable: true,
-    },
-    costAccount: {
-      name: 'item.field.sell_account',
-      type: 'text',
-      accessor: 'costAccount.name',
-      exportable: true,
-      printable: false,
-    },
-    sellAccount: {
-      name: 'item.field.sell_description',
-      type: 'text',
-      accessor: 'sellAccount.name',
-      exportable: true,
-      printable: false,
-    },
-    inventoryAccount: {
-      name: 'item.field.inventory_account',
-      type: 'text',
-      accessor: 'inventoryAccount.name',
-      exportable: true,
-    },
-    sellDescription: {
-      name: 'Sell description',
-      type: 'text',
-      exportable: true,
-      printable: false,
-    },
-    purchaseDescription: {
-      name: 'Purchase description',
-      type: 'text',
-      exportable: true,
-      printable: false,
-    },
-    quantityOnHand: {
-      name: 'item.field.quantity_on_hand',
-      type: 'number',
-      exportable: true,
-    },
-    note: {
-      name: 'item.field.note',
-      type: 'text',
-      exportable: true,
-    },
-    category: {
-      name: 'item.field.category',
-      type: 'text',
-      accessor: 'category.name',
-      exportable: true,
-    },
-    active: {
-      name: 'item.field.active',
-      fieldType: 'boolean',
-      exportable: true,
-      printable: false,
-    },
-    createdAt: {
-      name: 'item.field.created_at',
-      type: 'date',
-      exportable: true,
-      printable: false,
-    },
-  },
   fields2: {
     type: {
       name: 'item.field.type',
@@ -299,7 +195,7 @@ export default {
       fieldType: 'relation',
       relationModel: 'ItemCategory',
       relationImportMatch: ['name'],
-      importHint: 'Matches the category name.',
+      importHint: "Matches the category name."
     },
     active: {
       name: 'item.field.active',

packages/server/src/models/ItemCategory.Settings.ts

@@ -5,7 +5,6 @@ export default {
     sortOrder: 'DESC',
   },
   importable: true,
-  exportable: true,
   fields: {
     name: {
       name: 'item_category.field.name',
@@ -29,24 +28,6 @@ export default {
       columnType: 'date',
     },
   },
-  columns: {
-    name: {
-      name: 'item_category.field.name',
-      type: 'text',
-    },
-    description: {
-      name: 'item_category.field.description',
-      type: 'text',
-    },
-    count: {
-      name: 'item_category.field.count',
-      type: 'text',
-    },
-    createdAt: {
-      name: 'item_category.field.created_at',
-      type: 'text',
-    },
-  },
   fields2: {
     name: {
       name: 'item_category.field.name',

packages/server/src/models/ManualJournal.Settings.ts

@@ -5,17 +5,9 @@ export default {
     sortField: 'name',
   },
   importable: true,
-  exportFlattenOn: 'entries',
-
-  exportable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'journalNumber',
-
-  print: {
-    pageTitle: 'Manual Journals',
-  },
-
   fields: {
     date: {
       name: 'manual_journal.field.date',
@@ -64,83 +56,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    date: {
-      name: 'manual_journal.field.date',
-      type: 'date',
-      accessor: 'formattedDate',
-    },
-    journalNumber: {
-      name: 'manual_journal.field.journal_number',
-      type: 'text',
-    },
-    reference: {
-      name: 'manual_journal.field.reference',
-      type: 'text',
-    },
-    journalType: {
-      name: 'manual_journal.field.journal_type',
-      type: 'text',
-    },
-    amount: {
-      name: 'Amount',
-      accessor: 'formattedAmount',
-    },
-    currencyCode: {
-      name: 'manual_journal.field.currency',
-      type: 'text',
-      printable: false,
-    },
-    exchangeRate: {
-      name: 'manual_journal.field.exchange_rate',
-      type: 'number',
-      printable: false,
-    },
-    description: {
-      name: 'manual_journal.field.description',
-      type: 'text',
-    },
-    entries: {
-      name: 'Entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        credit: {
-          name: 'Credit',
-          type: 'text',
-        },
-        debit: {
-          name: 'Debit',
-          type: 'text',
-        },
-        account: {
-          name: 'Account',
-          accessor: 'account.name',
-        },
-        contact: {
-          name: 'Contact',
-          accessor: 'contact.displayName',
-        },
-        note: {
-          name: 'Note',
-        },
-      },
-      publish: {
-        name: 'Publish',
-        type: 'boolean',
-        printable: false,
-      },
-      publishedAt: {
-        name: 'Published At',
-        printable: false,
-      },
-    },
-    createdAt: {
-      name: 'Created At',
-      accessor: 'formattedCreatedAt',
-      printable: false,
-    },
-  },
   fields2: {
     date: {
       name: 'manual_journal.field.date',

packages/server/src/models/ManualJournal.ts

@@ -94,9 +94,9 @@ export default class ManualJournal extends mixin(TenantModel, [
    * Relationship mapping.
    */
   static get relationMappings() {
+    const Media = require('models/Media');
     const AccountTransaction = require('models/AccountTransaction');
     const ManualJournalEntry = require('models/ManualJournalEntry');
-    const Document = require('models/Document');
 
     return {
       entries: {
@@ -121,23 +121,19 @@ export default class ManualJournal extends mixin(TenantModel, [
           query.where('referenceType', 'Journal');
         },
       },
-
+      media: {
-      /**
-       * Manual journal may has many attached attachments.
-       */
-      attachments: {
         relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
+        modelClass: Media.default,
         join: {
           from: 'manual_journals.id',
           through: {
-            from: 'document_links.modelId',
+            from: 'media_links.model_id',
-            to: 'document_links.documentId',
+            to: 'media_links.media_id',
           },
-          to: 'documents.id',
+          to: 'media.id',
         },
         filter(query) {
-          query.where('model_ref', 'ManualJournal');
+          query.where('model_name', 'ManualJournal');
         },
       },
     };

packages/server/src/models/PaymentReceive.Settings.ts

@@ -1,6 +1,5 @@
 export default {
   importable: true,
-  exportable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'paymentReceiveNo',
@@ -58,46 +57,6 @@ export default {
       fieldDate: 'date',
     },
   },
-  columns: {
-    customer: {
-      name: 'payment_receive.field.customer',
-      accessor: 'customer.displayName',
-      type: 'text',
-    },
-    paymentDate: {
-      name: 'payment_receive.field.payment_date',
-      type: 'date',
-      accessor: 'formattedPaymentDate',
-    },
-    amount: {
-      name: 'payment_receive.field.amount',
-      type: 'number',
-      accessor: 'formattedAmount'
-    },
-    referenceNo: {
-      name: 'payment_receive.field.reference_no',
-      type: 'text',
-    },
-    depositAccount: {
-      name: 'payment_receive.field.deposit_account',
-      accessor: 'depositAccount.name',
-      type: 'text',
-    },
-    paymentReceiveNo: {
-      name: 'payment_receive.field.payment_receive_no',
-      type: 'text',
-    },
-    statement: {
-      name: 'payment_receive.field.statement',
-      type: 'text',
-      printable: false,
-    },
-    created_at: {
-      name: 'payment_receive.field.created_at',
-      type: 'date',
-      printable: false,
-    },
-  },
   fields2: {
     customerId: {
       name: 'payment_receive.field.customer',
@@ -125,12 +84,12 @@ export default {
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       required: true,
-      importHint: 'Matches the account name or code.',
+      importHint: "Matches the account name or code."
     },
     paymentReceiveNo: {
       name: 'payment_receive.field.payment_receive_no',
       fieldType: 'text',
-      importHint: 'The payment number should be unique.',
+      importHint: "The payment number should be unique."
     },
     statement: {
       name: 'payment_receive.field.statement',
@@ -149,7 +108,7 @@ export default {
           relationModel: 'SaleInvoice',
           relationImportMatch: 'invoiceNo',
           required: true,
-          importHint: 'Matches the invoice number.',
+          importHint: "Matches the invoice number."
         },
         paymentAmount: {
           name: 'payment_receive.field.entries.payment_amount',

packages/server/src/models/PaymentReceive.ts

@@ -56,7 +56,6 @@ export default class PaymentReceive extends mixin(TenantModel, [
     const Customer = require('models/Customer');
     const Account = require('models/Account');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       customer: {
@@ -112,25 +111,6 @@ export default class PaymentReceive extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Payment transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'payment_receives.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'PaymentReceive');
-        },
-      },
     };
   }
 

packages/server/src/models/SaleEstimate.Settings.ts

@@ -4,18 +4,10 @@ export default {
     sortOrder: 'DESC',
     sortField: 'estimate_date',
   },
-  exportable: true,
-  exportFlattenOn: 'entries',
-
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'estimateNumber',
-
-  print: {
-    pageTitle: 'Sale Estimates'
-  },
-
   fields: {
     amount: {
       name: 'estimate.field.amount',
@@ -81,99 +73,6 @@ export default {
       columnType: 'date',
     },
   },
-  columns: {
-    customer: {
-      name: 'Customer',
-      type: 'text',
-      accessor: 'customer.displayName',
-      exportable: true,
-    },
-    estimateDate: {
-      name: 'Estimate Date',
-      type: 'date',
-      accessor: 'formattedEstimateDate',
-      exportable: true,
-    },
-    expirationDate: {
-      name: 'Expiration Date',
-      type: 'date',
-      accessor: 'formattedExpirationDate',
-      exportable: true,
-    },
-    estimateNumber: {
-      name: 'Estimate No.',
-      type: 'text',
-      exportable: true,
-    },
-    reference: {
-      name: 'Reference No.',
-      type: 'text',
-      exportable: true,
-    },
-    amount: {
-      name: 'Amount',
-      accessor: 'formattedAmount',
-      type: 'text',
-    },
-    exchangeRate: {
-      name: 'Exchange Rate',
-      type: 'number',
-      exportable: true,
-      printable: false,
-    },
-    currencyCode: {
-      name: 'Currency',
-      type: 'text',
-      exportable: true,
-      printable: false,
-    },
-    note: {
-      name: 'Note',
-      type: 'text',
-      exportable: true,
-      printable: false,
-    },
-    termsConditions: {
-      name: 'Terms & Conditions',
-      type: 'text',
-      exportable: true,
-      printable: false,
-    },
-    delivered: {
-      name: 'Delivered',
-      type: 'boolean',
-      exportable: true,
-      printable: false,
-    },
-    entries: {
-      name: 'Entries',
-      accessor: 'entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        itemName: {
-          name: 'Item Name',
-          accessor: 'item.name',
-        },
-        rate: {
-          name: 'Item Rate',
-          accessor: 'rateFormatted',
-        },
-        quantity: {
-          name: 'Item Quantity',
-          accessor: 'quantityFormatted',
-        },
-        description: {
-          name: 'Item Description',
-          printable: false,
-        },
-        amount: {
-          name: 'Item Amount',
-          accessor: 'totalFormatted',
-        },
-      },
-    },
-  },
   fields2: {
     customerId: {
       name: 'Customer',
@@ -233,7 +132,7 @@ export default {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: "Matches the item name or code."
         },
         rate: {
           name: 'invoice.field.rate',

packages/server/src/models/SaleEstimate.ts

@@ -182,7 +182,6 @@ export default class SaleEstimate extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Customer = require('models/Customer');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       customer: {
@@ -220,25 +219,6 @@ export default class SaleEstimate extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Sale estimate transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'sales_estimates.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'SaleEstimate');
-        },
-      },
     };
   }
 

packages/server/src/models/SaleInvoice.Settings.ts

@@ -4,17 +4,10 @@ export default {
     sortOrder: 'DESC',
     sortField: 'created_at',
   },
-  exportable: true,
-  exportFlattenOn: 'entries',
-
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'invoiceNo',
-
-  print: {
-    pageTitle: 'Sale invoices',
-  },
   fields: {
     customer: {
       name: 'invoice.field.customer',
@@ -94,97 +87,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    invoiceDate: {
-      name: 'invoice.field.invoice_date',
-      type: 'date',
-      accessor: 'invoiceDateFormatted',
-    },
-    dueDate: {
-      name: 'invoice.field.due_date',
-      type: 'date',
-      accessor: 'dueDateFormatted',
-    },
-    referenceNo: {
-      name: 'invoice.field.reference_no',
-      type: 'text',
-    },
-    invoiceNo: {
-      name: 'invoice.field.invoice_no',
-      type: 'text',
-    },
-    customer: {
-      name: 'invoice.field.customer',
-      type: 'text',
-      accessor: 'customer.displayName',
-    },
-    amount: {
-      name: 'invoice.field.amount',
-      type: 'text',
-      accessor: 'balanceAmountFormatted',
-    },
-    exchangeRate: {
-      name: 'invoice.field.exchange_rate',
-      type: 'number',
-      printable: false,
-    },
-    currencyCode: {
-      name: 'invoice.field.currency',
-      type: 'text',
-      printable: false,
-    },
-    paidAmount: {
-      name: 'Paid Amount',
-      accessor: 'paymentAmountFormatted',
-    },
-    dueAmount: {
-      name: 'Due Amount',
-      accessor: 'dueAmountFormatted',
-    },
-    invoiceMessage: {
-      name: 'invoice.field.invoice_message',
-      type: 'text',
-      printable: false,
-    },
-    termsConditions: {
-      name: 'invoice.field.terms_conditions',
-      type: 'text',
-      printable: false,
-    },
-    delivered: {
-      name: 'invoice.field.delivered',
-      type: 'boolean',
-      printable: false,
-    },
-    entries: {
-      name: 'Entries',
-      accessor: 'entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        itemName: {
-          name: 'Item Name',
-          accessor: 'item.name',
-        },
-        rate: {
-          name: 'Item Rate',
-          accessor: 'rateFormatted',
-        },
-        quantity: {
-          name: 'Item Quantity',
-          accessor: 'quantityFormatted',
-        },
-        description: {
-          name: 'Item Description',
-          printable: false,
-        },
-        amount: {
-          name: 'Item Amount',
-          accessor: 'totalFormatted',
-        },
-      },
-    },
-  },
   fields2: {
     invoiceDate: {
       name: 'invoice.field.invoice_date',
@@ -214,22 +116,18 @@ export default {
     exchangeRate: {
       name: 'invoice.field.exchange_rate',
       fieldType: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'invoice.field.currency',
       fieldType: 'text',
-      printable: false,
     },
     invoiceMessage: {
       name: 'invoice.field.invoice_message',
       fieldType: 'text',
-      printable: false,
     },
     termsConditions: {
       name: 'invoice.field.terms_conditions',
       fieldType: 'text',
-      printable: false,
     },
     entries: {
       name: 'invoice.field.entries',
@@ -244,7 +142,7 @@ export default {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: "Matches the item name or code."
         },
         rate: {
           name: 'invoice.field.rate',
@@ -265,7 +163,6 @@ export default {
     delivered: {
       name: 'invoice.field.delivered',
       fieldType: 'boolean',
-      printable: false,
     },
   },
 };

packages/server/src/models/SaleInvoice.ts

@@ -410,7 +410,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
     const Branch = require('models/Branch');
     const Account = require('models/Account');
     const TaxRateTransaction = require('models/TaxRateTransaction');
-    const Document = require('models/Document');
 
     return {
       /**
@@ -524,25 +523,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
           builder.where('reference_type', 'SaleInvoice');
         },
       },
-
-      /**
-       * Sale invoice transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'sales_invoices.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'SaleInvoice');
-        },
-      },
     };
   }
 

packages/server/src/models/SaleReceipt.Settings.ts

@@ -4,17 +4,10 @@ export default {
     sortOrder: 'DESC',
     sortField: 'created_at',
   },
-  exportable: true,
-  exportFlattenOn: 'entries',
-
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'receiptNumber',
-
-  print: {
-    pageTitle: 'Sale Receipts',
-  },
   fields: {
     amount: {
       name: 'receipt.field.amount',
@@ -84,92 +77,6 @@ export default {
       sortCustomQuery: StatusFieldSortQuery,
     },
   },
-  columns: {
-    depositAccount: {
-      name: 'receipt.field.deposit_account',
-      type: 'text',
-      accessor: 'depositAccount.name',
-    },
-    customer: {
-      name: 'receipt.field.customer',
-      type: 'text',
-      accessor: 'customer.displayName',
-    },
-    receiptDate: {
-      name: 'receipt.field.receipt_date',
-      accessor: 'formattedReceiptDate',
-      type: 'date',
-    },
-    receiptNumber: {
-      name: 'receipt.field.receipt_number',
-      type: 'text',
-    },
-    referenceNo: {
-      name: 'receipt.field.reference_no',
-      column: 'reference_no',
-      type: 'text',
-      exportable: true,
-    },
-    receiptMessage: {
-      name: 'receipt.field.receipt_message',
-      column: 'receipt_message',
-      type: 'text',
-      printable: false,
-    },
-    amount: {
-      name: 'receipt.field.amount',
-      accessor: 'formattedAmount',
-      type: 'number',
-    },
-    statement: {
-      name: 'receipt.field.statement',
-      type: 'text',
-      printable: false,
-    },
-    status: {
-      name: 'receipt.field.status',
-      type: 'enumeration',
-      options: [
-        { key: 'draft', label: 'receipt.field.status.draft' },
-        { key: 'closed', label: 'receipt.field.status.closed' },
-      ],
-      exportable: true,
-      printable: false,
-    },
-    entries: {
-      name: 'Entries',
-      accessor: 'entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        itemName: {
-          name: 'Item Name',
-          accessor: 'item.name',
-        },
-        rate: {
-          name: 'Item Rate',
-          accessor: 'rateFormatted',
-        },
-        quantity: {
-          name: 'Item Quantity',
-          accessor: 'quantityFormatted',
-        },
-        description: {
-          name: 'Item Description',
-          printable: false,
-        },
-        amount: {
-          name: 'Item Amount',
-          accessor: 'totalFormatted',
-        },
-      },
-    },
-    createdAt: {
-      name: 'receipt.field.created_at',
-      type: 'date',
-      printable: false,
-    },
-  },
   fields2: {
     receiptDate: {
       name: 'Receipt Date',
@@ -219,7 +126,7 @@ export default {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: "Matches the item name or code."
         },
         rate: {
           name: 'invoice.field.rate',

packages/server/src/models/SaleReceipt.ts

@@ -108,7 +108,6 @@ export default class SaleReceipt extends mixin(TenantModel, [
     const AccountTransaction = require('models/AccountTransaction');
     const ItemEntry = require('models/ItemEntry');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       customer: {
@@ -168,25 +167,6 @@ export default class SaleReceipt extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Sale receipt transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'sales_receipts.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'SaleReceipt');
-        },
-      },
     };
   }
 

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -104,10 +104,10 @@ export default class UncategorizedCashflowTransaction extends mixin(
    */
   private async updateUncategorizedTransactionCount(
     queryContext: QueryContext,
-    increment: boolean,
+    increment: boolean
-    amount: number = 1
   ) {
     const operation = increment ? 'increment' : 'decrement';
+    const amount = increment ? 1 : -1;
 
     await Account.query(queryContext.transaction)
       .findById(this.accountId)

packages/server/src/models/Vendor.Settings.ts

@@ -5,7 +5,6 @@ export default {
     sortField: 'created_at',
   },
   importable: true,
-  exportable: true,
   fields: {
     first_name: {
       name: 'vendor.field.first_name',
@@ -33,7 +32,7 @@ export default {
       fieldType: 'text',
     },
     personal_phone: {
-      name: 'vendor.field.personal_phone',
+      name: 'vendor.field.personal_pone',
       column: 'personal_phone',
       fieldType: 'text',
     },
@@ -91,174 +90,6 @@ export default {
       },
     },
   },
-  columns: {
-    firstName: {
-      name: 'vendor.field.first_name',
-      type: 'text',
-    },
-    lastName: {
-      name: 'vendor.field.last_name',
-      type: 'text',
-    },
-    displayName: {
-      name: 'vendor.field.display_name',
-      type: 'text',
-    },
-    email: {
-      name: 'vendor.field.email',
-      type: 'text',
-    },
-    workPhone: {
-      name: 'vendor.field.work_phone',
-      type: 'text',
-    },
-    personalPhone: {
-      name: 'vendor.field.personal_phone',
-      type: 'text',
-    },
-    companyName: {
-      name: 'vendor.field.company_name',
-      type: 'text',
-    },
-    website: {
-      name: 'vendor.field.website',
-      type: 'text',
-    },
-    balance: {
-      name: 'vendor.field.balance',
-      type: 'number',
-    },
-    openingBalance: {
-      name: 'vendor.field.opening_balance',
-      type: 'number',
-      printable: false
-    },
-    openingBalanceAt: {
-      name: 'vendor.field.opening_balance_at',
-      type: 'date',
-      printable: false
-    },
-    currencyCode: {
-      name: 'vendor.field.currency',
-      type: 'text',
-      printable: false
-    },
-    status: {
-      name: 'vendor.field.status',
-      printable: false
-    },
-    note: {
-      name: 'vendor.field.note',
-      type: 'text',
-      printable: false
-    },
-    // Billing Address
-    billingAddress1: {
-      name: 'Billing Address 1',
-      column: 'billing_address1',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    billingAddress2: {
-      name: 'Billing Address 2',
-      column: 'billing_address2',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    billingAddressCity: {
-      name: 'Billing Address City',
-      column: 'billing_address_city',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    billingAddressCountry: {
-      name: 'Billing Address Country',
-      column: 'billing_address_country',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    billingAddressPostcode: {
-      name: 'Billing Address Postcode',
-      column: 'billing_address_postcode',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    billingAddressState: {
-      name: 'Billing Address State',
-      column: 'billing_address_state',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    billingAddressPhone: {
-      name: 'Billing Address Phone',
-      column: 'billing_address_phone',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    // Shipping Address
-    shippingAddress1: {
-      name: 'Shipping Address 1',
-      column: 'shipping_address1',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    shippingAddress2: {
-      name: 'Shipping Address 2',
-      column: 'shipping_address2',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    shippingAddressCity: {
-      name: 'Shipping Address City',
-      column: 'shipping_address_city',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    shippingAddressCountry: {
-      name: 'Shipping Address Country',
-      column: 'shipping_address_country',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    shippingAddressPostcode: {
-      name: 'Shipping Address Postcode',
-      column: 'shipping_address_postcode',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    shippingAddressState: {
-      name: 'Shipping Address State',
-      column: 'shipping_address_state',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    shippingAddressPhone: {
-      name: 'Shipping Address Phone',
-      column: 'shipping_address_phone',
-      type: 'text',
-      exportable: true,
-      printable: false
-    },
-    createdAt: {
-      name: 'vendor.field.created_at',
-      type: 'date',
-      exportable: true,
-      printable: false
-    },
-  },
   fields2: {
     firstName: {
       name: 'vendor.field.first_name',

packages/server/src/models/VendorCredit.Meta.ts

@@ -12,17 +12,10 @@ export default {
     sortOrder: 'DESC',
     sortField: 'name',
   },
-  exportable: true,
-  exportFlattenOn: 'entries',
-
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'vendorCreditNumber',
-
-  print: {
-    pageTitle: 'Vendor Credits',
-  },
   fields: {
     vendor: {
       name: 'vendor_credit.field.vendor',
@@ -83,84 +76,6 @@ export default {
       fieldType: 'date',
     },
   },
-  columns: {
-    vendorId: {
-      name: 'Vendor',
-      type: 'relation',
-      accessor: 'vendor.displayName',
-    },
-    exchangeRate: {
-      name: 'Echange Rate',
-      type: 'text',
-      printable: false,
-    },
-    vendorCreditNumber: {
-      name: 'Vendor Credit No.',
-      type: 'text',
-    },
-    referenceNo: {
-      name: 'Refernece No.',
-      type: 'text',
-    },
-    vendorCreditDate: {
-      name: 'Vendor Credit Date',
-      accessor: 'formattedVendorCreditDate',
-    },
-    amount: {
-      name: 'Amount',
-      accessor: 'formattedAmount',
-    },
-    creditRemaining: {
-      name: 'Credits Remaining',
-      accessor: 'formattedCreditsRemaining',
-      printable: false,
-    },
-    refundedAmount: {
-      name: 'Refunded Amount',
-      accessor: 'refundedAmount',
-      printable: false,
-    },
-    invoicedAmount: {
-      name: 'Invoiced Amount',
-      accessor: 'formattedInvoicedAmount',
-    },
-    note: {
-      name: 'Note',
-      type: 'text',
-      printable: false,
-    },
-    open: {
-      name: 'Open',
-      type: 'boolean',
-      printable: false,
-    },
-    entries: {
-      name: 'Entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        itemName: {
-          name: 'Item Name',
-          accessor: 'item.name',
-        },
-        rate: {
-          name: 'Item Rate',
-          accessor: 'rateFormatted',
-        },
-        quantity: {
-          name: 'Item Quantity',
-          accessor: 'quantityFormatted',
-        },
-        description: {
-          name: 'Item Description',
-        },
-        amount: {
-          name: 'Item Amount',
-          accessor: 'totalFormatted',
-        },
-      },
-    },
-  },
   fields2: {
     vendorId: {
       name: 'Vendor',
@@ -207,7 +122,7 @@ export default {
           relationModel: 'Item',
           relationImportMatch: ['name', 'code'],
           required: true,
-          importHint: 'Matches the item name or code.',
+          importHint: "Matches the item name or code."
         },
         rate: {
           name: 'Rate',

packages/server/src/models/VendorCredit.ts

@@ -177,7 +177,6 @@ export default class VendorCredit extends mixin(TenantModel, [
     const Vendor = require('models/Vendor');
     const ItemEntry = require('models/ItemEntry');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       vendor: {
@@ -216,25 +215,6 @@ export default class VendorCredit extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Vendor credit may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'vendor_credits.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'VendorCredit');
-        },
-      },
     };
   }
 

packages/server/src/models/WarehouseTransfer.Settings.ts

@@ -8,34 +8,6 @@ export default {
     sortField: 'name',
     sortOrder: 'DESC',
   },
-  columns: {
-    date: {
-      name: 'warehouse_transfer.field.date',
-      type: 'date',
-      exportable: true,
-    },
-    transaction_number: {
-      name: 'warehouse_transfer.field.transaction_number',
-      type: 'text',
-      exportable: true,
-    },
-    status: {
-      name: 'warehouse_transfer.field.status',
-      fieldType: 'enumeration',
-      options: [
-        { key: 'draft', label: 'Draft' },
-        { key: 'in-transit', label: 'In Transit' },
-        { key: 'transferred', label: 'Transferred' },
-      ],
-      sortable: false,
-    },
-    created_at: {
-      name: 'warehouse_transfer.field.created_at',
-      column: 'created_at',
-      columnType: 'date',
-      fieldType: 'date',
-    },
-  },
   fields: {
     date: {
       name: 'warehouse_transfer.field.date',

packages/server/src/server.ts

@@ -1,5 +1,4 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
-import 'newrelic';
 import './before';
 import '@/config';
 

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

@@ -1,31 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { AccountsApplication } from './AccountsApplication';
-import { Exportable } from '../Export/Exportable';
-import { IAccountsFilter, IAccountsStructureType } from '@/interfaces';
-
-@Service()
-export class AccountsExportable extends Exportable {
-  @Inject()
-  private accountsApplication: AccountsApplication;
-
-  /**
-   * Retrieves the accounts data to exportable sheet.
-   * @param {number} tenantId
-   * @returns
-   */
-  public exportable(tenantId: number, query: IAccountsFilter) {
-    const parsedQuery = {
-      sortOrder: 'desc',
-      columnSortBy: 'created_at',
-      inactiveMode: false,
-      ...query,
-      structure: IAccountsStructureType.Flat,
-      pageSize: 12000,
-      page: 1,
-    } as IAccountsFilter;
-
-    return this.accountsApplication
-      .getAccounts(tenantId, parsedQuery)
-      .then((output) => output.accounts);
-  }
-}

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

@@ -7,7 +7,6 @@ import {
   IAccountEventCreatedPayload,
   IAccountEventCreatingPayload,
   IAccountCreateDTO,
-  CreateAccountParams,
 } from '@/interfaces';
 import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
@@ -31,22 +30,19 @@ export class CreateAccount {
 
   /**
    * Authorize the account creation.
-   * @param {number} tenantId
+   * @param  {number} tenantId
-   * @param {IAccountCreateDTO} accountDTO
+   * @param  {IAccountCreateDTO} accountDTO
    */
   private authorize = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    baseCurrency: string,
+    baseCurrency: string
-    params?: CreateAccountParams
   ) => {
     // Validate account name uniquiness.
-    if (!params.ignoreUniqueName) {
+    await this.validator.validateAccountNameUniquiness(
-      await this.validator.validateAccountNameUniquiness(
+      tenantId,
-        tenantId,
+      accountDTO.name
-        accountDTO.name
+    );
-      );
-    }
     // Validate the account code uniquiness.
     if (accountDTO.code) {
       await this.validator.isAccountCodeUniqueOrThrowError(
@@ -86,7 +82,7 @@ export class CreateAccount {
 
   /**
    * Transformes the create account DTO to input model.
-   * @param {IAccountCreateDTO} createAccountDTO
+   * @param   {IAccountCreateDTO} createAccountDTO
    */
   private transformDTOToModel = (
     createAccountDTO: IAccountCreateDTO,
@@ -108,8 +104,7 @@ export class CreateAccount {
   public createAccount = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction,
+    trx?: Knex.Transaction
-    params: CreateAccountParams = { ignoreUniqueName: false }
   ): Promise<IAccount> => {
     const { Account } = this.tenancy.models(tenantId);
 
@@ -117,12 +112,8 @@ export class CreateAccount {
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
     // Authorize the account creation.
-    await this.authorize(
+    await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency);
-      tenantId,
+
-      accountDTO,
-      tenantMeta.baseCurrency,
-      params
-    );
     // Transformes the DTO to model.
     const accountInputModel = this.transformDTOToModel(
       accountDTO,
@@ -157,4 +148,3 @@ export class CreateAccount {
     );
   };
 }
-