Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
This commit is contained in:
commit
0650ab5f9a
|
@ -157,9 +157,8 @@ export class PpobCallbackController {
|
||||||
@Post('/digiflazz')
|
@Post('/digiflazz')
|
||||||
async getDigiflazz(@Req() request: FastifyRequest) {
|
async getDigiflazz(@Req() request: FastifyRequest) {
|
||||||
const response = request.body;
|
const response = request.body;
|
||||||
console.log('responsehemat', response);
|
console.log('responsedigiflazz', response);
|
||||||
console.log('responsehemat2', request.body);
|
if (response['data']['message'] != 'Transaksi Sukses') {
|
||||||
if (response['msg'] != 'Transaksi Sukses') {
|
|
||||||
//TODO: UPDATE GAGAL
|
//TODO: UPDATE GAGAL
|
||||||
await this.transactionService.checkCallbackOrderFailed(
|
await this.transactionService.checkCallbackOrderFailed(
|
||||||
response['data']['ref_id'],
|
response['data']['ref_id'],
|
||||||
|
|
|
@ -690,6 +690,7 @@ export class TransactionService {
|
||||||
if (product.type == 'prepaid') {
|
if (product.type == 'prepaid') {
|
||||||
newHitSupplier= {
|
newHitSupplier= {
|
||||||
success: hitSupplier.status.includes('Pending') || hitSupplier.status.includes('Sukses'),
|
success: hitSupplier.status.includes('Pending') || hitSupplier.status.includes('Sukses'),
|
||||||
|
sn: hitSupplier.sn,
|
||||||
harga: hitSupplier.price,
|
harga: hitSupplier.price,
|
||||||
msg: hitSupplier.message,
|
msg: hitSupplier.message,
|
||||||
};
|
};
|
||||||
|
@ -785,13 +786,17 @@ export class TransactionService {
|
||||||
} else {
|
} else {
|
||||||
transactionData.balance_remaining =
|
transactionData.balance_remaining =
|
||||||
coaAccount.amount - product_price.mark_up_price - costInventory;
|
coaAccount.amount - product_price.mark_up_price - costInventory;
|
||||||
if (hitSupplier.sn == '') {
|
if (
|
||||||
transactionData.status = statusTransaction.PENDING;
|
hitSupplier.sn != null ||
|
||||||
status = statusTransaction[transactionData.status];
|
hitSupplier.sn != '' ||
|
||||||
} else {
|
hitSupplier.sn != undefined
|
||||||
|
) {
|
||||||
transactionData.seri_number = hitSupplier.sn;
|
transactionData.seri_number = hitSupplier.sn;
|
||||||
transactionData.status = statusTransaction.SUCCESS;
|
transactionData.status = statusTransaction.SUCCESS;
|
||||||
status = statusTransaction[transactionData.status];
|
status = statusTransaction[transactionData.status];
|
||||||
|
} else {
|
||||||
|
transactionData.status = statusTransaction.PENDING;
|
||||||
|
status = statusTransaction[transactionData.status];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user