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

- revert total modal in dashboard

Browse Source
This commit is contained in:
Fadli 2022-07-22 08:57:18 +07:00
parent 43cd745d5e
commit 73d033738a
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1884,23 +1884,24 @@ export class TransactionService {
const data = await baseQuery const data = await baseQuery
.select('SUM(transactions.amount) as total_amount') .select('SUM(transactions.amount) as total_amount')
.addSelect('SUM(product_price.price) as total_modal')
.addSelect('SUM(product_price.mark_up_price) as total_profit') .addSelect('SUM(product_price.mark_up_price) as total_profit')
.addSelect('COUNT(transactions.id) as total_transaction') .addSelect('COUNT(transactions.id) as total_transaction')
.getRawOne(); .getRawOne();
const dataCoa = this.coaRepository // const dataCoa = this.coaRepository
.createQueryBuilder('coa') // .createQueryBuilder('coa')
.innerJoin('user', 'user', 'coa.user = user.id') // .innerJoin('user', 'user', 'coa.user = user.id')
.where( // .where(
`coa.type = '0' and user.partner_id is not NULL and user.is_active = true and is_rejected = false` // `coa.type = '0' and user.partner_id is not NULL and user.is_active = true and is_rejected = false`
); // );
//
const coa = await dataCoa // const coa = await dataCoa
.select('SUM(coa.amount) as total_modal') // .select('SUM(coa.amount) as total_modal')
.getRawOne(); // .getRawOne();
return { return {
total_modal: parseInt(coa.total_modal), total_modal: parseInt(data.total_modal),
total_amount: parseInt(data.total_amount), total_amount: parseInt(data.total_amount),
total_transaction: parseInt(data.total_transaction), total_transaction: parseInt(data.total_transaction),
total_profit: parseInt(data.total_profit), total_profit: parseInt(data.total_profit),