Merge branch 'development' into 'devops-staging'
Development See merge request empatnusabangsa/ppob/ppob-backend!93
This commit is contained in:
commit
1abf798f03
|
@ -65,6 +65,11 @@ export class Transactions extends BaseModel {
|
||||||
})
|
})
|
||||||
callback_json: string;
|
callback_json: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
})
|
||||||
|
failed_reason: string;
|
||||||
|
|
||||||
@OneToMany(
|
@OneToMany(
|
||||||
() => TransactionJournal,
|
() => TransactionJournal,
|
||||||
(transaction_journal) => transaction_journal.transaction_head,
|
(transaction_journal) => transaction_journal.transaction_head,
|
||||||
|
|
|
@ -707,9 +707,12 @@ export class TransactionService {
|
||||||
supplier_trx_id: supplier_trx_id,
|
supplier_trx_id: supplier_trx_id,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
const dataMsg = callback.msg;
|
||||||
|
const failedReason = dataMsg.split('.');
|
||||||
|
|
||||||
dataTransaction.status = statusTransaction.FAILED;
|
dataTransaction.status = statusTransaction.FAILED;
|
||||||
dataTransaction.callback_json = callback;
|
dataTransaction.callback_json = callback;
|
||||||
|
dataTransaction.failed_reason = failedReason[0] + ', ' + failedReason[1];
|
||||||
|
|
||||||
await this.transactionRepository.save(dataTransaction);
|
await this.transactionRepository.save(dataTransaction);
|
||||||
}
|
}
|
||||||
|
@ -924,6 +927,7 @@ export class TransactionService {
|
||||||
.addSelect('transaction.supplier_trx_id', 'transaction_code')
|
.addSelect('transaction.supplier_trx_id', 'transaction_code')
|
||||||
.addSelect('transaction.status', 'status')
|
.addSelect('transaction.status', 'status')
|
||||||
.addSelect('transaction.partner_trx_id', 'partner_transaction_code')
|
.addSelect('transaction.partner_trx_id', 'partner_transaction_code')
|
||||||
|
.addSelect('transaction.failed_reason', 'failed_reason')
|
||||||
.addSelect('userData.name', 'buyer')
|
.addSelect('userData.name', 'buyer')
|
||||||
.addSelect('product.name', 'name')
|
.addSelect('product.name', 'name')
|
||||||
.addSelect('product.id', 'product_id')
|
.addSelect('product.id', 'product_id')
|
||||||
|
|
Loading…
Reference in New Issue
Block a user