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

Merge branch 'development' into 'devops-staging'

Browse Source 
Development

See merge request empatnusabangsa/ppob/ppob-backend!163
This commit is contained in:
ilham dwi pratama 2022-05-18 15:24:33 +00:00
commit b1a71c4153
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/product/product.service.ts
View File

@ -380,7 +380,6 @@ export class ProductService {
relations: ['supplier'], relations: ['supplier'],
where: { where: {
code: code, code: code,
type: type,
}, },
}); });
} catch (e) { } catch (e) {

2
src/transaction/ppob_callback.controller.ts
View File

@ -78,7 +78,7 @@ export class PpobCallbackController {
); );
// //
} else { } else {
if (response['status'] != 20) { if (response['status'].toString() != '20') {
//TODO: UPDATE GAGAL //TODO: UPDATE GAGAL
const updateTransaction = const updateTransaction =
await this.transactionService.callbackOrderFailed( await this.transactionService.callbackOrderFailed(

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

@ -485,7 +485,7 @@ export class TransactionService {
try { try {
const billId = await this.checkBillHistoryRepository.findOneOrFail({ const billId = await this.checkBillHistoryRepository.findOneOrFail({
where: { where: {
id: orderTransactionDto.bill_trx_id trx_id: orderTransactionDto.bill_trx_id
}, },
}); });
product_price.price = billId.amount; product_price.price = billId.amount;
@ -502,7 +502,6 @@ export class TransactionService {
throw e; throw e;
} }
} }
} }
if (coaAccount.amount < product_price.mark_up_price + product_price.price) { if (coaAccount.amount < product_price.mark_up_price + product_price.price) {
@ -529,16 +528,22 @@ export class TransactionService {
trxId, trxId,
supplier, supplier,
); );
// let hitSupplier;
if (supplier.code != 'IRS') { if (supplier.code != 'IRS') {
const parsingResponse = hitSupplier.split(' '); const parsingResponse = hitSupplier.split(' ');
hitSupplier = { console.log
const newHitSupplier = {
success: hitSupplier.includes('diproses'), success: hitSupplier.includes('diproses'),
harga: parseInt( harga: parseInt(
parsingResponse[parsingResponse.length - 2].replaceAll('.', ''), parsingResponse[parsingResponse.length - 2].replace(/\./g,' '),
), ),
msg: hitSupplier, msg: hitSupplier,
}; };
hitSupplier = newHitSupplier;
if(orderTransactionDto.bill_trx_id !== null){
hitSupplier.harga = product_price.price;
}
} }
// const hitSupplier = { // const hitSupplier = {
// harga: 2000, // harga: 2000,
@ -1167,8 +1172,7 @@ export class TransactionService {
const coaExpense = await this.coaService.findByName( const coaExpense = await this.coaService.findByName(
`${coaType[coaType.EXPENSE]}-SYSTEM`, `${coaType[coaType.EXPENSE]}-SYSTEM`,
); );
if (userData.partner != null) {
if (!userData.partner) {
//GET SALES //GET SALES
supervisorData = await this.calculateCommission( supervisorData = await this.calculateCommission(
supervisorData, supervisorData,