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

This commit is contained in:
Muhammad Fadli 2023-09-21 00:55:24 +07:00
commit 3fee394dff

View File

@ -790,8 +790,9 @@ export class TransactionService {
transactionData.partner_trx_id = orderTransactionDto.trx_id;
transactionData.supplier_trx_id = trxId;
transactionData.check_bill = orderTransactionDto.bill_trx_id;
console.log('statushitsupplier', hitSupplier.success)
if (!hitSupplier.success) {
console.log('masukstatusgagal', 'masuk')
transactionData.balance_remaining = coaAccount.amount;
transactionData.status = statusTransaction.FAILED;
status = statusTransaction[transactionData.status];
@ -804,6 +805,7 @@ export class TransactionService {
HttpStatus.INTERNAL_SERVER_ERROR,
);
} else {
console.log('masukstatuspending', 'masuk')
transactionData.balance_remaining =
coaAccount.amount - product_price.mark_up_price - costInventory;
if (supplier.code == 'Vocagame') {