- fix total modal in dashboard admin
This commit is contained in:
parent
f77fae0e16
commit
67e79280b2
|
@ -1884,15 +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
|
||||||
|
.createQueryBuilder('coa')
|
||||||
|
.where(
|
||||||
|
`coa.type = '0'`
|
||||||
|
);
|
||||||
|
|
||||||
|
const coa = await dataCoa
|
||||||
|
.select('SUM(coa.amount) as total_modal')
|
||||||
|
.getRawOne();
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
total_modal: parseInt(coa.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_modal: parseInt(data.total_modal),
|
|
||||||
total_profit: parseInt(data.total_profit),
|
total_profit: parseInt(data.total_profit),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user