diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index eed5832..2735a2d 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -1111,23 +1111,23 @@ export class TransactionService { supplier_trx_id ); - if (transactionData.status == statusTransaction.FAILED) { - throw new HttpException( - { - statusCode: HttpStatus.BAD_REQUEST, - error: 'failed to update, the transaction already failed', - }, - HttpStatus.BAD_REQUEST, - ); - } else if (transactionData.status == statusTransaction.SUCCESS) { - throw new HttpException( - { - statusCode: HttpStatus.BAD_REQUEST, - error: 'failed to update, the transaction already success', - }, - HttpStatus.BAD_REQUEST, - ); - } else { + // if (transactionData.status == statusTransaction.FAILED) { + // throw new HttpException( + // { + // statusCode: HttpStatus.BAD_REQUEST, + // error: 'failed to update, the transaction already failed', + // }, + // HttpStatus.BAD_REQUEST, + // ); + // } else if (transactionData.status == statusTransaction.SUCCESS) { + // throw new HttpException( + // { + // statusCode: HttpStatus.BAD_REQUEST, + // error: 'failed to update, the transaction already success', + // }, + // HttpStatus.BAD_REQUEST, + // ); + // } else { const updateTransaction = await this.callbackOrderFailed( supplier_trx_id, callback, @@ -1142,7 +1142,7 @@ export class TransactionService { HttpStatus.BAD_REQUEST, ); - } + // } } @@ -1337,14 +1337,14 @@ export class TransactionService { }); dataTransaction.status = statusTransaction.SUCCESS; - if(callback['sn']){ + if (callback['sn']) { dataTransaction.seri_number = callback['sn']; console.log("msksn1", dataTransaction.seri_number) } else { const response = callback['message']; const responseBaru = response.split(' '); dataTransaction.seri_number = - responseBaru[10].length > 1 ? responseBaru[10] : responseBaru[9]; + responseBaru[10].length > 1 ? responseBaru[10] : responseBaru[9]; if (dataTransaction.seri_number == 'SN:') { dataTransaction.seri_number = responseBaru[11] @@ -1352,7 +1352,7 @@ export class TransactionService { } dataTransaction.callback_json = callback; - if(callback['message']) { + if (callback['message']) { if (callback['message'].includes('METRO')) { if (callback['price'] != dataTransaction.product_price.price) { dataProductHistoryPrice.price = parseInt(callback['price']) @@ -1365,18 +1365,18 @@ export class TransactionService { let supervisorData = []; const product_price = await this.productHistoryPriceService.findById( - dataTransaction.product_price.id, + dataTransaction.product_price.id, ); const product = await this.productService.findOneById( - product_price.product.id, + product_price.product.id, ); let profit = product_price.mark_up_price; //GET COA const coaExpense = await this.coaService.findByName( - `${coaType[coaType.EXPENSE]}-SYSTEM`, + `${coaType[coaType.EXPENSE]}-SYSTEM`, ); // dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; @@ -1384,17 +1384,17 @@ export class TransactionService { if (userData.partner == null) { //GET SALES supervisorData = await this.calculateCommission( - supervisorData, - profit, - userData, + supervisorData, + profit, + userData, ); profit = supervisorData - .map((item) => { - return item.credit; - }) - .reduce((prev, curr) => { - return prev + curr; - }, 0); + .map((item) => { + return item.credit; + }) + .reduce((prev, curr) => { + return prev + curr; + }, 0); supervisorData = supervisorData.concat([ { @@ -1420,21 +1420,22 @@ export class TransactionService { } catch (e) { throw e; } - + if (userData.partner != null) { if (userData.partner) { const message = `Transaksi ${product.code} dengan tujuan ${dataTransaction.destination} telah berhasil.`; this.callbackToPartner( - userData.partner.id, - message, - dataTransaction.partner_trx_id, - dataTransaction.amount, - product.code, - dataTransaction.destination, - dataTransaction.seri_number, - 'berhasil', + userData.partner.id, + message, + dataTransaction.partner_trx_id, + dataTransaction.amount, + product.code, + dataTransaction.destination, + dataTransaction.seri_number, + 'berhasil', ); } } + } async resendOrderToPartner(supplier_trx_id: string, status: boolean){ const dataTransaction = await this.transactionRepository.findOne({