From 891d9a86d2d029fd6a6792b98b64d75f0bfa4733 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:51:48 +0700 Subject: [PATCH] fix: wrong vat --- src/controllers/05-quotation-controller.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/controllers/05-quotation-controller.ts b/src/controllers/05-quotation-controller.ts index cc6fe6b..096864e 100644 --- a/src/controllers/05-quotation-controller.ts +++ b/src/controllers/05-quotation-controller.ts @@ -487,7 +487,9 @@ export class QuotationController extends Controller { const price = finalPriceWithVat; const pricePerUnit = price / (1 + VAT_DEFAULT); - const vat = p.calcVat ? (pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT : 0; + const vat = (body.agentPrice ? p.agentPriceCalcVat : p.calcVat) + ? (pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT + : 0; return { order: i + 1, @@ -754,7 +756,9 @@ export class QuotationController extends Controller { const price = finalPriceWithVat; const pricePerUnit = price / (1 + VAT_DEFAULT); - const vat = p.calcVat ? (pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT : 0; + const vat = (record.agentPrice ? p.agentPriceCalcVat : p.calcVat) + ? (pricePerUnit * v.amount - (v.discount || 0)) * VAT_DEFAULT + : 0; return { order: i + 1,