PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging

Browse Source
This commit is contained in:
Fadli 2022-08-10 23:21:14 +07:00
commit dd80de65c5
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/transaction/transaction.service.ts
View File

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