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!46
This commit is contained in:
Catur Bagaskara 2021-12-22 09:10:43 +00:00
commit c35442b67e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,7 +308,7 @@ export class TransactionService {
let supervisorData = []; let supervisorData = [];
let profit = product_price.mark_up_price - product_price.price; let profit = product_price.mark_up_price;
if (!userData.partner) { if (!userData.partner) {
//GET SALES //GET SALES
@ -382,11 +382,11 @@ export class TransactionService {
}, },
{ {
coa_id: coaAccount.id, coa_id: coaAccount.id,
debit: product_price.mark_up_price, debit: product_price.mark_up_price + product_price.price,
}, },
{ {
coa_id: coaSales.id, coa_id: coaSales.id,
credit: product_price.mark_up_price, credit: product_price.mark_up_price + product_price.price,
}, },
{ {
coa_id: coaExpense.id, coa_id: coaExpense.id,
@ -416,6 +416,7 @@ export class TransactionService {
transactionData.user_destination = depositReturnDto.destination; transactionData.user_destination = depositReturnDto.destination;
transactionData.status = statusTransaction.PENDING; transactionData.status = statusTransaction.PENDING;
transactionData.type = typeTransaction.DEPOSIT_RETURN; transactionData.type = typeTransaction.DEPOSIT_RETURN;
transactionData.image_prove = depositReturnDto.image_prove;
await this.connection.transaction(async (manager) => { await this.connection.transaction(async (manager) => {
await manager.insert(Transactions, transactionData); await manager.insert(Transactions, transactionData);
}); });