From 524a493149a86615357ca3d2d2d73437b66af167 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:52:53 +0700 Subject: [PATCH] fix: get actual price from final price instead --- src/controllers/08-credit-note-controller.ts | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/controllers/08-credit-note-controller.ts b/src/controllers/08-credit-note-controller.ts index ad29da1..8c66ac2 100644 --- a/src/controllers/08-credit-note-controller.ts +++ b/src/controllers/08-credit-note-controller.ts @@ -323,16 +323,15 @@ export class CreditNoteController extends Controller { (v) => v.workStatus === RequestWorkStatus.Completed, ).length; - const price = c.request.quotation.agentPrice ? "price" : "agentPrice"; + const price = + c.productService.pricePerUnit - + c.productService.discount / c.productService.amount + + c.productService.vat / c.productService.amount; if (serviceChargeStepCount && successCount) { - return ( - a + - c.productService.product[price] - - c.productService.product.serviceCharge * successCount - ); + return a + price - c.productService.product.serviceCharge * successCount; } - return a + c.productService.product.price; + return a + price; }, 0); this.setStatus(HttpStatus.CREATED); @@ -457,16 +456,15 @@ export class CreditNoteController extends Controller { (v) => v.workStatus === RequestWorkStatus.Completed, ).length; - const price = c.request.quotation.agentPrice ? "price" : "agentPrice"; + const price = + c.productService.pricePerUnit - + c.productService.discount / c.productService.amount + + c.productService.vat / c.productService.amount; if (serviceChargeStepCount && successCount) { - return ( - a + - c.productService.product[price] - - c.productService.product.serviceCharge * successCount - ); + return a + price - c.productService.product.serviceCharge * successCount; } - return a + c.productService.product.price; + return a + price; }, 0); const record = await prisma.creditNote.update({