chamomind/jws-backend
chamomind/jws-backend
6
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

fix: price not accurate after recalc vat

Browse source
This commit is contained in:
Methapon2001 2025-01-06 09:32:42 +07:00
parent f4bbfbbc08
commit a4ba0e032f
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/05-quotation-controller.ts
View file

@ -419,11 +419,11 @@ export class QuotationController extends Controller {
const list = body.productServiceList.map((v, i) => { const list = body.productServiceList.map((v, i) => {
const p = product.find((p) => p.id === v.productId)!; const p = product.find((p) => p.id === v.productId)!;
const price = body.agentPrice ? p.agentPrice : p.price; const price = body.agentPrice ? p.agentPrice : p.price;
const pricePerUnit = p.vatIncluded ? precisionRound(price / (1 + VAT_DEFAULT)) : price; const pricePerUnit = p.vatIncluded ? price / (1 + VAT_DEFAULT) : price;
const vat = p.calcVat const vat = p.calcVat
? precisionRound( ? (pricePerUnit * (v.discount ? v.amount : 1) - (v.discount || 0)) *
(pricePerUnit * (v.discount ? v.amount : 1) - (v.discount || 0)) * VAT_DEFAULT, VAT_DEFAULT *
) * (!v.discount ? v.amount : 1) (!v.discount ? v.amount : 1)
: 0; : 0;
return { return {
@ -684,11 +684,11 @@ export class QuotationController extends Controller {
const list = body.productServiceList?.map((v, i) => { const list = body.productServiceList?.map((v, i) => {
const p = product.find((p) => p.id === v.productId)!; const p = product.find((p) => p.id === v.productId)!;
const price = record.agentPrice ? p.agentPrice : p.price; const price = record.agentPrice ? p.agentPrice : p.price;
const pricePerUnit = p.vatIncluded ? precisionRound(price / (1 + VAT_DEFAULT)) : price; const pricePerUnit = p.vatIncluded ? price / (1 + VAT_DEFAULT) : price;
const vat = p.calcVat const vat = p.calcVat
? precisionRound( ? (pricePerUnit * (v.discount ? v.amount : 1) - (v.discount || 0)) *
(pricePerUnit * (v.discount ? v.amount : 1) - (v.discount || 0)) * VAT_DEFAULT, VAT_DEFAULT *
) * (!v.discount ? v.amount : 1) (!v.discount ? v.amount : 1)
: 0; : 0;
return { return {
order: i + 1, order: i + 1,