mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-17 13:20:31 +00:00
Compare commits
89 Commits
attachment
...
v0.17.7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eff8b41720 | ||
|
|
632cc3d72e | ||
|
|
3e437a041c | ||
|
|
e783cfeafa | ||
|
|
5dde7f5584 | ||
|
|
8e0911ec85 | ||
|
|
7b4afd3859 | ||
|
|
590715037b | ||
|
|
1e53a8e85e | ||
|
|
2ad77103ac | ||
|
|
c1fc70863b | ||
|
|
125dff8376 | ||
|
|
84da7b7df5 | ||
|
|
4c82f6f8ad | ||
|
|
0d7aad5448 | ||
|
|
74b74a2722 | ||
|
|
3a0a0db8a7 | ||
|
|
265ea9ca48 | ||
|
|
cfd37f8894 | ||
|
|
d1caa5c5ce | ||
|
|
d998d716b7 | ||
|
|
031ccc4a0b | ||
|
|
e4f61823b3 | ||
|
|
1cbc1c056f | ||
|
|
4d4ef54c56 | ||
|
|
f7fcfefc78 | ||
|
|
858f347fd4 | ||
|
|
4d73b59cf3 | ||
|
|
bc67f0cca8 | ||
|
|
ef2d1ff141 | ||
|
|
dc4cdb2a8f | ||
|
|
8862810706 | ||
|
|
3dadbeac4d | ||
|
|
494d2c1fe0 | ||
|
|
d27562bd43 | ||
|
|
8b99e0938d | ||
|
|
94192bfc29 | ||
|
|
708a4dda9e | ||
|
|
10fcf94c92 | ||
|
|
fc9995c4da | ||
|
|
7dc769004d | ||
|
|
5dbfd36415 | ||
|
|
044f11ff74 | ||
|
|
6afe1a09c6 | ||
|
|
909a70e2c5 | ||
|
|
84dd0fa86b | ||
|
|
a4719fe15b | ||
|
|
fd915b503f | ||
|
|
bbba54c08e | ||
|
|
f241e2bede | ||
|
|
175bc243f3 | ||
|
|
7c06c8bb8a | ||
|
|
8fd930caac | ||
|
|
e175307da4 | ||
|
|
b1bf932e88 | ||
|
|
aa897212ab | ||
|
|
890903e08b | ||
|
|
16b2a33cf6 | ||
|
|
382d4ab028 | ||
|
|
85f26e1079 | ||
|
|
1b237323f6 | ||
|
|
f15fecde54 | ||
|
|
79be4266bb | ||
|
|
08ad117331 | ||
|
|
958f78e7a4 | ||
|
|
ba77351e44 | ||
|
|
09a15966f0 | ||
|
|
7ff36e8c4f | ||
|
|
8ed24748ec | ||
|
|
6a6dcadaf9 | ||
|
|
308a4f62ae | ||
|
|
6e50de1d28 | ||
|
|
ceb133e29a | ||
|
|
e7871e34a9 | ||
|
|
cfdbcea9c0 | ||
|
|
fcd61c6159 | ||
|
|
2244cc6116 | ||
|
|
15dbc4137c | ||
|
|
8f904fae3a | ||
|
|
c8f31f33be | ||
|
|
dc5bdf0b66 | ||
|
|
fe41f7976d | ||
|
|
2c7da86a00 | ||
|
|
8c2b9fba29 | ||
|
|
7208b8fab5 | ||
|
|
0836fe14e0 | ||
|
|
1227111fae | ||
|
|
2ada57a2b4 | ||
|
|
e380c598d3 |
30
.env.example
30
.env.example
@@ -75,31 +75,17 @@ 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_DEVELOPMENT=
|
PLAID_SECRET=
|
||||||
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=
|
||||||
|
|||||||
127
.github/workflows/build-deploy-develop-container.yaml
vendored
Normal file
127
.github/workflows/build-deploy-develop-container.yaml
vendored
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
# 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 }}
|
||||||
43
CHANGELOG.md
43
CHANGELOG.md
@@ -2,6 +2,49 @@
|
|||||||
|
|
||||||
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
|
## [0.16.11] - 06-05-2024
|
||||||
|
|
||||||
### improvements
|
### improvements
|
||||||
|
|||||||
@@ -3,30 +3,27 @@
|
|||||||
version: '3.3'
|
version: '3.3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
nginx:
|
proxy:
|
||||||
container_name: bigcapital-nginx-gateway
|
image: envoyproxy/envoy:v1.30-latest
|
||||||
build:
|
depends_on:
|
||||||
context: ./docker/nginx
|
- server
|
||||||
args:
|
- webapp
|
||||||
- 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
|
||||||
depends_on:
|
volumes:
|
||||||
- server
|
- ./docker/envoy/envoy.yaml:/etc/envoy/envoy.yaml
|
||||||
- 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: bigcapitalhq/webapp:latest
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
|
networks:
|
||||||
|
- bigcapital_network
|
||||||
|
|
||||||
server:
|
server:
|
||||||
container_name: bigcapital-server
|
container_name: bigcapital-server
|
||||||
@@ -42,6 +39,8 @@ 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}
|
||||||
@@ -82,18 +81,24 @@ 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_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
|
- PLAID_SECRET=${PLAID_SECRET}
|
||||||
- PLAID_SECRET_SANDBOX=${b8cf42b441e110451e2f69ad7e1e9f}
|
|
||||||
- PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
|
- PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
|
||||||
|
|
||||||
# Lemon Squeez
|
# Lemon Squeez
|
||||||
@@ -108,7 +113,15 @@ services:
|
|||||||
- NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED}
|
- 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_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_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
|
||||||
@@ -126,6 +139,8 @@ 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
|
||||||
@@ -141,6 +156,8 @@ 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
|
||||||
@@ -150,6 +167,8 @@ 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
|
||||||
@@ -160,11 +179,15 @@ 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:
|
||||||
@@ -179,3 +202,8 @@ volumes:
|
|||||||
redis:
|
redis:
|
||||||
name: bigcapital_prod_redis
|
name: bigcapital_prod_redis
|
||||||
driver: local
|
driver: local
|
||||||
|
|
||||||
|
# Networks
|
||||||
|
networks:
|
||||||
|
bigcapital_network:
|
||||||
|
driver: bridge
|
||||||
|
|||||||
62
docker/envoy/envoy.yaml
Normal file
62
docker/envoy/envoy.yaml
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
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,21 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
#!/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
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,9 +20,13 @@
|
|||||||
"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",
|
||||||
@@ -73,12 +77,14 @@
|
|||||||
"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",
|
||||||
@@ -113,6 +119,7 @@
|
|||||||
},
|
},
|
||||||
"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",
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
@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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
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,6 +70,10 @@ 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,7 +207,6 @@ 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.',
|
||||||
|
|||||||
@@ -0,0 +1,264 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@ import DashboardService from '@/services/Dashboard/DashboardService';
|
|||||||
@Service()
|
@Service()
|
||||||
export default class DashboardMetaController {
|
export default class DashboardMetaController {
|
||||||
@Inject()
|
@Inject()
|
||||||
dashboardService: DashboardService;
|
private dashboardService: DashboardService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor router.
|
* Constructor router.
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export class ExpensesController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* Expense DTO schema.
|
* Expense DTO schema.
|
||||||
*/
|
*/
|
||||||
get expenseDTOSchema() {
|
private get expenseDTOSchema() {
|
||||||
return [
|
return [
|
||||||
check('reference_no')
|
check('reference_no')
|
||||||
.optional({ nullable: true })
|
.optional({ nullable: true })
|
||||||
@@ -130,6 +130,9 @@ 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(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,6 +186,9 @@ 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(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -269,7 +275,7 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
async deleteExpense(req: Request, res: Response, next: NextFunction) {
|
private 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;
|
||||||
|
|
||||||
@@ -291,7 +297,11 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
async publishExpense(req: Request, res: Response, next: NextFunction) {
|
private async publishExpense(
|
||||||
|
req: Request,
|
||||||
|
res: Response,
|
||||||
|
next: NextFunction
|
||||||
|
) {
|
||||||
const { tenantId, user } = req;
|
const { tenantId, user } = req;
|
||||||
const { id: expenseId } = req.params;
|
const { id: expenseId } = req.params;
|
||||||
|
|
||||||
@@ -313,7 +323,11 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
async getExpensesList(req: Request, res: Response, next: NextFunction) {
|
private async getExpensesList(
|
||||||
|
req: Request,
|
||||||
|
res: Response,
|
||||||
|
next: NextFunction
|
||||||
|
) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const filter = {
|
const filter = {
|
||||||
sortOrder: 'desc',
|
sortOrder: 'desc',
|
||||||
@@ -343,7 +357,7 @@ export class ExpensesController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
async getExpense(req: Request, res: Response, next: NextFunction) {
|
private async getExpense(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const { id: expenseId } = req.params;
|
const { id: expenseId } = req.params;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import BaseController from '@/api/controllers/BaseController';
|
|||||||
import { ServiceError } from '@/exceptions';
|
import { ServiceError } from '@/exceptions';
|
||||||
import { ExportApplication } from '@/services/Export/ExportApplication';
|
import { ExportApplication } from '@/services/Export/ExportApplication';
|
||||||
import { ACCEPT_TYPE } from '@/interfaces/Http';
|
import { ACCEPT_TYPE } from '@/interfaces/Http';
|
||||||
|
import { convertAcceptFormatToFormat } from './_utils';
|
||||||
|
|
||||||
@Service()
|
@Service()
|
||||||
export class ExportController extends BaseController {
|
export class ExportController extends BaseController {
|
||||||
@@ -14,7 +15,7 @@ export class ExportController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* Router constructor method.
|
* Router constructor method.
|
||||||
*/
|
*/
|
||||||
router() {
|
public router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
@@ -25,7 +26,6 @@ export class ExportController extends BaseController {
|
|||||||
],
|
],
|
||||||
this.validationResult,
|
this.validationResult,
|
||||||
this.export.bind(this),
|
this.export.bind(this),
|
||||||
this.catchServiceErrors
|
|
||||||
);
|
);
|
||||||
return router;
|
return router;
|
||||||
}
|
}
|
||||||
@@ -48,11 +48,14 @@ export class ExportController extends BaseController {
|
|||||||
ACCEPT_TYPE.APPLICATION_CSV,
|
ACCEPT_TYPE.APPLICATION_CSV,
|
||||||
ACCEPT_TYPE.APPLICATION_PDF,
|
ACCEPT_TYPE.APPLICATION_PDF,
|
||||||
]);
|
]);
|
||||||
|
const applicationFormat = convertAcceptFormatToFormat(acceptType);
|
||||||
|
|
||||||
const data = await this.exportResourceApp.export(
|
const data = await this.exportResourceApp.export(
|
||||||
tenantId,
|
tenantId,
|
||||||
query.resource,
|
query.resource,
|
||||||
acceptType === ACCEPT_TYPE.APPLICATION_XLSX ? 'xlsx' : 'csv'
|
applicationFormat
|
||||||
);
|
);
|
||||||
|
// Retrieves the csv format.
|
||||||
if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
|
if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
|
||||||
res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
|
res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
|
||||||
res.setHeader('Content-Type', 'text/csv');
|
res.setHeader('Content-Type', 'text/csv');
|
||||||
@@ -69,31 +72,16 @@ export class ExportController extends BaseController {
|
|||||||
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
|
||||||
);
|
);
|
||||||
return res.send(data);
|
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) {
|
} catch (error) {
|
||||||
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) {
|
|
||||||
return res.status(400).send({
|
|
||||||
errors: [{ type: error.errorType }],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
next(error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
13
packages/server/src/api/controllers/Export/_utils.ts
Normal file
13
packages/server/src/api/controllers/Export/_utils.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
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.
|
||||||
*/
|
*/
|
||||||
router() {
|
public router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
@@ -240,11 +240,7 @@ 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.
|
||||||
*/
|
*/
|
||||||
get manualJournalParamSchema() {
|
private get manualJournalParamSchema() {
|
||||||
return [param('id').exists().isNumeric().toInt()];
|
return [param('id').exists().isNumeric().toInt()];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manual journal DTO schema.
|
* Manual journal DTO schema.
|
||||||
*/
|
*/
|
||||||
get manualJournalValidationSchema() {
|
private get manualJournalValidationSchema() {
|
||||||
return [
|
return [
|
||||||
check('date').exists().isISO8601(),
|
check('date').exists().isISO8601(),
|
||||||
check('currency_code').optional(),
|
check('currency_code').optional(),
|
||||||
@@ -148,13 +148,16 @@ 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.
|
||||||
*/
|
*/
|
||||||
get manualJournalsListSchema() {
|
private 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(),
|
||||||
@@ -320,7 +323,7 @@ export default class ManualJournalsController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
getManualJournalsList = async (
|
private 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 req
|
* @param {Request} req
|
||||||
* @param res
|
* @param {Response} res
|
||||||
* @param next
|
* @param {NextFunction} next
|
||||||
* @returns
|
* @returns {Response|void}
|
||||||
*/
|
*/
|
||||||
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,8 +29,7 @@ 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',
|
||||||
@@ -43,8 +42,7 @@ 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',
|
||||||
@@ -56,16 +54,14 @@ 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',
|
||||||
@@ -76,24 +72,21 @@ 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;
|
||||||
}
|
}
|
||||||
@@ -252,22 +245,4 @@ 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,7 +118,6 @@ 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(),
|
||||||
@@ -148,6 +147,9 @@ 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(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,6 +192,9 @@ 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,6 +122,9 @@ 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,6 +186,9 @@ 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(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,6 +231,9 @@ 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,6 +236,9 @@ 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,6 +164,9 @@ 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,6 +184,9 @@ 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,6 +36,8 @@ 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)),
|
||||||
@@ -98,6 +100,8 @@ 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,6 +158,8 @@ 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,6 +155,7 @@ 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);
|
||||||
@@ -229,7 +230,7 @@ export default class UsersController extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @param {NextFunction} next
|
* @param {NextFunction} next
|
||||||
*/
|
*/
|
||||||
catchServiceErrors(
|
private catchServiceErrors(
|
||||||
error: Error,
|
error: Error,
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ export class WarehousesController extends BaseController {
|
|||||||
*
|
*
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
router() {
|
public router() {
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { Router } from 'express';
|
import { NextFunction, Router, Request, Response } from 'express';
|
||||||
import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
|
|
||||||
import { Request, Response } from 'express';
|
|
||||||
import { Inject, Service } from 'typedi';
|
import { Inject, Service } from 'typedi';
|
||||||
|
import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
|
||||||
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';
|
||||||
@@ -34,14 +33,21 @@ export class Webhooks extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @returns {Response}
|
* @returns {Response}
|
||||||
*/
|
*/
|
||||||
public async lemonWebhooks(req: Request, res: Response) {
|
public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
|
||||||
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;
|
||||||
|
|
||||||
await this.lemonWebhooksService.handlePostWebhook(rawBody, data, signature);
|
try {
|
||||||
|
await this.lemonWebhooksService.handlePostWebhook(
|
||||||
return res.status(200).send();
|
rawBody,
|
||||||
|
data,
|
||||||
|
signature
|
||||||
|
);
|
||||||
|
return res.status(200).send();
|
||||||
|
} catch (error) {
|
||||||
|
next(error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -50,20 +56,25 @@ export class Webhooks extends BaseController {
|
|||||||
* @param {Response} res
|
* @param {Response} res
|
||||||
* @returns {Response}
|
* @returns {Response}
|
||||||
*/
|
*/
|
||||||
public async plaidWebhooks(req: Request, res: Response) {
|
public async plaidWebhooks(req: Request, res: Response, next: NextFunction) {
|
||||||
const { tenantId } = req;
|
const { tenantId } = req;
|
||||||
const {
|
|
||||||
webhook_type: webhookType,
|
|
||||||
webhook_code: webhookCode,
|
|
||||||
item_id: plaidItemId,
|
|
||||||
} = req.body;
|
|
||||||
|
|
||||||
await this.plaidApp.webhooks(
|
try {
|
||||||
tenantId,
|
const {
|
||||||
plaidItemId,
|
webhook_type: webhookType,
|
||||||
webhookType,
|
webhook_code: webhookCode,
|
||||||
webhookCode
|
item_id: plaidItemId,
|
||||||
);
|
} = 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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
20
packages/server/src/api/exceptions/GlobalErrorException.ts
Normal file
20
packages/server/src/api/exceptions/GlobalErrorException.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
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 });
|
||||||
|
}
|
||||||
@@ -10,8 +10,14 @@ import {
|
|||||||
DataError,
|
DataError,
|
||||||
} from 'objection';
|
} from 'objection';
|
||||||
|
|
||||||
// In this example `res` is an express response object.
|
/**
|
||||||
export default function ObjectionErrorHandlerMiddleware(
|
* Handles the Objection error exception.
|
||||||
|
* @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,
|
||||||
@@ -108,6 +114,7 @@ export default function ObjectionErrorHandlerMiddleware(
|
|||||||
type: 'UnknownDatabaseError',
|
type: 'UnknownDatabaseError',
|
||||||
data: {},
|
data: {},
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
next(err);
|
||||||
}
|
}
|
||||||
next(err);
|
|
||||||
}
|
}
|
||||||
25
packages/server/src/api/exceptions/ServiceErrorException.ts
Normal file
25
packages/server/src/api/exceptions/ServiceErrorException.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -62,6 +62,7 @@ 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 { ExportController } from './controllers/Export/ExportController';
|
||||||
|
import { AttachmentsController } from './controllers/Attachments/AttachmentsController';
|
||||||
|
|
||||||
export default () => {
|
export default () => {
|
||||||
const app = Router();
|
const app = Router();
|
||||||
@@ -142,7 +143,8 @@ 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('/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());
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ 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';
|
||||||
|
|
||||||
@@ -28,7 +29,7 @@ function initSystemKnex() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function initTenantKnex(organizationId) {
|
function initTenantKnex(organizationId: string = '') {
|
||||||
return Knex({
|
return Knex({
|
||||||
client: config.tenant.db_client,
|
client: config.tenant.db_client,
|
||||||
connection: {
|
connection: {
|
||||||
@@ -71,6 +72,12 @@ 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,
|
||||||
@@ -87,6 +94,7 @@ function getAllSystemTenants(knex) {
|
|||||||
// - 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')
|
||||||
@@ -145,10 +153,13 @@ 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 = await getAllSystemTenants(sysKnex);
|
const tenants = cmd?.all
|
||||||
|
? 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}`;
|
||||||
@@ -179,18 +190,20 @@ 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('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
|
.option(
|
||||||
|
'-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 getAllSystemTenants(sysKnex);
|
const tenants = await getAllInitializedTenants(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);
|
||||||
@@ -212,18 +225,17 @@ commander
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
if (!cmd.tenant_id) {
|
if (!cmd.tenant_id) {
|
||||||
tenants.forEach((tenant) => {
|
await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
|
||||||
const oper = migrateTenant(tenant.organizationId);
|
.for(tenants)
|
||||||
migrateOpers.push(oper);
|
.process((tenant, index, pool) => {
|
||||||
});
|
return migrateTenant(tenant.organizationId);
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
success('All tenants are migrated.');
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
const oper = migrateTenant(cmd.tenant_id);
|
await migrateTenant(cmd.tenant_id);
|
||||||
migrateOpers.push(oper);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Promise.all(migrateOpers).then(() => {
|
|
||||||
success('All tenants are migrated.');
|
|
||||||
});
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
exit(error);
|
exit(error);
|
||||||
}
|
}
|
||||||
@@ -232,19 +244,21 @@ 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('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
|
.option(
|
||||||
|
'-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 getAllSystemTenants(sysKnex);
|
const tenants = await getAllInitializedTenants(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 migrateOpers = [];
|
const migrateTenant = async (organizationId: string) => {
|
||||||
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();
|
||||||
@@ -265,19 +279,18 @@ commander
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (!cmd.tenant_id) {
|
if (!cmd.tenant_id) {
|
||||||
tenants.forEach((tenant) => {
|
await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
|
||||||
const oper = migrateTenant(tenant.organizationId);
|
.for(tenants)
|
||||||
migrateOpers.push(oper);
|
.process((tenant, index, pool) => {
|
||||||
});
|
return migrateTenant(tenant.organizationId);
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
success('All tenants are rollbacked.');
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
const oper = migrateTenant(cmd.tenant_id);
|
await migrateTenant(cmd.tenant_id);
|
||||||
migrateOpers.push(oper);
|
|
||||||
}
|
}
|
||||||
Promise.all(migrateOpers).then(() => {
|
|
||||||
success('All tenants are rollbacked.');
|
|
||||||
});
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
exit(error);
|
exit(error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -157,7 +157,10 @@ module.exports = {
|
|||||||
* Sign-up email confirmation
|
* Sign-up email confirmation
|
||||||
*/
|
*/
|
||||||
signupConfirmation: {
|
signupConfirmation: {
|
||||||
enabled: parseBoolean<boolean>(process.env.SIGNUP_EMAIL_CONFIRMATION, false),
|
enabled: parseBoolean<boolean>(
|
||||||
|
process.env.SIGNUP_EMAIL_CONFIRMATION,
|
||||||
|
false
|
||||||
|
),
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -201,10 +204,7 @@ 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,
|
||||||
secretDevelopment: process.env.PLAID_SECRET_DEVELOPMENT,
|
secret: process.env.PLAID_SECRET,
|
||||||
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,6 +215,7 @@ 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`,
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -225,4 +226,15 @@ 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',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,4 +11,4 @@ exports.up = function (knex) {
|
|||||||
|
|
||||||
exports.down = function (knex) {
|
exports.down = function (knex) {
|
||||||
return knex.schema.dropTableIfExists('storage');
|
return knex.schema.dropTableIfExists('storage');
|
||||||
};
|
};
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
exports.up = function (knex) {
|
||||||
|
return knex.schema.dropTableIfExists('storage');
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.down = function (knex) {};
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
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');
|
||||||
|
};
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
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');
|
||||||
|
};
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
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();
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -164,3 +164,7 @@ export enum TaxRateAction {
|
|||||||
DELETE = 'Delete',
|
DELETE = 'Delete',
|
||||||
VIEW = 'View',
|
VIEW = 'View',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface CreateAccountParams {
|
||||||
|
ignoreUniqueName: boolean;
|
||||||
|
}
|
||||||
|
|||||||
3
packages/server/src/interfaces/Attachments.ts
Normal file
3
packages/server/src/interfaces/Attachments.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export interface AttachmentLinkDTO {
|
||||||
|
key: string;
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ 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;
|
||||||
@@ -20,6 +21,7 @@ export interface IBillDTO {
|
|||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
projectId?: number;
|
projectId?: number;
|
||||||
isInclusiveTax?: boolean;
|
isInclusiveTax?: boolean;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IBillEditDTO {
|
export interface IBillEditDTO {
|
||||||
@@ -38,6 +40,7 @@ export interface IBillEditDTO {
|
|||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
projectId?: number;
|
projectId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IBill {
|
export interface IBill {
|
||||||
@@ -105,6 +108,7 @@ 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;
|
||||||
}
|
}
|
||||||
@@ -126,6 +130,7 @@ export interface IBillEditedPayload {
|
|||||||
billId: number;
|
billId: number;
|
||||||
oldBill: IBill;
|
oldBill: IBill;
|
||||||
bill: IBill;
|
bill: IBill;
|
||||||
|
billDTO: IBillDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
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;
|
||||||
@@ -45,6 +46,7 @@ export interface IBillPaymentDTO {
|
|||||||
reference: string;
|
reference: string;
|
||||||
entries: IBillPaymentEntryDTO[];
|
entries: IBillPaymentEntryDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IBillReceivePageEntry {
|
export interface IBillReceivePageEntry {
|
||||||
@@ -66,6 +68,7 @@ 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;
|
||||||
}
|
}
|
||||||
@@ -87,6 +90,7 @@ export interface IBillPaymentEventEditedPayload {
|
|||||||
billPaymentId: number;
|
billPaymentId: number;
|
||||||
billPayment: IBillPayment;
|
billPayment: IBillPayment;
|
||||||
oldBillPayment: IBillPayment;
|
oldBillPayment: IBillPayment;
|
||||||
|
billPaymentDTO: IBillPaymentDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
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;
|
||||||
@@ -21,6 +22,7 @@ export interface ICreditNoteNewDTO {
|
|||||||
entries: ICreditNoteEntryNewDTO[];
|
entries: ICreditNoteEntryNewDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ICreditNoteEditDTO {
|
export interface ICreditNoteEditDTO {
|
||||||
@@ -33,6 +35,7 @@ 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,6 +2,7 @@ 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;
|
||||||
@@ -81,6 +82,7 @@ export interface IExpenseCommonDTO {
|
|||||||
categories: IExpenseCategoryDTO[];
|
categories: IExpenseCategoryDTO[];
|
||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IExpenseCreateDTO extends IExpenseCommonDTO {}
|
export interface IExpenseCreateDTO extends IExpenseCommonDTO {}
|
||||||
@@ -152,6 +154,7 @@ export interface IExpenseCreatedPayload {
|
|||||||
expenseId: number;
|
expenseId: number;
|
||||||
authorizedUser: ISystemUser;
|
authorizedUser: ISystemUser;
|
||||||
expense: IExpense;
|
expense: IExpense;
|
||||||
|
expenseDTO: IExpenseCreateDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ 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[];
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ 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;
|
||||||
@@ -56,6 +57,7 @@ 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 {
|
||||||
@@ -142,6 +144,7 @@ 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 {
|
||||||
@@ -161,6 +164,7 @@ export interface IManualJournalEventCreatedPayload {
|
|||||||
tenantId: number;
|
tenantId: number;
|
||||||
manualJournal: IManualJournal;
|
manualJournal: IManualJournal;
|
||||||
manualJournalId: number;
|
manualJournalId: number;
|
||||||
|
manualJournalDTO: IManualJournalDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,6 +122,10 @@ 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;
|
||||||
@@ -134,6 +138,8 @@ export interface IModelMeta {
|
|||||||
importAggregateOn?: string;
|
importAggregateOn?: string;
|
||||||
importAggregateBy?: string;
|
importAggregateBy?: string;
|
||||||
|
|
||||||
|
print?: IModelPrintMeta;
|
||||||
|
|
||||||
fields: { [key: string]: IModelMetaField };
|
fields: { [key: string]: IModelMetaField };
|
||||||
columns: { [key: string]: IModelMetaColumn };
|
columns: { [key: string]: IModelMetaColumn };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ 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;
|
||||||
@@ -37,6 +38,7 @@ export interface IPaymentReceiveCreateDTO {
|
|||||||
entries: IPaymentReceiveEntryDTO[];
|
entries: IPaymentReceiveEntryDTO[];
|
||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IPaymentReceiveEditDTO {
|
export interface IPaymentReceiveEditDTO {
|
||||||
@@ -50,6 +52,7 @@ export interface IPaymentReceiveEditDTO {
|
|||||||
statement: string;
|
statement: string;
|
||||||
entries: IPaymentReceiveEntryDTO[];
|
entries: IPaymentReceiveEntryDTO[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IPaymentReceiveEntry {
|
export interface IPaymentReceiveEntry {
|
||||||
@@ -114,6 +117,7 @@ export interface IPaymentReceiveCreatedPayload {
|
|||||||
paymentReceive: IPaymentReceive;
|
paymentReceive: IPaymentReceive;
|
||||||
paymentReceiveId: number;
|
paymentReceiveId: number;
|
||||||
authorizedUser: ISystemUser;
|
authorizedUser: ISystemUser;
|
||||||
|
paymentReceiveDTO: IPaymentReceiveCreateDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,6 +126,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ 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;
|
||||||
@@ -38,6 +39,7 @@ export interface ISaleEstimateDTO {
|
|||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
|
export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
|
||||||
@@ -70,6 +72,7 @@ export interface ISaleEstimateEditedPayload {
|
|||||||
estimateId: number;
|
estimateId: number;
|
||||||
saleEstimate: ISaleEstimate;
|
saleEstimate: ISaleEstimate;
|
||||||
oldSaleEstimate: ISaleEstimate;
|
oldSaleEstimate: ISaleEstimate;
|
||||||
|
estimateDTO: ISaleEstimateDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ 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;
|
||||||
@@ -64,6 +65,8 @@ 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,6 +1,7 @@
|
|||||||
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;
|
||||||
@@ -43,6 +44,7 @@ export interface ISaleReceiptDTO {
|
|||||||
closed: boolean;
|
closed: boolean;
|
||||||
entries: any[];
|
entries: any[];
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ISalesReceiptsService {
|
export interface ISalesReceiptsService {
|
||||||
@@ -85,6 +87,7 @@ export interface ISaleReceiptCreatedPayload {
|
|||||||
tenantId: number;
|
tenantId: number;
|
||||||
saleReceipt: ISaleReceipt;
|
saleReceipt: ISaleReceipt;
|
||||||
saleReceiptId: number;
|
saleReceiptId: number;
|
||||||
|
saleReceiptDTO: ISaleReceiptDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,6 +96,7 @@ export interface ISaleReceiptEditedPayload {
|
|||||||
oldSaleReceipt: number;
|
oldSaleReceipt: number;
|
||||||
saleReceipt: ISaleReceipt;
|
saleReceipt: ISaleReceipt;
|
||||||
saleReceiptId: number;
|
saleReceiptId: number;
|
||||||
|
saleReceiptDTO: ISaleReceiptDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ 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,5 +1,6 @@
|
|||||||
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',
|
||||||
@@ -61,6 +62,7 @@ export interface IVendorCreditDTO {
|
|||||||
|
|
||||||
branchId?: number;
|
branchId?: number;
|
||||||
warehouseId?: number;
|
warehouseId?: number;
|
||||||
|
attachments?: AttachmentLinkDTO[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IVendorCreditCreateDTO extends IVendorCreditDTO {}
|
export interface IVendorCreditCreateDTO extends IVendorCreditDTO {}
|
||||||
@@ -118,6 +120,7 @@ export interface IVendorCreditEditedPayload {
|
|||||||
oldVendorCredit: IVendorCredit;
|
oldVendorCredit: IVendorCredit;
|
||||||
vendorCredit: IVendorCredit;
|
vendorCredit: IVendorCredit;
|
||||||
vendorCreditId: number;
|
vendorCreditId: number;
|
||||||
|
vendorCreditDTO: IVendorCreditEditDTO;
|
||||||
trx: Knex.Transaction;
|
trx: Knex.Transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,10 +70,7 @@ export class PlaidClientWrapper {
|
|||||||
baseOptions: {
|
baseOptions: {
|
||||||
headers: {
|
headers: {
|
||||||
'PLAID-CLIENT-ID': config.plaid.clientId,
|
'PLAID-CLIENT-ID': config.plaid.clientId,
|
||||||
'PLAID-SECRET':
|
'PLAID-SECRET': config.plaid.secret,
|
||||||
config.plaid.env === 'development'
|
|
||||||
? config.plaid.secretDevelopment
|
|
||||||
: config.plaid.secretSandbox,
|
|
||||||
'Plaid-Version': '2020-09-14',
|
'Plaid-Version': '2020-09-14',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
11
packages/server/src/lib/S3/S3.ts
Normal file
11
packages/server/src/lib/S3/S3.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
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,13 +149,19 @@ 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('YYYY/MM/DD') : '';
|
return date ? moment(date).format(this.dateFormat) : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -193,6 +199,7 @@ 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,6 +24,17 @@ 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
|
||||||
@@ -41,7 +52,11 @@ 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);
|
||||||
|
|||||||
@@ -92,7 +92,16 @@ import { DeleteCashflowTransactionOnUncategorize } from '@/services/Cashflow/sub
|
|||||||
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 { SendVerfiyMailOnSignUp } from '@/services/Authentication/events/SendVerfiyMailOnSignUp';
|
||||||
|
import { AttachmentsOnSaleInvoiceCreated } from '@/services/Attachments/events/AttachmentsOnSaleInvoice';
|
||||||
|
import { AttachmentsOnSaleReceipt } from '@/services/Attachments/events/AttachmentsOnSaleReceipts';
|
||||||
|
import { AttachmentsOnManualJournals } from '@/services/Attachments/events/AttachmentsOnManualJournals';
|
||||||
|
import { AttachmentsOnExpenses } from '@/services/Attachments/events/AttachmentsOnExpenses';
|
||||||
|
import { AttachmentsOnBills } from '@/services/Attachments/events/AttachmentsOnBills';
|
||||||
|
import { AttachmentsOnPaymentsReceived } from '@/services/Attachments/events/AttachmentsOnPaymentsReceived';
|
||||||
|
import { AttachmentsOnVendorCredits } from '@/services/Attachments/events/AttachmentsOnVendorCredits';
|
||||||
|
import { AttachmentsOnCreditNote } from '@/services/Attachments/events/AttachmentsOnCreditNote';
|
||||||
|
import { AttachmentsOnBillPayments } from '@/services/Attachments/events/AttachmentsOnPaymentsMade';
|
||||||
|
import { AttachmentsOnSaleEstimates } from '@/services/Attachments/events/AttachmentsOnSaleEstimates';
|
||||||
|
|
||||||
export default () => {
|
export default () => {
|
||||||
return new EventPublisher();
|
return new EventPublisher();
|
||||||
@@ -224,6 +233,18 @@ export const susbcribers = () => {
|
|||||||
PreventDeleteTransactionOnDelete,
|
PreventDeleteTransactionOnDelete,
|
||||||
|
|
||||||
SubscribeFreeOnSignupCommunity,
|
SubscribeFreeOnSignupCommunity,
|
||||||
SendVerfiyMailOnSignUp
|
SendVerfiyMailOnSignUp,
|
||||||
|
|
||||||
|
// Attachments
|
||||||
|
AttachmentsOnSaleInvoiceCreated,
|
||||||
|
AttachmentsOnSaleEstimates,
|
||||||
|
AttachmentsOnSaleReceipt,
|
||||||
|
AttachmentsOnPaymentsReceived,
|
||||||
|
AttachmentsOnCreditNote,
|
||||||
|
AttachmentsOnVendorCredits,
|
||||||
|
AttachmentsOnBills,
|
||||||
|
AttachmentsOnBillPayments,
|
||||||
|
AttachmentsOnManualJournals,
|
||||||
|
AttachmentsOnExpenses,
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,7 +17,9 @@ 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 ObjectionErrorHandlerMiddleware from '@/api/middleware/ObjectionErrorHandlerMiddleware';
|
import { ObjectionErrorException } from '@/api/exceptions/ObjectionErrorException';
|
||||||
|
import { ServiceErrorException } from '@/api/exceptions/ServiceErrorException';
|
||||||
|
import { GlobalErrorException } from '@/api/exceptions/GlobalErrorException';
|
||||||
|
|
||||||
export default ({ app }) => {
|
export default ({ app }) => {
|
||||||
// Express configuration.
|
// Express configuration.
|
||||||
@@ -30,9 +32,6 @@ 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());
|
||||||
|
|
||||||
@@ -65,8 +64,10 @@ export default ({ app }) => {
|
|||||||
// Agendash application load.
|
// Agendash application load.
|
||||||
app.use('/agendash', AgendashController.router());
|
app.use('/agendash', AgendashController.router());
|
||||||
|
|
||||||
// Handles objectionjs errors.
|
// Handles errors.
|
||||||
app.use(ObjectionErrorHandlerMiddleware);
|
app.use(ObjectionErrorException);
|
||||||
|
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) => {
|
||||||
|
|||||||
@@ -60,9 +60,10 @@ 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';
|
||||||
|
|
||||||
export default (knex) => {
|
export default (knex) => {
|
||||||
const models = {
|
const models = {
|
||||||
@@ -126,9 +127,10 @@ export default (knex) => {
|
|||||||
Task,
|
Task,
|
||||||
TaxRate,
|
TaxRate,
|
||||||
TaxRateTransaction,
|
TaxRateTransaction,
|
||||||
Attachment,
|
Document,
|
||||||
|
DocumentLink,
|
||||||
PlaidItem,
|
PlaidItem,
|
||||||
UncategorizedCashflowTransaction
|
UncategorizedCashflowTransaction,
|
||||||
};
|
};
|
||||||
return mapValues(models, (model) => model.bindKnex(knex));
|
return mapValues(models, (model) => model.bindKnex(knex));
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ export default {
|
|||||||
},
|
},
|
||||||
importable: true,
|
importable: true,
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Chart of Accounts',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
name: {
|
name: {
|
||||||
name: 'account.field.name',
|
name: 'account.field.name',
|
||||||
@@ -121,7 +124,7 @@ export default {
|
|||||||
},
|
},
|
||||||
balance: {
|
balance: {
|
||||||
name: 'account.field.balance',
|
name: 'account.field.balance',
|
||||||
accessor: 'amount',
|
accessor: 'formattedAmount',
|
||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
name: 'account.field.description',
|
name: 'account.field.description',
|
||||||
@@ -133,6 +136,7 @@ export default {
|
|||||||
},
|
},
|
||||||
createdAt: {
|
createdAt: {
|
||||||
name: 'account.field.created_at',
|
name: 'account.field.created_at',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ export default {
|
|||||||
importAggregator: 'group',
|
importAggregator: 'group',
|
||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'billNumber',
|
importAggregateBy: 'billNumber',
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Bills',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
vendor: {
|
vendor: {
|
||||||
name: 'bill.field.vendor',
|
name: 'bill.field.vendor',
|
||||||
@@ -83,6 +86,10 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
columns: {
|
columns: {
|
||||||
|
billDate: {
|
||||||
|
name: 'Date',
|
||||||
|
accessor: 'formattedBillDate',
|
||||||
|
},
|
||||||
billNumber: {
|
billNumber: {
|
||||||
name: 'Bill No.',
|
name: 'Bill No.',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
@@ -91,13 +98,10 @@ export default {
|
|||||||
name: 'Reference No.',
|
name: 'Reference No.',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
},
|
},
|
||||||
billDate: {
|
|
||||||
name: 'Date',
|
|
||||||
type: 'date',
|
|
||||||
},
|
|
||||||
dueDate: {
|
dueDate: {
|
||||||
name: 'Due Date',
|
name: 'Due Date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'formattedDueDate',
|
||||||
},
|
},
|
||||||
vendorId: {
|
vendorId: {
|
||||||
name: 'Vendor',
|
name: 'Vendor',
|
||||||
@@ -111,10 +115,12 @@ export default {
|
|||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'Exchange Rate',
|
name: 'Exchange Rate',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'Currency Code',
|
name: 'Currency Code',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
dueAmount: {
|
dueAmount: {
|
||||||
name: 'Due Amount',
|
name: 'Due Amount',
|
||||||
@@ -127,10 +133,12 @@ export default {
|
|||||||
note: {
|
note: {
|
||||||
name: 'Note',
|
name: 'Note',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
open: {
|
open: {
|
||||||
name: 'Open',
|
name: 'Open',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'Entries',
|
name: 'Entries',
|
||||||
|
|||||||
@@ -403,6 +403,7 @@ export default class Bill extends mixin(TenantModel, [
|
|||||||
const BillLandedCost = require('models/BillLandedCost');
|
const BillLandedCost = require('models/BillLandedCost');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
const TaxRateTransaction = require('models/TaxRateTransaction');
|
const TaxRateTransaction = require('models/TaxRateTransaction');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
vendor: {
|
vendor: {
|
||||||
@@ -465,6 +466,25 @@ export default class Bill extends mixin(TenantModel, [
|
|||||||
builder.where('reference_type', 'Bill');
|
builder.where('reference_type', 'Bill');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bill may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'bills.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'Bill');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ export default {
|
|||||||
paymentDate: {
|
paymentDate: {
|
||||||
name: 'bill_payment.field.payment_date',
|
name: 'bill_payment.field.payment_date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'formattedPaymentDate'
|
||||||
},
|
},
|
||||||
paymentNumber: {
|
paymentNumber: {
|
||||||
name: 'bill_payment.field.payment_number',
|
name: 'bill_payment.field.payment_number',
|
||||||
@@ -94,14 +95,17 @@ export default {
|
|||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'Currency Code',
|
name: 'Currency Code',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'bill_payment.field.exchange_rate',
|
name: 'bill_payment.field.exchange_rate',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
statement: {
|
statement: {
|
||||||
name: 'bill_payment.field.note',
|
name: 'bill_payment.field.note',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
reference: {
|
reference: {
|
||||||
name: 'bill_payment.field.reference',
|
name: 'bill_payment.field.reference',
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ export default class BillPayment extends mixin(TenantModel, [
|
|||||||
const Vendor = require('models/Vendor');
|
const Vendor = require('models/Vendor');
|
||||||
const Account = require('models/Account');
|
const Account = require('models/Account');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
entries: {
|
entries: {
|
||||||
@@ -114,6 +115,25 @@ export default class BillPayment extends mixin(TenantModel, [
|
|||||||
to: 'branches.id',
|
to: 'branches.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bill payment may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'bills_payments.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'BillPayment');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ export default {
|
|||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'creditNoteNumber',
|
importAggregateBy: 'creditNoteNumber',
|
||||||
|
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Credit Notes',
|
||||||
|
},
|
||||||
|
|
||||||
fields: {
|
fields: {
|
||||||
customer: {
|
customer: {
|
||||||
name: 'credit_note.field.customer',
|
name: 'credit_note.field.customer',
|
||||||
@@ -88,36 +92,34 @@ export default {
|
|||||||
columns: {
|
columns: {
|
||||||
customer: {
|
customer: {
|
||||||
name: 'Customer',
|
name: 'Customer',
|
||||||
type: 'relation',
|
|
||||||
accessor: 'customer.displayName',
|
accessor: 'customer.displayName',
|
||||||
},
|
},
|
||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'Exchange Rate',
|
name: 'Exchange Rate',
|
||||||
type: 'number',
|
printable: false,
|
||||||
},
|
},
|
||||||
creditNoteDate: {
|
creditNoteDate: {
|
||||||
name: 'Credit Note Date',
|
name: 'Credit Note Date',
|
||||||
type: 'date',
|
accessor: 'formattedCreditNoteDate'
|
||||||
},
|
},
|
||||||
referenceNo: {
|
referenceNo: {
|
||||||
name: 'Reference No.',
|
name: 'Reference No.',
|
||||||
type: 'text',
|
|
||||||
},
|
},
|
||||||
note: {
|
note: {
|
||||||
name: 'Note',
|
name: 'Note',
|
||||||
type: 'text',
|
|
||||||
},
|
},
|
||||||
termsConditions: {
|
termsConditions: {
|
||||||
name: 'Terms & Conditions',
|
name: 'Terms & Conditions',
|
||||||
type: 'text',
|
printable: false,
|
||||||
},
|
},
|
||||||
creditNoteNumber: {
|
creditNoteNumber: {
|
||||||
name: 'Credit Note Number',
|
name: 'Credit Note Number',
|
||||||
type: 'text',
|
printable: false,
|
||||||
},
|
},
|
||||||
open: {
|
open: {
|
||||||
name: 'Open',
|
name: 'Open',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'Entries',
|
name: 'Entries',
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ export default class CreditNote extends mixin(TenantModel, [
|
|||||||
const ItemEntry = require('models/ItemEntry');
|
const ItemEntry = require('models/ItemEntry');
|
||||||
const Customer = require('models/Customer');
|
const Customer = require('models/Customer');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
/**
|
/**
|
||||||
@@ -233,6 +234,25 @@ export default class CreditNote extends mixin(TenantModel, [
|
|||||||
to: 'branches.id',
|
to: 'branches.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Credit note may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'credit_notes.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'CreditNote');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ export default {
|
|||||||
sortOrder: 'DESC',
|
sortOrder: 'DESC',
|
||||||
sortField: 'created_at',
|
sortField: 'created_at',
|
||||||
},
|
},
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Customers',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
first_name: {
|
first_name: {
|
||||||
name: 'vendor.field.first_name',
|
name: 'vendor.field.first_name',
|
||||||
@@ -127,100 +130,121 @@ export default {
|
|||||||
balance: {
|
balance: {
|
||||||
name: 'vendor.field.balance',
|
name: 'vendor.field.balance',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
accessor: 'formattedBalance',
|
||||||
},
|
},
|
||||||
openingBalance: {
|
openingBalance: {
|
||||||
name: 'vendor.field.opening_balance',
|
name: 'vendor.field.opening_balance',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
openingBalanceAt: {
|
openingBalanceAt: {
|
||||||
name: 'vendor.field.opening_balance_at',
|
name: 'vendor.field.opening_balance_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'vendor.field.currency',
|
name: 'vendor.field.currency',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
name: 'vendor.field.status',
|
name: 'vendor.field.status',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
note: {
|
note: {
|
||||||
name: 'vendor.field.note',
|
name: 'vendor.field.note',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
// Billing Address
|
// Billing Address
|
||||||
billingAddress1: {
|
billingAddress1: {
|
||||||
name: 'Billing Address 1',
|
name: 'Billing Address 1',
|
||||||
column: 'billing_address1',
|
column: 'billing_address1',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddress2: {
|
billingAddress2: {
|
||||||
name: 'Billing Address 2',
|
name: 'Billing Address 2',
|
||||||
column: 'billing_address2',
|
column: 'billing_address2',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressCity: {
|
billingAddressCity: {
|
||||||
name: 'Billing Address City',
|
name: 'Billing Address City',
|
||||||
column: 'billing_address_city',
|
column: 'billing_address_city',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressCountry: {
|
billingAddressCountry: {
|
||||||
name: 'Billing Address Country',
|
name: 'Billing Address Country',
|
||||||
column: 'billing_address_country',
|
column: 'billing_address_country',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressPostcode: {
|
billingAddressPostcode: {
|
||||||
name: 'Billing Address Postcode',
|
name: 'Billing Address Postcode',
|
||||||
column: 'billing_address_postcode',
|
column: 'billing_address_postcode',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressState: {
|
billingAddressState: {
|
||||||
name: 'Billing Address State',
|
name: 'Billing Address State',
|
||||||
column: 'billing_address_state',
|
column: 'billing_address_state',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressPhone: {
|
billingAddressPhone: {
|
||||||
name: 'Billing Address Phone',
|
name: 'Billing Address Phone',
|
||||||
column: 'billing_address_phone',
|
column: 'billing_address_phone',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
// Shipping Address
|
// Shipping Address
|
||||||
shippingAddress1: {
|
shippingAddress1: {
|
||||||
name: 'Shipping Address 1',
|
name: 'Shipping Address 1',
|
||||||
column: 'shipping_address1',
|
column: 'shipping_address1',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddress2: {
|
shippingAddress2: {
|
||||||
name: 'Shipping Address 2',
|
name: 'Shipping Address 2',
|
||||||
column: 'shipping_address2',
|
column: 'shipping_address2',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressCity: {
|
shippingAddressCity: {
|
||||||
name: 'Shipping Address City',
|
name: 'Shipping Address City',
|
||||||
column: 'shipping_address_city',
|
column: 'shipping_address_city',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressCountry: {
|
shippingAddressCountry: {
|
||||||
name: 'Shipping Address Country',
|
name: 'Shipping Address Country',
|
||||||
column: 'shipping_address_country',
|
column: 'shipping_address_country',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressPostcode: {
|
shippingAddressPostcode: {
|
||||||
name: 'Shipping Address Postcode',
|
name: 'Shipping Address Postcode',
|
||||||
column: 'shipping_address_postcode',
|
column: 'shipping_address_postcode',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressPhone: {
|
shippingAddressPhone: {
|
||||||
name: 'Shipping Address Phone',
|
name: 'Shipping Address Phone',
|
||||||
column: 'shipping_address_phone',
|
column: 'shipping_address_phone',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressState: {
|
shippingAddressState: {
|
||||||
name: 'Shipping Address State',
|
name: 'Shipping Address State',
|
||||||
column: 'shipping_address_state',
|
column: 'shipping_address_state',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
createdAt: {
|
createdAt: {
|
||||||
name: 'vendor.field.created_at',
|
name: 'vendor.field.created_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel';
|
|||||||
import ModelSetting from './ModelSetting';
|
import ModelSetting from './ModelSetting';
|
||||||
import ModelSearchable from './ModelSearchable';
|
import ModelSearchable from './ModelSearchable';
|
||||||
|
|
||||||
export default class Attachment extends mixin(TenantModel, [
|
export default class Document extends mixin(TenantModel, [
|
||||||
ModelSetting,
|
ModelSetting,
|
||||||
ModelSearchable,
|
ModelSearchable,
|
||||||
]) {
|
]) {
|
||||||
@@ -11,7 +11,7 @@ export default class Attachment extends mixin(TenantModel, [
|
|||||||
* Table name
|
* Table name
|
||||||
*/
|
*/
|
||||||
static get tableName() {
|
static get tableName() {
|
||||||
return 'storage';
|
return 'documents';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
44
packages/server/src/models/DocumentLink.ts
Normal file
44
packages/server/src/models/DocumentLink.ts
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import { Model, mixin } from 'objection';
|
||||||
|
import TenantModel from 'models/TenantModel';
|
||||||
|
import ModelSetting from './ModelSetting';
|
||||||
|
import ModelSearchable from './ModelSearchable';
|
||||||
|
|
||||||
|
export default class DocumentLink extends mixin(TenantModel, [
|
||||||
|
ModelSetting,
|
||||||
|
ModelSearchable,
|
||||||
|
]) {
|
||||||
|
/**
|
||||||
|
* Table name
|
||||||
|
*/
|
||||||
|
static get tableName() {
|
||||||
|
return 'document_links';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Model timestamps.
|
||||||
|
*/
|
||||||
|
get timestamps() {
|
||||||
|
return ['createdAt', 'updatedAt'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Relationship mapping.
|
||||||
|
*/
|
||||||
|
static get relationMappings() {
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
|
return {
|
||||||
|
/**
|
||||||
|
* Sale invoice associated entries.
|
||||||
|
*/
|
||||||
|
document: {
|
||||||
|
relation: Model.HasOneRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'document_links.documentId',
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,6 +10,9 @@ export default {
|
|||||||
importable: true,
|
importable: true,
|
||||||
exportFlattenOn: 'categories',
|
exportFlattenOn: 'categories',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Expenses',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
payment_date: {
|
payment_date: {
|
||||||
name: 'expense.field.payment_date',
|
name: 'expense.field.payment_date',
|
||||||
@@ -67,7 +70,7 @@ export default {
|
|||||||
paymentReceive: {
|
paymentReceive: {
|
||||||
name: 'expense.field.payment_account',
|
name: 'expense.field.payment_account',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
accessor: 'paymentAccount.name'
|
accessor: 'paymentAccount.name',
|
||||||
},
|
},
|
||||||
referenceNo: {
|
referenceNo: {
|
||||||
name: 'expense.field.reference_no',
|
name: 'expense.field.reference_no',
|
||||||
@@ -75,15 +78,18 @@ export default {
|
|||||||
},
|
},
|
||||||
paymentDate: {
|
paymentDate: {
|
||||||
name: 'expense.field.payment_date',
|
name: 'expense.field.payment_date',
|
||||||
|
accessor: 'formattedDate',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'expense.field.currency_code',
|
name: 'expense.field.currency_code',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'expense.field.exchange_rate',
|
name: 'expense.field.exchange_rate',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
name: 'expense.field.description',
|
name: 'expense.field.description',
|
||||||
@@ -111,6 +117,7 @@ export default {
|
|||||||
publish: {
|
publish: {
|
||||||
name: 'expense.field.publish',
|
name: 'expense.field.publish',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ export default class Expense extends mixin(TenantModel, [
|
|||||||
static get relationMappings() {
|
static get relationMappings() {
|
||||||
const Account = require('models/Account');
|
const Account = require('models/Account');
|
||||||
const ExpenseCategory = require('models/ExpenseCategory');
|
const ExpenseCategory = require('models/ExpenseCategory');
|
||||||
const Media = require('models/Media');
|
const Document = require('models/Document');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -217,21 +217,21 @@ export default class Expense extends mixin(TenantModel, [
|
|||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Expense transaction may has many attached attachments.
|
||||||
*/
|
*/
|
||||||
media: {
|
attachments: {
|
||||||
relation: Model.ManyToManyRelation,
|
relation: Model.ManyToManyRelation,
|
||||||
modelClass: Media.default,
|
modelClass: Document.default,
|
||||||
join: {
|
join: {
|
||||||
from: 'expenses_transactions.id',
|
from: 'expenses_transactions.id',
|
||||||
through: {
|
through: {
|
||||||
from: 'media_links.model_id',
|
from: 'document_links.modelId',
|
||||||
to: 'media_links.media_id',
|
to: 'document_links.documentId',
|
||||||
},
|
},
|
||||||
to: 'media.id',
|
to: 'documents.id',
|
||||||
},
|
},
|
||||||
filter(query) {
|
filter(query) {
|
||||||
query.where('model_name', 'Expense');
|
query.where('model_ref', 'Expense');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ export default {
|
|||||||
sortField: 'name',
|
sortField: 'name',
|
||||||
sortOrder: 'DESC',
|
sortOrder: 'DESC',
|
||||||
},
|
},
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Items',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
type: {
|
type: {
|
||||||
name: 'item.field.type',
|
name: 'item.field.type',
|
||||||
@@ -127,6 +130,7 @@ export default {
|
|||||||
name: 'item.field.type',
|
name: 'item.field.type',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
accessor: 'typeFormatted',
|
||||||
},
|
},
|
||||||
name: {
|
name: {
|
||||||
name: 'item.field.name',
|
name: 'item.field.name',
|
||||||
@@ -142,11 +146,13 @@ export default {
|
|||||||
name: 'item.field.sellable',
|
name: 'item.field.sellable',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
purchasable: {
|
purchasable: {
|
||||||
name: 'item.field.purchasable',
|
name: 'item.field.purchasable',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
sellPrice: {
|
sellPrice: {
|
||||||
name: 'item.field.cost_price',
|
name: 'item.field.cost_price',
|
||||||
@@ -163,12 +169,14 @@ export default {
|
|||||||
type: 'text',
|
type: 'text',
|
||||||
accessor: 'costAccount.name',
|
accessor: 'costAccount.name',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
sellAccount: {
|
sellAccount: {
|
||||||
name: 'item.field.sell_description',
|
name: 'item.field.sell_description',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
accessor: 'sellAccount.name',
|
accessor: 'sellAccount.name',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
inventoryAccount: {
|
inventoryAccount: {
|
||||||
name: 'item.field.inventory_account',
|
name: 'item.field.inventory_account',
|
||||||
@@ -180,11 +188,13 @@ export default {
|
|||||||
name: 'Sell description',
|
name: 'Sell description',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
purchaseDescription: {
|
purchaseDescription: {
|
||||||
name: 'Purchase description',
|
name: 'Purchase description',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
quantityOnHand: {
|
quantityOnHand: {
|
||||||
name: 'item.field.quantity_on_hand',
|
name: 'item.field.quantity_on_hand',
|
||||||
@@ -206,11 +216,13 @@ export default {
|
|||||||
name: 'item.field.active',
|
name: 'item.field.active',
|
||||||
fieldType: 'boolean',
|
fieldType: 'boolean',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
createdAt: {
|
createdAt: {
|
||||||
name: 'item.field.created_at',
|
name: 'item.field.created_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ export default {
|
|||||||
importAggregator: 'group',
|
importAggregator: 'group',
|
||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'journalNumber',
|
importAggregateBy: 'journalNumber',
|
||||||
|
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Manual Journals',
|
||||||
|
},
|
||||||
|
|
||||||
fields: {
|
fields: {
|
||||||
date: {
|
date: {
|
||||||
name: 'manual_journal.field.date',
|
name: 'manual_journal.field.date',
|
||||||
@@ -63,6 +68,7 @@ export default {
|
|||||||
date: {
|
date: {
|
||||||
name: 'manual_journal.field.date',
|
name: 'manual_journal.field.date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'formattedDate',
|
||||||
},
|
},
|
||||||
journalNumber: {
|
journalNumber: {
|
||||||
name: 'manual_journal.field.journal_number',
|
name: 'manual_journal.field.journal_number',
|
||||||
@@ -83,10 +89,12 @@ export default {
|
|||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'manual_journal.field.currency',
|
name: 'manual_journal.field.currency',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'manual_journal.field.exchange_rate',
|
name: 'manual_journal.field.exchange_rate',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
name: 'manual_journal.field.description',
|
name: 'manual_journal.field.description',
|
||||||
@@ -120,13 +128,17 @@ export default {
|
|||||||
publish: {
|
publish: {
|
||||||
name: 'Publish',
|
name: 'Publish',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
publishedAt: {
|
publishedAt: {
|
||||||
name: 'Published At',
|
name: 'Published At',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
createdAt: {
|
createdAt: {
|
||||||
name: 'Created At',
|
name: 'Created At',
|
||||||
|
accessor: 'formattedCreatedAt',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -94,9 +94,9 @@ export default class ManualJournal extends mixin(TenantModel, [
|
|||||||
* Relationship mapping.
|
* Relationship mapping.
|
||||||
*/
|
*/
|
||||||
static get relationMappings() {
|
static get relationMappings() {
|
||||||
const Media = require('models/Media');
|
|
||||||
const AccountTransaction = require('models/AccountTransaction');
|
const AccountTransaction = require('models/AccountTransaction');
|
||||||
const ManualJournalEntry = require('models/ManualJournalEntry');
|
const ManualJournalEntry = require('models/ManualJournalEntry');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
entries: {
|
entries: {
|
||||||
@@ -121,19 +121,23 @@ export default class ManualJournal extends mixin(TenantModel, [
|
|||||||
query.where('referenceType', 'Journal');
|
query.where('referenceType', 'Journal');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
media: {
|
|
||||||
|
/**
|
||||||
|
* Manual journal may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
relation: Model.ManyToManyRelation,
|
relation: Model.ManyToManyRelation,
|
||||||
modelClass: Media.default,
|
modelClass: Document.default,
|
||||||
join: {
|
join: {
|
||||||
from: 'manual_journals.id',
|
from: 'manual_journals.id',
|
||||||
through: {
|
through: {
|
||||||
from: 'media_links.model_id',
|
from: 'document_links.modelId',
|
||||||
to: 'media_links.media_id',
|
to: 'document_links.documentId',
|
||||||
},
|
},
|
||||||
to: 'media.id',
|
to: 'documents.id',
|
||||||
},
|
},
|
||||||
filter(query) {
|
filter(query) {
|
||||||
query.where('model_name', 'ManualJournal');
|
query.where('model_ref', 'ManualJournal');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -67,10 +67,12 @@ export default {
|
|||||||
paymentDate: {
|
paymentDate: {
|
||||||
name: 'payment_receive.field.payment_date',
|
name: 'payment_receive.field.payment_date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'formattedPaymentDate',
|
||||||
},
|
},
|
||||||
amount: {
|
amount: {
|
||||||
name: 'payment_receive.field.amount',
|
name: 'payment_receive.field.amount',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
accessor: 'formattedAmount'
|
||||||
},
|
},
|
||||||
referenceNo: {
|
referenceNo: {
|
||||||
name: 'payment_receive.field.reference_no',
|
name: 'payment_receive.field.reference_no',
|
||||||
@@ -88,10 +90,12 @@ export default {
|
|||||||
statement: {
|
statement: {
|
||||||
name: 'payment_receive.field.statement',
|
name: 'payment_receive.field.statement',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
created_at: {
|
created_at: {
|
||||||
name: 'payment_receive.field.created_at',
|
name: 'payment_receive.field.created_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ export default class PaymentReceive extends mixin(TenantModel, [
|
|||||||
const Customer = require('models/Customer');
|
const Customer = require('models/Customer');
|
||||||
const Account = require('models/Account');
|
const Account = require('models/Account');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
customer: {
|
customer: {
|
||||||
@@ -111,6 +112,25 @@ export default class PaymentReceive extends mixin(TenantModel, [
|
|||||||
to: 'branches.id',
|
to: 'branches.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Payment transaction may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'payment_receives.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'PaymentReceive');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ export default {
|
|||||||
importAggregator: 'group',
|
importAggregator: 'group',
|
||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'estimateNumber',
|
importAggregateBy: 'estimateNumber',
|
||||||
|
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Sale Estimates'
|
||||||
|
},
|
||||||
|
|
||||||
fields: {
|
fields: {
|
||||||
amount: {
|
amount: {
|
||||||
name: 'estimate.field.amount',
|
name: 'estimate.field.amount',
|
||||||
@@ -86,11 +91,13 @@ export default {
|
|||||||
estimateDate: {
|
estimateDate: {
|
||||||
name: 'Estimate Date',
|
name: 'Estimate Date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'formattedEstimateDate',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
},
|
},
|
||||||
expirationDate: {
|
expirationDate: {
|
||||||
name: 'Expiration Date',
|
name: 'Expiration Date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'formattedExpirationDate',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
},
|
},
|
||||||
estimateNumber: {
|
estimateNumber: {
|
||||||
@@ -112,26 +119,31 @@ export default {
|
|||||||
name: 'Exchange Rate',
|
name: 'Exchange Rate',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'Currency',
|
name: 'Currency',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
note: {
|
note: {
|
||||||
name: 'Note',
|
name: 'Note',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
termsConditions: {
|
termsConditions: {
|
||||||
name: 'Terms & Conditions',
|
name: 'Terms & Conditions',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
delivered: {
|
delivered: {
|
||||||
name: 'Delivered',
|
name: 'Delivered',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'Entries',
|
name: 'Entries',
|
||||||
@@ -153,6 +165,7 @@ export default {
|
|||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
name: 'Item Description',
|
name: 'Item Description',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
amount: {
|
amount: {
|
||||||
name: 'Item Amount',
|
name: 'Item Amount',
|
||||||
|
|||||||
@@ -182,6 +182,7 @@ export default class SaleEstimate extends mixin(TenantModel, [
|
|||||||
const ItemEntry = require('models/ItemEntry');
|
const ItemEntry = require('models/ItemEntry');
|
||||||
const Customer = require('models/Customer');
|
const Customer = require('models/Customer');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
customer: {
|
customer: {
|
||||||
@@ -219,6 +220,25 @@ export default class SaleEstimate extends mixin(TenantModel, [
|
|||||||
to: 'branches.id',
|
to: 'branches.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sale estimate transaction may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'sales_estimates.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'SaleEstimate');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,10 @@ export default {
|
|||||||
importAggregator: 'group',
|
importAggregator: 'group',
|
||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'invoiceNo',
|
importAggregateBy: 'invoiceNo',
|
||||||
|
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Sale invoices',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
customer: {
|
customer: {
|
||||||
name: 'invoice.field.customer',
|
name: 'invoice.field.customer',
|
||||||
@@ -94,10 +98,12 @@ export default {
|
|||||||
invoiceDate: {
|
invoiceDate: {
|
||||||
name: 'invoice.field.invoice_date',
|
name: 'invoice.field.invoice_date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'invoiceDateFormatted',
|
||||||
},
|
},
|
||||||
dueDate: {
|
dueDate: {
|
||||||
name: 'invoice.field.due_date',
|
name: 'invoice.field.due_date',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
accessor: 'dueDateFormatted',
|
||||||
},
|
},
|
||||||
referenceNo: {
|
referenceNo: {
|
||||||
name: 'invoice.field.reference_no',
|
name: 'invoice.field.reference_no',
|
||||||
@@ -120,10 +126,12 @@ export default {
|
|||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'invoice.field.exchange_rate',
|
name: 'invoice.field.exchange_rate',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'invoice.field.currency',
|
name: 'invoice.field.currency',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
paidAmount: {
|
paidAmount: {
|
||||||
name: 'Paid Amount',
|
name: 'Paid Amount',
|
||||||
@@ -136,14 +144,17 @@ export default {
|
|||||||
invoiceMessage: {
|
invoiceMessage: {
|
||||||
name: 'invoice.field.invoice_message',
|
name: 'invoice.field.invoice_message',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
termsConditions: {
|
termsConditions: {
|
||||||
name: 'invoice.field.terms_conditions',
|
name: 'invoice.field.terms_conditions',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
delivered: {
|
delivered: {
|
||||||
name: 'invoice.field.delivered',
|
name: 'invoice.field.delivered',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'Entries',
|
name: 'Entries',
|
||||||
@@ -165,6 +176,7 @@ export default {
|
|||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
name: 'Item Description',
|
name: 'Item Description',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
amount: {
|
amount: {
|
||||||
name: 'Item Amount',
|
name: 'Item Amount',
|
||||||
@@ -202,18 +214,22 @@ export default {
|
|||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'invoice.field.exchange_rate',
|
name: 'invoice.field.exchange_rate',
|
||||||
fieldType: 'number',
|
fieldType: 'number',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'invoice.field.currency',
|
name: 'invoice.field.currency',
|
||||||
fieldType: 'text',
|
fieldType: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
invoiceMessage: {
|
invoiceMessage: {
|
||||||
name: 'invoice.field.invoice_message',
|
name: 'invoice.field.invoice_message',
|
||||||
fieldType: 'text',
|
fieldType: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
termsConditions: {
|
termsConditions: {
|
||||||
name: 'invoice.field.terms_conditions',
|
name: 'invoice.field.terms_conditions',
|
||||||
fieldType: 'text',
|
fieldType: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'invoice.field.entries',
|
name: 'invoice.field.entries',
|
||||||
@@ -249,6 +265,7 @@ export default {
|
|||||||
delivered: {
|
delivered: {
|
||||||
name: 'invoice.field.delivered',
|
name: 'invoice.field.delivered',
|
||||||
fieldType: 'boolean',
|
fieldType: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -410,6 +410,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
|
|||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
const Account = require('models/Account');
|
const Account = require('models/Account');
|
||||||
const TaxRateTransaction = require('models/TaxRateTransaction');
|
const TaxRateTransaction = require('models/TaxRateTransaction');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
/**
|
/**
|
||||||
@@ -523,6 +524,25 @@ export default class SaleInvoice extends mixin(TenantModel, [
|
|||||||
builder.where('reference_type', 'SaleInvoice');
|
builder.where('reference_type', 'SaleInvoice');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sale invoice transaction may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'sales_invoices.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'SaleInvoice');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,10 @@ export default {
|
|||||||
importAggregator: 'group',
|
importAggregator: 'group',
|
||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'receiptNumber',
|
importAggregateBy: 'receiptNumber',
|
||||||
|
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Sale Receipts',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
amount: {
|
amount: {
|
||||||
name: 'receipt.field.amount',
|
name: 'receipt.field.amount',
|
||||||
@@ -81,11 +85,6 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
columns: {
|
columns: {
|
||||||
amount: {
|
|
||||||
name: 'receipt.field.amount',
|
|
||||||
column: 'amount',
|
|
||||||
type: 'number',
|
|
||||||
},
|
|
||||||
depositAccount: {
|
depositAccount: {
|
||||||
name: 'receipt.field.deposit_account',
|
name: 'receipt.field.deposit_account',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
@@ -98,6 +97,7 @@ export default {
|
|||||||
},
|
},
|
||||||
receiptDate: {
|
receiptDate: {
|
||||||
name: 'receipt.field.receipt_date',
|
name: 'receipt.field.receipt_date',
|
||||||
|
accessor: 'formattedReceiptDate',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
},
|
},
|
||||||
receiptNumber: {
|
receiptNumber: {
|
||||||
@@ -114,10 +114,17 @@ export default {
|
|||||||
name: 'receipt.field.receipt_message',
|
name: 'receipt.field.receipt_message',
|
||||||
column: 'receipt_message',
|
column: 'receipt_message',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
|
},
|
||||||
|
amount: {
|
||||||
|
name: 'receipt.field.amount',
|
||||||
|
accessor: 'formattedAmount',
|
||||||
|
type: 'number',
|
||||||
},
|
},
|
||||||
statement: {
|
statement: {
|
||||||
name: 'receipt.field.statement',
|
name: 'receipt.field.statement',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
name: 'receipt.field.status',
|
name: 'receipt.field.status',
|
||||||
@@ -127,6 +134,7 @@ export default {
|
|||||||
{ key: 'closed', label: 'receipt.field.status.closed' },
|
{ key: 'closed', label: 'receipt.field.status.closed' },
|
||||||
],
|
],
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'Entries',
|
name: 'Entries',
|
||||||
@@ -148,6 +156,7 @@ export default {
|
|||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
name: 'Item Description',
|
name: 'Item Description',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
amount: {
|
amount: {
|
||||||
name: 'Item Amount',
|
name: 'Item Amount',
|
||||||
@@ -158,6 +167,7 @@ export default {
|
|||||||
createdAt: {
|
createdAt: {
|
||||||
name: 'receipt.field.created_at',
|
name: 'receipt.field.created_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ export default class SaleReceipt extends mixin(TenantModel, [
|
|||||||
const AccountTransaction = require('models/AccountTransaction');
|
const AccountTransaction = require('models/AccountTransaction');
|
||||||
const ItemEntry = require('models/ItemEntry');
|
const ItemEntry = require('models/ItemEntry');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
customer: {
|
customer: {
|
||||||
@@ -167,6 +168,25 @@ export default class SaleReceipt extends mixin(TenantModel, [
|
|||||||
to: 'branches.id',
|
to: 'branches.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sale receipt transaction may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'sales_receipts.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'SaleReceipt');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -104,10 +104,10 @@ export default class UncategorizedCashflowTransaction extends mixin(
|
|||||||
*/
|
*/
|
||||||
private async updateUncategorizedTransactionCount(
|
private async updateUncategorizedTransactionCount(
|
||||||
queryContext: QueryContext,
|
queryContext: QueryContext,
|
||||||
increment: boolean
|
increment: boolean,
|
||||||
|
amount: number = 1
|
||||||
) {
|
) {
|
||||||
const operation = increment ? 'increment' : 'decrement';
|
const operation = increment ? 'increment' : 'decrement';
|
||||||
const amount = increment ? 1 : -1;
|
|
||||||
|
|
||||||
await Account.query(queryContext.transaction)
|
await Account.query(queryContext.transaction)
|
||||||
.findById(this.accountId)
|
.findById(this.accountId)
|
||||||
|
|||||||
@@ -131,21 +131,26 @@ export default {
|
|||||||
openingBalance: {
|
openingBalance: {
|
||||||
name: 'vendor.field.opening_balance',
|
name: 'vendor.field.opening_balance',
|
||||||
type: 'number',
|
type: 'number',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
openingBalanceAt: {
|
openingBalanceAt: {
|
||||||
name: 'vendor.field.opening_balance_at',
|
name: 'vendor.field.opening_balance_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
currencyCode: {
|
currencyCode: {
|
||||||
name: 'vendor.field.currency',
|
name: 'vendor.field.currency',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
name: 'vendor.field.status',
|
name: 'vendor.field.status',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
note: {
|
note: {
|
||||||
name: 'vendor.field.note',
|
name: 'vendor.field.note',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
// Billing Address
|
// Billing Address
|
||||||
billingAddress1: {
|
billingAddress1: {
|
||||||
@@ -153,42 +158,49 @@ export default {
|
|||||||
column: 'billing_address1',
|
column: 'billing_address1',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddress2: {
|
billingAddress2: {
|
||||||
name: 'Billing Address 2',
|
name: 'Billing Address 2',
|
||||||
column: 'billing_address2',
|
column: 'billing_address2',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressCity: {
|
billingAddressCity: {
|
||||||
name: 'Billing Address City',
|
name: 'Billing Address City',
|
||||||
column: 'billing_address_city',
|
column: 'billing_address_city',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressCountry: {
|
billingAddressCountry: {
|
||||||
name: 'Billing Address Country',
|
name: 'Billing Address Country',
|
||||||
column: 'billing_address_country',
|
column: 'billing_address_country',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressPostcode: {
|
billingAddressPostcode: {
|
||||||
name: 'Billing Address Postcode',
|
name: 'Billing Address Postcode',
|
||||||
column: 'billing_address_postcode',
|
column: 'billing_address_postcode',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressState: {
|
billingAddressState: {
|
||||||
name: 'Billing Address State',
|
name: 'Billing Address State',
|
||||||
column: 'billing_address_state',
|
column: 'billing_address_state',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
billingAddressPhone: {
|
billingAddressPhone: {
|
||||||
name: 'Billing Address Phone',
|
name: 'Billing Address Phone',
|
||||||
column: 'billing_address_phone',
|
column: 'billing_address_phone',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
// Shipping Address
|
// Shipping Address
|
||||||
shippingAddress1: {
|
shippingAddress1: {
|
||||||
@@ -196,47 +208,55 @@ export default {
|
|||||||
column: 'shipping_address1',
|
column: 'shipping_address1',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddress2: {
|
shippingAddress2: {
|
||||||
name: 'Shipping Address 2',
|
name: 'Shipping Address 2',
|
||||||
column: 'shipping_address2',
|
column: 'shipping_address2',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressCity: {
|
shippingAddressCity: {
|
||||||
name: 'Shipping Address City',
|
name: 'Shipping Address City',
|
||||||
column: 'shipping_address_city',
|
column: 'shipping_address_city',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressCountry: {
|
shippingAddressCountry: {
|
||||||
name: 'Shipping Address Country',
|
name: 'Shipping Address Country',
|
||||||
column: 'shipping_address_country',
|
column: 'shipping_address_country',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressPostcode: {
|
shippingAddressPostcode: {
|
||||||
name: 'Shipping Address Postcode',
|
name: 'Shipping Address Postcode',
|
||||||
column: 'shipping_address_postcode',
|
column: 'shipping_address_postcode',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressState: {
|
shippingAddressState: {
|
||||||
name: 'Shipping Address State',
|
name: 'Shipping Address State',
|
||||||
column: 'shipping_address_state',
|
column: 'shipping_address_state',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
shippingAddressPhone: {
|
shippingAddressPhone: {
|
||||||
name: 'Shipping Address Phone',
|
name: 'Shipping Address Phone',
|
||||||
column: 'shipping_address_phone',
|
column: 'shipping_address_phone',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
createdAt: {
|
createdAt: {
|
||||||
name: 'vendor.field.created_at',
|
name: 'vendor.field.created_at',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
exportable: true,
|
exportable: true,
|
||||||
|
printable: false
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
fields2: {
|
fields2: {
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ export default {
|
|||||||
importAggregateOn: 'entries',
|
importAggregateOn: 'entries',
|
||||||
importAggregateBy: 'vendorCreditNumber',
|
importAggregateBy: 'vendorCreditNumber',
|
||||||
|
|
||||||
|
print: {
|
||||||
|
pageTitle: 'Vendor Credits',
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
vendor: {
|
vendor: {
|
||||||
name: 'vendor_credit.field.vendor',
|
name: 'vendor_credit.field.vendor',
|
||||||
@@ -89,6 +92,7 @@ export default {
|
|||||||
exchangeRate: {
|
exchangeRate: {
|
||||||
name: 'Echange Rate',
|
name: 'Echange Rate',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
vendorCreditNumber: {
|
vendorCreditNumber: {
|
||||||
name: 'Vendor Credit No.',
|
name: 'Vendor Credit No.',
|
||||||
@@ -100,7 +104,7 @@ export default {
|
|||||||
},
|
},
|
||||||
vendorCreditDate: {
|
vendorCreditDate: {
|
||||||
name: 'Vendor Credit Date',
|
name: 'Vendor Credit Date',
|
||||||
type: 'date',
|
accessor: 'formattedVendorCreditDate',
|
||||||
},
|
},
|
||||||
amount: {
|
amount: {
|
||||||
name: 'Amount',
|
name: 'Amount',
|
||||||
@@ -109,10 +113,12 @@ export default {
|
|||||||
creditRemaining: {
|
creditRemaining: {
|
||||||
name: 'Credits Remaining',
|
name: 'Credits Remaining',
|
||||||
accessor: 'formattedCreditsRemaining',
|
accessor: 'formattedCreditsRemaining',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
refundedAmount: {
|
refundedAmount: {
|
||||||
name: 'Refunded Amount',
|
name: 'Refunded Amount',
|
||||||
accessor: 'refundedAmount',
|
accessor: 'refundedAmount',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
invoicedAmount: {
|
invoicedAmount: {
|
||||||
name: 'Invoiced Amount',
|
name: 'Invoiced Amount',
|
||||||
@@ -121,10 +127,12 @@ export default {
|
|||||||
note: {
|
note: {
|
||||||
name: 'Note',
|
name: 'Note',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
open: {
|
open: {
|
||||||
name: 'Open',
|
name: 'Open',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
printable: false,
|
||||||
},
|
},
|
||||||
entries: {
|
entries: {
|
||||||
name: 'Entries',
|
name: 'Entries',
|
||||||
|
|||||||
@@ -177,6 +177,7 @@ export default class VendorCredit extends mixin(TenantModel, [
|
|||||||
const Vendor = require('models/Vendor');
|
const Vendor = require('models/Vendor');
|
||||||
const ItemEntry = require('models/ItemEntry');
|
const ItemEntry = require('models/ItemEntry');
|
||||||
const Branch = require('models/Branch');
|
const Branch = require('models/Branch');
|
||||||
|
const Document = require('models/Document');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
vendor: {
|
vendor: {
|
||||||
@@ -215,6 +216,25 @@ export default class VendorCredit extends mixin(TenantModel, [
|
|||||||
to: 'branches.id',
|
to: 'branches.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Vendor credit may has many attached attachments.
|
||||||
|
*/
|
||||||
|
attachments: {
|
||||||
|
relation: Model.ManyToManyRelation,
|
||||||
|
modelClass: Document.default,
|
||||||
|
join: {
|
||||||
|
from: 'vendor_credits.id',
|
||||||
|
through: {
|
||||||
|
from: 'document_links.modelId',
|
||||||
|
to: 'document_links.documentId',
|
||||||
|
},
|
||||||
|
to: 'documents.id',
|
||||||
|
},
|
||||||
|
filter(query) {
|
||||||
|
query.where('model_ref', 'VendorCredit');
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ export default class Ledger implements ILedger {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Filters entries by the given accounts ids then returns a new ledger.
|
* Filters entries by the given accounts ids then returns a new ledger.
|
||||||
* @param {number[]} accountIds
|
* @param {number[]} accountIds
|
||||||
* @returns {ILedger}
|
* @returns {ILedger}
|
||||||
*/
|
*/
|
||||||
public whereAccountsIds(accountIds: number[]): ILedger {
|
public whereAccountsIds(accountIds: number[]): ILedger {
|
||||||
@@ -274,4 +274,14 @@ export default class Ledger implements ILedger {
|
|||||||
const entries = Ledger.mappingTransactions(transactions);
|
const entries = Ledger.mappingTransactions(transactions);
|
||||||
return new Ledger(entries);
|
return new Ledger(entries);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve the transaction amount.
|
||||||
|
* @param {number} credit - Credit amount.
|
||||||
|
* @param {number} debit - Debit amount.
|
||||||
|
* @param {string} normal - Credit or debit.
|
||||||
|
*/
|
||||||
|
static getAmount(credit: number, debit: number, normal: string) {
|
||||||
|
return normal === 'credit' ? credit - debit : debit - credit;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import {
|
|||||||
IAccountEventCreatedPayload,
|
IAccountEventCreatedPayload,
|
||||||
IAccountEventCreatingPayload,
|
IAccountEventCreatingPayload,
|
||||||
IAccountCreateDTO,
|
IAccountCreateDTO,
|
||||||
|
CreateAccountParams,
|
||||||
} from '@/interfaces';
|
} from '@/interfaces';
|
||||||
import events from '@/subscribers/events';
|
import events from '@/subscribers/events';
|
||||||
import UnitOfWork from '@/services/UnitOfWork';
|
import UnitOfWork from '@/services/UnitOfWork';
|
||||||
@@ -30,19 +31,22 @@ export class CreateAccount {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Authorize the account creation.
|
* Authorize the account creation.
|
||||||
* @param {number} tenantId
|
* @param {number} tenantId
|
||||||
* @param {IAccountCreateDTO} accountDTO
|
* @param {IAccountCreateDTO} accountDTO
|
||||||
*/
|
*/
|
||||||
private authorize = async (
|
private authorize = async (
|
||||||
tenantId: number,
|
tenantId: number,
|
||||||
accountDTO: IAccountCreateDTO,
|
accountDTO: IAccountCreateDTO,
|
||||||
baseCurrency: string
|
baseCurrency: string,
|
||||||
|
params?: CreateAccountParams
|
||||||
) => {
|
) => {
|
||||||
// Validate account name uniquiness.
|
// Validate account name uniquiness.
|
||||||
await this.validator.validateAccountNameUniquiness(
|
if (!params.ignoreUniqueName) {
|
||||||
tenantId,
|
await this.validator.validateAccountNameUniquiness(
|
||||||
accountDTO.name
|
tenantId,
|
||||||
);
|
accountDTO.name
|
||||||
|
);
|
||||||
|
}
|
||||||
// Validate the account code uniquiness.
|
// Validate the account code uniquiness.
|
||||||
if (accountDTO.code) {
|
if (accountDTO.code) {
|
||||||
await this.validator.isAccountCodeUniqueOrThrowError(
|
await this.validator.isAccountCodeUniqueOrThrowError(
|
||||||
@@ -82,7 +86,7 @@ export class CreateAccount {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Transformes the create account DTO to input model.
|
* Transformes the create account DTO to input model.
|
||||||
* @param {IAccountCreateDTO} createAccountDTO
|
* @param {IAccountCreateDTO} createAccountDTO
|
||||||
*/
|
*/
|
||||||
private transformDTOToModel = (
|
private transformDTOToModel = (
|
||||||
createAccountDTO: IAccountCreateDTO,
|
createAccountDTO: IAccountCreateDTO,
|
||||||
@@ -104,7 +108,8 @@ export class CreateAccount {
|
|||||||
public createAccount = async (
|
public createAccount = async (
|
||||||
tenantId: number,
|
tenantId: number,
|
||||||
accountDTO: IAccountCreateDTO,
|
accountDTO: IAccountCreateDTO,
|
||||||
trx?: Knex.Transaction
|
trx?: Knex.Transaction,
|
||||||
|
params: CreateAccountParams = { ignoreUniqueName: false }
|
||||||
): Promise<IAccount> => {
|
): Promise<IAccount> => {
|
||||||
const { Account } = this.tenancy.models(tenantId);
|
const { Account } = this.tenancy.models(tenantId);
|
||||||
|
|
||||||
@@ -112,8 +117,12 @@ export class CreateAccount {
|
|||||||
const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
|
const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
|
||||||
|
|
||||||
// Authorize the account creation.
|
// Authorize the account creation.
|
||||||
await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency);
|
await this.authorize(
|
||||||
|
tenantId,
|
||||||
|
accountDTO,
|
||||||
|
tenantMeta.baseCurrency,
|
||||||
|
params
|
||||||
|
);
|
||||||
// Transformes the DTO to model.
|
// Transformes the DTO to model.
|
||||||
const accountInputModel = this.transformDTOToModel(
|
const accountInputModel = this.transformDTOToModel(
|
||||||
accountDTO,
|
accountDTO,
|
||||||
@@ -148,3 +157,4 @@ export class CreateAccount {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { Transformer } from '@/lib/Transformer/Transformer';
|
||||||
|
|
||||||
|
export class AttachmentTransformer extends Transformer {
|
||||||
|
/**
|
||||||
|
* Exclude attributes.
|
||||||
|
* @returns {string[]}
|
||||||
|
*/
|
||||||
|
public excludeAttributes = (): string[] => {
|
||||||
|
return ['id', 'createdAt'];
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Includeded attributes.
|
||||||
|
* @returns {string[]}
|
||||||
|
*/
|
||||||
|
public includeAttributes = (): string[] => {
|
||||||
|
return [];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
import { Inject, Service } from 'typedi';
|
||||||
|
import { UploadDocument } from './UploadDocument';
|
||||||
|
import { DeleteAttachment } from './DeleteAttachment';
|
||||||
|
import { GetAttachment } from './GetAttachment';
|
||||||
|
import { LinkAttachment } from './LinkAttachment';
|
||||||
|
import { UnlinkAttachment } from './UnlinkAttachment';
|
||||||
|
import { getAttachmentPresignedUrl } from './GetAttachmentPresignedUrl';
|
||||||
|
|
||||||
|
@Service()
|
||||||
|
export class AttachmentsApplication {
|
||||||
|
@Inject()
|
||||||
|
private uploadDocumentService: UploadDocument;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
private deleteDocumentService: DeleteAttachment;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
private getDocumentService: GetAttachment;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
private linkDocumentService: LinkAttachment;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
private unlinkDocumentService: UnlinkAttachment;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
private getPresignedUrlService: getAttachmentPresignedUrl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Saves the metadata of uploaded document to S3 on database.
|
||||||
|
* @param {number} tenantId
|
||||||
|
* @param {} file
|
||||||
|
* @returns {Promise<Document>}
|
||||||
|
*/
|
||||||
|
public upload(tenantId: number, file: any) {
|
||||||
|
return this.uploadDocumentService.upload(tenantId, file);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes the give file attachment file key.
|
||||||
|
* @param {number} tenantId
|
||||||
|
* @param {string} documentKey
|
||||||
|
* @returns {Promise<void>}
|
||||||
|
*/
|
||||||
|
public delete(tenantId: number, documentKey: string) {
|
||||||
|
return this.deleteDocumentService.delete(tenantId, documentKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the document data.
|
||||||
|
* @param {number} tenantId
|
||||||
|
* @param {string} documentKey
|
||||||
|
*/
|
||||||
|
public get(tenantId: number, documentKey: string) {
|
||||||
|
return this.getDocumentService.getAttachment(tenantId, documentKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Links the given document to resource model.
|
||||||
|
* @param {number} tenantId
|
||||||
|
* @param {string} filekey
|
||||||
|
* @param {string} modelRef
|
||||||
|
* @param {number} modelId
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
public link(
|
||||||
|
tenantId: number,
|
||||||
|
filekey: string,
|
||||||
|
modelRef: string,
|
||||||
|
modelId: number
|
||||||
|
) {
|
||||||
|
return this.linkDocumentService.link(tenantId, filekey, modelRef, modelId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unlinks the given document from resource model.
|
||||||
|
* @param {number} tenantId
|
||||||
|
* @param {string} filekey
|
||||||
|
* @param {string} modelRef
|
||||||
|
* @param {number} modelId
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
public unlink(
|
||||||
|
tenantId: number,
|
||||||
|
filekey: string,
|
||||||
|
modelRef: string,
|
||||||
|
modelId: number
|
||||||
|
) {
|
||||||
|
return this.unlinkDocumentService.unlink(
|
||||||
|
tenantId,
|
||||||
|
filekey,
|
||||||
|
modelRef,
|
||||||
|
modelId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the presigned url of the given attachment key.
|
||||||
|
* @param {string} key
|
||||||
|
* @returns {Promise<string>}
|
||||||
|
*/
|
||||||
|
public getPresignedUrl(key: string): Promise<string> {
|
||||||
|
return this.getPresignedUrlService.getPresignedUrl(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
45
packages/server/src/services/Attachments/DeleteAttachment.ts
Normal file
45
packages/server/src/services/Attachments/DeleteAttachment.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import { DeleteObjectCommand } from '@aws-sdk/client-s3';
|
||||||
|
import { Inject, Service } from 'typedi';
|
||||||
|
import { s3 } from '@/lib/S3/S3';
|
||||||
|
import HasTenancyService from '../Tenancy/TenancyService';
|
||||||
|
import config from '@/config';
|
||||||
|
import UnitOfWork from '../UnitOfWork';
|
||||||
|
import { Knex } from 'knex';
|
||||||
|
|
||||||
|
@Service()
|
||||||
|
export class DeleteAttachment {
|
||||||
|
@Inject()
|
||||||
|
private tenancy: HasTenancyService;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
private uow: UnitOfWork;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes the give file attachment file key.
|
||||||
|
* @param {number} tenantId
|
||||||
|
* @param {string} filekey
|
||||||
|
*/
|
||||||
|
async delete(tenantId: number, filekey: string): Promise<void> {
|
||||||
|
const { Document, DocumentLink } = this.tenancy.models(tenantId);
|
||||||
|
|
||||||
|
const params = {
|
||||||
|
Bucket: config.s3.bucket,
|
||||||
|
Key: filekey,
|
||||||
|
};
|
||||||
|
await s3.send(new DeleteObjectCommand(params));
|
||||||
|
|
||||||
|
const foundDocument = await Document.query()
|
||||||
|
.findOne('key', filekey)
|
||||||
|
.throwIfNotFound();
|
||||||
|
|
||||||
|
await this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
|
||||||
|
// Delete all document links
|
||||||
|
await DocumentLink.query(trx)
|
||||||
|
.where('documentId', foundDocument.id)
|
||||||
|
.delete();
|
||||||
|
|
||||||
|
// Delete thedocument.
|
||||||
|
await Document.query(trx).findById(foundDocument.id).delete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user