mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-16 04:40:32 +00:00
Compare commits
1 Commits
v0.18.1
...
backup-scr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
341bcbea7d |
@@ -123,15 +123,6 @@
|
|||||||
"contributions": [
|
"contributions": [
|
||||||
"code"
|
"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,
|
"contributorsPerLine": 7,
|
||||||
|
|||||||
33
.env.example
33
.env.example
@@ -48,9 +48,6 @@ SIGNUP_DISABLED=false
|
|||||||
SIGNUP_ALLOWED_DOMAINS=
|
SIGNUP_ALLOWED_DOMAINS=
|
||||||
SIGNUP_ALLOWED_EMAILS=
|
SIGNUP_ALLOWED_EMAILS=
|
||||||
|
|
||||||
# Sign-up Email Confirmation
|
|
||||||
SIGNUP_EMAIL_CONFIRMATION=false
|
|
||||||
|
|
||||||
# API rate limit (points,duration,block duration).
|
# API rate limit (points,duration,block duration).
|
||||||
API_RATE_LIMIT=120,60,600
|
API_RATE_LIMIT=120,60,600
|
||||||
|
|
||||||
@@ -75,17 +72,31 @@ PLAID_ENV=sandbox
|
|||||||
# Your Plaid keys, which can be found in the Plaid Dashboard.
|
# Your Plaid keys, which can be found in the Plaid Dashboard.
|
||||||
# https://dashboard.plaid.com/account/keys
|
# https://dashboard.plaid.com/account/keys
|
||||||
PLAID_CLIENT_ID=
|
PLAID_CLIENT_ID=
|
||||||
PLAID_SECRET=
|
PLAID_SECRET_DEVELOPMENT=
|
||||||
|
PLAID_SECRET_SANDBOX=
|
||||||
|
|
||||||
PLAID_LINK_WEBHOOK=
|
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
|
# https://docs.lemonsqueezy.com/guides/developer-guide/getting-started#create-an-api-key
|
||||||
LEMONSQUEEZY_API_KEY=
|
LEMONSQUEEZY_API_KEY=
|
||||||
LEMONSQUEEZY_STORE_ID=
|
LEMONSQUEEZY_STORE_ID=
|
||||||
LEMONSQUEEZY_WEBHOOK_SECRET=
|
LEMONSQUEEZY_WEBHOOK_SECRET=
|
||||||
|
|
||||||
# S3 documents and attachments
|
|
||||||
S3_REGION=US
|
|
||||||
S3_ACCESS_KEY_ID=
|
|
||||||
S3_SECRET_ACCESS_KEY=
|
|
||||||
S3_ENDPOINT=
|
|
||||||
S3_BUCKET=
|
|
||||||
|
|||||||
41
.github/workflows/build-deploy-container.yml
vendored
41
.github/workflows/build-deploy-container.yml
vendored
@@ -6,13 +6,18 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
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:
|
jobs:
|
||||||
build-publish-webapp:
|
build-publish-webapp:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform:
|
||||||
|
- linux/amd64
|
||||||
|
- linux/arm64
|
||||||
name: Build and deploy webapp container
|
name: Build and deploy webapp container
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
environment: production
|
environment: production
|
||||||
@@ -25,6 +30,9 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
@@ -32,26 +40,27 @@ jobs:
|
|||||||
- name: Log in to the Container registry
|
- name: Log in to the Container registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
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
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
|
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
|
||||||
with:
|
with:
|
||||||
images: ${{ env.WEBAPP_IMAGE_NAME }}
|
images: ${{ env.REGISTRY }}/${{ env.WEBAPP_IMAGE_NAME }}
|
||||||
|
|
||||||
# Builds and push the Docker image.
|
# Builds and push the Docker image.
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
id: build
|
id: build
|
||||||
with:
|
with:
|
||||||
context: ./
|
context: .
|
||||||
file: ./packages/webapp/Dockerfile
|
file: ./packages/webapp/Dockerfile
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: ${{ matrix.platform }}
|
||||||
push: true
|
push: true
|
||||||
|
tags: ghcr.io/bigcapitalhq/webapp:latest
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
tags: bigcapitalhq/webapp:latest, bigcapitalhq/webapp:${{github.ref_name}}
|
|
||||||
|
|
||||||
- name: Export digest
|
- name: Export digest
|
||||||
run: |
|
run: |
|
||||||
@@ -62,7 +71,7 @@ jobs:
|
|||||||
- name: Upload digest
|
- name: Upload digest
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: digests-webapp
|
name: digests-main-${{ env.PLATFORM_PAIR }}
|
||||||
path: /tmp/digests/*
|
path: /tmp/digests/*
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 1
|
retention-days: 1
|
||||||
@@ -84,6 +93,9 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
@@ -91,8 +103,9 @@ jobs:
|
|||||||
- name: Log in to the Container registry
|
- name: Log in to the Container registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
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.
|
# Builds and push the Docker image.
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
@@ -101,9 +114,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: ./
|
context: ./
|
||||||
file: ./packages/server/Dockerfile
|
file: ./packages/server/Dockerfile
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: ${{ matrix.platform }}
|
||||||
push: true
|
push: true
|
||||||
tags: bigcapitalhq/server:latest, bigcapitalhq/server:${{github.ref_name}}
|
tags: ghcr.io/bigcapitalhq/server:latest
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
- name: Export digest
|
- name: Export digest
|
||||||
@@ -115,7 +128,7 @@ jobs:
|
|||||||
- name: Upload digest
|
- name: Upload digest
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: digests-server
|
name: digests-main-${{ env.PLATFORM_PAIR }}
|
||||||
path: /tmp/digests/*
|
path: /tmp/digests/*
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 1
|
retention-days: 1
|
||||||
|
|||||||
@@ -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 }}
|
|
||||||
113
CHANGELOG.md
113
CHANGELOG.md
@@ -2,119 +2,6 @@
|
|||||||
|
|
||||||
All notable changes to Bigcapital server-side will be in this file.
|
All notable changes to Bigcapital server-side will be in this file.
|
||||||
|
|
||||||
## [v0.17.5] - 17-06-2024
|
|
||||||
|
|
||||||
* fix: Balance sheet and P/L nested accounts by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/501
|
|
||||||
* fix: add space between buttons on floating actions bar by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/508
|
|
||||||
* feat: Migrating to Envoy proxy instead of Nginx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/509
|
|
||||||
* fix: Disable email confirmation does not work with invited users by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/497
|
|
||||||
* feat: Setting up the date format in the whole system dates by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/506
|
|
||||||
|
|
||||||
## [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
|
## [0.14.0] - 30-01-2024
|
||||||
|
|
||||||
* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
|
* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<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">
|
<img src="https://raw.githubusercontent.com/abouolia/blog/main/public/bigcapital.svg" alt="Bigcapital" width="280" height="75">
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://my.bigcapital.app">Bigcapital Cloud</a>
|
<a href="https://app.bigcapital.ly">Bigcapital Cloud</a>
|
||||||
</p>
|
</p>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ Bigcapital is available open-source under AGPL license. You can host it on your
|
|||||||
|
|
||||||
### Docker
|
### 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
|
## Development
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@ You can integrate Bigcapital API with your system to organize your transactions
|
|||||||
|
|
||||||
# Resources
|
# 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.
|
- [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions.
|
||||||
- [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
|
- [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
|
||||||
- [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
|
- [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://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="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://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>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -3,31 +3,34 @@
|
|||||||
version: '3.3'
|
version: '3.3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
proxy:
|
nginx:
|
||||||
image: envoyproxy/envoy:v1.30-latest
|
container_name: bigcapital-nginx-gateway
|
||||||
depends_on:
|
build:
|
||||||
- server
|
context: ./docker/nginx
|
||||||
- webapp
|
args:
|
||||||
|
- SERVER_PROXY_PORT=3000
|
||||||
|
- WEB_SSL=false
|
||||||
|
- SELF_SIGNED=false
|
||||||
|
volumes:
|
||||||
|
- ./data/logs/nginx/:/var/log/nginx
|
||||||
|
- ./docker/certbot/certs/:/var/certs
|
||||||
ports:
|
ports:
|
||||||
- '${PUBLIC_PROXY_PORT:-80}:80'
|
- '${PUBLIC_PROXY_PORT:-80}:80'
|
||||||
- '${PUBLIC_PROXY_SSL_PORT:-443}:443'
|
- '${PUBLIC_PROXY_SSL_PORT:-443}:443'
|
||||||
tty: true
|
tty: true
|
||||||
volumes:
|
depends_on:
|
||||||
- ./docker/envoy/envoy.yaml:/etc/envoy/envoy.yaml
|
- server
|
||||||
|
- webapp
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
webapp:
|
webapp:
|
||||||
container_name: bigcapital-webapp
|
container_name: bigcapital-webapp
|
||||||
image: bigcapitalhq/webapp:latest
|
image: ghcr.io/bigcapitalhq/webapp:latest
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
server:
|
server:
|
||||||
container_name: bigcapital-server
|
container_name: bigcapital-server
|
||||||
image: bigcapitalhq/server:latest
|
image: ghcr.io/bigcapitalhq/server:latest
|
||||||
expose:
|
expose:
|
||||||
- '3000'
|
- '3000'
|
||||||
links:
|
links:
|
||||||
@@ -39,8 +42,6 @@ services:
|
|||||||
- mongo
|
- mongo
|
||||||
- redis
|
- redis
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
environment:
|
environment:
|
||||||
# Mail
|
# Mail
|
||||||
- MAIL_HOST=${MAIL_HOST}
|
- MAIL_HOST=${MAIL_HOST}
|
||||||
@@ -81,24 +82,18 @@ services:
|
|||||||
- SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
|
- SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
|
||||||
- SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
|
- SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
|
||||||
|
|
||||||
# Sign-up email confirmation
|
|
||||||
- SIGNUP_EMAIL_CONFIRMATION=${SIGNUP_EMAIL_CONFIRMATION}
|
|
||||||
|
|
||||||
# Gotenberg (Pdf generator)
|
# Gotenberg (Pdf generator)
|
||||||
- GOTENBERG_URL=${GOTENBERG_URL}
|
- GOTENBERG_URL=${GOTENBERG_URL}
|
||||||
- GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_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
|
# Bank Sync
|
||||||
- BANKING_CONNECT=${BANKING_CONNECT}
|
- BANKING_CONNECT=${BANKING_CONNECT}
|
||||||
|
|
||||||
# Plaid
|
# Plaid
|
||||||
- PLAID_ENV=${PLAID_ENV}
|
- PLAID_ENV=${PLAID_ENV}
|
||||||
- PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
|
- 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}
|
- PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
|
||||||
|
|
||||||
# Lemon Squeez
|
# Lemon Squeez
|
||||||
@@ -107,22 +102,6 @@ services:
|
|||||||
- LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET}
|
- LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET}
|
||||||
- HOSTED_ON_BIGCAPITAL_CLOUD=${HOSTED_ON_BIGCAPITAL_CLOUD}
|
- 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}
|
|
||||||
|
|
||||||
database_migration:
|
database_migration:
|
||||||
container_name: bigcapital-database-migration
|
container_name: bigcapital-database-migration
|
||||||
build:
|
build:
|
||||||
@@ -139,8 +118,6 @@ services:
|
|||||||
- TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
|
- TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- mysql
|
- mysql
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
container_name: bigcapital-mysql
|
container_name: bigcapital-mysql
|
||||||
@@ -156,8 +133,6 @@ services:
|
|||||||
- mysql:/var/lib/mysql
|
- mysql:/var/lib/mysql
|
||||||
expose:
|
expose:
|
||||||
- '3306'
|
- '3306'
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
mongo:
|
mongo:
|
||||||
container_name: bigcapital-mongo
|
container_name: bigcapital-mongo
|
||||||
@@ -167,8 +142,6 @@ services:
|
|||||||
- '27017'
|
- '27017'
|
||||||
volumes:
|
volumes:
|
||||||
- mongo:/var/lib/mongodb
|
- mongo:/var/lib/mongodb
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
container_name: bigcapital-redis
|
container_name: bigcapital-redis
|
||||||
@@ -179,15 +152,11 @@ services:
|
|||||||
- '6379'
|
- '6379'
|
||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: gotenberg/gotenberg:7
|
image: gotenberg/gotenberg:7
|
||||||
expose:
|
expose:
|
||||||
- '9000'
|
- '9000'
|
||||||
networks:
|
|
||||||
- bigcapital_network
|
|
||||||
|
|
||||||
# Volumes
|
# Volumes
|
||||||
volumes:
|
volumes:
|
||||||
@@ -202,8 +171,3 @@ volumes:
|
|||||||
redis:
|
redis:
|
||||||
name: bigcapital_prod_redis
|
name: bigcapital_prod_redis
|
||||||
driver: local
|
driver: local
|
||||||
|
|
||||||
# Networks
|
|
||||||
networks:
|
|
||||||
bigcapital_network:
|
|
||||||
driver: bridge
|
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
static_resources:
|
|
||||||
listeners:
|
|
||||||
- name: listener_0
|
|
||||||
address:
|
|
||||||
socket_address:
|
|
||||||
address: 0.0.0.0
|
|
||||||
port_value: 80
|
|
||||||
filter_chains:
|
|
||||||
- filters:
|
|
||||||
- name: envoy.filters.network.http_connection_manager
|
|
||||||
typed_config:
|
|
||||||
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
|
|
||||||
stat_prefix: ingress_http
|
|
||||||
route_config:
|
|
||||||
name: local_route
|
|
||||||
virtual_hosts:
|
|
||||||
- name: backend
|
|
||||||
domains: ['*']
|
|
||||||
routes:
|
|
||||||
- match:
|
|
||||||
prefix: '/api'
|
|
||||||
route:
|
|
||||||
cluster: dynamic_server
|
|
||||||
- match:
|
|
||||||
prefix: '/'
|
|
||||||
route:
|
|
||||||
cluster: webapp
|
|
||||||
http_filters:
|
|
||||||
- name: envoy.filters.http.router
|
|
||||||
typed_config:
|
|
||||||
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
|
|
||||||
|
|
||||||
clusters:
|
|
||||||
- name: dynamic_server
|
|
||||||
connect_timeout: 0.25s
|
|
||||||
type: STRICT_DNS
|
|
||||||
dns_lookup_family: V4_ONLY
|
|
||||||
lb_policy: ROUND_ROBIN
|
|
||||||
load_assignment:
|
|
||||||
cluster_name: dynamic_server
|
|
||||||
endpoints:
|
|
||||||
- lb_endpoints:
|
|
||||||
- endpoint:
|
|
||||||
address:
|
|
||||||
socket_address:
|
|
||||||
address: server
|
|
||||||
port_value: 3000
|
|
||||||
|
|
||||||
- name: webapp
|
|
||||||
connect_timeout: 0.25s
|
|
||||||
type: STRICT_DNS
|
|
||||||
dns_lookup_family: V4_ONLY
|
|
||||||
lb_policy: ROUND_ROBIN
|
|
||||||
load_assignment:
|
|
||||||
cluster_name: webapp
|
|
||||||
endpoints:
|
|
||||||
- lb_endpoints:
|
|
||||||
- endpoint:
|
|
||||||
address:
|
|
||||||
socket_address:
|
|
||||||
address: webapp
|
|
||||||
port_value: 80
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM bigcapitalhq/server:latest as build
|
FROM ghcr.io/bigcapitalhq/server:latest as build
|
||||||
|
|
||||||
ARG DB_HOST= \
|
ARG DB_HOST= \
|
||||||
DB_USER= \
|
DB_USER= \
|
||||||
@@ -34,5 +34,7 @@ WORKDIR /app/packages/server
|
|||||||
|
|
||||||
RUN git clone https://github.com/vishnubob/wait-for-it.git
|
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"]
|
||||||
5
docker/migration/start.sh
Normal file
5
docker/migration/start.sh
Normal file
@@ -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
|
||||||
21
docker/nginx/Dockerfile
Normal file
21
docker/nginx/Dockerfile
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
FROM nginx:1.11
|
||||||
|
|
||||||
|
RUN mkdir /etc/nginx/sites-available && rm /etc/nginx/conf.d/default.conf
|
||||||
|
ADD nginx.conf /etc/nginx/
|
||||||
|
|
||||||
|
COPY scripts /root/scripts/
|
||||||
|
COPY certs /etc/ssl/
|
||||||
|
|
||||||
|
COPY sites /etc/nginx/templates
|
||||||
|
|
||||||
|
ARG SERVER_PROXY_PORT=3000
|
||||||
|
ARG WEB_SSL=false
|
||||||
|
ARG SELF_SIGNED=false
|
||||||
|
|
||||||
|
ENV SERVER_PROXY_PORT=$SERVER_PROXY_PORT
|
||||||
|
ENV WEB_SSL=$WEB_SSL
|
||||||
|
ENV SELF_SIGNED=$SELF_SIGNED
|
||||||
|
|
||||||
|
RUN /bin/bash /root/scripts/build-nginx.sh
|
||||||
|
|
||||||
|
CMD nginx
|
||||||
0
docker/nginx/certs/.gitkeep
Normal file
0
docker/nginx/certs/.gitkeep
Normal file
33
docker/nginx/nginx.conf
Normal file
33
docker/nginx/nginx.conf
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
user www-data;
|
||||||
|
worker_processes auto;
|
||||||
|
pid /run/nginx.pid;
|
||||||
|
daemon off;
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 2048;
|
||||||
|
use epoll;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
server_tokens off;
|
||||||
|
sendfile on;
|
||||||
|
tcp_nopush on;
|
||||||
|
tcp_nodelay on;
|
||||||
|
keepalive_timeout 15;
|
||||||
|
types_hash_max_size 2048;
|
||||||
|
client_max_body_size 20M;
|
||||||
|
open_file_cache max=100;
|
||||||
|
gzip on;
|
||||||
|
gzip_disable "msie6";
|
||||||
|
|
||||||
|
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
||||||
|
ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
|
||||||
|
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
include /etc/nginx/conf.d/*.conf;
|
||||||
|
include /etc/nginx/sites-available/*;
|
||||||
|
access_log /var/log/nginx/access.log;
|
||||||
|
error_log /var/log/nginx/error.log;
|
||||||
|
}
|
||||||
9
docker/nginx/scripts/build-nginx.sh
Normal file
9
docker/nginx/scripts/build-nginx.sh
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
for conf in /etc/nginx/templates/*.conf; do
|
||||||
|
mv $conf "/etc/nginx/sites-available/"$(basename $conf) > /dev/null
|
||||||
|
done
|
||||||
|
|
||||||
|
for template in /etc/nginx/templates/*.template; do
|
||||||
|
envsubst < $template > "/etc/nginx/sites-available/"$(basename $template)".conf"
|
||||||
|
done
|
||||||
16
docker/nginx/sites/server.template
Normal file
16
docker/nginx/sites/server.template
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
server {
|
||||||
|
listen 80 default_server;
|
||||||
|
|
||||||
|
location /api {
|
||||||
|
proxy_pass http://server:${SERVER_PROXY_PORT};
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://webapp;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /.well-known/acme-challenge/ {
|
||||||
|
root /var/www/letsencrypt/;
|
||||||
|
log_not_found off;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -78,9 +78,6 @@ ENV MAIL_HOST=$MAIL_HOST \
|
|||||||
SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
|
SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
|
||||||
SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS
|
SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS
|
||||||
|
|
||||||
# New Relic config file.
|
|
||||||
ENV NEW_RELIC_NO_CONFIG_FILE=true
|
|
||||||
|
|
||||||
# Create app directory.
|
# Create app directory.
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -92,8 +89,8 @@ RUN npm install -g pnpm
|
|||||||
# Copy application dependency manifests to the container image.
|
# Copy application dependency manifests to the container image.
|
||||||
COPY ./package*.json ./
|
COPY ./package*.json ./
|
||||||
COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
|
COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
|
||||||
COPY ./lerna.json ./lerna.json
|
|
||||||
COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
|
COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
|
||||||
|
COPY ./lerna.json ./lerna.json
|
||||||
COPY ./packages/server/package*.json ./packages/server/
|
COPY ./packages/server/package*.json ./packages/server/
|
||||||
|
|
||||||
# Install application dependencies
|
# Install application dependencies
|
||||||
|
|||||||
@@ -20,13 +20,9 @@
|
|||||||
"bigcapital": "./bin/bigcapital.js"
|
"bigcapital": "./bin/bigcapital.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-sdk/client-s3": "^3.576.0",
|
|
||||||
"@aws-sdk/s3-request-presigner": "^3.583.0",
|
|
||||||
"@casl/ability": "^5.4.3",
|
"@casl/ability": "^5.4.3",
|
||||||
"@hapi/boom": "^7.4.3",
|
"@hapi/boom": "^7.4.3",
|
||||||
"@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
|
"@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
|
||||||
"@supercharge/promise-pool": "^3.2.0",
|
|
||||||
"@types/express": "^4.17.21",
|
|
||||||
"@types/i18n": "^0.8.7",
|
"@types/i18n": "^0.8.7",
|
||||||
"@types/knex": "^0.16.1",
|
"@types/knex": "^0.16.1",
|
||||||
"@types/mathjs": "^6.0.12",
|
"@types/mathjs": "^6.0.12",
|
||||||
@@ -77,18 +73,15 @@
|
|||||||
"lru-cache": "^6.0.0",
|
"lru-cache": "^6.0.0",
|
||||||
"mathjs": "^9.4.0",
|
"mathjs": "^9.4.0",
|
||||||
"memory-cache": "^0.2.0",
|
"memory-cache": "^0.2.0",
|
||||||
"mime-types": "^2.1.35",
|
|
||||||
"moment": "^2.24.0",
|
"moment": "^2.24.0",
|
||||||
"moment-range": "^4.0.2",
|
"moment-range": "^4.0.2",
|
||||||
"moment-timezone": "^0.5.43",
|
"moment-timezone": "^0.5.43",
|
||||||
"mongodb": "^6.1.0",
|
"mongodb": "^6.1.0",
|
||||||
"mongoose": "^5.10.0",
|
"mongoose": "^5.10.0",
|
||||||
"multer": "1.4.5-lts.1",
|
"multer": "1.4.5-lts.1",
|
||||||
"multer-s3": "^3.0.1",
|
|
||||||
"mustache": "^3.0.3",
|
"mustache": "^3.0.3",
|
||||||
"mysql": "^2.17.1",
|
"mysql": "^2.17.1",
|
||||||
"mysql2": "^1.6.5",
|
"mysql2": "^1.6.5",
|
||||||
"newrelic": "^11.15.0",
|
|
||||||
"node-cache": "^4.2.1",
|
"node-cache": "^4.2.1",
|
||||||
"nodemailer": "^6.3.0",
|
"nodemailer": "^6.3.0",
|
||||||
"nodemon": "^1.19.1",
|
"nodemon": "^1.19.1",
|
||||||
@@ -119,7 +112,6 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/lodash": "^4.14.158",
|
"@types/lodash": "^4.14.158",
|
||||||
"@types/multer": "^1.4.11",
|
|
||||||
"@types/ramda": "^0.27.64",
|
"@types/ramda": "^0.27.64",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.50.0",
|
"@typescript-eslint/eslint-plugin": "^5.50.0",
|
||||||
"@typescript-eslint/parser": "^5.50.0",
|
"@typescript-eslint/parser": "^5.50.0",
|
||||||
|
|||||||
@@ -244,7 +244,6 @@
|
|||||||
"account.field.active": "Active",
|
"account.field.active": "Active",
|
||||||
"account.field.currency": "Currency",
|
"account.field.currency": "Currency",
|
||||||
"account.field.balance": "Balance",
|
"account.field.balance": "Balance",
|
||||||
"account.field.bank_balance": "Bank Balance",
|
|
||||||
"account.field.parent_account": "Parent Account",
|
"account.field.parent_account": "Parent Account",
|
||||||
"account.field.created_at": "Created at",
|
"account.field.created_at": "Created at",
|
||||||
"item.field.type": "Item Type",
|
"item.field.type": "Item Type",
|
||||||
@@ -332,7 +331,7 @@
|
|||||||
"bill_payment.field.reference_no": "Reference No.",
|
"bill_payment.field.reference_no": "Reference No.",
|
||||||
"bill_payment.field.description": "Description",
|
"bill_payment.field.description": "Description",
|
||||||
"bill_payment.field.exchange_rate": "Exchange Rate",
|
"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.bill": "Bill No.",
|
||||||
"bill_payment.field.entries.payment_amount": "Payment Amount",
|
"bill_payment.field.entries.payment_amount": "Payment Amount",
|
||||||
"bill_payment.field.reference": "Reference No.",
|
"bill_payment.field.reference": "Reference No.",
|
||||||
@@ -432,7 +431,6 @@
|
|||||||
"vendor.field.created_at": "Created at",
|
"vendor.field.created_at": "Created at",
|
||||||
"vendor.field.balance": "Balance",
|
"vendor.field.balance": "Balance",
|
||||||
"vendor.field.status": "Status",
|
"vendor.field.status": "Status",
|
||||||
"vendor.field.note": "Note",
|
|
||||||
"vendor.field.currency": "Currency",
|
"vendor.field.currency": "Currency",
|
||||||
"vendor.field.status.active": "Active",
|
"vendor.field.status.active": "Active",
|
||||||
"vendor.field.status.inactive": "Inactive",
|
"vendor.field.status.inactive": "Inactive",
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -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
|
|
||||||
@@ -70,10 +70,6 @@ module.exports = {
|
|||||||
src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
|
src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
|
||||||
dest: `${RESOURCES_PATH}/css/modules`,
|
dest: `${RESOURCES_PATH}/css/modules`,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
src: `${RESOURCES_PATH}/scss/modules/export-resource-table.scss`,
|
|
||||||
dest: `${RESOURCES_PATH}/css/modules`,
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
// RTL builds.
|
// RTL builds.
|
||||||
rtl: [
|
rtl: [
|
||||||
|
|||||||
@@ -207,6 +207,7 @@ export default class AccountsController extends BaseController {
|
|||||||
tenantId,
|
tenantId,
|
||||||
accountDTO
|
accountDTO
|
||||||
);
|
);
|
||||||
|
|
||||||
return res.status(200).send({
|
return res.status(200).send({
|
||||||
id: account.id,
|
id: account.id,
|
||||||
message: 'The account has been created successfully.',
|
message: 'The account has been created successfully.',
|
||||||
|
|||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,8 +9,6 @@ import { DATATYPES_LENGTH } from '@/data/DataTypes';
|
|||||||
import LoginThrottlerMiddleware from '@/api/middleware/LoginThrottlerMiddleware';
|
import LoginThrottlerMiddleware from '@/api/middleware/LoginThrottlerMiddleware';
|
||||||
import AuthenticationApplication from '@/services/Authentication/AuthApplication';
|
import AuthenticationApplication from '@/services/Authentication/AuthApplication';
|
||||||
|
|
||||||
import JWTAuth from '@/api/middleware/jwtAuth';
|
|
||||||
import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
|
|
||||||
@Service()
|
@Service()
|
||||||
export default class AuthenticationController extends BaseController {
|
export default class AuthenticationController extends BaseController {
|
||||||
@Inject()
|
@Inject()
|
||||||
@@ -30,20 +28,6 @@ export default class AuthenticationController extends BaseController {
|
|||||||
asyncMiddleware(this.login.bind(this)),
|
asyncMiddleware(this.login.bind(this)),
|
||||||
this.handlerErrors
|
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(
|
router.post(
|
||||||
'/register',
|
'/register',
|
||||||
this.registerSchema,
|
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.
|
* Reset password schema.
|
||||||
* @returns {ValidationChain[]}
|
* @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
|
* Send reset password handler
|
||||||
* @param {Request} req
|
* @param {Request} req
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
import { Inject, Service } from 'typedi';
|
|
||||||
import { NextFunction, Request, Response, Router } from 'express';
|
|
||||||
import BaseController from '@/api/controllers/BaseController';
|
|
||||||
import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
|
|
||||||
import { GetBankAccountSummary } from '@/services/Banking/BankAccounts/GetBankAccountSummary';
|
|
||||||
|
|
||||||
@Service()
|
|
||||||
export class BankAccountsController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
private getBankAccountSummaryService: GetBankAccountSummary;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Router constructor.
|
|
||||||
*/
|
|
||||||
router() {
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
router.get('/:bankAccountId/meta', this.getBankAccountSummary.bind(this));
|
|
||||||
|
|
||||||
return router;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the bank account meta summary.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|null>}
|
|
||||||
*/
|
|
||||||
async getBankAccountSummary(
|
|
||||||
req: Request<{ bankAccountId: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { bankAccountId } = req.params;
|
|
||||||
const { tenantId } = req;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data =
|
|
||||||
await this.getBankAccountSummaryService.getBankAccountSummary(
|
|
||||||
tenantId,
|
|
||||||
bankAccountId
|
|
||||||
);
|
|
||||||
return res.status(200).send({ data });
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
import { Inject, Service } from 'typedi';
|
|
||||||
import { NextFunction, Request, Response, Router } from 'express';
|
|
||||||
import BaseController from '@/api/controllers/BaseController';
|
|
||||||
import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
|
|
||||||
import { body, param } from 'express-validator';
|
|
||||||
import {
|
|
||||||
GetMatchedTransactionsFilter,
|
|
||||||
IMatchTransactionsDTO,
|
|
||||||
} from '@/services/Banking/Matching/types';
|
|
||||||
|
|
||||||
@Service()
|
|
||||||
export class BankTransactionsMatchingController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Router constructor.
|
|
||||||
*/
|
|
||||||
public router() {
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
router.post(
|
|
||||||
'/:transactionId',
|
|
||||||
[
|
|
||||||
param('transactionId').exists(),
|
|
||||||
body('matchedTransactions').isArray({ min: 1 }),
|
|
||||||
body('matchedTransactions.*.reference_type').exists(),
|
|
||||||
body('matchedTransactions.*.reference_id').isNumeric().toInt(),
|
|
||||||
],
|
|
||||||
this.validationResult,
|
|
||||||
this.matchBankTransaction.bind(this)
|
|
||||||
);
|
|
||||||
router.post(
|
|
||||||
'/unmatch/:transactionId',
|
|
||||||
[param('transactionId').exists()],
|
|
||||||
this.validationResult,
|
|
||||||
this.unmatchMatchedBankTransaction.bind(this)
|
|
||||||
);
|
|
||||||
return router;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Matches the given bank transaction.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|null>}
|
|
||||||
*/
|
|
||||||
private async matchBankTransaction(
|
|
||||||
req: Request<{ transactionId: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { transactionId } = req.params;
|
|
||||||
const matchTransactionDTO = this.matchedBodyData(
|
|
||||||
req
|
|
||||||
) as IMatchTransactionsDTO;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.bankTransactionsMatchingApp.matchTransaction(
|
|
||||||
tenantId,
|
|
||||||
transactionId,
|
|
||||||
matchTransactionDTO
|
|
||||||
);
|
|
||||||
return res.status(200).send({
|
|
||||||
id: transactionId,
|
|
||||||
message: 'The bank transaction has been matched.',
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unmatches the matched bank transaction.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|null>}
|
|
||||||
*/
|
|
||||||
private async unmatchMatchedBankTransaction(
|
|
||||||
req: Request<{ transactionId: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { transactionId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.bankTransactionsMatchingApp.unmatchMatchedTransaction(
|
|
||||||
tenantId,
|
|
||||||
transactionId
|
|
||||||
);
|
|
||||||
return res.status(200).send({
|
|
||||||
id: transactionId,
|
|
||||||
message: 'The bank matched transaction has been unmatched.',
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,33 +2,17 @@ import Container, { Inject, Service } from 'typedi';
|
|||||||
import { Router } from 'express';
|
import { Router } from 'express';
|
||||||
import BaseController from '@/api/controllers/BaseController';
|
import BaseController from '@/api/controllers/BaseController';
|
||||||
import { PlaidBankingController } from './PlaidBankingController';
|
import { PlaidBankingController } from './PlaidBankingController';
|
||||||
import { BankingRulesController } from './BankingRulesController';
|
|
||||||
import { BankTransactionsMatchingController } from './BankTransactionsMatchingController';
|
|
||||||
import { RecognizedTransactionsController } from './RecognizedTransactionsController';
|
|
||||||
import { BankAccountsController } from './BankAccountsController';
|
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
export class BankingController extends BaseController {
|
export class BankingController extends BaseController {
|
||||||
/**
|
/**
|
||||||
* Router constructor.
|
* Router constructor.
|
||||||
*/
|
*/
|
||||||
public router() {
|
router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.use('/plaid', Container.get(PlaidBankingController).router());
|
router.use('/plaid', Container.get(PlaidBankingController).router());
|
||||||
router.use('/rules', Container.get(BankingRulesController).router());
|
|
||||||
router.use(
|
|
||||||
'/matches',
|
|
||||||
Container.get(BankTransactionsMatchingController).router()
|
|
||||||
);
|
|
||||||
router.use(
|
|
||||||
'/recognized',
|
|
||||||
Container.get(RecognizedTransactionsController).router()
|
|
||||||
);
|
|
||||||
router.use(
|
|
||||||
'/bank_accounts',
|
|
||||||
Container.get(BankAccountsController).router()
|
|
||||||
);
|
|
||||||
return router;
|
return router;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,206 +0,0 @@
|
|||||||
import { Inject, Service } from 'typedi';
|
|
||||||
import { NextFunction, Request, Response, Router } from 'express';
|
|
||||||
import BaseController from '@/api/controllers/BaseController';
|
|
||||||
import { BankRulesApplication } from '@/services/Banking/Rules/BankRulesApplication';
|
|
||||||
import { body, param } from 'express-validator';
|
|
||||||
import {
|
|
||||||
ICreateBankRuleDTO,
|
|
||||||
IEditBankRuleDTO,
|
|
||||||
} from '@/services/Banking/Rules/types';
|
|
||||||
|
|
||||||
@Service()
|
|
||||||
export class BankingRulesController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
private bankRulesApplication: BankRulesApplication;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Bank rule DTO validation schema.
|
|
||||||
*/
|
|
||||||
private get bankRuleValidationSchema() {
|
|
||||||
return [
|
|
||||||
body('name').isString().exists(),
|
|
||||||
body('order').isInt({ min: 0 }),
|
|
||||||
|
|
||||||
// Apply to if transaction is.
|
|
||||||
body('apply_if_account_id')
|
|
||||||
.isInt({ min: 0 })
|
|
||||||
.optional({ nullable: true }),
|
|
||||||
body('apply_if_transaction_type').isIn(['deposit', 'withdrawal']),
|
|
||||||
|
|
||||||
// Conditions
|
|
||||||
body('conditions_type').isString().isIn(['and', 'or']).default('and'),
|
|
||||||
body('conditions').isArray({ min: 1 }),
|
|
||||||
body('conditions.*.field').exists().isIn(['description', 'amount']),
|
|
||||||
body('conditions.*.comparator')
|
|
||||||
.exists()
|
|
||||||
.isIn(['equals', 'contains', 'not_contain'])
|
|
||||||
.default('contain'),
|
|
||||||
body('conditions.*.value').exists(),
|
|
||||||
|
|
||||||
// Assign
|
|
||||||
body('assign_category').isString(),
|
|
||||||
body('assign_account_id').isInt({ min: 0 }),
|
|
||||||
body('assign_payee').isString().optional({ nullable: true }),
|
|
||||||
body('assign_memo').isString().optional({ nullable: true }),
|
|
||||||
|
|
||||||
body('recognition').isBoolean().toBoolean().optional({ nullable: true }),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Router constructor.
|
|
||||||
*/
|
|
||||||
public router() {
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
router.post(
|
|
||||||
'/',
|
|
||||||
[...this.bankRuleValidationSchema],
|
|
||||||
this.validationResult,
|
|
||||||
this.createBankRule.bind(this)
|
|
||||||
);
|
|
||||||
router.post(
|
|
||||||
'/:id',
|
|
||||||
[param('id').toInt().exists(), ...this.bankRuleValidationSchema],
|
|
||||||
this.validationResult,
|
|
||||||
this.editBankRule.bind(this)
|
|
||||||
);
|
|
||||||
router.delete(
|
|
||||||
'/:id',
|
|
||||||
[param('id').toInt().exists()],
|
|
||||||
this.validationResult,
|
|
||||||
this.deleteBankRule.bind(this)
|
|
||||||
);
|
|
||||||
router.get(
|
|
||||||
'/:id',
|
|
||||||
[param('id').toInt().exists()],
|
|
||||||
this.validationResult,
|
|
||||||
this.getBankRule.bind(this)
|
|
||||||
);
|
|
||||||
router.get(
|
|
||||||
'/',
|
|
||||||
[param('id').toInt().exists()],
|
|
||||||
this.validationResult,
|
|
||||||
this.getBankRules.bind(this)
|
|
||||||
);
|
|
||||||
return router;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new bank rule.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
*/
|
|
||||||
private async createBankRule(
|
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const createBankRuleDTO = this.matchedBodyData(req) as ICreateBankRuleDTO;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const bankRule = await this.bankRulesApplication.createBankRule(
|
|
||||||
tenantId,
|
|
||||||
createBankRuleDTO
|
|
||||||
);
|
|
||||||
return res.status(200).send({
|
|
||||||
id: bankRule.id,
|
|
||||||
message: 'The bank rule has been created successfully.',
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Edits the given bank rule.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
*/
|
|
||||||
private async editBankRule(req: Request, res: Response, next: NextFunction) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { id: ruleId } = req.params;
|
|
||||||
const editBankRuleDTO = this.matchedBodyData(req) as IEditBankRuleDTO;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.bankRulesApplication.editBankRule(
|
|
||||||
tenantId,
|
|
||||||
ruleId,
|
|
||||||
editBankRuleDTO
|
|
||||||
);
|
|
||||||
return res.status(200).send({
|
|
||||||
id: ruleId,
|
|
||||||
message: 'The bank rule has been updated successfully.',
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes the given bank rule.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
*/
|
|
||||||
private async deleteBankRule(
|
|
||||||
req: Request<{ id: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { id: ruleId } = req.params;
|
|
||||||
const { tenantId } = req;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.bankRulesApplication.deleteBankRule(tenantId, ruleId);
|
|
||||||
|
|
||||||
return res
|
|
||||||
.status(200)
|
|
||||||
.send({ message: 'The bank rule has been deleted.', id: ruleId });
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve the given bank rule.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
*/
|
|
||||||
private async getBankRule(req: Request, res: Response, next: NextFunction) {
|
|
||||||
const { id: ruleId } = req.params;
|
|
||||||
const { tenantId } = req;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const bankRule = await this.bankRulesApplication.getBankRule(
|
|
||||||
tenantId,
|
|
||||||
ruleId
|
|
||||||
);
|
|
||||||
|
|
||||||
return res.status(200).send({ bankRule });
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the bank rules.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
*/
|
|
||||||
private async getBankRules(req: Request, res: Response, next: NextFunction) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const bankRules = await this.bankRulesApplication.getBankRules(tenantId);
|
|
||||||
return res.status(200).send({ bankRules });
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
import { Inject, Service } from 'typedi';
|
|
||||||
import { param } from 'express-validator';
|
|
||||||
import { NextFunction, Request, Response, Router, query } from 'express';
|
|
||||||
import BaseController from '../BaseController';
|
|
||||||
import { ExcludeBankTransactionsApplication } from '@/services/Banking/Exclude/ExcludeBankTransactionsApplication';
|
|
||||||
|
|
||||||
@Service()
|
|
||||||
export class ExcludeBankTransactionsController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
private excludeBankTransactionApp: ExcludeBankTransactionsApplication;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Router constructor.
|
|
||||||
*/
|
|
||||||
public router() {
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
router.put(
|
|
||||||
'/transactions/:transactionId/exclude',
|
|
||||||
[param('transactionId').exists()],
|
|
||||||
this.validationResult,
|
|
||||||
this.excludeBankTransaction.bind(this)
|
|
||||||
);
|
|
||||||
router.put(
|
|
||||||
'/transactions/:transactionId/unexclude',
|
|
||||||
[param('transactionId').exists()],
|
|
||||||
this.validationResult,
|
|
||||||
this.unexcludeBankTransaction.bind(this)
|
|
||||||
);
|
|
||||||
router.get(
|
|
||||||
'/excluded',
|
|
||||||
[],
|
|
||||||
this.validationResult,
|
|
||||||
this.getExcludedBankTransactions.bind(this)
|
|
||||||
);
|
|
||||||
return router;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Marks a bank transaction as excluded.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
private async excludeBankTransaction(
|
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
): Promise<Response | void> {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { transactionId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.excludeBankTransactionApp.excludeBankTransaction(
|
|
||||||
tenantId,
|
|
||||||
transactionId
|
|
||||||
);
|
|
||||||
return res.status(200).send({
|
|
||||||
message: 'The bank transaction has been excluded.',
|
|
||||||
id: transactionId,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Marks a bank transaction as not excluded.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|void>}
|
|
||||||
*/
|
|
||||||
private async unexcludeBankTransaction(
|
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
): Promise<Response | void> {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { transactionId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await this.excludeBankTransactionApp.unexcludeBankTransaction(
|
|
||||||
tenantId,
|
|
||||||
transactionId
|
|
||||||
);
|
|
||||||
return res.status(200).send({
|
|
||||||
message: 'The bank transaction has been unexcluded.',
|
|
||||||
id: transactionId,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the excluded uncategorized bank transactions.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|null>}
|
|
||||||
*/
|
|
||||||
private async getExcludedBankTransactions(
|
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
): Promise<Response | void> {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const filter = this.matchedBodyData(req);
|
|
||||||
|
|
||||||
console.log('123');
|
|
||||||
try {
|
|
||||||
const data =
|
|
||||||
await this.excludeBankTransactionApp.getExcludedBankTransactions(
|
|
||||||
tenantId,
|
|
||||||
filter
|
|
||||||
);
|
|
||||||
return res.status(200).send(data);
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
import { Inject, Service } from 'typedi';
|
|
||||||
import { NextFunction, Request, Response, Router } from 'express';
|
|
||||||
import BaseController from '@/api/controllers/BaseController';
|
|
||||||
import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
|
|
||||||
|
|
||||||
@Service()
|
|
||||||
export class RecognizedTransactionsController extends BaseController {
|
|
||||||
@Inject()
|
|
||||||
private cashflowApplication: CashflowApplication;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Router constructor.
|
|
||||||
*/
|
|
||||||
router() {
|
|
||||||
const router = Router();
|
|
||||||
|
|
||||||
router.get('/', this.getRecognizedTransactions.bind(this));
|
|
||||||
router.get(
|
|
||||||
'/transactions/:uncategorizedTransactionId',
|
|
||||||
this.getRecognizedTransaction.bind(this)
|
|
||||||
);
|
|
||||||
|
|
||||||
return router;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the recognized bank transactions.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|null>}
|
|
||||||
*/
|
|
||||||
async getRecognizedTransactions(
|
|
||||||
req: Request<{ accountId: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const filter = this.matchedQueryData(req);
|
|
||||||
const { tenantId } = req;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data = await this.cashflowApplication.getRecognizedTransactions(
|
|
||||||
tenantId,
|
|
||||||
filter
|
|
||||||
);
|
|
||||||
return res.status(200).send(data);
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the recognized transaction of the ginen uncategorized transaction.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
* @returns {Promise<Response|null>}
|
|
||||||
*/
|
|
||||||
async getRecognizedTransaction(
|
|
||||||
req: Request<{ uncategorizedTransactionId: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { uncategorizedTransactionId } = req.params;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data = await this.cashflowApplication.getRecognizedTransaction(
|
|
||||||
tenantId,
|
|
||||||
uncategorizedTransactionId
|
|
||||||
);
|
|
||||||
return res.status(200).send({ data });
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import CommandCashflowTransaction from './NewCashflowTransaction';
|
|||||||
import DeleteCashflowTransaction from './DeleteCashflowTransaction';
|
import DeleteCashflowTransaction from './DeleteCashflowTransaction';
|
||||||
import GetCashflowTransaction from './GetCashflowTransaction';
|
import GetCashflowTransaction from './GetCashflowTransaction';
|
||||||
import GetCashflowAccounts from './GetCashflowAccounts';
|
import GetCashflowAccounts from './GetCashflowAccounts';
|
||||||
import { ExcludeBankTransactionsController } from '../Banking/ExcludeBankTransactionsController';
|
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
export default class CashflowController {
|
export default class CashflowController {
|
||||||
@@ -15,7 +14,6 @@ export default class CashflowController {
|
|||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.use(Container.get(CommandCashflowTransaction).router());
|
router.use(Container.get(CommandCashflowTransaction).router());
|
||||||
router.use(Container.get(ExcludeBankTransactionsController).router());
|
|
||||||
router.use(Container.get(GetCashflowTransaction).router());
|
router.use(Container.get(GetCashflowTransaction).router());
|
||||||
router.use(Container.get(GetCashflowAccounts).router());
|
router.use(Container.get(GetCashflowAccounts).router());
|
||||||
router.use(Container.get(DeleteCashflowTransaction).router());
|
router.use(Container.get(DeleteCashflowTransaction).router());
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ export default class GetCashflowAccounts extends BaseController {
|
|||||||
query('search_keyword').optional({ nullable: true }).isString().trim(),
|
query('search_keyword').optional({ nullable: true }).isString().trim(),
|
||||||
],
|
],
|
||||||
this.asyncMiddleware(this.getCashflowAccounts),
|
this.asyncMiddleware(this.getCashflowAccounts),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
return router;
|
return router;
|
||||||
}
|
}
|
||||||
@@ -66,4 +67,22 @@ export default class GetCashflowAccounts extends BaseController {
|
|||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Catches the service errors.
|
||||||
|
* @param {Error} error - Error.
|
||||||
|
* @param {Request} req - Request.
|
||||||
|
* @param {Response} res - Response.
|
||||||
|
* @param {NextFunction} next -
|
||||||
|
*/
|
||||||
|
private catchServiceErrors(
|
||||||
|
error,
|
||||||
|
req: Request,
|
||||||
|
res: Response,
|
||||||
|
next: NextFunction
|
||||||
|
) {
|
||||||
|
if (error instanceof ServiceError) {
|
||||||
|
}
|
||||||
|
next(error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,27 +6,18 @@ import { ServiceError } from '@/exceptions';
|
|||||||
import CheckPolicies from '@/api/middleware/CheckPolicies';
|
import CheckPolicies from '@/api/middleware/CheckPolicies';
|
||||||
import { AbilitySubject, CashflowAction } from '@/interfaces';
|
import { AbilitySubject, CashflowAction } from '@/interfaces';
|
||||||
import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
|
import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
|
||||||
import { GetMatchedTransactionsFilter } from '@/services/Banking/Matching/types';
|
|
||||||
import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
|
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
export default class GetCashflowAccounts extends BaseController {
|
export default class GetCashflowAccounts extends BaseController {
|
||||||
@Inject()
|
@Inject()
|
||||||
private cashflowApplication: CashflowApplication;
|
private cashflowApplication: CashflowApplication;
|
||||||
|
|
||||||
@Inject()
|
|
||||||
private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Controller router.
|
* Controller router.
|
||||||
*/
|
*/
|
||||||
public router() {
|
public router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.get(
|
|
||||||
'/transactions/:transactionId/matches',
|
|
||||||
this.getMatchedTransactions.bind(this)
|
|
||||||
);
|
|
||||||
router.get(
|
router.get(
|
||||||
'/transactions/:transactionId',
|
'/transactions/:transactionId',
|
||||||
CheckPolicies(CashflowAction.View, AbilitySubject.Cashflow),
|
CheckPolicies(CashflowAction.View, AbilitySubject.Cashflow),
|
||||||
@@ -56,6 +47,7 @@ export default class GetCashflowAccounts extends BaseController {
|
|||||||
tenantId,
|
tenantId,
|
||||||
transactionId
|
transactionId
|
||||||
);
|
);
|
||||||
|
|
||||||
return res.status(200).send({
|
return res.status(200).send({
|
||||||
cashflow_transaction: this.transfromToResponse(cashflowTransaction),
|
cashflow_transaction: this.transfromToResponse(cashflowTransaction),
|
||||||
});
|
});
|
||||||
@@ -64,34 +56,6 @@ export default class GetCashflowAccounts extends BaseController {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the matched transactions.
|
|
||||||
* @param {Request} req
|
|
||||||
* @param {Response} res
|
|
||||||
* @param {NextFunction} next
|
|
||||||
*/
|
|
||||||
private async getMatchedTransactions(
|
|
||||||
req: Request<{ transactionId: number }>,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { tenantId } = req;
|
|
||||||
const { transactionId } = req.params;
|
|
||||||
const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data =
|
|
||||||
await this.bankTransactionsMatchingApp.getMatchedTransactions(
|
|
||||||
tenantId,
|
|
||||||
transactionId,
|
|
||||||
filter
|
|
||||||
);
|
|
||||||
return res.status(200).send(data);
|
|
||||||
} catch (error) {
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Catches the service errors.
|
* Catches the service errors.
|
||||||
* @param {Error} error - Error.
|
* @param {Error} error - Error.
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import DashboardService from '@/services/Dashboard/DashboardService';
|
|||||||
@Service()
|
@Service()
|
||||||
export default class DashboardMetaController {
|
export default class DashboardMetaController {
|
||||||
@Inject()
|
@Inject()
|
||||||
private dashboardService: DashboardService;
|
dashboardService: DashboardService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor router.
|
* Constructor router.
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export class ExpensesController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* Expense DTO schema.
|
* Expense DTO schema.
|
||||||
*/
|
*/
|
||||||
private get expenseDTOSchema() {
|
get expenseDTOSchema() {
|
||||||
return [
|
return [
|
||||||
check('reference_no')
|
check('reference_no')
|
||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
@@ -130,9 +130,6 @@ export class ExpensesController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isInt({ max: DATATYPES_LENGTH.INT_10 })
|
.isInt({ max: DATATYPES_LENGTH.INT_10 })
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,9 +183,6 @@ export class ExpensesController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isInt({ max: DATATYPES_LENGTH.INT_10 })
|
.isInt({ max: DATATYPES_LENGTH.INT_10 })
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -275,7 +269,7 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @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 { tenantId, user } = req;
|
||||||
const { id: expenseId } = req.params;
|
const { id: expenseId } = req.params;
|
||||||
|
|
||||||
@@ -297,11 +291,7 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @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 { tenantId, user } = req;
|
||||||
const { id: expenseId } = req.params;
|
const { id: expenseId } = req.params;
|
||||||
|
|
||||||
@@ -323,11 +313,7 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
private async getExpensesList(
|
async getExpensesList(req: Request, res: Response, next: NextFunction) {
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const filter = {
|
const filter = {
|
||||||
sortOrder: 'desc',
|
sortOrder: 'desc',
|
||||||
@@ -357,7 +343,7 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
private async getExpense(req: Request, res: Response, next: NextFunction) {
|
async getExpense(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const { id: expenseId } = req.params;
|
const { id: expenseId } = req.params;
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -16,7 +16,7 @@ export class ImportController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* Router constructor method.
|
* Router constructor method.
|
||||||
*/
|
*/
|
||||||
public router() {
|
router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
@@ -240,7 +240,11 @@ export class ImportController extends BaseController {
|
|||||||
errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
|
errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
return res.status(400).send({
|
||||||
|
errors: [{ type: error.errorType }],
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
next(error);
|
next(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,14 +77,14 @@ export default class ManualJournalsController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* Specific manual journal id param validation schema.
|
* Specific manual journal id param validation schema.
|
||||||
*/
|
*/
|
||||||
private get manualJournalParamSchema() {
|
get manualJournalParamSchema() {
|
||||||
return [param('id').exists().isNumeric().toInt()];
|
return [param('id').exists().isNumeric().toInt()];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manual journal DTO schema.
|
* Manual journal DTO schema.
|
||||||
*/
|
*/
|
||||||
private get manualJournalValidationSchema() {
|
get manualJournalValidationSchema() {
|
||||||
return [
|
return [
|
||||||
check('date').exists().isISO8601(),
|
check('date').exists().isISO8601(),
|
||||||
check('currency_code').optional(),
|
check('currency_code').optional(),
|
||||||
@@ -148,16 +148,13 @@ export default class ManualJournalsController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isNumeric()
|
.isNumeric()
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manual journals list validation schema.
|
* Manual journals list validation schema.
|
||||||
*/
|
*/
|
||||||
private get manualJournalsListSchema() {
|
get manualJournalsListSchema() {
|
||||||
return [
|
return [
|
||||||
query('page').optional().isNumeric().toInt(),
|
query('page').optional().isNumeric().toInt(),
|
||||||
query('page_size').optional().isNumeric().toInt(),
|
query('page_size').optional().isNumeric().toInt(),
|
||||||
@@ -323,7 +320,7 @@ export default class ManualJournalsController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
private getManualJournalsList = async (
|
getManualJournalsList = async (
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
next: NextFunction
|
next: NextFunction
|
||||||
|
|||||||
@@ -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(
|
private async baseCurrencyMutateAbility(
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
next: Function
|
next: Function
|
||||||
): Promise<Response|void> {
|
) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -29,7 +29,8 @@ export class ProjectsController extends BaseController {
|
|||||||
check('cost_estimate').exists().isDecimal(),
|
check('cost_estimate').exists().isDecimal(),
|
||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.createProject.bind(this))
|
asyncMiddleware(this.createProject.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
router.post(
|
router.post(
|
||||||
'/:id',
|
'/:id',
|
||||||
@@ -42,7 +43,8 @@ export class ProjectsController extends BaseController {
|
|||||||
check('cost_estimate').exists().isDecimal(),
|
check('cost_estimate').exists().isDecimal(),
|
||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.editProject.bind(this))
|
asyncMiddleware(this.editProject.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
router.patch(
|
router.patch(
|
||||||
'/:projectId/status',
|
'/:projectId/status',
|
||||||
@@ -54,14 +56,16 @@ export class ProjectsController extends BaseController {
|
|||||||
.isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
|
.isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
|
||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.editProject.bind(this))
|
asyncMiddleware(this.editProject.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
router.get(
|
router.get(
|
||||||
'/:id',
|
'/:id',
|
||||||
CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
|
CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
|
||||||
[param('id').exists().isInt().toInt()],
|
[param('id').exists().isInt().toInt()],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.getProject.bind(this))
|
asyncMiddleware(this.getProject.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
router.get(
|
router.get(
|
||||||
'/:projectId/billable/entries',
|
'/:projectId/billable/entries',
|
||||||
@@ -72,21 +76,24 @@ export class ProjectsController extends BaseController {
|
|||||||
query('to_date').optional().isISO8601(),
|
query('to_date').optional().isISO8601(),
|
||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.projectBillableEntries.bind(this))
|
asyncMiddleware(this.projectBillableEntries.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
router.get(
|
router.get(
|
||||||
'/',
|
'/',
|
||||||
CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
|
CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
|
||||||
[],
|
[],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.getProjects.bind(this))
|
asyncMiddleware(this.getProjects.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
router.delete(
|
router.delete(
|
||||||
'/:id',
|
'/:id',
|
||||||
CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
|
CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
|
||||||
[param('id').exists().isInt().toInt()],
|
[param('id').exists().isInt().toInt()],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.deleteProject.bind(this))
|
asyncMiddleware(this.deleteProject.bind(this)),
|
||||||
|
this.catchServiceErrors
|
||||||
);
|
);
|
||||||
return router;
|
return router;
|
||||||
}
|
}
|
||||||
@@ -245,4 +252,22 @@ export class ProjectsController extends BaseController {
|
|||||||
next(error);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,6 +118,7 @@ export default class BillsController extends BaseController {
|
|||||||
check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
|
check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
|
||||||
|
|
||||||
check('entries').isArray({ min: 1 }),
|
check('entries').isArray({ min: 1 }),
|
||||||
|
|
||||||
check('entries.*.index').exists().isNumeric().toInt(),
|
check('entries.*.index').exists().isNumeric().toInt(),
|
||||||
check('entries.*.item_id').exists().isNumeric().toInt(),
|
check('entries.*.item_id').exists().isNumeric().toInt(),
|
||||||
check('entries.*.rate').exists().isNumeric().toFloat(),
|
check('entries.*.rate').exists().isNumeric().toFloat(),
|
||||||
@@ -147,9 +148,6 @@ export default class BillsController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isNumeric()
|
.isNumeric()
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,9 +190,6 @@ export default class BillsController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isBoolean()
|
.isBoolean()
|
||||||
.toBoolean(),
|
.toBoolean(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,9 +122,6 @@ export default class BillsPayments extends BaseController {
|
|||||||
check('entries.*.index').optional().isNumeric().toInt(),
|
check('entries.*.index').optional().isNumeric().toInt(),
|
||||||
check('entries.*.bill_id').exists().isNumeric().toInt(),
|
check('entries.*.bill_id').exists().isNumeric().toInt(),
|
||||||
check('entries.*.payment_amount').exists().isNumeric().toFloat(),
|
check('entries.*.payment_amount').exists().isNumeric().toFloat(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -186,9 +186,6 @@ export default class VendorCreditController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isNumeric()
|
.isNumeric()
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,9 +228,6 @@ export default class VendorCreditController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isNumeric()
|
.isNumeric()
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -236,9 +236,6 @@ export default class PaymentReceivesController extends BaseController {
|
|||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
.isNumeric()
|
.isNumeric()
|
||||||
.toInt(),
|
.toInt(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -164,9 +164,6 @@ export default class PaymentReceivesController extends BaseController {
|
|||||||
check('entries.*.index').optional().isNumeric().toInt(),
|
check('entries.*.index').optional().isNumeric().toInt(),
|
||||||
check('entries.*.invoice_id').exists().isNumeric().toInt(),
|
check('entries.*.invoice_id').exists().isNumeric().toInt(),
|
||||||
check('entries.*.payment_amount').exists().isNumeric().toFloat(),
|
check('entries.*.payment_amount').exists().isNumeric().toFloat(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -184,9 +184,6 @@ export default class SalesEstimatesController extends BaseController {
|
|||||||
check('note').optional().trim().escape(),
|
check('note').optional().trim().escape(),
|
||||||
check('terms_conditions').optional().trim().escape(),
|
check('terms_conditions').optional().trim().escape(),
|
||||||
check('send_to_email').optional().trim().escape(),
|
check('send_to_email').optional().trim().escape(),
|
||||||
|
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,8 +36,6 @@ export default class SaleInvoicesController extends BaseController {
|
|||||||
[
|
[
|
||||||
...this.saleInvoiceValidationSchema,
|
...this.saleInvoiceValidationSchema,
|
||||||
check('from_estimate_id').optional().isNumeric().toInt(),
|
check('from_estimate_id').optional().isNumeric().toInt(),
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.newSaleInvoice.bind(this)),
|
asyncMiddleware(this.newSaleInvoice.bind(this)),
|
||||||
@@ -100,8 +98,6 @@ export default class SaleInvoicesController extends BaseController {
|
|||||||
[
|
[
|
||||||
...this.saleInvoiceValidationSchema,
|
...this.saleInvoiceValidationSchema,
|
||||||
...this.specificSaleInvoiceValidation,
|
...this.specificSaleInvoiceValidation,
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
asyncMiddleware(this.editSaleInvoice.bind(this)),
|
asyncMiddleware(this.editSaleInvoice.bind(this)),
|
||||||
|
|||||||
@@ -158,8 +158,6 @@ export default class SalesReceiptsController extends BaseController {
|
|||||||
.toInt(),
|
.toInt(),
|
||||||
check('receipt_message').optional().trim().escape(),
|
check('receipt_message').optional().trim().escape(),
|
||||||
check('statement').optional().trim().escape(),
|
check('statement').optional().trim().escape(),
|
||||||
check('attachments').isArray().optional(),
|
|
||||||
check('attachments.*.key').exists().isString(),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -155,7 +155,6 @@ export default class UsersController extends BaseController {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const user = await this.usersService.getUser(tenantId, userId);
|
const user = await this.usersService.getUser(tenantId, userId);
|
||||||
|
|
||||||
return res.status(200).send({ user });
|
return res.status(200).send({ user });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
next(error);
|
next(error);
|
||||||
@@ -230,7 +229,7 @@ export default class UsersController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
private catchServiceErrors(
|
catchServiceErrors(
|
||||||
error: Error,
|
error: Error,
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ export class WarehousesController extends BaseController {
|
|||||||
*
|
*
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
public router() {
|
router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
|
|||||||
@@ -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 { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
|
||||||
|
import { Request, Response } from 'express';
|
||||||
|
import { Inject, Service } from 'typedi';
|
||||||
import BaseController from '../BaseController';
|
import BaseController from '../BaseController';
|
||||||
import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
|
import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
|
||||||
import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
|
import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
|
||||||
@@ -33,21 +34,14 @@ export class Webhooks extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @returns {Response}
|
* @returns {Response}
|
||||||
*/
|
*/
|
||||||
public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
|
public async lemonWebhooks(req: Request, res: Response) {
|
||||||
const data = req.body;
|
const data = req.body;
|
||||||
const signature = req.headers['x-signature'] ?? '';
|
const signature = req.headers['x-signature'] ?? '';
|
||||||
const rawBody = req.rawBody;
|
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
|
* @param {Response} res
|
||||||
* @returns {Response}
|
* @returns {Response}
|
||||||
*/
|
*/
|
||||||
public async plaidWebhooks(req: Request, res: Response, next: NextFunction) {
|
public async plaidWebhooks(req: Request, res: Response) {
|
||||||
const { tenantId } = req;
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 });
|
|
||||||
}
|
|
||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -61,8 +61,6 @@ import { TaxRatesController } from './controllers/TaxRates/TaxRates';
|
|||||||
import { ImportController } from './controllers/Import/ImportController';
|
import { ImportController } from './controllers/Import/ImportController';
|
||||||
import { BankingController } from './controllers/Banking/BankingController';
|
import { BankingController } from './controllers/Banking/BankingController';
|
||||||
import { Webhooks } from './controllers/Webhooks/Webhooks';
|
import { Webhooks } from './controllers/Webhooks/Webhooks';
|
||||||
import { ExportController } from './controllers/Export/ExportController';
|
|
||||||
import { AttachmentsController } from './controllers/Attachments/AttachmentsController';
|
|
||||||
|
|
||||||
export default () => {
|
export default () => {
|
||||||
const app = Router();
|
const app = Router();
|
||||||
@@ -143,8 +141,6 @@ export default () => {
|
|||||||
dashboard.use('/projects', Container.get(ProjectsController).router());
|
dashboard.use('/projects', Container.get(ProjectsController).router());
|
||||||
dashboard.use('/tax-rates', Container.get(TaxRatesController).router());
|
dashboard.use('/tax-rates', Container.get(TaxRatesController).router());
|
||||||
dashboard.use('/import', Container.get(ImportController).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(ProjectTasksController).router());
|
||||||
dashboard.use('/', Container.get(ProjectTimesController).router());
|
dashboard.use('/', Container.get(ProjectTimesController).router());
|
||||||
|
|||||||
@@ -10,14 +10,8 @@ import {
|
|||||||
DataError,
|
DataError,
|
||||||
} from 'objection';
|
} 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,
|
err: Error,
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
@@ -114,7 +108,6 @@ export function ObjectionErrorException(
|
|||||||
type: 'UnknownDatabaseError',
|
type: 'UnknownDatabaseError',
|
||||||
data: {},
|
data: {},
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
next(err);
|
|
||||||
}
|
}
|
||||||
|
next(err);
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,6 @@ import color from 'colorette';
|
|||||||
import argv from 'getopts';
|
import argv from 'getopts';
|
||||||
import Knex from 'knex';
|
import Knex from 'knex';
|
||||||
import { knexSnakeCaseMappers } from 'objection';
|
import { knexSnakeCaseMappers } from 'objection';
|
||||||
import { PromisePool } from '@supercharge/promise-pool';
|
|
||||||
import '../before';
|
import '../before';
|
||||||
import config from '../config';
|
import config from '../config';
|
||||||
|
|
||||||
@@ -29,7 +28,7 @@ function initSystemKnex() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function initTenantKnex(organizationId: string = '') {
|
function initTenantKnex(organizationId) {
|
||||||
return Knex({
|
return Knex({
|
||||||
client: config.tenant.db_client,
|
client: config.tenant.db_client,
|
||||||
connection: {
|
connection: {
|
||||||
@@ -72,12 +71,6 @@ function getAllSystemTenants(knex) {
|
|||||||
return knex('tenants');
|
return knex('tenants');
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAllInitializedTenants(knex) {
|
|
||||||
return knex('tenants').whereNotNull('initializedAt');
|
|
||||||
}
|
|
||||||
|
|
||||||
const MIGRATION_CONCURRENCY = 10;
|
|
||||||
|
|
||||||
// module.exports = {
|
// module.exports = {
|
||||||
// log,
|
// log,
|
||||||
// success,
|
// success,
|
||||||
@@ -94,7 +87,6 @@ const MIGRATION_CONCURRENCY = 10;
|
|||||||
// - bigcapital tenants:migrate:make
|
// - bigcapital tenants:migrate:make
|
||||||
// - bigcapital system:migrate:make
|
// - bigcapital system:migrate:make
|
||||||
// - bigcapital tenants:list
|
// - bigcapital tenants:list
|
||||||
// - bigcapital tenants:list --all
|
|
||||||
|
|
||||||
commander
|
commander
|
||||||
.command('system:migrate:rollback')
|
.command('system:migrate:rollback')
|
||||||
@@ -153,13 +145,10 @@ commander
|
|||||||
commander
|
commander
|
||||||
.command('tenants:list')
|
.command('tenants:list')
|
||||||
.description('Retrieve a list of all system tenants databases.')
|
.description('Retrieve a list of all system tenants databases.')
|
||||||
.option('-a, --all', 'All tenants even are not initialized.')
|
|
||||||
.action(async (cmd) => {
|
.action(async (cmd) => {
|
||||||
try {
|
try {
|
||||||
const sysKnex = await initSystemKnex();
|
const sysKnex = await initSystemKnex();
|
||||||
const tenants = cmd?.all
|
const tenants = await getAllSystemTenants(sysKnex);
|
||||||
? await getAllSystemTenants(sysKnex)
|
|
||||||
: await getAllInitializedTenants(sysKnex);
|
|
||||||
|
|
||||||
tenants.forEach((tenant) => {
|
tenants.forEach((tenant) => {
|
||||||
const dbName = `${config.tenant.db_name_prefix}${tenant.organizationId}`;
|
const dbName = `${config.tenant.db_name_prefix}${tenant.organizationId}`;
|
||||||
@@ -190,20 +179,18 @@ commander
|
|||||||
commander
|
commander
|
||||||
.command('tenants:migrate:latest')
|
.command('tenants:migrate:latest')
|
||||||
.description('Migrate all tenants or the given tenant id.')
|
.description('Migrate all tenants or the given tenant id.')
|
||||||
.option(
|
.option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
|
||||||
'-t, --tenant_id [tenant_id]',
|
|
||||||
'Which organization id do you migrate.'
|
|
||||||
)
|
|
||||||
.action(async (cmd) => {
|
.action(async (cmd) => {
|
||||||
try {
|
try {
|
||||||
const sysKnex = await initSystemKnex();
|
const sysKnex = await initSystemKnex();
|
||||||
const tenants = await getAllInitializedTenants(sysKnex);
|
const tenants = await getAllSystemTenants(sysKnex);
|
||||||
const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
|
const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
|
||||||
|
|
||||||
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
|
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
|
||||||
exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
|
exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
|
||||||
}
|
}
|
||||||
// Validate the tenant id exist first of all.
|
// Validate the tenant id exist first of all.
|
||||||
|
const migrateOpers = [];
|
||||||
const migrateTenant = async (organizationId) => {
|
const migrateTenant = async (organizationId) => {
|
||||||
try {
|
try {
|
||||||
const tenantKnex = await initTenantKnex(organizationId);
|
const tenantKnex = await initTenantKnex(organizationId);
|
||||||
@@ -225,17 +212,18 @@ commander
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
if (!cmd.tenant_id) {
|
if (!cmd.tenant_id) {
|
||||||
await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
|
tenants.forEach((tenant) => {
|
||||||
.for(tenants)
|
const oper = migrateTenant(tenant.organizationId);
|
||||||
.process((tenant, index, pool) => {
|
migrateOpers.push(oper);
|
||||||
return migrateTenant(tenant.organizationId);
|
});
|
||||||
})
|
|
||||||
.then(() => {
|
|
||||||
success('All tenants are migrated.');
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
await migrateTenant(cmd.tenant_id);
|
const oper = migrateTenant(cmd.tenant_id);
|
||||||
|
migrateOpers.push(oper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Promise.all(migrateOpers).then(() => {
|
||||||
|
success('All tenants are migrated.');
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
exit(error);
|
exit(error);
|
||||||
}
|
}
|
||||||
@@ -244,21 +232,19 @@ commander
|
|||||||
commander
|
commander
|
||||||
.command('tenants:migrate:rollback')
|
.command('tenants:migrate:rollback')
|
||||||
.description('Rollback the last batch of tenants migrations.')
|
.description('Rollback the last batch of tenants migrations.')
|
||||||
.option(
|
.option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
|
||||||
'-t, --tenant_id [tenant_id]',
|
|
||||||
'Which organization id do you migrate.'
|
|
||||||
)
|
|
||||||
.action(async (cmd) => {
|
.action(async (cmd) => {
|
||||||
try {
|
try {
|
||||||
const sysKnex = await initSystemKnex();
|
const sysKnex = await initSystemKnex();
|
||||||
const tenants = await getAllInitializedTenants(sysKnex);
|
const tenants = await getAllSystemTenants(sysKnex);
|
||||||
const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
|
const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
|
||||||
|
|
||||||
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
|
if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
|
||||||
exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
|
exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const migrateTenant = async (organizationId: string) => {
|
const migrateOpers = [];
|
||||||
|
const migrateTenant = async (organizationId) => {
|
||||||
try {
|
try {
|
||||||
const tenantKnex = await initTenantKnex(organizationId);
|
const tenantKnex = await initTenantKnex(organizationId);
|
||||||
const [batchNo, _log] = await tenantKnex.migrate.rollback();
|
const [batchNo, _log] = await tenantKnex.migrate.rollback();
|
||||||
@@ -279,18 +265,19 @@ commander
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (!cmd.tenant_id) {
|
if (!cmd.tenant_id) {
|
||||||
await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
|
tenants.forEach((tenant) => {
|
||||||
.for(tenants)
|
const oper = migrateTenant(tenant.organizationId);
|
||||||
.process((tenant, index, pool) => {
|
migrateOpers.push(oper);
|
||||||
return migrateTenant(tenant.organizationId);
|
});
|
||||||
})
|
|
||||||
.then(() => {
|
|
||||||
success('All tenants are rollbacked.');
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
await migrateTenant(cmd.tenant_id);
|
const oper = migrateTenant(cmd.tenant_id);
|
||||||
|
migrateOpers.push(oper);
|
||||||
}
|
}
|
||||||
|
Promise.all(migrateOpers).then(() => {
|
||||||
|
success('All tenants are rollbacked.');
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
exit(error);
|
exit(error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ module.exports = {
|
|||||||
mail: {
|
mail: {
|
||||||
host: process.env.MAIL_HOST,
|
host: process.env.MAIL_HOST,
|
||||||
port: process.env.MAIL_PORT,
|
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,
|
username: process.env.MAIL_USERNAME,
|
||||||
password: process.env.MAIL_PASSWORD,
|
password: process.env.MAIL_PASSWORD,
|
||||||
from: process.env.MAIL_FROM_ADDRESS,
|
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.
|
* Puppeteer remote browserless connection.
|
||||||
*/
|
*/
|
||||||
@@ -204,7 +194,10 @@ module.exports = {
|
|||||||
plaid: {
|
plaid: {
|
||||||
env: process.env.PLAID_ENV || 'sandbox',
|
env: process.env.PLAID_ENV || 'sandbox',
|
||||||
clientId: process.env.PLAID_CLIENT_ID,
|
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,
|
linkWebhook: process.env.PLAID_LINK_WEBHOOK,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -215,7 +208,6 @@ module.exports = {
|
|||||||
key: process.env.LEMONSQUEEZY_API_KEY,
|
key: process.env.LEMONSQUEEZY_API_KEY,
|
||||||
storeId: process.env.LEMONSQUEEZY_STORE_ID,
|
storeId: process.env.LEMONSQUEEZY_STORE_ID,
|
||||||
webhookSecret: process.env.LEMONSQUEEZY_WEBHOOK_SECRET,
|
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),
|
defaultTo(process.env.HOSTED_ON_BIGCAPITAL_CLOUD, false),
|
||||||
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',
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,16 +1,7 @@
|
|||||||
export const CashflowTransactionTypes = {
|
|
||||||
OtherIncome: 'Other income',
|
|
||||||
OtherExpense: 'Other expense',
|
|
||||||
OwnerDrawing: 'Owner drawing',
|
|
||||||
OwnerContribution: 'Owner contribution',
|
|
||||||
TransferToAccount: 'Transfer to account',
|
|
||||||
TransferFromAccount: 'Transfer from account',
|
|
||||||
};
|
|
||||||
|
|
||||||
export const TransactionTypes = {
|
export const TransactionTypes = {
|
||||||
SaleInvoice: 'Sale invoice',
|
SaleInvoice: 'Sale invoice',
|
||||||
SaleReceipt: 'Sale receipt',
|
SaleReceipt: 'Sale receipt',
|
||||||
PaymentReceive: 'Payment received',
|
PaymentReceive: 'Payment receive',
|
||||||
Bill: 'Bill',
|
Bill: 'Bill',
|
||||||
BillPayment: 'Payment made',
|
BillPayment: 'Payment made',
|
||||||
VendorOpeningBalance: 'Vendor opening balance',
|
VendorOpeningBalance: 'Vendor opening balance',
|
||||||
@@ -26,10 +17,12 @@ export const TransactionTypes = {
|
|||||||
OtherExpense: 'Other expense',
|
OtherExpense: 'Other expense',
|
||||||
OwnerDrawing: 'Owner drawing',
|
OwnerDrawing: 'Owner drawing',
|
||||||
InvoiceWriteOff: 'Invoice write-off',
|
InvoiceWriteOff: 'Invoice write-off',
|
||||||
|
|
||||||
CreditNote: 'transaction_type.credit_note',
|
CreditNote: 'transaction_type.credit_note',
|
||||||
VendorCredit: 'transaction_type.vendor_credit',
|
VendorCredit: 'transaction_type.vendor_credit',
|
||||||
|
|
||||||
RefundCreditNote: 'transaction_type.refund_credit_note',
|
RefundCreditNote: 'transaction_type.refund_credit_note',
|
||||||
RefundVendorCredit: 'transaction_type.refund_vendor_credit',
|
RefundVendorCredit: 'transaction_type.refund_vendor_credit',
|
||||||
|
|
||||||
LandedCost: 'transaction_type.landed_cost',
|
LandedCost: 'transaction_type.landed_cost',
|
||||||
CashflowTransaction: CashflowTransactionTypes,
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.dropTableIfExists('storage');
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {};
|
|
||||||
@@ -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');
|
|
||||||
};
|
|
||||||
@@ -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');
|
|
||||||
};
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema
|
|
||||||
.createTable('bank_rules', (table) => {
|
|
||||||
table.increments('id').primary();
|
|
||||||
table.string('name');
|
|
||||||
table.integer('order').unsigned();
|
|
||||||
|
|
||||||
table
|
|
||||||
.integer('apply_if_account_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('accounts');
|
|
||||||
table.string('apply_if_transaction_type');
|
|
||||||
|
|
||||||
table.string('assign_category');
|
|
||||||
table
|
|
||||||
.integer('assign_account_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('accounts');
|
|
||||||
table.string('assign_payee');
|
|
||||||
table.string('assign_memo');
|
|
||||||
|
|
||||||
table.string('conditions_type');
|
|
||||||
|
|
||||||
table.timestamps();
|
|
||||||
})
|
|
||||||
.createTable('bank_rule_conditions', (table) => {
|
|
||||||
table.increments('id').primary();
|
|
||||||
table
|
|
||||||
.integer('rule_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('bank_rules');
|
|
||||||
table.string('field');
|
|
||||||
table.string('comparator');
|
|
||||||
table.string('value');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex.schema
|
|
||||||
.dropTableIfExists('bank_rules')
|
|
||||||
.dropTableIfExists('bank_rule_conditions');
|
|
||||||
};
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.createTable('recognized_bank_transactions', (table) => {
|
|
||||||
table.increments('id');
|
|
||||||
table
|
|
||||||
.integer('uncategorized_transaction_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('uncategorized_cashflow_transactions')
|
|
||||||
.withKeyName('recognizedBankTransactionsUncategorizedTransIdForeign');
|
|
||||||
table
|
|
||||||
.integer('bank_rule_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('bank_rules');
|
|
||||||
|
|
||||||
table.string('assigned_category');
|
|
||||||
table
|
|
||||||
.integer('assigned_account_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('accounts');
|
|
||||||
table.string('assigned_payee');
|
|
||||||
table.string('assigned_memo');
|
|
||||||
|
|
||||||
table.timestamps();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex.schema.dropTableIfExists('recognized_bank_transactions');
|
|
||||||
};
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
|
|
||||||
table
|
|
||||||
.integer('recognized_transaction_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('recognized_bank_transactions')
|
|
||||||
.withKeyName('uncategorizedCashflowTransRecognizedTranIdForeign');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
|
|
||||||
table.dropColumn('recognized_transaction_id');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.createTable('matched_bank_transactions', (table) => {
|
|
||||||
table.increments('id');
|
|
||||||
table
|
|
||||||
.integer('uncategorized_transaction_id')
|
|
||||||
.unsigned()
|
|
||||||
.references('id')
|
|
||||||
.inTable('uncategorized_cashflow_transactions');
|
|
||||||
table.string('reference_type');
|
|
||||||
table.integer('reference_id').unsigned();
|
|
||||||
table.decimal('amount');
|
|
||||||
table.timestamps();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex.schema.dropTableIfExists('matched_bank_transactions');
|
|
||||||
};
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
|
|
||||||
table.datetime('excluded_at');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
|
|
||||||
table.dropColumn('excluded_at');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
|
|
||||||
table.string('batch');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
|
|
||||||
table.dropColumn('batch');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex.schema.table('settings', (table) => {
|
|
||||||
table.text('value').alter();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = (knex) => {
|
|
||||||
return knex.schema.table('settings', (table) => {
|
|
||||||
table.string('value').alter();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
exports.up = function (knex) {
|
|
||||||
return knex('accounts_transactions')
|
|
||||||
.whereIn('referenceType', [
|
|
||||||
'OtherIncome',
|
|
||||||
'OtherExpense',
|
|
||||||
'OwnerDrawing',
|
|
||||||
'OwnerContribution',
|
|
||||||
'TransferToAccount',
|
|
||||||
'TransferFromAccount',
|
|
||||||
])
|
|
||||||
.update({
|
|
||||||
transactionType: knex.raw(`
|
|
||||||
CASE
|
|
||||||
WHEN REFERENCE_TYPE = 'OtherIncome' THEN 'OtherIncome'
|
|
||||||
WHEN REFERENCE_TYPE = 'OtherExpense' THEN 'OtherExpense'
|
|
||||||
WHEN REFERENCE_TYPE = 'OwnerDrawing' THEN 'OwnerDrawing'
|
|
||||||
WHEN REFERENCE_TYPE = 'OwnerContribution' THEN 'OwnerContribution'
|
|
||||||
WHEN REFERENCE_TYPE = 'TransferToAccount' THEN 'TransferToAccount'
|
|
||||||
WHEN REFERENCE_TYPE = 'TransferFromAccount' THEN 'TransferFromAccount'
|
|
||||||
END
|
|
||||||
`),
|
|
||||||
referenceType: knex.raw(`
|
|
||||||
CASE
|
|
||||||
WHEN REFERENCE_TYPE IN ('OtherIncome', 'OtherExpense', 'OwnerDrawing', 'OwnerContribution', 'TransferToAccount', 'TransferFromAccount') THEN 'CashflowTransaction'
|
|
||||||
ELSE REFERENCE_TYPE
|
|
||||||
END
|
|
||||||
`),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.down = function (knex) {
|
|
||||||
return knex('accounts_transactions')
|
|
||||||
.whereIn('transactionType', [
|
|
||||||
'OtherIncome',
|
|
||||||
'OtherExpense',
|
|
||||||
'OwnerDrawing',
|
|
||||||
'OwnerContribution',
|
|
||||||
'TransferToAccount',
|
|
||||||
'TransferFromAccount',
|
|
||||||
])
|
|
||||||
.update({
|
|
||||||
referenceType: knex.raw(`
|
|
||||||
CASE
|
|
||||||
WHEN TRANSACTION_TYPE = 'OtherIncome' THEN 'OtherIncome'
|
|
||||||
WHEN TRANSACTION_TYPE = 'OtherExpense' THEN 'OtherExpense'
|
|
||||||
WHEN TRANSACTION_TYPE = 'OwnerDrawing' THEN 'OwnerDrawing'
|
|
||||||
WHEN TRANSACTION_TYPE = 'OwnerContribution' THEN 'OwnerContribution'
|
|
||||||
WHEN TRANSACTION_TYPE = 'TransferToAccount' THEN 'TransferToAccount'
|
|
||||||
WHEN TRANSACTION_TYPE = 'TransferFromAccount' THEN 'TransferFromAccount'
|
|
||||||
ELSE REFERENCE_TYPE
|
|
||||||
END
|
|
||||||
`),
|
|
||||||
transactionType: knex.raw(`
|
|
||||||
CASE
|
|
||||||
WHEN TRANSACTION_TYPE IN ('OtherIncome', 'OtherExpense', 'OwnerDrawing', 'OwnerContribution', 'TransferToAccount', 'TransferFromAccount') THEN NULL
|
|
||||||
ELSE TRANSACTION_TYPE
|
|
||||||
END
|
|
||||||
`),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -66,9 +66,7 @@ export interface IAccountTransaction {
|
|||||||
referenceId: number;
|
referenceId: number;
|
||||||
|
|
||||||
referenceNumber?: string;
|
referenceNumber?: string;
|
||||||
|
|
||||||
transactionNumber?: string;
|
transactionNumber?: string;
|
||||||
transactionType?: string;
|
|
||||||
|
|
||||||
note?: string;
|
note?: string;
|
||||||
|
|
||||||
@@ -166,7 +164,3 @@ export enum TaxRateAction {
|
|||||||
DELETE = 'Delete',
|
DELETE = 'Delete',
|
||||||
VIEW = 'View',
|
VIEW = 'View',
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CreateAccountParams {
|
|
||||||
ignoreUniqueName: boolean;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
export interface AttachmentLinkDTO {
|
|
||||||
key: string;
|
|
||||||
}
|
|
||||||
@@ -66,27 +66,16 @@ export interface IAuthResetedPasswordEventPayload {
|
|||||||
password: string;
|
password: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export interface IAuthSendingResetPassword {
|
export interface IAuthSendingResetPassword {
|
||||||
user: ISystemUser;
|
user: ISystemUser,
|
||||||
token: string;
|
token: string;
|
||||||
}
|
}
|
||||||
export interface IAuthSendedResetPassword {
|
export interface IAuthSendedResetPassword {
|
||||||
user: ISystemUser;
|
user: ISystemUser,
|
||||||
token: string;
|
token: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IAuthGetMetaPOJO {
|
export interface IAuthGetMetaPOJO {
|
||||||
signupDisabled: boolean;
|
signupDisabled: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IAuthSignUpVerifingEventPayload {
|
|
||||||
email: string;
|
|
||||||
verifyToken: string;
|
|
||||||
userId: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IAuthSignUpVerifiedEventPayload {
|
|
||||||
email: string;
|
|
||||||
verifyToken: string;
|
|
||||||
userId: number;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { Knex } from 'knex';
|
|||||||
import { IDynamicListFilterDTO } from './DynamicFilter';
|
import { IDynamicListFilterDTO } from './DynamicFilter';
|
||||||
import { IItemEntry, IItemEntryDTO } from './ItemEntry';
|
import { IItemEntry, IItemEntryDTO } from './ItemEntry';
|
||||||
import { IBillLandedCost } from './LandedCost';
|
import { IBillLandedCost } from './LandedCost';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface IBillDTO {
|
export interface IBillDTO {
|
||||||
vendorId: number;
|
vendorId: number;
|
||||||
@@ -21,7 +20,6 @@ export interface IBillDTO {
|
|||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
projectId?: number;
|
projectId?: number;
|
||||||
isInclusiveTax?: boolean;
|
isInclusiveTax?: boolean;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IBillEditDTO {
|
export interface IBillEditDTO {
|
||||||
@@ -40,7 +38,6 @@ export interface IBillEditDTO {
|
|||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
projectId?: number;
|
projectId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IBill {
|
export interface IBill {
|
||||||
@@ -108,7 +105,6 @@ export interface IBillsService {
|
|||||||
export interface IBillCreatedPayload {
|
export interface IBillCreatedPayload {
|
||||||
tenantId: number;
|
tenantId: number;
|
||||||
bill: IBill;
|
bill: IBill;
|
||||||
billDTO: IBillDTO;
|
|
||||||
billId: number;
|
billId: number;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
@@ -130,7 +126,6 @@ export interface IBillEditedPayload {
|
|||||||
billId: number;
|
billId: number;
|
||||||
oldBill: IBill;
|
oldBill: IBill;
|
||||||
bill: IBill;
|
bill: IBill;
|
||||||
billDTO: IBillDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { Knex } from 'knex';
|
import { Knex } from 'knex';
|
||||||
import { IBill } from './Bill';
|
import { IBill } from './Bill';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface IBillPaymentEntry {
|
export interface IBillPaymentEntry {
|
||||||
id?: number;
|
id?: number;
|
||||||
@@ -46,7 +45,6 @@ export interface IBillPaymentDTO {
|
|||||||
reference: string;
|
reference: string;
|
||||||
entries: IBillPaymentEntryDTO[];
|
entries: IBillPaymentEntryDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IBillReceivePageEntry {
|
export interface IBillReceivePageEntry {
|
||||||
@@ -68,7 +66,6 @@ export interface IBillPaymentsService {
|
|||||||
export interface IBillPaymentEventCreatedPayload {
|
export interface IBillPaymentEventCreatedPayload {
|
||||||
tenantId: number;
|
tenantId: number;
|
||||||
billPayment: IBillPayment;
|
billPayment: IBillPayment;
|
||||||
billPaymentDTO: IBillPaymentDTO;
|
|
||||||
billPaymentId: number;
|
billPaymentId: number;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
@@ -90,7 +87,6 @@ export interface IBillPaymentEventEditedPayload {
|
|||||||
billPaymentId: number;
|
billPaymentId: number;
|
||||||
billPayment: IBillPayment;
|
billPayment: IBillPayment;
|
||||||
oldBillPayment: IBillPayment;
|
oldBillPayment: IBillPayment;
|
||||||
billPaymentDTO: IBillPaymentDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -267,5 +267,4 @@ export interface CreateUncategorizedTransactionDTO {
|
|||||||
description?: string;
|
description?: string;
|
||||||
referenceNo?: string | null;
|
referenceNo?: string | null;
|
||||||
plaidTransactionId?: string | null;
|
plaidTransactionId?: string | null;
|
||||||
batch?: string;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,9 +130,8 @@ export interface ICommandCashflowDeletedPayload {
|
|||||||
|
|
||||||
export interface ICashflowTransactionCategorizedPayload {
|
export interface ICashflowTransactionCategorizedPayload {
|
||||||
tenantId: number;
|
tenantId: number;
|
||||||
uncategorizedTransaction: any;
|
cashflowTransactionId: number;
|
||||||
cashflowTransaction: ICashflowTransaction;
|
cashflowTransaction: ICashflowTransaction;
|
||||||
categorizeDTO: any;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
export interface ICashflowTransactionUncategorizingPayload {
|
export interface ICashflowTransactionUncategorizingPayload {
|
||||||
@@ -165,10 +164,3 @@ export interface IGetUncategorizedTransactionsQuery {
|
|||||||
page?: number;
|
page?: number;
|
||||||
pageSize?: number;
|
pageSize?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export interface IGetRecognizedTransactionsQuery {
|
|
||||||
page?: number;
|
|
||||||
pageSize?: number;
|
|
||||||
accountId?: number;
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Knex } from 'knex';
|
import { Knex } from 'knex';
|
||||||
import { IDynamicListFilter, IItemEntry, IVendorCredit } from '@/interfaces';
|
import { IDynamicListFilter, IItemEntry, IVendorCredit } from '@/interfaces';
|
||||||
import { ILedgerEntry } from './Ledger';
|
import { ILedgerEntry } from './Ledger';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface ICreditNoteEntryNewDTO {
|
export interface ICreditNoteEntryNewDTO {
|
||||||
index: number;
|
index: number;
|
||||||
@@ -22,7 +21,6 @@ export interface ICreditNoteNewDTO {
|
|||||||
entries: ICreditNoteEntryNewDTO[];
|
entries: ICreditNoteEntryNewDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
attachments?: AttachmentLinkDTO[]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ICreditNoteEditDTO {
|
export interface ICreditNoteEditDTO {
|
||||||
@@ -35,7 +33,6 @@ export interface ICreditNoteEditDTO {
|
|||||||
entries: ICreditNoteEntryNewDTO[];
|
entries: ICreditNoteEntryNewDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
attachments?: AttachmentLinkDTO[]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ICreditNoteEntry extends IItemEntry {}
|
export interface ICreditNoteEntry extends IItemEntry {}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { Knex } from 'knex';
|
|||||||
import { ISystemUser } from './User';
|
import { ISystemUser } from './User';
|
||||||
import { IFilterRole } from './DynamicFilter';
|
import { IFilterRole } from './DynamicFilter';
|
||||||
import { IAccount } from './Account';
|
import { IAccount } from './Account';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface IPaginationMeta {
|
export interface IPaginationMeta {
|
||||||
total: number;
|
total: number;
|
||||||
@@ -82,7 +81,6 @@ export interface IExpenseCommonDTO {
|
|||||||
categories: IExpenseCategoryDTO[];
|
categories: IExpenseCategoryDTO[];
|
||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IExpenseCreateDTO extends IExpenseCommonDTO {}
|
export interface IExpenseCreateDTO extends IExpenseCommonDTO {}
|
||||||
@@ -154,7 +152,6 @@ export interface IExpenseCreatedPayload {
|
|||||||
expenseId: number;
|
expenseId: number;
|
||||||
authorizedUser: ISystemUser;
|
authorizedUser: ISystemUser;
|
||||||
expense: IExpense;
|
expense: IExpense;
|
||||||
expenseDTO: IExpenseCreateDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,9 +29,4 @@ export interface ICashflowAccountTransaction {
|
|||||||
|
|
||||||
date: Date;
|
date: Date;
|
||||||
formattedDate: string;
|
formattedDate: string;
|
||||||
|
|
||||||
status: string;
|
|
||||||
formattedStatus: string;
|
|
||||||
|
|
||||||
uncategorizedTransactionId: number;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,8 +56,6 @@ export interface IGeneralLedgerSheetAccount {
|
|||||||
transactions: IGeneralLedgerSheetAccountTransaction[];
|
transactions: IGeneralLedgerSheetAccountTransaction[];
|
||||||
openingBalance: IGeneralLedgerSheetAccountBalance;
|
openingBalance: IGeneralLedgerSheetAccountBalance;
|
||||||
closingBalance: IGeneralLedgerSheetAccountBalance;
|
closingBalance: IGeneralLedgerSheetAccountBalance;
|
||||||
closingBalanceSubaccounts?: IGeneralLedgerSheetAccountBalance;
|
|
||||||
children?: IGeneralLedgerSheetAccount[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export type IGeneralLedgerSheetData = IGeneralLedgerSheetAccount[];
|
export type IGeneralLedgerSheetData = IGeneralLedgerSheetAccount[];
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
import { ImportFilePreviewPOJO } from "@/services/Import/interfaces";
|
|
||||||
|
|
||||||
|
|
||||||
export interface IImportFileCommitedEventPayload {
|
|
||||||
tenantId: number;
|
|
||||||
importId: number;
|
|
||||||
meta: ImportFilePreviewPOJO;
|
|
||||||
}
|
|
||||||
@@ -40,8 +40,6 @@ export interface ILedgerEntry {
|
|||||||
date: Date | string;
|
date: Date | string;
|
||||||
|
|
||||||
transactionType: string;
|
transactionType: string;
|
||||||
transactionSubType: string;
|
|
||||||
|
|
||||||
transactionId: number;
|
transactionId: number;
|
||||||
|
|
||||||
transactionNumber?: string;
|
transactionNumber?: string;
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { Knex } from 'knex';
|
|||||||
import { IDynamicListFilterDTO } from './DynamicFilter';
|
import { IDynamicListFilterDTO } from './DynamicFilter';
|
||||||
import { ISystemUser } from './User';
|
import { ISystemUser } from './User';
|
||||||
import { IAccount } from './Account';
|
import { IAccount } from './Account';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface IManualJournal {
|
export interface IManualJournal {
|
||||||
id?: number;
|
id?: number;
|
||||||
@@ -57,7 +56,6 @@ export interface IManualJournalDTO {
|
|||||||
publish?: boolean;
|
publish?: boolean;
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
entries: IManualJournalEntryDTO[];
|
entries: IManualJournalEntryDTO[];
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IManualJournalsFilter extends IDynamicListFilterDTO {
|
export interface IManualJournalsFilter extends IDynamicListFilterDTO {
|
||||||
@@ -144,7 +142,6 @@ export interface IManualJournalEventEditedPayload {
|
|||||||
tenantId: number;
|
tenantId: number;
|
||||||
manualJournal: IManualJournal;
|
manualJournal: IManualJournal;
|
||||||
oldManualJournal: IManualJournal;
|
oldManualJournal: IManualJournal;
|
||||||
manualJournalDTO: IManualJournalDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
export interface IManualJournalEditingPayload {
|
export interface IManualJournalEditingPayload {
|
||||||
@@ -164,7 +161,6 @@ export interface IManualJournalEventCreatedPayload {
|
|||||||
tenantId: number;
|
tenantId: number;
|
||||||
manualJournal: IManualJournal;
|
manualJournal: IManualJournal;
|
||||||
manualJournalId: number;
|
manualJournalId: number;
|
||||||
manualJournalDTO: IManualJournalDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,26 +122,17 @@ export type IModelMetaCollectionField = IModelMetaCollectionFieldCommon &
|
|||||||
export type IModelMetaRelationField = IModelMetaRelationFieldCommon &
|
export type IModelMetaRelationField = IModelMetaRelationFieldCommon &
|
||||||
IModelMetaRelationEnumerationField;
|
IModelMetaRelationEnumerationField;
|
||||||
|
|
||||||
interface IModelPrintMeta{
|
|
||||||
pageTitle: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IModelMeta {
|
export interface IModelMeta {
|
||||||
defaultFilterField: string;
|
defaultFilterField: string;
|
||||||
defaultSort: IModelMetaDefaultSort;
|
defaultSort: IModelMetaDefaultSort;
|
||||||
|
|
||||||
exportable?: boolean;
|
|
||||||
exportFlattenOn?: string;
|
|
||||||
|
|
||||||
importable?: boolean;
|
importable?: boolean;
|
||||||
|
|
||||||
importAggregator?: string;
|
importAggregator?: string;
|
||||||
importAggregateOn?: string;
|
importAggregateOn?: string;
|
||||||
importAggregateBy?: string;
|
importAggregateBy?: string;
|
||||||
|
|
||||||
print?: IModelPrintMeta;
|
|
||||||
|
|
||||||
fields: { [key: string]: IModelMetaField };
|
fields: { [key: string]: IModelMetaField };
|
||||||
columns: { [key: string]: IModelMetaColumn };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----
|
// ----
|
||||||
@@ -170,22 +161,3 @@ export type IModelMetaField2 = IModelMetaFieldCommon2 &
|
|||||||
| IModelMetaRelationField2
|
| IModelMetaRelationField2
|
||||||
| IModelMetaCollectionField
|
| 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);
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import {
|
|||||||
} from '@/interfaces';
|
} from '@/interfaces';
|
||||||
import { ILedgerEntry } from './Ledger';
|
import { ILedgerEntry } from './Ledger';
|
||||||
import { ISaleInvoice } from './SaleInvoice';
|
import { ISaleInvoice } from './SaleInvoice';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface IPaymentReceive {
|
export interface IPaymentReceive {
|
||||||
id?: number;
|
id?: number;
|
||||||
@@ -38,7 +37,6 @@ export interface IPaymentReceiveCreateDTO {
|
|||||||
entries: IPaymentReceiveEntryDTO[];
|
entries: IPaymentReceiveEntryDTO[];
|
||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IPaymentReceiveEditDTO {
|
export interface IPaymentReceiveEditDTO {
|
||||||
@@ -52,7 +50,6 @@ export interface IPaymentReceiveEditDTO {
|
|||||||
statement: string;
|
statement: string;
|
||||||
entries: IPaymentReceiveEntryDTO[];
|
entries: IPaymentReceiveEntryDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IPaymentReceiveEntry {
|
export interface IPaymentReceiveEntry {
|
||||||
@@ -117,7 +114,6 @@ export interface IPaymentReceiveCreatedPayload {
|
|||||||
paymentReceive: IPaymentReceive;
|
paymentReceive: IPaymentReceive;
|
||||||
paymentReceiveId: number;
|
paymentReceiveId: number;
|
||||||
authorizedUser: ISystemUser;
|
authorizedUser: ISystemUser;
|
||||||
paymentReceiveDTO: IPaymentReceiveCreateDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,7 +122,6 @@ export interface IPaymentReceiveEditedPayload {
|
|||||||
paymentReceiveId: number;
|
paymentReceiveId: number;
|
||||||
paymentReceive: IPaymentReceive;
|
paymentReceive: IPaymentReceive;
|
||||||
oldPaymentReceive: IPaymentReceive;
|
oldPaymentReceive: IPaymentReceive;
|
||||||
paymentReceiveDTO: IPaymentReceiveEditDTO;
|
|
||||||
authorizedUser: ISystemUser;
|
authorizedUser: ISystemUser;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import { Knex } from "knex";
|
|
||||||
|
|
||||||
export interface IPlaidItemCreatedEventPayload {
|
export interface IPlaidItemCreatedEventPayload {
|
||||||
tenantId: number;
|
tenantId: number;
|
||||||
plaidAccessToken: string;
|
plaidAccessToken: string;
|
||||||
@@ -56,10 +54,3 @@ export interface SyncAccountsTransactionsTask {
|
|||||||
plaidAccountId: number;
|
plaidAccountId: number;
|
||||||
plaidTransactions: PlaidTransaction[];
|
plaidTransactions: PlaidTransaction[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IPlaidTransactionsSyncedEventPayload {
|
|
||||||
tenantId: number;
|
|
||||||
plaidAccountId: number;
|
|
||||||
batch: string;
|
|
||||||
trx?: Knex.Transaction
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { Knex } from 'knex';
|
|||||||
import { IItemEntry, IItemEntryDTO } from './ItemEntry';
|
import { IItemEntry, IItemEntryDTO } from './ItemEntry';
|
||||||
import { IDynamicListFilterDTO } from '@/interfaces/DynamicFilter';
|
import { IDynamicListFilterDTO } from '@/interfaces/DynamicFilter';
|
||||||
import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
|
import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface ISaleEstimate {
|
export interface ISaleEstimate {
|
||||||
id?: number;
|
id?: number;
|
||||||
@@ -39,7 +38,6 @@ export interface ISaleEstimateDTO {
|
|||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
|
export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
|
||||||
@@ -72,7 +70,6 @@ export interface ISaleEstimateEditedPayload {
|
|||||||
estimateId: number;
|
estimateId: number;
|
||||||
saleEstimate: ISaleEstimate;
|
saleEstimate: ISaleEstimate;
|
||||||
oldSaleEstimate: ISaleEstimate;
|
oldSaleEstimate: ISaleEstimate;
|
||||||
estimateDTO: ISaleEstimateDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { ISystemUser, IAccount, ITaxTransaction } from '@/interfaces';
|
|||||||
import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
|
import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
|
||||||
import { IDynamicListFilter } from '@/interfaces/DynamicFilter';
|
import { IDynamicListFilter } from '@/interfaces/DynamicFilter';
|
||||||
import { IItemEntry, IItemEntryDTO } from './ItemEntry';
|
import { IItemEntry, IItemEntryDTO } from './ItemEntry';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface ISaleInvoice {
|
export interface ISaleInvoice {
|
||||||
id: number;
|
id: number;
|
||||||
@@ -65,8 +64,6 @@ export interface ISaleInvoiceDTO {
|
|||||||
branchId?: number | null;
|
branchId?: number | null;
|
||||||
|
|
||||||
isInclusiveTax?: boolean;
|
isInclusiveTax?: boolean;
|
||||||
|
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ISaleInvoiceCreateDTO extends ISaleInvoiceDTO {
|
export interface ISaleInvoiceCreateDTO extends ISaleInvoiceDTO {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Knex } from 'knex';
|
import { Knex } from 'knex';
|
||||||
import { IItemEntry } from './ItemEntry';
|
import { IItemEntry } from './ItemEntry';
|
||||||
import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
|
import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export interface ISaleReceipt {
|
export interface ISaleReceipt {
|
||||||
id?: number;
|
id?: number;
|
||||||
@@ -44,7 +43,6 @@ export interface ISaleReceiptDTO {
|
|||||||
closed: boolean;
|
closed: boolean;
|
||||||
entries: any[];
|
entries: any[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ISalesReceiptsService {
|
export interface ISalesReceiptsService {
|
||||||
@@ -87,7 +85,6 @@ export interface ISaleReceiptCreatedPayload {
|
|||||||
tenantId: number;
|
tenantId: number;
|
||||||
saleReceipt: ISaleReceipt;
|
saleReceipt: ISaleReceipt;
|
||||||
saleReceiptId: number;
|
saleReceiptId: number;
|
||||||
saleReceiptDTO: ISaleReceiptDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,7 +93,6 @@ export interface ISaleReceiptEditedPayload {
|
|||||||
oldSaleReceipt: number;
|
oldSaleReceipt: number;
|
||||||
saleReceipt: ISaleReceipt;
|
saleReceipt: ISaleReceipt;
|
||||||
saleReceiptId: number;
|
saleReceiptId: number;
|
||||||
saleReceiptDTO: ISaleReceiptDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ export interface ISystemUser extends Model {
|
|||||||
password: string;
|
password: string;
|
||||||
email: string;
|
email: string;
|
||||||
|
|
||||||
verifyToken: string;
|
|
||||||
verified: boolean;
|
|
||||||
|
|
||||||
roleId: number;
|
roleId: number;
|
||||||
tenantId: number;
|
tenantId: number;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { IDynamicListFilter, IItemEntry, IItemEntryDTO } from '@/interfaces';
|
import { IDynamicListFilter, IItemEntry, IItemEntryDTO } from '@/interfaces';
|
||||||
import { Knex } from 'knex';
|
import { Knex } from 'knex';
|
||||||
import { AttachmentLinkDTO } from './Attachments';
|
|
||||||
|
|
||||||
export enum VendorCreditAction {
|
export enum VendorCreditAction {
|
||||||
Create = 'Create',
|
Create = 'Create',
|
||||||
@@ -62,7 +61,6 @@ export interface IVendorCreditDTO {
|
|||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
attachments?: AttachmentLinkDTO[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IVendorCreditCreateDTO extends IVendorCreditDTO {}
|
export interface IVendorCreditCreateDTO extends IVendorCreditDTO {}
|
||||||
@@ -120,7 +118,6 @@ export interface IVendorCreditEditedPayload {
|
|||||||
oldVendorCredit: IVendorCredit;
|
oldVendorCredit: IVendorCredit;
|
||||||
vendorCredit: IVendorCredit;
|
vendorCredit: IVendorCredit;
|
||||||
vendorCreditId: number;
|
vendorCreditId: number;
|
||||||
vendorCreditDTO: IVendorCreditEditDTO;
|
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,7 +70,10 @@ export class PlaidClientWrapper {
|
|||||||
baseOptions: {
|
baseOptions: {
|
||||||
headers: {
|
headers: {
|
||||||
'PLAID-CLIENT-ID': config.plaid.clientId,
|
'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',
|
'Plaid-Version': '2020-09-14',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -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,
|
|
||||||
});
|
|
||||||
@@ -149,19 +149,13 @@ export class Transformer {
|
|||||||
return this.excludeAttributes().length > 0;
|
return this.excludeAttributes().length > 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
private dateFormat = 'YYYY MMM DD';
|
|
||||||
|
|
||||||
setDateFormat(format: string) {
|
|
||||||
this.dateFormat = format;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param date
|
* @param date
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
protected formatDate(date) {
|
protected formatDate(date) {
|
||||||
return date ? moment(date).format(this.dateFormat) : '';
|
return date ? moment(date).format('YYYY/MM/DD') : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -169,8 +163,8 @@ export class Transformer {
|
|||||||
* @param number
|
* @param number
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
protected formatNumber(number, props?) {
|
protected formatNumber(number) {
|
||||||
return formatNumber(number, { money: false, ...props });
|
return formatNumber(number, { money: false });
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -199,7 +193,6 @@ export class Transformer {
|
|||||||
) {
|
) {
|
||||||
transformer.setOptions(options);
|
transformer.setOptions(options);
|
||||||
transformer.setContext(this.context);
|
transformer.setContext(this.context);
|
||||||
transformer.setDateFormat(this.dateFormat);
|
|
||||||
|
|
||||||
return transformer.work(obj);
|
return transformer.work(obj);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,17 +24,6 @@ export class TransformerInjectable {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the given tenatn date format.
|
|
||||||
* @param {number} tenantId
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
async getTenantDateFormat(tenantId: number) {
|
|
||||||
const metadata = await TenantMetadata.query().findOne('tenantId', tenantId);
|
|
||||||
|
|
||||||
return metadata.dateFormat;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Transformes the given transformer after inject the tenant context.
|
* Transformes the given transformer after inject the tenant context.
|
||||||
* @param {number} tenantId
|
* @param {number} tenantId
|
||||||
@@ -52,11 +41,7 @@ export class TransformerInjectable {
|
|||||||
if (!isNull(tenantId)) {
|
if (!isNull(tenantId)) {
|
||||||
const context = await this.getApplicationContext(tenantId);
|
const context = await this.getApplicationContext(tenantId);
|
||||||
transformer.setContext(context);
|
transformer.setContext(context);
|
||||||
|
|
||||||
const dateFormat = await this.getTenantDateFormat(tenantId);
|
|
||||||
transformer.setDateFormat(dateFormat);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
transformer.setOptions(options);
|
transformer.setOptions(options);
|
||||||
|
|
||||||
return transformer.work(object);
|
return transformer.work(object);
|
||||||
|
|||||||
@@ -91,28 +91,7 @@ import { SaleEstimateMarkApprovedOnMailSent } from '@/services/Sales/Estimates/s
|
|||||||
import { DeleteCashflowTransactionOnUncategorize } from '@/services/Cashflow/subscribers/DeleteCashflowTransactionOnUncategorize';
|
import { DeleteCashflowTransactionOnUncategorize } from '@/services/Cashflow/subscribers/DeleteCashflowTransactionOnUncategorize';
|
||||||
import { PreventDeleteTransactionOnDelete } from '@/services/Cashflow/subscribers/PreventDeleteTransactionsOnDelete';
|
import { PreventDeleteTransactionOnDelete } from '@/services/Cashflow/subscribers/PreventDeleteTransactionsOnDelete';
|
||||||
import { SubscribeFreeOnSignupCommunity } from '@/services/Subscription/events/SubscribeFreeOnSignupCommunity';
|
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';
|
|
||||||
import { TriggerRecognizedTransactions } from '@/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions';
|
|
||||||
import { ValidateMatchingOnExpenseDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnExpenseDelete';
|
|
||||||
import { ValidateMatchingOnManualJournalDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnManualJournalDelete';
|
|
||||||
import { ValidateMatchingOnPaymentReceivedDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete';
|
|
||||||
import { ValidateMatchingOnPaymentMadeDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete';
|
|
||||||
import { ValidateMatchingOnCashflowDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnCashflowDelete';
|
|
||||||
import { RecognizeSyncedBankTranasctions } from '@/services/Banking/Plaid/subscribers/RecognizeSyncedBankTransactions';
|
|
||||||
import { UnlinkBankRuleOnDeleteBankRule } from '@/services/Banking/Rules/events/UnlinkBankRuleOnDeleteBankRule';
|
|
||||||
import { DecrementUncategorizedTransactionOnMatching } from '@/services/Banking/Matching/events/DecrementUncategorizedTransactionsOnMatch';
|
|
||||||
import { DecrementUncategorizedTransactionOnExclude } from '@/services/Banking/Exclude/events/DecrementUncategorizedTransactionOnExclude';
|
|
||||||
import { DecrementUncategorizedTransactionOnCategorize } from '@/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize';
|
|
||||||
|
|
||||||
export default () => {
|
export default () => {
|
||||||
return new EventPublisher();
|
return new EventPublisher();
|
||||||
@@ -243,36 +222,6 @@ export const susbcribers = () => {
|
|||||||
DeleteCashflowTransactionOnUncategorize,
|
DeleteCashflowTransactionOnUncategorize,
|
||||||
PreventDeleteTransactionOnDelete,
|
PreventDeleteTransactionOnDelete,
|
||||||
|
|
||||||
SubscribeFreeOnSignupCommunity,
|
SubscribeFreeOnSignupCommunity
|
||||||
SendVerfiyMailOnSignUp,
|
|
||||||
|
|
||||||
// Attachments
|
|
||||||
AttachmentsOnSaleInvoiceCreated,
|
|
||||||
AttachmentsOnSaleEstimates,
|
|
||||||
AttachmentsOnSaleReceipt,
|
|
||||||
AttachmentsOnPaymentsReceived,
|
|
||||||
AttachmentsOnCreditNote,
|
|
||||||
AttachmentsOnVendorCredits,
|
|
||||||
AttachmentsOnBills,
|
|
||||||
AttachmentsOnBillPayments,
|
|
||||||
AttachmentsOnManualJournals,
|
|
||||||
AttachmentsOnExpenses,
|
|
||||||
|
|
||||||
// Bank Rules
|
|
||||||
TriggerRecognizedTransactions,
|
|
||||||
UnlinkBankRuleOnDeleteBankRule,
|
|
||||||
DecrementUncategorizedTransactionOnMatching,
|
|
||||||
DecrementUncategorizedTransactionOnExclude,
|
|
||||||
DecrementUncategorizedTransactionOnCategorize,
|
|
||||||
|
|
||||||
// Validate matching
|
|
||||||
ValidateMatchingOnCashflowDelete,
|
|
||||||
ValidateMatchingOnExpenseDelete,
|
|
||||||
ValidateMatchingOnManualJournalDelete,
|
|
||||||
ValidateMatchingOnPaymentReceivedDelete,
|
|
||||||
ValidateMatchingOnPaymentMadeDelete,
|
|
||||||
|
|
||||||
// Plaid
|
|
||||||
RecognizeSyncedBankTranasctions,
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,9 +17,7 @@ import {
|
|||||||
} from '@/api/middleware/JSONResponseTransformer';
|
} from '@/api/middleware/JSONResponseTransformer';
|
||||||
import config from '@/config';
|
import config from '@/config';
|
||||||
import path from 'path';
|
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 }) => {
|
export default ({ app }) => {
|
||||||
// Express configuration.
|
// Express configuration.
|
||||||
@@ -32,6 +30,9 @@ export default ({ app }) => {
|
|||||||
// Helmet helps you secure your Express apps by setting various HTTP headers.
|
// Helmet helps you secure your Express apps by setting various HTTP headers.
|
||||||
app.use(helmet());
|
app.use(helmet());
|
||||||
|
|
||||||
|
// Allow to full error stack traces and internal details
|
||||||
|
app.use(errorHandler());
|
||||||
|
|
||||||
// Boom response objects.
|
// Boom response objects.
|
||||||
app.use(boom());
|
app.use(boom());
|
||||||
|
|
||||||
@@ -64,10 +65,8 @@ export default ({ app }) => {
|
|||||||
// Agendash application load.
|
// Agendash application load.
|
||||||
app.use('/agendash', AgendashController.router());
|
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
|
// catch 404 and forward to error handler
|
||||||
app.use((req: Request, res: Response, next: NextFunction) => {
|
app.use((req: Request, res: Response, next: NextFunction) => {
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ import { SaleReceiptMailNotificationJob } from '@/services/Sales/Receipts/SaleRe
|
|||||||
import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob';
|
import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob';
|
||||||
import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob';
|
import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob';
|
||||||
import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob';
|
import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob';
|
||||||
import { SendVerifyMailJob } from '@/services/Authentication/jobs/SendVerifyMailJob';
|
|
||||||
import { RegonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/RecognizeTransactionsJob';
|
|
||||||
|
|
||||||
export default ({ agenda }: { agenda: Agenda }) => {
|
export default ({ agenda }: { agenda: Agenda }) => {
|
||||||
new ResetPasswordMailJob(agenda);
|
new ResetPasswordMailJob(agenda);
|
||||||
@@ -29,8 +27,6 @@ export default ({ agenda }: { agenda: Agenda }) => {
|
|||||||
new PaymentReceiveMailNotificationJob(agenda);
|
new PaymentReceiveMailNotificationJob(agenda);
|
||||||
new PlaidFetchTransactionsJob(agenda);
|
new PlaidFetchTransactionsJob(agenda);
|
||||||
new ImportDeleteExpiredFilesJobs(agenda);
|
new ImportDeleteExpiredFilesJobs(agenda);
|
||||||
new SendVerifyMailJob(agenda);
|
|
||||||
new RegonizeTransactionsJob(agenda);
|
|
||||||
|
|
||||||
agenda.start().then(() => {
|
agenda.start().then(() => {
|
||||||
agenda.every('1 hours', 'delete-expired-imported-files', {});
|
agenda.every('1 hours', 'delete-expired-imported-files', {});
|
||||||
|
|||||||
@@ -60,14 +60,9 @@ import Time from 'models/Time';
|
|||||||
import Task from 'models/Task';
|
import Task from 'models/Task';
|
||||||
import TaxRate from 'models/TaxRate';
|
import TaxRate from 'models/TaxRate';
|
||||||
import TaxRateTransaction from 'models/TaxRateTransaction';
|
import TaxRateTransaction from 'models/TaxRateTransaction';
|
||||||
|
import Attachment from 'models/Attachment';
|
||||||
import PlaidItem from 'models/PlaidItem';
|
import PlaidItem from 'models/PlaidItem';
|
||||||
import UncategorizedCashflowTransaction from 'models/UncategorizedCashflowTransaction';
|
import UncategorizedCashflowTransaction from 'models/UncategorizedCashflowTransaction';
|
||||||
import Document from '@/models/Document';
|
|
||||||
import DocumentLink from '@/models/DocumentLink';
|
|
||||||
import { BankRule } from '@/models/BankRule';
|
|
||||||
import { BankRuleCondition } from '@/models/BankRuleCondition';
|
|
||||||
import { RecognizedBankTransaction } from '@/models/RecognizedBankTransaction';
|
|
||||||
import { MatchedBankTransaction } from '@/models/MatchedBankTransaction';
|
|
||||||
|
|
||||||
export default (knex) => {
|
export default (knex) => {
|
||||||
const models = {
|
const models = {
|
||||||
@@ -131,14 +126,9 @@ export default (knex) => {
|
|||||||
Task,
|
Task,
|
||||||
TaxRate,
|
TaxRate,
|
||||||
TaxRateTransaction,
|
TaxRateTransaction,
|
||||||
Document,
|
Attachment,
|
||||||
DocumentLink,
|
|
||||||
PlaidItem,
|
PlaidItem,
|
||||||
UncategorizedCashflowTransaction,
|
UncategorizedCashflowTransaction
|
||||||
BankRule,
|
|
||||||
BankRuleCondition,
|
|
||||||
RecognizedBankTransaction,
|
|
||||||
MatchedBankTransaction,
|
|
||||||
};
|
};
|
||||||
return mapValues(models, (model) => model.bindKnex(knex));
|
return mapValues(models, (model) => model.bindKnex(knex));
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user