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

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

Browse Source
This commit is contained in:
Fadli 2022-11-17 12:29:14 +07:00
commit 1b53e34683
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1533,6 +1533,25 @@ 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;
try {
console.log('updatestatustrans', 'update');
await this.connection.transaction(async (manager) => {
await manager.save(dataTransaction);
await manager.save(dataProductHistoryPrice);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager: manager,
transaction: dataTransaction,
amount: dataTransaction.amount,
journals: supervisorData,
});
});
} catch (e) {
console.log('errupdatestatus', e);
throw e;
}
if (userData.partner == null) { if (userData.partner == null) {
console.log('partnernull', 'masuk'); console.log('partnernull', 'masuk');
//GET SALES //GET SALES
@ -1557,25 +1576,6 @@ export class TransactionService {
]); ]);
} }
try {
console.log('updatestatustrans', 'update');
await this.connection.transaction(async (manager) => {
await manager.save(dataTransaction);
await manager.save(dataProductHistoryPrice);
await this.accountingTransaction({
createTransaction: false,
transactionalEntityManager: manager,
transaction: dataTransaction,
amount: dataTransaction.amount,
journals: supervisorData,
});
});
} catch (e) {
console.log('errupdatestatus', e);
throw e;
}
if (userData.partner != null) { if (userData.partner != null) {
if (userData.partner) { if (userData.partner) {
console.log('partnernotnull', 'masuk'); console.log('partnernotnull', 'masuk');