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:
Muhammad Fadli 2023-05-10 15:00:54 +07:00
commit 17f8bb10a9
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1960,20 +1960,34 @@ export class TransactionService {
enDate: new Date(endDate), enDate: new Date(endDate),
}, },
); );
} else if (trxId != null) { } else if (trxId != null || partnerTrxId != null) {
baseQuery.andWhere( if (trxId != null && partnerTrxId != null) {
'transaction.supplier_trx_id = :trxId', baseQuery.andWhere(
{ 'transaction.supplier_trx_id = :trxId and transaction.partner_trx_id = :partnerTrxId',
trxId: trxId {
}, trxId: trxId,
); partnerTrxId: partnerTrxId,
} else if (partnerTrxId != null) { },
baseQuery.andWhere( );
'transaction.partner_trx_id = :partnerTrxId', } else {
{ if (trxId != null) {
partnerTrxId: partnerTrxId baseQuery.andWhere(
}, 'transaction.supplier_trx_id = :trxId',
); {
trxId: trxId
},
);
} else if (partnerTrxId != null) {
baseQuery.andWhere(
'transaction.partner_trx_id = :partnerTrxId',
{
partnerTrxId: partnerTrxId
},
);
}
}
} }
const data = await baseQuery const data = await baseQuery