QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Expense cannot accept credit card as payment account

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-09-03 12:22:07 +02:00
parent 795303c3a8
commit 37a8ca4e97
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/server/src/services/Expenses/CRUD/CommandExpenseValidator.ts
View File

@@ -1,7 +1,7 @@
import { Service, Inject } from 'typedi';
import { sumBy, difference } from 'lodash';
import { ServiceError } from '@/exceptions';
import { ERRORS } from '../constants';
import { ERRORS, SUPPORTED_EXPENSE_PAYMENT_ACCOUNT_TYPES } from '../constants';
import {
IAccount,
IExpense,
@@ -79,7 +79,9 @@ export class CommandExpenseValidator {
* @throws {ServiceError}
*/
public validatePaymentAccountType = (paymentAccount: number[]) => {
if (!paymentAccount.isParentType(ACCOUNT_PARENT_TYPE.CURRENT_ASSET)) {
if (
!paymentAccount.isAccountType(SUPPORTED_EXPENSE_PAYMENT_ACCOUNT_TYPES)
) {
throw new ServiceError(ERRORS.PAYMENT_ACCOUNT_HAS_INVALID_TYPE);
}
};

11
packages/server/src/services/Expenses/constants.ts
View File

@@ -1,3 +1,5 @@
import { ACCOUNT_TYPE } from '@/data/AccountTypes';
export const DEFAULT_VIEW_COLUMNS = [];
export const DEFAULT_VIEWS = [
{
@@ -76,3 +78,12 @@ export const ExpensesSampleData = [
Publish: 'T',
},
];
export const SUPPORTED_EXPENSE_PAYMENT_ACCOUNT_TYPES = [
ACCOUNT_TYPE.CASH,
ACCOUNT_TYPE.BANK,
ACCOUNT_TYPE.CREDIT_CARD,
ACCOUNT_TYPE.OTHER_CURRENT_ASSET,
ACCOUNT_TYPE.NON_CURRENT_ASSET,
ACCOUNT_TYPE.FIXED_ASSET,
];