Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
This commit is contained in:
		| @@ -688,7 +688,7 @@ export class TransactionService { | |||||||
|         let newHitSupplier; |         let newHitSupplier; | ||||||
|  |  | ||||||
|         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, |             sn: hitSupplier.sn, | ||||||
|             harga: hitSupplier.price, |             harga: hitSupplier.price, | ||||||
| @@ -786,6 +786,8 @@ 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; | ||||||
|  |             console.log('hitsupplierstatus', hitSupplier.success) | ||||||
|  |             console.log('hitsuppliersn', hitSupplier.sn) | ||||||
|             if ( |             if ( | ||||||
|                 hitSupplier.sn != null || |                 hitSupplier.sn != null || | ||||||
|                 hitSupplier.sn != '' || |                 hitSupplier.sn != '' || | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user