diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 11d7b87..5367dec 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -1883,24 +1883,25 @@ export class TransactionService { ); const data = await baseQuery - .select('SUM(transactions.amount) as total_amount') - .addSelect('SUM(product_price.mark_up_price) as total_profit') - .addSelect('COUNT(transactions.id) as total_transaction') - .getRawOne(); - - const dataCoa = this.coaRepository - .createQueryBuilder('coa') - .innerJoin('user', 'user', 'coa.user = user.id') - .where( - `coa.type = '0' and user.partner_id is not NULL and user.is_active = true and is_rejected = false` - ); - - const coa = await dataCoa - .select('SUM(coa.amount) as total_modal') + .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('COUNT(transactions.id) as total_transaction') .getRawOne(); + // const dataCoa = this.coaRepository + // .createQueryBuilder('coa') + // .innerJoin('user', 'user', 'coa.user = user.id') + // .where( + // `coa.type = '0' and user.partner_id is not NULL and user.is_active = true and is_rejected = false` + // ); + // + // const coa = await dataCoa + // .select('SUM(coa.amount) as total_modal') + // .getRawOne(); + return { - total_modal: parseInt(coa.total_modal), + total_modal: parseInt(data.total_modal), total_amount: parseInt(data.total_amount), total_transaction: parseInt(data.total_transaction), total_profit: parseInt(data.total_profit),