From e3c781f85769f1a803a640a309b1b6b264ccaf5f Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Fri, 24 Jan 2025 21:55:32 +0700
Subject: [PATCH] refactor: before vat minus discount

---
 src/pages/09_task-order/expansion/ProductExpansion.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/09_task-order/expansion/ProductExpansion.vue b/src/pages/09_task-order/expansion/ProductExpansion.vue
index b47dd5ff..f38b2507 100644
--- a/src/pages/09_task-order/expansion/ProductExpansion.vue
+++ b/src/pages/09_task-order/expansion/ProductExpansion.vue
@@ -242,7 +242,10 @@ function calcPrice(
             <q-td class="text-right" v-if="!creditNote">
               {{
                 formatNumberDecimal(
-                  calcPricePerUnit(props.row.product) * props.row.list.length,
+                  calcPricePerUnit(props.row.product) * props.row.list.length -
+                    (taskProduct.find(
+                      (v) => v.productId === props.row.product.id,
+                    )?.discount || 0),
                   2,
                 )
               }}