Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging

This commit is contained in:
Fadli 2022-10-12 10:24:53 +07:00
commit 76b6ff9888

View File

@ -2109,9 +2109,9 @@ export class TransactionService {
const { total_expense } = await baseQuery const { total_expense } = await baseQuery
.select('SUM(transaction_journal.amount) as total_expense') .select('SUM(transaction_journal.amount) as total_expense')
.innerJoin('transactions.transactionJournal', 'transaction_journal') .innerJoin('transactions.transactionJournal', 'transaction_journal')
.innerJoin('transactions', 'transactions') .innerJoin('user', 'user')
.where( .where(
`transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and partner_trx_id is NULL`, `transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and user.partner_id is NULL`,
) )
.getRawOne(); .getRawOne();