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

Merge branch 'develop'

Browse source
This commit is contained in:
Methapon2001 2025-01-23 11:31:47 +07:00
commit 1af782f624
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

1
src/controllers/07-task-controller.ts
View file

@ -166,6 +166,7 @@ export class TaskController extends Controller {
responsibleUser: true,
requestWork: {
include: {
stepStatus: true,
request: {
include: {
employee: true,