PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master'

Browse Source 
Development

See merge request empatnusabangsa/ppob/ppob-backend!187
This commit is contained in:
ilham dwi pratama 2022-06-28 09:22:25 +00:00
commit 8a0ec416ea
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1159,7 +1159,13 @@ export class TransactionService {
});
dataTransaction.status = statusTransaction.SUCCESS;
dataTransaction.seri_number = callback['sn'];
if(callback['sn']){
dataTransaction.seri_number = callback['sn'];
} else {
const response = callback['message'];
const responseBaru = response.split(' ');
dataTransaction.seri_number = responseBaru[10];
}
dataTransaction.callback_json = callback;
const userData = await this.userService.findExist(dataTransaction.user);
@ -1180,7 +1186,8 @@ export class TransactionService {
const coaExpense = await this.coaService.findByName(
`${coaType[coaType.EXPENSE]}-SYSTEM`,
);
if (userData.partner != null) {
if (userData.partner == null) {
//GET SALES
supervisorData = await this.calculateCommission(
supervisorData,
@ -1292,7 +1299,14 @@ export class TransactionService {
status: string,
) {
const partnerData = await this.userService.findPartner(partnerId);
const url = `${partnerData.callback_url}?status=${status}&memberID=${partnerData.code}&trxid=${trxId}&harga=${harga}&product=${productCode}&dest=${destination}&seriNumber=${seriNumber}&message=${message}`;
const userData = await this.userService.findOneByPartner(partnerId);
const coaAccount = await this.coaService.findByUser(
userData.id,
coaType.WALLET,
);
const url = `${partnerData.callback_url}?status=${status}&memberID=${partnerData.code}&trxid=${trxId}&harga=${harga}&product=${productCode}&dest=${destination}&seriNumber=${seriNumber}&message=${message}&saldo=${coaAccount.amount}`;
const result = await this.callbackPartnerRepository.insert({
partner_trx_id: partnerId,
trx_id: trxId,