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

This commit is contained in:
Muhammad Fadli 2023-08-02 00:04:23 +07:00
commit 679111ac2c

View File

@ -1443,10 +1443,19 @@ export class TransactionService {
if (callback['message']) { if (callback['message']) {
if (callback['message'].includes('METRO')) { if (callback['message'].includes('METRO')) {
const response = callback['message'];
const responseBaru = response.split('.');
dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal. ${responseBaru[1]}`;
if (callback['price'] != dataTransaction.product_price.price) { if (callback['price'] != dataTransaction.product_price.price) {
dataTransaction.product_price.price = parseInt(callback['price']); dataTransaction.product_price.price = parseInt(callback['price']);
} }
} }
} else if (callback['msg']) {
const response = callback['msg'];
const responseBaru = response.split('.');
dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal. ${responseBaru[1]}`;
} else {
dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal`;
} }
//GET COA //GET COA
@ -1459,7 +1468,6 @@ export class TransactionService {
dataTransaction.status = statusTransaction.FAILED; dataTransaction.status = statusTransaction.FAILED;
dataTransaction.callback_json = callback; dataTransaction.callback_json = callback;
dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal`;
dataTransaction.balance_remaining = parseInt(coaAccount.amount.toString()) + parseInt(dataTransaction.amount.toString()); dataTransaction.balance_remaining = parseInt(coaAccount.amount.toString()) + parseInt(dataTransaction.amount.toString());
const coaInventory = await this.coaService.findByName( const coaInventory = await this.coaService.findByName(
@ -1509,7 +1517,7 @@ export class TransactionService {
} }
if (userData.partner) { if (userData.partner) {
const message = `Transaksi ${product.code} dengan tujuan ${dataTransaction.destination} telah gagal.`; const message = dataTransaction.failed_reason;
this.callbackToPartner( this.callbackToPartner(
userData.partner.id, userData.partner.id,