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

fix: calc vat after discount only

Browse source
This commit is contained in:
Methapon Metanipat 2024-10-07 15:29:45 +07:00
parent 66444bfdc5
commit 68a3e7dffd
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ type QuotationUpdate = {
* @maximum 1 * @maximum 1
* @minimum 0 * @minimum 0
*/ */
discount: number; discount?: number;
workerIndex?: number[]; workerIndex?: number[];
}[]; }[];
}; };
@ -344,7 +344,7 @@ export class QuotationController extends Controller {
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 ? precisionRound(price / (1 + VAT_DEFAULT)) : price;
const vat = precisionRound(p.vatIncluded ? price - pricePerUnit : price * VAT_DEFAULT); const vat = precisionRound((pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT);
return { return {
order: i + 1, order: i + 1,
@ -369,7 +369,7 @@ export class QuotationController extends Controller {
(a, c) => { (a, c) => {
a.totalPrice = precisionRound(a.totalPrice + c.pricePerUnit * c.amount); a.totalPrice = precisionRound(a.totalPrice + c.pricePerUnit * c.amount);
a.totalDiscount = precisionRound(a.totalDiscount + c.discount); a.totalDiscount = precisionRound(a.totalDiscount + c.discount);
a.vat = precisionRound(a.vat + c.vat * c.amount); a.vat = precisionRound(a.vat + c.vat);
a.finalPrice = precisionRound(a.totalPrice - a.totalDiscount + a.vat); a.finalPrice = precisionRound(a.totalPrice - a.totalDiscount + a.vat);
return a; return a;
@ -550,7 +550,7 @@ export class QuotationController extends Controller {
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 ? precisionRound(price / 1 + VAT_DEFAULT) : price;
const vat = precisionRound(p.vatIncluded ? price - pricePerUnit : price * VAT_DEFAULT); const vat = precisionRound((pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT);
return { return {
order: i + 1, order: i + 1,
@ -576,7 +576,7 @@ export class QuotationController extends Controller {
(a, c) => { (a, c) => {
a.totalPrice = precisionRound(a.totalPrice + c.pricePerUnit * c.amount); a.totalPrice = precisionRound(a.totalPrice + c.pricePerUnit * c.amount);
a.totalDiscount = precisionRound(a.totalDiscount + c.discount); a.totalDiscount = precisionRound(a.totalDiscount + c.discount);
a.vat = precisionRound(a.vat + c.vat * c.amount); a.vat = precisionRound(a.vat + c.vat);
a.finalPrice = precisionRound(a.totalPrice - a.totalDiscount + a.vat); a.finalPrice = precisionRound(a.totalPrice - a.totalDiscount + a.vat);
return a; return a;