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
2023-03-01 02:12:21 +07:00
parent ad2e7ac0c5 4df19347bb
commit 5cfc01e9e2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -769,10 +769,9 @@ export class TransactionService {
transactionData.partner_trx_id = orderTransactionDto.trx_id; transactionData.partner_trx_id = orderTransactionDto.trx_id;
transactionData.supplier_trx_id = trxId; transactionData.supplier_trx_id = trxId;
transactionData.check_bill = orderTransactionDto.bill_trx_id; transactionData.check_bill = orderTransactionDto.bill_trx_id;
transactionData.balance_remaining =
coaAccount.amount - product_price.mark_up_price - costInventory;
if (!hitSupplier.success) { if (!hitSupplier.success) {
transactionData.balance_remaining = coaAccount.amount;
transactionData.status = statusTransaction.FAILED; transactionData.status = statusTransaction.FAILED;
status = statusTransaction[transactionData.status]; status = statusTransaction[transactionData.status];
await this.transactionRepository.insert(transactionData); await this.transactionRepository.insert(transactionData);
@@ -784,6 +783,8 @@ export class TransactionService {
HttpStatus.INTERNAL_SERVER_ERROR, HttpStatus.INTERNAL_SERVER_ERROR,
); );
} else { } else {
transactionData.balance_remaining =
coaAccount.amount - product_price.mark_up_price - costInventory;
if ( if (
hitSupplier.sn != null || hitSupplier.sn != null ||
hitSupplier.sn != '' || hitSupplier.sn != '' ||