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

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

Browse Source
This commit is contained in:
Fadli 2022-08-10 23:57:15 +07:00
commit 3575aa47b1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,7 +629,7 @@ export class TransactionService {
transactionData.partner_trx_id = orderTransactionDto.trx_id; transactionData.partner_trx_id = orderTransactionDto.trx_id;
transactionData.supplier_trx_id = trxId; transactionData.supplier_trx_id = trxId;
transactionData.check_bill = orderTransactionDto.bill_trx_id; transactionData.check_bill = orderTransactionDto.bill_trx_id;
transactionData.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory; transactionData.balance_remaining = coaAccount.amount;
if (!hitSupplier.success) { if (!hitSupplier.success) {
transactionData.status = statusTransaction.FAILED; transactionData.status = statusTransaction.FAILED;
@ -1237,7 +1237,7 @@ export class TransactionService {
if (callback['message'].includes('METRO')) { if (callback['message'].includes('METRO')) {
if (callback['price'] != dataTransaction.product_price.price) { if (callback['price'] != dataTransaction.product_price.price) {
console.log("mskupdt", "msk") console.log("mskupdt", "msk")
dataProductHistoryPrice.price = parseInt(callback['price']) dataTransaction.product_price.price = parseInt(callback['price'])
} }
} }
} }
@ -1349,12 +1349,19 @@ export class TransactionService {
const userData = await this.userService.findExist(dataTransaction.user); const userData = await this.userService.findExist(dataTransaction.user);
const coaAccount = await this.coaService.findByUser(
userData.id,
coaType.WALLET,
);
let supervisorData = []; let supervisorData = [];
const product_price = await this.productHistoryPriceService.findById( const product_price = await this.productHistoryPriceService.findById(
dataTransaction.product_price.id, dataTransaction.product_price.id,
); );
let costInventory = product_price.price;
const product = await this.productService.findOneById( const product = await this.productService.findOneById(
product_price.product.id, product_price.product.id,
); );
@ -1366,6 +1373,8 @@ export class TransactionService {
`${coaType[coaType.EXPENSE]}-SYSTEM`, `${coaType[coaType.EXPENSE]}-SYSTEM`,
); );
dataTransaction.balance_remaining = coaAccount.amount - product_price.mark_up_price - costInventory;
if (userData.partner == null) { if (userData.partner == null) {
//GET SALES //GET SALES
supervisorData = await this.calculateCommission( supervisorData = await this.calculateCommission(
@ -1671,6 +1680,7 @@ export class TransactionService {
.addSelect('userData.name', 'buyer') .addSelect('userData.name', 'buyer')
.addSelect('product.name', 'name') .addSelect('product.name', 'name')
.addSelect('product_price.price', 'product_price') .addSelect('product_price.price', 'product_price')
.addSelect('product_price.mark_up_price', 'mark_up_price')
.addSelect('product.name', 'supplier_name') .addSelect('product.name', 'supplier_name')
.addSelect('supplier.name', 'supplier_name') .addSelect('supplier.name', 'supplier_name')
.orderBy('transaction.created_at', 'DESC'); .orderBy('transaction.created_at', 'DESC');