From b92888486af6cdea0916106f5dc1a1e870a2dd49 Mon Sep 17 00:00:00 2001 From: ilham Date: Fri, 4 Feb 2022 20:08:32 +0700 Subject: [PATCH 1/5] fix: space --- src/helper/irs-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helper/irs-service.ts b/src/helper/irs-service.ts index 32e70a7..1ca2687 100644 --- a/src/helper/irs-service.ts +++ b/src/helper/irs-service.ts @@ -5,7 +5,7 @@ export const createTransaction = async (kode, tujuan) => { return axios.default .get( - `http://h2h.elangpixiu.com/api/h2h ?id=PT0005&pin=04JFGC&user=D10BD0&pass=6251F3&kodeproduk=${kode}&tujuan=${tujuan}&counter=1&idtrx=${codeTransaksi}`, + `http://h2h.elangpixiu.com/api/h2h?id=PT0005&pin=04JFGC&user=D10BD0&pass=6251F3&kodeproduk=${kode}&tujuan=${tujuan}&counter=1&idtrx=${codeTransaksi}`, ) .then((response) => { return response.data; From 3e0f016408ac5ef6cece5a218fb353a8bdf4f965 Mon Sep 17 00:00:00 2001 From: ilham Date: Fri, 4 Feb 2022 20:13:07 +0700 Subject: [PATCH 2/5] fix: space --- src/helper/irs-api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helper/irs-api.ts b/src/helper/irs-api.ts index 1c5b439..37b4bc4 100644 --- a/src/helper/irs-api.ts +++ b/src/helper/irs-api.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -const irs_url = 'http://h2h.elangpangarep.com/api/h2h'; +const irs_url = 'http://h2h.elangpixiu.com/api/h2h'; const irs_id = 'PT0005'; const irs_pin = '04JFGC'; const irs_user = 'D10BD0'; From 730d7fc3e44f6ad6a6d23476e528fb53315534d1 Mon Sep 17 00:00:00 2001 From: ilham Date: Fri, 4 Feb 2022 21:28:57 +0700 Subject: [PATCH 3/5] fix: calculating --- src/transaction/transaction.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index e51a280..7adaa89 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -1325,7 +1325,7 @@ export class TransactionService { return { coa_id: coaAccount.id, - credit: (totalPrice * commissionValue.commission) / 100, + credit: Math.floor((totalPrice * commissionValue.commission) / 100), }; }), ); From 62225606b08541a865a7dc1af65a937e7717af11 Mon Sep 17 00:00:00 2001 From: ilham Date: Fri, 4 Feb 2022 22:37:51 +0700 Subject: [PATCH 4/5] fix: transaction service --- src/transaction/transaction.service.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 7adaa89..1b65d06 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -505,9 +505,11 @@ export class TransactionService { responseAPISupplier: hitSupplier, }); + let costInventory = product_price.price; + if (hitSupplier.harga != product_price.price) { product_price.endDate = new Date(); - + costInventory = hitSupplier.harga; const listActivePrice = await this.productHistoryPriceService.getAllActivePriceByProduct( product.id, @@ -570,7 +572,7 @@ export class TransactionService { journals: [ { coa_id: coaInventory.id, - credit: product_price.price, + credit: costInventory, }, { coa_id: coaCostOfSales.id, From 890f82bfec7ed8ee51e1e96b14ebca28e0b285d7 Mon Sep 17 00:00:00 2001 From: ilham Date: Sat, 5 Feb 2022 21:07:12 +0700 Subject: [PATCH 5/5] fix: transaction --- src/transaction/transaction.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 1b65d06..d4e07d4 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -576,16 +576,16 @@ export class TransactionService { }, { coa_id: coaCostOfSales.id, - debit: product_price.price, + debit: costInventory, }, { coa_id: coaAccount.id, - debit: product_price.mark_up_price + product_price.price, + debit: product_price.mark_up_price + costInventory, }, { // eslint-disable-next-line camelcase coa_id: coaSales.id, - credit: product_price.mark_up_price + product_price.price, + credit: product_price.mark_up_price + costInventory, }, ], });