From d251cadb0d9f016c53e7b3c9a6052bce5741eeb6 Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 10 Aug 2022 23:12:31 +0700 Subject: [PATCH 1/2] - revert auto update price logs --- src/transaction/transaction.service.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 5c15528..3dbf8cf 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -1225,16 +1225,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") + dataTransaction.product_price.price = parseInt(callback['price']) + } + } + } //GET COA const coaAccount = await this.coaService.findByUser( @@ -1246,8 +1246,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}`, From 0b9df3006a16dbc9263e5f85cb225ab0be96131a Mon Sep 17 00:00:00 2001 From: Fadli Date: Wed, 10 Aug 2022 23:20:30 +0700 Subject: [PATCH 2/2] - fix auto update price and add new repository for product_history_price --- src/transaction/transaction.service.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 3dbf8cf..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('.'); @@ -1231,7 +1237,7 @@ export class TransactionService { if (callback['message'].includes('METRO')) { if (callback['price'] != dataTransaction.product_price.price) { console.log("mskupdt", "msk") - dataTransaction.product_price.price = parseInt(callback['price']) + dataProductHistoryPrice.price = parseInt(callback['price']) } } } @@ -1262,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, @@ -1315,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']; @@ -1329,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']) } } } @@ -1379,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,