Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging

src/transaction/transaction.service.ts

@@ -1884,15 +1884,24 @@ export class TransactionService {
 
     const data = await baseQuery
       .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')
+        .where(
+            `coa.type = '0'`
+        );
+
+    const coa = await dataCoa
+        .select('SUM(coa.amount) as total_modal')
+        .getRawOne();
+
     return {
+      total_modal: parseInt(coa.total_modal),
       total_amount: parseInt(data.total_amount),
       total_transaction: parseInt(data.total_transaction),
-      total_modal: parseInt(data.total_modal),
       total_profit: parseInt(data.total_profit),
     };
   }