From 1f627e6db28f434b0e19a00198837618815fc4c0 Mon Sep 17 00:00:00 2001
From: ilham <ilhamdwips@gmail.com>
Date: Wed, 22 Dec 2021 15:32:53 +0700
Subject: [PATCH 1/2] fix: order transaction

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

diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts
index 1c12a1a..208eb66 100644
--- a/src/transaction/transaction.service.ts
+++ b/src/transaction/transaction.service.ts
@@ -308,7 +308,7 @@ export class TransactionService {
 
     let supervisorData = [];
 
-    let profit = product_price.mark_up_price - product_price.price;
+    let profit = product_price.mark_up_price;
 
     if (!userData.partner) {
       //GET SALES
@@ -382,11 +382,11 @@ export class TransactionService {
             },
             {
               coa_id: coaAccount.id,
-              debit: product_price.mark_up_price,
+              debit: product_price.mark_up_price + product_price.price,
             },
             {
               coa_id: coaSales.id,
-              credit: product_price.mark_up_price,
+              credit: product_price.mark_up_price + product_price.price,
             },
             {
               coa_id: coaExpense.id,

From 4659b2a749d6ac1708ec99427efd3fbdebd9d27b Mon Sep 17 00:00:00 2001
From: caturbgs <savemeplease11>
Date: Wed, 22 Dec 2021 16:09:39 +0700
Subject: [PATCH 2/2] feat: add insert image on endpoint payback

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

diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts
index 208eb66..1ecf9b6 100644
--- a/src/transaction/transaction.service.ts
+++ b/src/transaction/transaction.service.ts
@@ -416,6 +416,7 @@ export class TransactionService {
       transactionData.user_destination = depositReturnDto.destination;
       transactionData.status = statusTransaction.PENDING;
       transactionData.type = typeTransaction.DEPOSIT_RETURN;
+      transactionData.image_prove = depositReturnDto.image_prove;
       await this.connection.transaction(async (manager) => {
         await manager.insert(Transactions, transactionData);
       });