diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 6685405..e823456 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 - product_price.mark_up_price - costInventory; + transactionData.balance_remaining = coaAccount.amount; if (!hitSupplier.success) { transactionData.status = statusTransaction.FAILED; @@ -1237,7 +1237,7 @@ export class TransactionService { if (callback['message'].includes('METRO')) { if (callback['price'] != dataTransaction.product_price.price) { console.log("mskupdt", "msk") - dataProductHistoryPrice.price = parseInt(callback['price']) + dataTransaction.product_price.price = parseInt(callback['price']) } } } @@ -1349,12 +1349,19 @@ 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, ); @@ -1366,6 +1373,8 @@ export class TransactionService { `${coaType[coaType.EXPENSE]}-SYSTEM`, ); + dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; + if (userData.partner == null) { //GET SALES supervisorData = await this.calculateCommission( @@ -1671,6 +1680,7 @@ export class TransactionService { .addSelect('userData.name', 'buyer') .addSelect('product.name', 'name') .addSelect('product_price.price', 'product_price') + .addSelect('product_price.mark_up_price', 'mark_up_price') .addSelect('product.name', 'supplier_name') .addSelect('supplier.name', 'supplier_name') .orderBy('transaction.created_at', 'DESC');