From 8117094aebe4eeda271d357896d70eb8c3210eab Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:13:31 +0700 Subject: [PATCH 1/2] feat: also return step status too --- src/controllers/07-task-controller.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts index 6a91faa..8317f12 100644 --- a/src/controllers/07-task-controller.ts +++ b/src/controllers/07-task-controller.ts @@ -166,6 +166,7 @@ export class TaskController extends Controller { responsibleUser: true, requestWork: { include: { + stepStatus: true, request: { include: { employee: true, From 1d33a15b12f7b71cc4b492c7f4a84cc0cfa5348b Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:31:36 +0700 Subject: [PATCH 2/2] fix: wrong calc vat --- src/controllers/05-quotation-controller.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/05-quotation-controller.ts b/src/controllers/05-quotation-controller.ts index 866b93a..6f964d6 100644 --- a/src/controllers/05-quotation-controller.ts +++ b/src/controllers/05-quotation-controller.ts @@ -480,7 +480,7 @@ export class QuotationController extends Controller { const originalPrice = body.agentPrice ? p.agentPrice : p.price; const finalPriceWithVat = precisionRound( - originalPrice + (p.vatIncluded ? 0 : originalPrice * 1.07), + originalPrice + (p.vatIncluded ? 0 : originalPrice * VAT_DEFAULT), ); const price = finalPriceWithVat; @@ -747,7 +747,7 @@ export class QuotationController extends Controller { const originalPrice = record.agentPrice ? p.agentPrice : p.price; const finalPriceWithVat = precisionRound( - originalPrice + (p.vatIncluded ? 0 : originalPrice * 1.07), + originalPrice + (p.vatIncluded ? 0 : originalPrice * VAT_DEFAULT), ); const price = finalPriceWithVat;