PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fadli 2022-10-12 10:44:09 +07:00
commit 3c8b9b5481
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/transaction/transaction.service.ts
View File

@ -2109,9 +2109,8 @@ export class TransactionService {
const { total_expense } = await baseQuery
.select('SUM(transaction_journal.amount) as total_expense')
.innerJoin('transactions.transactionJournal', 'transaction_journal')
.innerJoin('user', 'user')
.where(
`transaction_journal.type = '0' and transaction_journal.amount < product_price.price and transactions.status = 1 and user.partner_id is NULL`,
`transaction_journal.type = '0' and transaction_journal.amount < product_price.price`,
)
.getRawOne();
@ -2122,7 +2121,7 @@ export class TransactionService {
total_transaction: parseInt(data.total_transaction),
total_modal: parseInt(data.total_modal),
total_profit: parseInt(data.total_profit),
total_commission: parseInt(data.total_profit) - parseInt(total_expense),
total_commission: - parseInt(total_expense) - parseInt(data.total_profit),
};
}