diff --git a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
index 781ebf26..6793018b 100644
--- a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
+++ b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
@@ -126,18 +126,14 @@ const DeliveryOrderProductForm = ({
           Number(initialValues.total_peti)
       : 0;
 
-  // const initialPricePerConvertion =
-  //   initialValues?.total_price &&
-  //   initialValues?.total_peti &&
-  //   Number(initialValues.total_peti) !== 0
-  //     ? (Number(initialValues.total_price) -
-  //         initialSisaBerat * Number(initialValues.unit_price || 0)) /
-  //       Number(initialValues.total_peti)
-  //     : 0;
-
-  const initialPricePerConvertion = initialValues?.unit_price
-    ? Number(initialValues?.unit_price)
-    : 0;
+  const initialPricePerConvertion =
+    initialValues?.total_price &&
+    initialValues?.total_peti &&
+    Number(initialValues.total_peti) !== 0
+      ? (Number(initialValues.total_price) -
+          initialSisaBerat * Number(initialValues.unit_price || 0)) /
+        Number(initialValues.total_peti)
+      : Number(initialValues?.unit_price || 0);
 
   const initialPriceSisaBerat =
     initialValues?.total_price && initialValues?.total_peti
@@ -728,7 +724,7 @@ const DeliveryOrderProductForm = ({
               placeholder='Masukan Total Peti'
               endAdornment={
                 <div className='flex items-center gap-2'>
-                  <span className='text-sm text-base-content/50'>Kg</span>
+                  <span className='text-sm text-base-content/50'>Peti</span>
                 </div>
               }
               bottomLabel={`1 ${formik.values.convertion_unit?.value.toLowerCase()} = ${formik.values.weight_per_convertion ?? 0} Kg`}
@@ -778,6 +774,9 @@ const DeliveryOrderProductForm = ({
               }
               errorMessage={formik.errors.total_weight}
               placeholder='Masukan Total Bobot'
+              disabled={
+                formik.values.convertion_unit?.value.toLowerCase() === 'peti'
+              }
             />
           )}
 
diff --git a/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx b/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx
index a7f2c73e..5f0031f8 100644
--- a/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx
+++ b/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx
@@ -61,18 +61,14 @@ const SalesOrderProductForm = ({
           Number(initialValues.total_peti)
       : 0;
 
-  // const initialPricePerConvertion =
-  //   initialValues?.total_price &&
-  //   initialValues?.total_peti &&
-  //   Number(initialValues.total_peti) !== 0
-  //     ? (Number(initialValues.total_price) -
-  //         initialSisaBerat * Number(initialValues.unit_price || 0)) /
-  //       Number(initialValues.total_peti)
-  //     : 0;
-
-  const initialPricePerConvertion = initialValues?.unit_price
-    ? Number(initialValues?.unit_price)
-    : 0;
+  const initialPricePerConvertion =
+    initialValues?.total_price &&
+    initialValues?.total_peti &&
+    Number(initialValues.total_peti) !== 0
+      ? (Number(initialValues.total_price) -
+          initialSisaBerat * Number(initialValues.unit_price || 0)) /
+        Number(initialValues.total_peti)
+      : Number(initialValues?.unit_price || 0);
 
   const isInitialTelurQty =
     initialValues?.marketing_type?.value?.toLowerCase() === 'telur' &&
@@ -624,7 +620,7 @@ const SalesOrderProductForm = ({
               placeholder='Masukan Total Peti'
               endAdornment={
                 <div className='flex items-center gap-2'>
-                  <span className='text-sm text-base-content/50'>Kg</span>
+                  <span className='text-sm text-base-content/50'>Peti</span>
                 </div>
               }
               bottomLabel={`1 ${formik.values.convertion_unit?.value.toLowerCase()} = ${formik.values.weight_per_convertion ?? 0} Kg`}
@@ -674,6 +670,9 @@ const SalesOrderProductForm = ({
               }
               errorMessage={formik.errors.total_weight}
               placeholder='Masukan Total Bobot'
+              disabled={
+                formik.values.convertion_unit?.value.toLowerCase() === 'peti'
+              }
             />
           )}