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; 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,