From 5939763b573ca0d706cf0fd6a85e7916736abb7f Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Tue, 18 Mar 2025 14:50:48 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(subscribe):=20Handle=20optio?=
 =?UTF-8?q?nal=20values=20in=20price=20and=20discount=20calculations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/app/dashboard/subscribe/subscribe-form.tsx | 5 ++---
 packages/ui/src/custom-components/dynamic-Inputs.tsx  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/admin/app/dashboard/subscribe/subscribe-form.tsx b/apps/admin/app/dashboard/subscribe/subscribe-form.tsx
index 8db278a..e83c7f5 100644
--- a/apps/admin/app/dashboard/subscribe/subscribe-form.tsx
+++ b/apps/admin/app/dashboard/subscribe/subscribe-form.tsx
@@ -564,7 +564,7 @@ export default function SubscribeForm<T extends Record<string, any>>({
                                     return {
                                       ...data,
                                       price: evaluateWithPrecision(
-                                        `${unit_price} * ${data.quantity} * ${data.discount} / 100`,
+                                        `${unit_price || 0} * ${data.quantity || 0} * ${data.discount || 0} / 100`,
                                       ),
                                     };
                                   },
@@ -581,7 +581,7 @@ export default function SubscribeForm<T extends Record<string, any>>({
                                     return {
                                       ...data,
                                       discount: evaluateWithPrecision(
-                                        `${data.price} / ${data.quantity} / ${unit_price} * 100`,
+                                        `${data.price || 0} / ${data.quantity || 0} / ${unit_price || 0} * 100`,
                                       ),
                                     };
                                   },
@@ -589,7 +589,6 @@ export default function SubscribeForm<T extends Record<string, any>>({
                               ]}
                               value={field.value}
                               onChange={(value) => {
-                                console.log(value);
                                 form.setValue(field.name, value);
                               }}
                             />
diff --git a/packages/ui/src/custom-components/dynamic-Inputs.tsx b/packages/ui/src/custom-components/dynamic-Inputs.tsx
index c9d7c87..7ba7d37 100644
--- a/packages/ui/src/custom-components/dynamic-Inputs.tsx
+++ b/packages/ui/src/custom-components/dynamic-Inputs.tsx
@@ -36,7 +36,7 @@ export function ObjectInput<T extends Record<string, any>>({
     let updatedState = { ...internalState, ...value };
 
     fields.forEach((field) => {
-      if (field.calculateValue) {
+      if (field?.calculateValue) {
         updatedState = field.calculateValue(updatedState);
       }
     });