Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
This commit is contained in:
commit
23acd699d4
|
@ -2114,14 +2114,12 @@ export class TransactionService {
|
|||
)
|
||||
.getRawOne();
|
||||
|
||||
console.log("totaprofitni", data.total_profit);
|
||||
console.log("totalexpense", total_expense);
|
||||
return {
|
||||
total_amount: parseInt(data.total_amount),
|
||||
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),
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user