diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 5c15528..6685405 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -1204,6 +1204,12 @@ export class TransactionService { relations: ['product_price'], }); + const dataProductHistoryPrice = await this.productPriceRepository.findOne({ + where: { + id: dataTransaction.product_price.id, + }, + }); + // const dataMsg = callback.msg; // const failedReason = dataMsg.split('.'); @@ -1225,16 +1231,16 @@ export class TransactionService { dataTransaction.callback_json = callback; dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal`; - // console.log("inipricetable", dataTransaction.product_price.price) - // console.log("inipricecallback", callback['price']) - // if(callback['message']) { - // if (callback['message'].includes('METRO')) { - // if (callback['price'] != dataTransaction.product_price.price) { - // console.log("mskupdt", "msk") - // dataTransaction.product_price.price = parseInt(callback['price']) - // } - // } - // } + console.log("inipricetable", dataTransaction.product_price.price) + console.log("inipricecallback", callback['price']) + if(callback['message']) { + if (callback['message'].includes('METRO')) { + if (callback['price'] != dataTransaction.product_price.price) { + console.log("mskupdt", "msk") + dataProductHistoryPrice.price = parseInt(callback['price']) + } + } + } //GET COA const coaAccount = await this.coaService.findByUser( @@ -1246,8 +1252,6 @@ export class TransactionService { dataTransaction.callback_json = callback; dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal`; dataTransaction.balance_remaining = coaAccount.amount + product_price.mark_up_price + product_price.price; - dataTransaction.product_price.price = parseInt(callback['price']) - const coaInventory = await this.coaService.findByName( `${coaType[coaType.INVENTORY]}-${product.supplier.code}`, @@ -1264,6 +1268,7 @@ export class TransactionService { try { await this.connection.transaction(async (manager) => { await manager.save(dataTransaction); + await manager.save(dataProductHistoryPrice); await this.accountingTransaction({ createTransaction: false, @@ -1317,6 +1322,12 @@ export class TransactionService { relations: ['product_price'], }); + const dataProductHistoryPrice = await this.productPriceRepository.findOne({ + where: { + id: dataTransaction.product_price.id, + }, + }); + dataTransaction.status = statusTransaction.SUCCESS; if(callback['sn']){ dataTransaction.seri_number = callback['sn']; @@ -1331,7 +1342,7 @@ export class TransactionService { if(callback['message']) { if (callback['message'].includes('METRO')) { if (callback['price'] != dataTransaction.product_price.price) { - dataTransaction.product_price.price = parseInt(callback['price']) + dataProductHistoryPrice.price = parseInt(callback['price']) } } } @@ -1381,6 +1392,7 @@ export class TransactionService { try { await this.connection.transaction(async (manager) => { await manager.save(dataTransaction); + await manager.save(dataProductHistoryPrice) await this.accountingTransaction({ createTransaction: false,