diff --git a/src/controllers/04-product-controller.ts b/src/controllers/04-product-controller.ts
index dd17c5e..80b7c71 100644
--- a/src/controllers/04-product-controller.ts
+++ b/src/controllers/04-product-controller.ts
@@ -477,15 +477,22 @@ export class ProductController extends Controller {
               ? "serviceFee"
               : "processingFee",
         shared: item.shared === "ใช่" ? true : false,
-        price: item?.price ? +parseFloat(item.price.replace(",", "")).toFixed(6) : 0,
+        price:
+          typeof item.price === "number"
+            ? item.price
+            : +parseFloat(item.price.replace(",", "")).toFixed(6),
         calcVat: item.calcVat === "ใช่" ? true : false,
         vatIncluded: item.vatIncluded === "รวม" ? true : false,
-        agentPrice: item?.agentPrice ? +parseFloat(item.agentPrice.replace(",", "")).toFixed(6) : 0,
+        agentPrice:
+          typeof item.agentPrice === "number"
+            ? item.agentPrice
+            : +parseFloat(item.agentPrice.replace(",", "")).toFixed(6),
         agentPriceCalcVat: item.agentPriceCalcVat === "ใช่" ? true : false,
         agentPriceVatIncluded: item.agentPriceVatIncluded === "รวม" ? true : false,
-        serviceCharge: item?.serviceCharge
-          ? +parseFloat(item.serviceCharge.replace(",", "")).toFixed(6)
-          : 0,
+        serviceCharge:
+          typeof item.serviceCharge === "number"
+            ? item.serviceCharge
+            : +parseFloat(item.serviceCharge.replace(",", "")).toFixed(6),
         serviceChargeCalcVat: item.serviceChargeCalcVat === "ใช่" ? true : false,
         serviceChargeVatIncluded: item.serviceChargeVatIncluded === "รวม" ? true : false,
       };