From c1c22560d58ff6b67764dee9633fa1be18d2aeef Mon Sep 17 00:00:00 2001 From: mfadiln2018 Date: Fri, 12 Aug 2022 21:36:15 +0700 Subject: [PATCH] Fix: balance remaining --- src/transaction/transaction.service.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index e823456..5271d07 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -629,7 +629,7 @@ export class TransactionService { transactionData.partner_trx_id = orderTransactionDto.trx_id; transactionData.supplier_trx_id = trxId; transactionData.check_bill = orderTransactionDto.bill_trx_id; - transactionData.balance_remaining = coaAccount.amount; + transactionData.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; if (!hitSupplier.success) { transactionData.status = statusTransaction.FAILED; @@ -1349,19 +1349,12 @@ export class TransactionService { const userData = await this.userService.findExist(dataTransaction.user); - const coaAccount = await this.coaService.findByUser( - userData.id, - coaType.WALLET, - ); - let supervisorData = []; const product_price = await this.productHistoryPriceService.findById( dataTransaction.product_price.id, ); - let costInventory = product_price.price; - const product = await this.productService.findOneById( product_price.product.id, ); @@ -1373,7 +1366,7 @@ export class TransactionService { `${coaType[coaType.EXPENSE]}-SYSTEM`, ); - dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; + // dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; if (userData.partner == null) { //GET SALES