Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging

This commit is contained in:
Fadli 2022-09-06 21:43:56 +07:00
commit b7b3c6a6e2

View File

@ -1382,6 +1382,7 @@ export class TransactionService {
// dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; // dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory;
if (userData.partner == null) { if (userData.partner == null) {
console.log('partnernull', userData.partner.id)
//GET SALES //GET SALES
supervisorData = await this.calculateCommission( supervisorData = await this.calculateCommission(
supervisorData, supervisorData,
@ -1422,6 +1423,7 @@ export class TransactionService {
} }
if (userData.partner != null) { if (userData.partner != null) {
if (userData.partner) { if (userData.partner) {
console.log('partnernotnull', userData.partner.id)
const message = `Transaksi ${product.code} dengan tujuan ${dataTransaction.destination} telah berhasil.`; const message = `Transaksi ${product.code} dengan tujuan ${dataTransaction.destination} telah berhasil.`;
this.callbackToPartner( this.callbackToPartner(
userData.partner.id, userData.partner.id,