From 6fe43a61948f3896f128a91eb488e67c5c48d647 Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Mon, 10 Oct 2022 22:01:46 +0700
Subject: [PATCH 1/2] - logs total expense

---
 src/transaction/transaction.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts
index 8e76020..9bde446 100644
--- a/src/transaction/transaction.service.ts
+++ b/src/transaction/transaction.service.ts
@@ -2114,6 +2114,8 @@ 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),

From 8d1ed5a686583c01aaa9a3a6ff8abbdd411af522 Mon Sep 17 00:00:00 2001
From: Fadli <muhammad.fadli@bangun-kreatif.com>
Date: Tue, 11 Oct 2022 11:30:41 +0700
Subject: [PATCH 2/2] - fix total commision

---
 src/transaction/transaction.service.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts
index 9bde446..d2fac58 100644
--- a/src/transaction/transaction.service.ts
+++ b/src/transaction/transaction.service.ts
@@ -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),
     };
   }