diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
index 6a86902..51b1605 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
@@ -12,9 +12,6 @@ import {
   GlobalReorderProductDetails,
   PreferenceData,
   getConfigType,
-  changefocusStatusCust,
-  changeCombofocus,
-  GlobalfocusStatusCust,
 } from '../../../../../Features/BookingScreen/BookingData/BookingData';
 import { ArrowRightOutlined } from '@ant-design/icons';
 import { Messages } from '../../../../../Components/Notifications/Messages';
@@ -49,13 +46,15 @@ import { calculateOverAllQtyLimit } from '../../../../../utils/calculations.js';
 const BSBillingEditQuantity = (props) => {
   const dispatch = useDispatch();
   const formRef = useRef(null);
+  const detailedFormRef = useRef(null);
+  const itemDiscountFormRef = useRef(null);
   const quantityInputRef = useRef(null);
   const priceChangeInputRef = useRef(null);
   const reductionInputRef = useRef(null);
-
-  const { setIndex = () => {} } = props;
+  const { setIndex = () => { } } = props;
 
   const [disableSubmitButton, setDisableSubmitButton] = useState(false);
+  console.log(disableSubmitButton, "disableSubmitButton")
   const SessionData = useSelector(StoredSessionData);
   // const AppId = SessionData?.AppId;
   // const CompId = SessionData?.CompId;
@@ -69,24 +68,13 @@ const BSBillingEditQuantity = (props) => {
     shallowEqual
   );
 
-  const overAllLimitPreferenece = preferenceDatas?.[0]?.[
-    'SettingDtlDetails'
-  ]?.find(
-    (item) =>
-      item.SettingIdName?.toLowerCase() === 'overalllimit' &&
-      item?.SettingValue === 'Y'
-  );
-  const itemWiseLimitPreferenece = preferenceDatas?.[0]?.[
-    'SettingDtlDetails'
-  ]?.find(
-    (item) =>
-      item.SettingIdName?.toLowerCase() === 'itemwiselimit' &&
-      item?.SettingValue === 'Y'
-  );
-  const maxQtyLimit =
-    itemWiseLimitPreferenece?.SettingCount ||
-    overAllLimitPreferenece?.SettingCount ||
-    null;
+  const overAllLimitPreferenece =
+    preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
+      (item) => (item.SettingIdName?.toLowerCase() === 'overalllimit') && item?.SettingValue === 'Y');
+  const itemWiseLimitPreferenece =
+    preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
+      (item) => item.SettingIdName?.toLowerCase() === 'itemwiselimit' && item?.SettingValue === 'Y');
+  const maxQtyLimit = itemWiseLimitPreferenece?.SettingCount || overAllLimitPreferenece?.SettingCount || null;
   const preferenceOffer =
     preferenceDatas?.[0]?.['SettingDtlDetails']?.find(
       (item) => item.SettingIdName === 'Offer'
@@ -100,7 +88,7 @@ const BSBillingEditQuantity = (props) => {
   );
   console.log(preferenceshortcutkey, 'preferenceshortcutkey');
   const [PriceChangeaccess, setPriceChangeaccess] = useState(true);
-  const selectStatuscust = useSelector(GlobalfocusStatusCust);
+
   const [ConfigDataList, setConfigDataList] = useState([]);
   const [messageType, setMessageType] = useState(null);
   const [messageData, setMessageData] = useState(null);
@@ -129,7 +117,7 @@ const BSBillingEditQuantity = (props) => {
     price: 'Price',
     quantity: 'qty',
     Parcel: 'Parcel',
-    weightAmount: 'weightAmount',
+    weightAmount: 'weightAmount'
   };
   const [RadioBtnSelection, setRadioBtnSelection] = useState(() => {
     if (props?.shortKeyMethod && SHORTKEY_TO_RADIO[props.shortKeyMethod]) {
@@ -155,6 +143,8 @@ const BSBillingEditQuantity = (props) => {
   const [PercentageSelection, setPercentageSelection] = useState('Fixed');
   const [RadioDetails, setRadioDetails] = useState(false);
   const [editedPrice, setEditedPrice] = useState(0);
+  const [itemDiscountPercentageSelection, setItemDiscountPercentageSelection] = useState('Fixed');
+  const [itemDiscountPrice, setItemDiscountPrice] = useState(0);
   const allowDecimal = preferenceDatas?.[0]?.SettingDtlDetails?.find(
     (setting) =>
       setting?.SettingIdName?.toLowerCase() === 'decimal' &&
@@ -170,7 +160,7 @@ const BSBillingEditQuantity = (props) => {
     shallowEqual
   );
   const FreeProdList = useSelector(GlobalFreeProdList);
-  console.log(CartOrderDetails, 'CartOrderDetails');
+  console.log(editedPrice, 'editedPrice');
 
   const TakAwayId = ConfigDataList?.find(
     (a) => a?.ConfigName === 'TakeAway'
@@ -197,9 +187,9 @@ const BSBillingEditQuantity = (props) => {
           ? parseInt(props.Productdata.OrderQty)
           : props.Productdata.OrderQty
       );
+      SellingPriceChange(parseFloat(props.Productdata?.SellingPrice || 0));
     },
-    [props.BSBillingEditQuantity],
-    [props.Productdata]
+    [props.BSBillingEditQuantity, props.Productdata]
   );
 
   useEffect(() => {
@@ -278,6 +268,13 @@ const BSBillingEditQuantity = (props) => {
     }
   }, [PackageDtl]);
 
+  useEffect(() => {
+    if (RadioBtnSelection === 'Price' && !RadioDetails) {
+      setEditedPrice(parseFloat(props.Productdata?.SellingPrice || 0));
+    }
+
+  }, [RadioBtnSelection, RadioDetails]);
+
   const getBookingTypeId = async () => {
     let tempconfigdata = await dispatch(
       getConfigType({ TypeName: 'Booking Type' })
@@ -316,9 +313,12 @@ const BSBillingEditQuantity = (props) => {
     setQuantity(tempremovedata);
   };
   const openRadioDetails = () => {
-    setDisableSubmitButton(false);
+    // setDisableSubmitButton(false);
     setRadioDetails(!RadioDetails);
     setEditedPrice(0);
+    // Clear ItemDiscount field and reset discount price
+    setItemDiscountPrice(0);
+    itemDiscountFormRef.current?.resetFields();
   };
 
   // const AddQuantityonly = () => {
@@ -357,6 +357,7 @@ const BSBillingEditQuantity = (props) => {
   };
 
   const calculateOverAllQty = (item, filterItems) => {
+
     if (!item) return 0;
 
     const totalUsedQty =
@@ -437,7 +438,8 @@ const BSBillingEditQuantity = (props) => {
   };
 
   const AddProductQuantity = async () => {
-    let newPrice = editedPrice > 0 ? editedPrice : props.Productdata.OrderRate;
+    let disCountprice = editedPrice - itemDiscountPrice
+    let newPrice = safeRound(disCountprice > 0 ? disCountprice : props.Productdata.OrderRate);
     await dispatch(changeHoldOrderDtl(false));
     await dispatch(changePreviousOrderLength(CartOrderDetails?.length));
 
@@ -459,18 +461,11 @@ const BSBillingEditQuantity = (props) => {
       );
       const editedProduct = CartOrderDetails[editedProductIndex];
 
-      if (
-        (overAllLimitPreferenece || itemWiseLimitPreferenece) &&
-        maxQtyLimit
-      ) {
+      if ((overAllLimitPreferenece || itemWiseLimitPreferenece) && maxQtyLimit) {
         if (overAllLimitPreferenece) {
-          const calculatedOverAllQty = calculateOverAllQtyLimit(
-            CartOrderDetails?.filter((_, index) => index !== editedProductIndex)
-          );
-          if (calculatedOverAllQty + editedQty > maxQtyLimit) {
-            setMessageData(
-              `Overall Quantity Limit Exceeds than ${maxQtyLimit}`
-            );
+          const calculatedOverAllQty = calculateOverAllQtyLimit(CartOrderDetails?.filter((_, index) => index !== editedProductIndex));
+          if ((calculatedOverAllQty + editedQty) > maxQtyLimit) {
+            setMessageData(`Overall Quantity Limit Exceeds than ${maxQtyLimit}`);
             setMessageType('warning');
             return;
           }
@@ -742,12 +737,11 @@ const BSBillingEditQuantity = (props) => {
     newPrice,
     overrideQty = null
   ) => {
-    const editedQty =
-      overrideQty !== null
-        ? overrideQty
-        : props?.Productdata?.ScaleType !== 'weight'
-          ? parseInt(Quantity)
-          : props.Productdata.OrderQty;
+    const editedQty = overrideQty !== null
+      ? overrideQty
+      : props?.Productdata?.ScaleType !== 'weight'
+        ? parseInt(Quantity)
+        : props.Productdata.OrderQty;
     const addFirst = BillOrderPre === 'Y';
     const isExistsInFreeProdList = FreeProdList?.find(
       (product) =>
@@ -771,7 +765,7 @@ const BSBillingEditQuantity = (props) => {
         return (
           cartItem?.InwardDtlId === editedProduct?.InwardDtlId &&
           cartItem?.OfferMessage?.[0]?.OfferId ===
-            editedProduct?.OfferMessage?.[0]?.OfferId &&
+          editedProduct?.OfferMessage?.[0]?.OfferId &&
           cartItem?.OfferMode === editedProduct?.OfferMode &&
           cartItem?.BookingTypeName !== editedProduct?.BookingTypeName
         );
@@ -905,7 +899,7 @@ const BSBillingEditQuantity = (props) => {
                   cartItem?.InwardDtlId === editedProduct?.InwardDtlId &&
                   cartItem?.OrderRate === editedProduct?.OrderRate &&
                   cartItem?.BookingTypeName !==
-                    editedProduct?.BookingTypeName &&
+                  editedProduct?.BookingTypeName &&
                   !cartItem?.OfferMode &&
                   cartItem?.Offer === 0
                 );
@@ -919,7 +913,7 @@ const BSBillingEditQuantity = (props) => {
                   cartItem?.InwardDtlId === editedProduct?.InwardDtlId &&
                   cartItem?.OrderRate === editedProduct?.OrderRate &&
                   cartItem?.BookingTypeName !==
-                    editedProduct?.BookingTypeName &&
+                  editedProduct?.BookingTypeName &&
                   cartItem?.OfferMode === editedProduct?.OfferMode &&
                   cartItem?.Offer > 0
                 );
@@ -1052,7 +1046,7 @@ const BSBillingEditQuantity = (props) => {
                       )
                     ) &&
                     product?.OfferId ===
-                      editedProduct?.OfferMessage?.[0]?.OfferId &&
+                    editedProduct?.OfferMessage?.[0]?.OfferId &&
                     product?.OfferMode === editedProduct?.OfferMode
                   ) {
                     const freeQty =
@@ -1085,7 +1079,7 @@ const BSBillingEditQuantity = (props) => {
                     // Also check main offer conditions
                     const isMatchingOffer =
                       offerProduct?.OfferId ===
-                        editedProduct?.OfferMessage?.[0]?.OfferId &&
+                      editedProduct?.OfferMessage?.[0]?.OfferId &&
                       offerProduct?.OfferMode === editedProduct?.OfferMode;
 
                     if (hasMatchingFreeProduct && isMatchingOffer) {
@@ -1168,7 +1162,7 @@ const BSBillingEditQuantity = (props) => {
                     )
                   ) &&
                   product?.OfferId ===
-                    editedProduct?.OfferMessage?.[0]?.OfferId &&
+                  editedProduct?.OfferMessage?.[0]?.OfferId &&
                   product?.OfferMode === editedProduct?.OfferMode
                 ) {
                   return {
@@ -1198,7 +1192,7 @@ const BSBillingEditQuantity = (props) => {
                   // Also check main offer conditions
                   const isMatchingOffer =
                     offerProduct?.OfferId ===
-                      editedProduct?.OfferMessage?.[0]?.OfferId &&
+                    editedProduct?.OfferMessage?.[0]?.OfferId &&
                     offerProduct?.OfferMode === editedProduct?.OfferMode;
 
                   if (hasMatchingFreeProduct && isMatchingOffer) {
@@ -1385,7 +1379,7 @@ const BSBillingEditQuantity = (props) => {
               // Also check main offer conditions
               const isMatchingOffer =
                 offerProduct?.OfferId ===
-                  editedProduct?.OfferMessage?.[0]?.OfferId &&
+                editedProduct?.OfferMessage?.[0]?.OfferId &&
                 offerProduct?.OfferMode === editedProduct?.OfferMode;
 
               if (hasMatchingFreeProduct && isMatchingOffer) {
@@ -1487,7 +1481,7 @@ const BSBillingEditQuantity = (props) => {
               // Also check main offer conditions
               const isMatchingOffer =
                 offerProduct?.OfferId ===
-                  editedProduct?.OfferMessage?.[0]?.OfferId &&
+                editedProduct?.OfferMessage?.[0]?.OfferId &&
                 offerProduct?.OfferMode === editedProduct?.OfferMode;
 
               if (hasMatchingFreeProduct && isMatchingOffer) {
@@ -1641,7 +1635,7 @@ const BSBillingEditQuantity = (props) => {
                   ) &&
                   cartItem?.Offer &&
                   isFreeProductApplicable?.OfferId ===
-                    cartItem?.OfferMessage?.[0]?.OfferId
+                  cartItem?.OfferMessage?.[0]?.OfferId
                 );
               }
             );
@@ -1930,11 +1924,11 @@ const BSBillingEditQuantity = (props) => {
                 product?.ProdId === editedProduct?.ProdId &&
                 product?.InwardDtlId === editedProduct?.InwardDtlId &&
                 product?.OfferId ===
-                  (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
-                    otherBookingTypeProduct?.OfferMessage?.[0]?.OfferId) &&
+                (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
+                  otherBookingTypeProduct?.OfferMessage?.[0]?.OfferId) &&
                 product?.OfferMode ===
-                  (sameBookingTypeProduct?.OfferMode ||
-                    otherBookingTypeProduct?.OfferMode)
+                (sameBookingTypeProduct?.OfferMode ||
+                  otherBookingTypeProduct?.OfferMode)
               ) {
                 return {
                   ...product,
@@ -1968,11 +1962,11 @@ const BSBillingEditQuantity = (props) => {
                 // Also check main offer conditions
                 const isMatchingOffer =
                   offerProduct?.OfferId ===
-                    (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
-                      otherBookingTypeProduct?.OfferMessage?.[0]?.OfferId) &&
+                  (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
+                    otherBookingTypeProduct?.OfferMessage?.[0]?.OfferId) &&
                   offerProduct?.OfferMode ===
-                    (sameBookingTypeProduct?.OfferMode ||
-                      otherBookingTypeProduct?.OfferMode);
+                  (sameBookingTypeProduct?.OfferMode ||
+                    otherBookingTypeProduct?.OfferMode);
 
                 if (hasMatchingFreeProduct && isMatchingOffer) {
                   // Get loyalty points from the matching free product
@@ -2113,7 +2107,7 @@ const BSBillingEditQuantity = (props) => {
                   cartItem?.Offer > 0 &&
                   isFreeProductApplicable?.OfferMode === cartItem?.OfferMode &&
                   isFreeProductApplicable?.OfferId ===
-                    cartItem?.OfferMessage?.[0]?.OfferId
+                  cartItem?.OfferMessage?.[0]?.OfferId
                 );
               }
             );
@@ -2216,11 +2210,11 @@ const BSBillingEditQuantity = (props) => {
                       if (
                         cartItem.ProdId === otherBookingTypeProduct.ProdId &&
                         cartItem.InwardDtlId ===
-                          otherBookingTypeProduct.InwardDtlId &&
+                        otherBookingTypeProduct.InwardDtlId &&
                         cartItem.BookingTypeName ===
-                          otherBookingTypeProduct.BookingTypeName &&
+                        otherBookingTypeProduct.BookingTypeName &&
                         cartItem.OrderRate ===
-                          otherBookingTypeProduct.OrderRate &&
+                        otherBookingTypeProduct.OrderRate &&
                         cartItem.OfferMode &&
                         cartItem.Offer > 0
                       ) {
@@ -2291,12 +2285,12 @@ const BSBillingEditQuantity = (props) => {
                     product?.ProdId === editedProduct?.ProdId &&
                     product?.InwardDtlId === editedProduct?.InwardDtlId &&
                     product?.OfferId ===
-                      (sameBookingTypeFreeProduct?.OfferMessage?.[0]?.OfferId ||
-                        otherBookingTypeFreeProduct?.OfferMessage?.[0]
-                          ?.OfferId) &&
+                    (sameBookingTypeFreeProduct?.OfferMessage?.[0]?.OfferId ||
+                      otherBookingTypeFreeProduct?.OfferMessage?.[0]
+                        ?.OfferId) &&
                     product?.OfferMode ===
-                      (sameBookingTypeFreeProduct?.OfferMode ||
-                        otherBookingTypeFreeProduct?.OfferMode)
+                    (sameBookingTypeFreeProduct?.OfferMode ||
+                      otherBookingTypeFreeProduct?.OfferMode)
                   ) {
                     return {
                       ...product,
@@ -2330,13 +2324,13 @@ const BSBillingEditQuantity = (props) => {
                     // Also check main offer conditions
                     const isMatchingOffer =
                       offerProduct?.OfferId ===
-                        (sameBookingTypeFreeProduct?.OfferMessage?.[0]
-                          ?.OfferId ||
-                          otherBookingTypeFreeProduct?.OfferMessage?.[0]
-                            ?.OfferId) &&
+                      (sameBookingTypeFreeProduct?.OfferMessage?.[0]
+                        ?.OfferId ||
+                        otherBookingTypeFreeProduct?.OfferMessage?.[0]
+                          ?.OfferId) &&
                       offerProduct?.OfferMode ===
-                        (sameBookingTypeFreeProduct?.OfferMode ||
-                          otherBookingTypeFreeProduct?.OfferMode);
+                      (sameBookingTypeFreeProduct?.OfferMode ||
+                        otherBookingTypeFreeProduct?.OfferMode);
 
                     if (hasMatchingFreeProduct && isMatchingOffer) {
                       // Get loyalty points from the matching free product
@@ -2418,11 +2412,11 @@ const BSBillingEditQuantity = (props) => {
                         if (
                           cartItem.ProdId === sameBookingTypeProduct.ProdId &&
                           cartItem.InwardDtlId ===
-                            sameBookingTypeProduct.InwardDtlId &&
+                          sameBookingTypeProduct.InwardDtlId &&
                           cartItem.BookingTypeName ===
-                            sameBookingTypeProduct.BookingTypeName &&
+                          sameBookingTypeProduct.BookingTypeName &&
                           cartItem.OrderRate ===
-                            sameBookingTypeProduct.OrderRate &&
+                          sameBookingTypeProduct.OrderRate &&
                           cartItem.OfferMode &&
                           cartItem.Offer > 0
                         ) {
@@ -2475,11 +2469,11 @@ const BSBillingEditQuantity = (props) => {
                         if (
                           cartItem.ProdId === sameBookingTypeProduct.ProdId &&
                           cartItem.InwardDtlId ===
-                            sameBookingTypeProduct.InwardDtlId &&
+                          sameBookingTypeProduct.InwardDtlId &&
                           cartItem.BookingTypeName ===
-                            sameBookingTypeProduct.BookingTypeName &&
+                          sameBookingTypeProduct.BookingTypeName &&
                           cartItem.OrderRate ===
-                            sameBookingTypeProduct.OrderRate &&
+                          sameBookingTypeProduct.OrderRate &&
                           cartItem.OfferMode &&
                           cartItem.Offer > 0
                         ) {
@@ -2568,11 +2562,11 @@ const BSBillingEditQuantity = (props) => {
                         if (
                           cartItem.ProdId === otherBookingTypeProduct.ProdId &&
                           cartItem?.InwardDtlId ===
-                            otherBookingTypeProduct.InwardDtlId &&
+                          otherBookingTypeProduct.InwardDtlId &&
                           cartItem?.BookingTypeName ===
-                            otherBookingTypeProduct.BookingTypeName &&
+                          otherBookingTypeProduct.BookingTypeName &&
                           cartItem?.OrderRate ===
-                            otherBookingTypeProduct.OrderRate &&
+                          otherBookingTypeProduct.OrderRate &&
                           cartItem?.OfferMode &&
                           cartItem?.Offer > 0
                         ) {
@@ -2601,11 +2595,11 @@ const BSBillingEditQuantity = (props) => {
                         if (
                           cartItem.ProdId === otherBookingTypeProduct.ProdId &&
                           cartItem.InwardDtlId ===
-                            otherBookingTypeProduct.InwardDtlId &&
+                          otherBookingTypeProduct.InwardDtlId &&
                           cartItem.BookingTypeName ===
-                            otherBookingTypeProduct.BookingTypeName &&
+                          otherBookingTypeProduct.BookingTypeName &&
                           cartItem.OrderRate ===
-                            otherBookingTypeProduct.OrderRate &&
+                          otherBookingTypeProduct.OrderRate &&
                           cartItem.OfferMode &&
                           cartItem.Offer > 0
                         ) {
@@ -2635,11 +2629,11 @@ const BSBillingEditQuantity = (props) => {
                         if (
                           cartItem.ProdId === otherBookingTypeProduct.ProdId &&
                           cartItem.InwardDtlId ===
-                            otherBookingTypeProduct.InwardDtlId &&
+                          otherBookingTypeProduct.InwardDtlId &&
                           cartItem.BookingTypeName ===
-                            otherBookingTypeProduct.BookingTypeName &&
+                          otherBookingTypeProduct.BookingTypeName &&
                           cartItem.OrderRate ===
-                            otherBookingTypeProduct.OrderRate &&
+                          otherBookingTypeProduct.OrderRate &&
                           cartItem.OfferMode &&
                           cartItem.Offer > 0
                         ) {
@@ -2738,12 +2732,12 @@ const BSBillingEditQuantity = (props) => {
                     product?.ProdId === editedProduct?.ProdId &&
                     product?.InwardDtlId === editedProduct?.InwardDtlId &&
                     product?.OfferId ===
-                      (sameBookingTypeFreeProduct?.OfferMessage?.[0]?.OfferId ||
-                        otherBookingTypeFreeProduct?.OfferMessage?.[0]
-                          ?.OfferId) &&
+                    (sameBookingTypeFreeProduct?.OfferMessage?.[0]?.OfferId ||
+                      otherBookingTypeFreeProduct?.OfferMessage?.[0]
+                        ?.OfferId) &&
                     product?.OfferMode ===
-                      (sameBookingTypeFreeProduct?.OfferMode ||
-                        otherBookingTypeFreeProduct?.OfferMode)
+                    (sameBookingTypeFreeProduct?.OfferMode ||
+                      otherBookingTypeFreeProduct?.OfferMode)
                   ) {
                     return {
                       ...product,
@@ -2777,12 +2771,12 @@ const BSBillingEditQuantity = (props) => {
                     // Also check main offer conditions
                     const isMatchingOffer =
                       offerProduct?.OfferId ===
-                        (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
-                          otherBookingTypeProduct?.OfferMessage?.[0]
-                            ?.OfferId) &&
+                      (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
+                        otherBookingTypeProduct?.OfferMessage?.[0]
+                          ?.OfferId) &&
                       offerProduct?.OfferMode ===
-                        (sameBookingTypeProduct?.OfferMode ||
-                          otherBookingTypeProduct?.OfferMode);
+                      (sameBookingTypeProduct?.OfferMode ||
+                        otherBookingTypeProduct?.OfferMode);
 
                     if (hasMatchingFreeProduct && isMatchingOffer) {
                       // Get loyalty points from the matching free product
@@ -2861,11 +2855,11 @@ const BSBillingEditQuantity = (props) => {
                       if (
                         cartItem.ProdId === sameBookingTypeProduct.ProdId &&
                         cartItem.InwardDtlId ===
-                          sameBookingTypeProduct.InwardDtlId &&
+                        sameBookingTypeProduct.InwardDtlId &&
                         cartItem.BookingTypeName ===
-                          sameBookingTypeProduct.BookingTypeName &&
+                        sameBookingTypeProduct.BookingTypeName &&
                         cartItem.OrderRate ===
-                          sameBookingTypeProduct.OrderRate &&
+                        sameBookingTypeProduct.OrderRate &&
                         cartItem.OfferMode &&
                         cartItem.Offer > 0
                       ) {
@@ -2924,11 +2918,11 @@ const BSBillingEditQuantity = (props) => {
                       if (
                         cartItem.ProdId === otherBookingTypeProduct.ProdId &&
                         cartItem.InwardDtlId ===
-                          otherBookingTypeProduct.InwardDtlId &&
+                        otherBookingTypeProduct.InwardDtlId &&
                         cartItem.BookingTypeName ===
-                          otherBookingTypeProduct.BookingTypeName &&
+                        otherBookingTypeProduct.BookingTypeName &&
                         cartItem.OrderRate ===
-                          otherBookingTypeProduct.OrderRate &&
+                        otherBookingTypeProduct.OrderRate &&
                         cartItem.OfferMode &&
                         cartItem.Offer > 0
                       ) {
@@ -3000,12 +2994,12 @@ const BSBillingEditQuantity = (props) => {
                     product?.ProdId === editedProduct?.ProdId &&
                     product?.InwardDtlId === editedProduct?.InwardDtlId &&
                     product?.OfferId ===
-                      (sameBookingTypeFreeProduct?.OfferMessage?.[0]?.OfferId ||
-                        otherBookingTypeFreeProduct?.OfferMessage?.[0]
-                          ?.OfferId) &&
+                    (sameBookingTypeFreeProduct?.OfferMessage?.[0]?.OfferId ||
+                      otherBookingTypeFreeProduct?.OfferMessage?.[0]
+                        ?.OfferId) &&
                     product?.OfferMode ===
-                      (sameBookingTypeFreeProduct?.OfferMode ||
-                        otherBookingTypeFreeProduct?.OfferMode)
+                    (sameBookingTypeFreeProduct?.OfferMode ||
+                      otherBookingTypeFreeProduct?.OfferMode)
                   ) {
                     return {
                       ...product,
@@ -3039,12 +3033,12 @@ const BSBillingEditQuantity = (props) => {
                     // Also check main offer conditions
                     const isMatchingOffer =
                       offerProduct?.OfferId ===
-                        (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
-                          otherBookingTypeProduct?.OfferMessage?.[0]
-                            ?.OfferId) &&
+                      (sameBookingTypeProduct?.OfferMessage?.[0]?.OfferId ||
+                        otherBookingTypeProduct?.OfferMessage?.[0]
+                          ?.OfferId) &&
                       offerProduct?.OfferMode ===
-                        (sameBookingTypeProduct?.OfferMode ||
-                          otherBookingTypeProduct?.OfferMode);
+                      (sameBookingTypeProduct?.OfferMode ||
+                        otherBookingTypeProduct?.OfferMode);
 
                     if (hasMatchingFreeProduct && isMatchingOffer) {
                       // Get loyalty points from the matching free product
@@ -3175,6 +3169,26 @@ const BSBillingEditQuantity = (props) => {
       ...(offerApply && {
         Offer: qty * (newPrice > 0 ? newPrice : editedProduct?.OrderRate),
       }),
+      ...(
+        !offerApply && itemDiscountPrice > 0
+          ? {
+            DiscountAmt: safeRound(itemDiscountPrice),
+            DiscountType: itemDiscountPercentageSelection === 'Fixed' ? 'F' : 'P',
+            DiscountValue:
+              itemDiscountPercentageSelection === 'Fixed'
+                ? itemDiscountPrice
+                : (
+                  (itemDiscountPrice /
+                    (newPrice > 0 ? newPrice : editedProduct?.OrderRate)) * 100
+                )
+          }
+          : {
+            DiscountAmt: null,
+            DiscountType: null,
+            DiscountValue: null
+          }
+      )
+
     };
 
     if (hasOffer) {
@@ -3199,17 +3213,17 @@ const BSBillingEditQuantity = (props) => {
           changeOrderCardDetails(
             CartOrderDetails?.map((i) =>
               i?.InwardDtlId == updatedProduct?.InwardDtlId &&
-              i?.BookingTypeName == updatedProduct?.BookingTypeName &&
-              i?.localId === updatedProduct?.localId
+                i?.BookingTypeName == updatedProduct?.BookingTypeName &&
+                i?.localId === updatedProduct?.localId
                 ? {
-                    ...updatedProduct,
-                    Offer: 0,
-                    OfferType:
-                      updatedProduct?.Type === 'C'
-                        ? updatedProduct?.OfferType
-                        : null,
-                    OfferMessage: null,
-                  }
+                  ...updatedProduct,
+                  Offer: 0,
+                  OfferType:
+                    updatedProduct?.Type === 'C'
+                      ? updatedProduct?.OfferType
+                      : null,
+                  OfferMessage: null,
+                }
                 : i
             )
           )
@@ -3234,6 +3248,7 @@ const BSBillingEditQuantity = (props) => {
         OfferMessage: updatedProduct?.OfferMessage || bestOffer?.OfferMessage,
       };
 
+
       console.log(updatedProduct, 'updatedProduct');
 
       const shouldRemove = (c) =>
@@ -3245,10 +3260,10 @@ const BSBillingEditQuantity = (props) => {
         ((c?.OfferModeType && c?.OfferMode === 'B'
           ? true
           : c?.OfferMode !== 'B') &&
-        c?.OfferMode !== 'P' &&
-        c?.OfferMode !== 'C' &&
-        c?.OfferMode !== 'O' &&
-        c?.OfferMode !== 'L'
+          c?.OfferMode !== 'P' &&
+          c?.OfferMode !== 'C' &&
+          c?.OfferMode !== 'O' &&
+          c?.OfferMode !== 'L'
           ? true
           : c?.Offer === 0);
 
@@ -3313,11 +3328,52 @@ const BSBillingEditQuantity = (props) => {
   const onPercentageSelectionChange = (data) => {
     setPercentageSelection(data);
     setEditedPrice(0);
-    formRef.current?.resetFields();
+    detailedFormRef.current?.resetFields();
     setDisableSubmitButton(false);
   };
+  const onItemDiscountPercentageChange = (data) => {
+    setItemDiscountPercentageSelection(data);
+    setItemDiscountPrice(0);
+    itemDiscountFormRef.current?.resetFields();
+  };
+  const ItemDiscountChangefun = (data) => {
+
+    const enteredDiscount = parseFloat(data?.target.value);
+
+    if (enteredDiscount) {
+      let roundedrice = safeRound(editedPrice ? editedPrice : 0)
+      const sellingPrice = parseFloat(roundedrice || props.Productdata?.SellingPrice || 0);
+      if (itemDiscountPercentageSelection === 'Fixed') {
+        if (parseFloat(enteredDiscount) < parseFloat(sellingPrice)) {
+          setItemDiscountPrice(parseFloat(enteredDiscount));
+        } else {
+          setMessageType('error');
+          setMessageData('Discount cannot exceed selling price');
+          setItemDiscountPrice(0);
+          itemDiscountFormRef.current?.resetFields();
+        }
+      } else {
+        if (parseFloat(enteredDiscount) < 100) {
+          let discountAmt = (parseFloat(enteredDiscount) * parseFloat(sellingPrice)) / 100;
+          setItemDiscountPrice(parseFloat(discountAmt));
+        } else {
+          setMessageType('error');
+          setMessageData('Percentage cannot exceed 100%');
+          setItemDiscountPrice(0);
+          itemDiscountFormRef.current?.resetFields();
+        }
+      }
+    } else {
+      setItemDiscountPrice(0);
+    }
+  };
   const PriceChangefun = (data) => {
     const enteredDiscount = parseFloat(data?.target.value);
+
+    // Clear ItemDiscount field and reset discount price
+    setItemDiscountPrice(0);
+    itemDiscountFormRef.current?.resetFields();
+
     if (enteredDiscount) {
       const sellingPrice = parseFloat(props.Productdata?.SellingPrice || 0);
       const limit = parseFloat(props.Productdata?.DiscountLimit || 0);
@@ -3429,11 +3485,15 @@ const BSBillingEditQuantity = (props) => {
     }
   };
   const SellingPriceChange = (data) => {
-    if (data?.target.value) {
+    if (data) {
       const sellingPrice = parseFloat(props.Productdata?.SellingPrice || 0);
       const limit = parseFloat(props.Productdata?.DiscountLimit || 0);
       const limitType = props.Productdata?.DiscountLimitType;
-      const enteredDiscount = parseFloat(data?.target.value);
+      const enteredDiscount = parseFloat(data);
+
+      // Clear ItemDiscount field and reset discount price
+      setItemDiscountPrice(0);
+      itemDiscountFormRef.current?.resetFields();
 
       if (limit === null || limit === undefined || limit === 0) {
         // if (
@@ -3441,6 +3501,7 @@ const BSBillingEditQuantity = (props) => {
         //   parseFloat(enteredDiscount) === parseFloat(sellingPrice)
         // ) {
         setEditedPrice(enteredDiscount);
+        formRef.current?.setFieldsValue({ SellPrice: enteredDiscount });
         setDisableSubmitButton(true);
         // } else {
         //   setMessageType('error');
@@ -3461,7 +3522,8 @@ const BSBillingEditQuantity = (props) => {
       }
 
       if (enteredDiscount === maxDiscount) {
-        setEditedPrice(data?.target.value);
+        setEditedPrice(data);
+        formRef.current?.setFieldsValue({ SellPrice: data });
         setDisableSubmitButton(true);
         return;
       }
@@ -3470,14 +3532,20 @@ const BSBillingEditQuantity = (props) => {
         setMessageType('error');
         setMessageData(`You cannot sell below ₹${maxDiscount.toFixed(2)}`);
         setEditedPrice(0);
+        formRef.current?.setFieldsValue({ SellPrice: 0 });
         setDisableSubmitButton(false);
         return;
       }
       setDisableSubmitButton(true);
-      setEditedPrice(data?.target.value);
+      setEditedPrice(data);
+      formRef.current?.setFieldsValue({ SellPrice: data });
     } else {
       setDisableSubmitButton(false);
       setEditedPrice(0);
+      formRef.current?.setFieldsValue({ SellPrice: 0 });
+      // Clear ItemDiscount field and reset discount price
+      setItemDiscountPrice(0);
+      itemDiscountFormRef.current?.resetFields();
     }
   };
 
@@ -3502,21 +3570,16 @@ const BSBillingEditQuantity = (props) => {
     );
     const editedProduct = {
       ...CartOrderDetails[editedProductIndex],
-      OrderQty: qty,
+      OrderQty: qty
     };
 
-    await handleEditQuantity(
-      editedProduct,
-      editedProductIndex,
-      editedProduct.OrderRate,
-      qty
-    );
+    await handleEditQuantity(editedProduct, editedProductIndex, editedProduct.OrderRate, qty);
     props.handleEditQuantityCancel();
     setClearQuantity(false);
   };
   const isKg =
     props?.Productdata?.Size == 1 &&
-    ['KG', 'KGS'].includes(props?.Productdata?.UomName?.toUpperCase());
+    ["KG", "KGS"].includes(props?.Productdata?.UomName?.toUpperCase());
 
   return (
     <div className="BSBilling-EditQuantity-Modal">
@@ -3599,7 +3662,7 @@ const BSBillingEditQuantity = (props) => {
                       }
                     }}
                   >
-                    Price Change
+                    OverRide / Discount
                   </button>
                 )}
 
@@ -3615,30 +3678,23 @@ const BSBillingEditQuantity = (props) => {
                   Packing
                 </button>
 
-                {isKg && (
-                  <button
-                    type="button"
-                    className={
-                      RadioBtnSelection === 'weightAmount'
-                        ? 'SelecBtn weightAmount'
-                        : 'ChangeBtn'
-                    }
-                    onClick={() => onRadioBtnChange('weightAmount')}
-                  >
-                    Weight / Amount
-                  </button>
-                )}
+                {isKg && (<button
+                  type="button"
+                  className={
+                    RadioBtnSelection === 'weightAmount'
+                      ? 'SelecBtn weightAmount'
+                      : 'ChangeBtn'
+                  }
+                  onClick={() => onRadioBtnChange('weightAmount')}
+                >
+                  Weight / Amount
+                </button>)}
+
               </div>
 
               {RadioBtnSelection == 'Quantity' && (
                 <>
-                  <div
-                    className="EditQuantity-Quantity"
-                    onBlur={() => {
-                      dispatch(changefocusStatusCust(!selectStatuscust));
-                      dispatch(changeCombofocus(false));
-                    }}
-                  >
+                  <div className="EditQuantity-Quantity">
                     <label className="EditQuantity-itemname">
                       Item Quantity:
                     </label>
@@ -3647,10 +3703,6 @@ const BSBillingEditQuantity = (props) => {
                       type="number"
                       value={Quantity}
                       onChange={(e) => setQuantity(e.target.value)}
-                      onBlur={() => {
-                        dispatch(changefocusStatusCust(!selectStatuscust));
-                        dispatch(changeCombofocus(false));
-                      }}
                       className="EditQuantity-Quantitybox"
                     />
                     <button
@@ -3700,62 +3752,147 @@ const BSBillingEditQuantity = (props) => {
                 </>
               )}
               {RadioBtnSelection == 'Price' && (
-                <div className="EditQuantity-PriceChange">
-                  <label className="EditQuantity-itemname">
-                    Item Price: {safeRound(props.Productdata.SellingPrice)} /
-                    per item{' '}
-                  </label>
+                <div style={{ display: "flex" }} >
+                  <div className="EditQuantity-PriceChange">
+                    <label className="EditQuantity-itemname">
+                      Item Price: {safeRound(props.Productdata.SellingPrice)} /
+                      per item{' '}
+                    </label>
 
-                  {!RadioDetails && (
-                    <Form.Item
-                      name="SellPrice"
-                      rules={[
-                        {
-                          pattern: /^(0\d+|[1-9]\d*)(\.\d+)?$/,
-                          message: 'Please Enter Number Only',
-                        },
-                        {
-                          validator: async (_, value) => {
-                            await validateSafeInput(value);
+                    {!RadioDetails && (
+                      <Form ref={formRef}>
+                        <Form.Item
+                          name="SellPrice"
+                          initialValue={editedPrice}
+                          rules={[
+                            {
+                              pattern: /^(0\d+|[1-9]\d*)(\.\d+)?$/,
+                              message: 'Please Enter Number Only',
+                            },
+                            {
+                              validator: async (_, value) => {
+                                await validateSafeInput(value);
 
-                            if (value && value.length > 10) {
-                              return Promise.reject(
-                                'Selling Price should not exceed 10 characters'
+                                if (value && value.length > 10) {
+                                  return Promise.reject(
+                                    'Selling Price should not exceed 10 characters'
+                                  );
+                                }
+
+                                return Promise.resolve();
+                              },
+                            },
+                          ]}
+                        >
+                          <InputField
+                            ref={priceChangeInputRef}
+                            value={editedPrice}
+                            label="Price Override"
+                            autocomplete="off"
+                            onChange={(e) => { SellingPriceChange(e?.target?.value) }}
+                            inputMode="decimal"
+                            isOnChange={editedPrice > 0 ? true : false}
+                            onInput={(e) => {
+                              const cleanedValue = e.target.value.replace(
+                                /[^0-9.]/g,
+                                ''
                               );
-                            }
+                              const parts = cleanedValue.split('.');
+                              e.target.value =
+                                parts.length > 2
+                                  ? `${parts[0]}.${parts.slice(1).join('')}`
+                                  : cleanedValue;
+                            }}
+                          // isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
+                          />
+                        </Form.Item>
+                      </Form>
+                    )}
 
-                            return Promise.resolve();
-                          },
-                        },
-                      ]}
-                    >
-                      <InputField
-                        ref={priceChangeInputRef}
-                        value={editedPrice}
-                        label="Selling Price"
-                        autocomplete="off"
-                        onChange={SellingPriceChange}
-                        inputMode="decimal"
-                        onInput={(e) => {
-                          const cleanedValue = e.target.value.replace(
-                            /[^0-9.]/g,
-                            ''
-                          );
-                          const parts = cleanedValue.split('.');
-                          e.target.value =
-                            parts.length > 2
-                              ? `${parts[0]}.${parts.slice(1).join('')}`
-                              : cleanedValue;
-                        }}
-                        // isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
-                      />
-                    </Form.Item>
-                  )}
+                    <div className="prodAddDetails" onClick={openRadioDetails}>
+                      More
+                    </div>
+                    {RadioDetails && (
+                      <>
+                        <div className="EditQuantity-Quantity">
+                          <RadioGrpButton
+                            content={[
+                              { value: 'Fixed', label: 'Fixed' },
+                              { value: 'Percentage', label: 'Percentage' },
+                            ]}
+                            fieldState={true}
+                            defaultSelect={PercentageSelection}
+                            onSelectFuntion={(e) => {
+                              onPercentageSelectionChange(e);
+                            }}
+                          />
+                        </div>
+                        <div className="EditQuantity-Quantity">
+                          <Form ref={detailedFormRef}>
+                            <Form.Item
+                              name="SellPrice"
+                              initialValue={editedPrice}
+                              rules={[
+                                {
+                                  pattern: /^[0-9]\d*(\.\d+)?$/,
+                                  message: 'Please Enter Number Only',
+                                },
+                                {
+                                  validator: async (_, value) => {
+                                    await validateSafeInput(value); // To block HTML tags & SQL keywords
+                                    return Promise.resolve();
+                                  },
+                                },
+                              ]}
+                            >
+                              <InputField
+                                ref={reductionInputRef}
+                                field="SellPrice"
+                                name="SellPrice"
+                                value={editedPrice}
+                                label="Reduction"
+                                fieldState={true}
+                                fieldApi={true}
+                                // id="error2"
+                                autocomplete="off"
+                                onChange={(e) => PriceChangefun(e)}
+                                inputMode="decimal"
+                                isOnChange={editedPrice > 0 ? true : false}
+                                onInput={(e) => {
+                                  const cleanedValue = e.target.value.replace(
+                                    /[^0-9.]/g,
+                                    ''
+                                  );
+                                  const parts = cleanedValue.split('.');
+                                  e.target.value =
+                                    parts.length > 2
+                                      ? `${parts[0]}.${parts.slice(1).join('')}`
+                                      : cleanedValue;
+                                }}
+                              // isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
+                              />
+                            </Form.Item>
+                            {/* <input type="text"
+                      onChange={(e)=>PriceChangefun(e)}
+                      className="EditQuantity-Pricebox"
+                    /> */}
+                          </Form>
+                        </div>
+                        {editedPrice > 0 && <div className="EditQuantity-Quantity">
+                          <div className="EditQuantity-itemname">
+                            {' '}
+                            Price: {safeRound(editedPrice ? editedPrice : 0)}
+                          </div>
+                        </div>}
+                      </>
+                    )}
 
-                  <div className="prodAddDetails" onClick={openRadioDetails}>
-                    More
                   </div>
-                  {RadioDetails && (
+                  <div style={{ borderLeft: "1px solid #ddd", paddingLeft: "15px", marginLeft: "15px" }}>
+                    <label className="EditQuantity-itemname">
+                      Item Discount
+                    </label>
+
                     <>
                       <div className="EditQuantity-Quantity">
                         <RadioGrpButton
@@ -3764,16 +3901,16 @@ const BSBillingEditQuantity = (props) => {
                             { value: 'Percentage', label: 'Percentage' },
                           ]}
                           fieldState={true}
-                          defaultSelect={PercentageSelection}
+                          defaultSelect={itemDiscountPercentageSelection}
                           onSelectFuntion={(e) => {
-                            onPercentageSelectionChange(e);
+                            onItemDiscountPercentageChange(e);
                           }}
                         />
                       </div>
                       <div className="EditQuantity-Quantity">
-                        <Form ref={formRef}>
+                        <Form ref={itemDiscountFormRef}>
                           <Form.Item
-                            name="SellPrice"
+                            name="ItemDiscount"
                             rules={[
                               {
                                 pattern: /^[1-9]\d*(\.\d+)?$/,
@@ -3781,23 +3918,21 @@ const BSBillingEditQuantity = (props) => {
                               },
                               {
                                 validator: async (_, value) => {
-                                  await validateSafeInput(value); // To block HTML tags & SQL keywords
+                                  await validateSafeInput(value);
                                   return Promise.resolve();
                                 },
                               },
                             ]}
                           >
                             <InputField
-                              ref={reductionInputRef}
-                              field="SellPrice"
-                              name="SellPrice"
-                              value={editedPrice}
-                              label="Reduction"
+                              field="ItemDiscount"
+                              name="ItemDiscount"
+                              value={itemDiscountPrice}
+                              label="Discount Amount"
                               fieldState={true}
                               fieldApi={true}
-                              // id="error2"
                               autocomplete="off"
-                              onChange={(e) => PriceChangefun(e)}
+                              onChange={(e) => ItemDiscountChangefun(e)}
                               inputMode="decimal"
                               onInput={(e) => {
                                 const cleanedValue = e.target.value.replace(
@@ -3810,24 +3945,22 @@ const BSBillingEditQuantity = (props) => {
                                     ? `${parts[0]}.${parts.slice(1).join('')}`
                                     : cleanedValue;
                               }}
-                              // isOnChange={formType == "edit" || formRef.current?.getFieldsValue()?.CustName ? true : false}
                             />
                           </Form.Item>
-                          {/* <input type="text"
-                      onChange={(e)=>PriceChangefun(e)}
-                      className="EditQuantity-Pricebox"
-                    /> */}
                         </Form>
                       </div>
-                      <div className="EditQuantity-Quantity">
+                      {itemDiscountPrice > 0 && editedPrice > 0 && <div className="EditQuantity-Quantity">
                         <div className="EditQuantity-itemname">
                           {' '}
-                          Price: {safeRound(editedPrice ? editedPrice : 0)}
+                          {console.log(editedPrice, itemDiscountPrice, "itemDiscountPrice")}
+                          Final Price: {safeRound(editedPrice) - (itemDiscountPrice || 0)}
                         </div>
-                      </div>
+                      </div>}
                     </>
-                  )}
+                  </div>
+
                 </div>
+
               )}
               {RadioBtnSelection == 'Parcel' && (
                 <>
@@ -3843,7 +3976,7 @@ const BSBillingEditQuantity = (props) => {
                   />
                 </>
               )}
-              {RadioBtnSelection == 'weightAmount' && isKg && (
+              {(RadioBtnSelection == 'weightAmount') && isKg && (
                 <>
                   <WeightCalculatePrice
                     CartOrderDetails={CartOrderDetails}
@@ -3855,14 +3988,14 @@ const BSBillingEditQuantity = (props) => {
               <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                 {((RadioBtnSelection == 'Price' && disableSubmitButton) ||
                   RadioBtnSelection == 'Quantity') && (
-                  <Buttons
-                    buttonText="Submit"
-                    color="901D77"
-                    htmlType
-                    // handleSubmit={AddProductQuantity}
-                    icon={<ArrowRightOutlined />}
-                  ></Buttons>
-                )}
+                    <Buttons
+                      buttonText="Submit"
+                      color="901D77"
+                      htmlType
+                      // handleSubmit={AddProductQuantity}
+                      icon={<ArrowRightOutlined />}
+                    ></Buttons>
+                  )}
               </div>
             </Form>
           </div>
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
index bc3de2f..400438c 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
@@ -2599,7 +2599,7 @@ const BSBillingTable3 = () => {
                         {item?.Type != 'C'
                           ? item.Offer && item.Offer > 0
                             ? item.Offer
-                            : '-'
+                            :item.DiscountAmt ? item.DiscountAmt : '-'
                           : item?.OfferPrice && item?.OfferPrice > 0
                             ? item?.OfferType === 'F'
                               ? `₹${safeRound(item.OfferPrice)}`
@@ -2876,7 +2876,7 @@ const BSBillingTable3 = () => {
                         {item?.Type != 'C'
                           ? item.Offer && item.Offer > 0
                             ? item.Offer
-                            : '-'
+                            : item.DiscountAmt ? item.DiscountAmt : '-'
                           : item?.OfferPrice && item?.OfferPrice > 0
                             ? item?.OfferType === 'F'
                               ? `₹${safeRound(item.OfferPrice)}`
@@ -3201,7 +3201,7 @@ const BSBillingTable3 = () => {
                         {item?.Type != 'C'
                           ? item.Offer && item.Offer > 0
                             ? item.Offer
-                            : '-'
+                            : item.DiscountAmt ? item.DiscountAmt : '-'
                           : item?.OfferPrice && item?.OfferPrice > 0
                             ? item?.OfferType === 'F'
                               ? `₹${safeRound(item.OfferPrice)}`
@@ -3511,7 +3511,7 @@ const BSBillingTable3 = () => {
                         {item?.Type != 'C'
                           ? item.Offer && item.Offer > 0
                             ? item.Offer
-                            : '-'
+                            : item.DiscountAmt ? item.DiscountAmt : '-'
                           : item?.OfferPrice && item?.OfferPrice > 0
                             ? item?.OfferType === 'F'
                               ? `₹${safeRound(item.OfferPrice)}`
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
index 4a936f4..b25a613 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
@@ -324,7 +324,7 @@ const BSBillingTable3Pay = () => {
   const ProdSubCat = useSelector(GlobalProductSubCategorie);
   const BSLayoutData = useSelector(getTemplateData);
   const Combodata = useSelector(GlobalCombocarddata, shallowEqual);
-
+  console.log(PaymentOptions, "PaymentOptions")
   const Custdisable = useSelector(GlobalSelectedCustDisable);
   const SettingDataSelector = useSelector(PreferenceData);
 
@@ -394,7 +394,6 @@ const BSBillingTable3Pay = () => {
   );
 
   console.log(OrderCardDetail, 'OrderCardDetail');
-  //Total calculation
   const TotalItems = OrderCardDetail?.length;
   const [formattedDate, setFormattedDate] = useState('');
   const [UpiOptionOpen, setUpiOptionOpen] = useState(false);
@@ -437,6 +436,7 @@ const BSBillingTable3Pay = () => {
   const [PaymentgatewayUPI, setPaymentgatewayUPI] = useState([]);
   const [PaymentDeviceUPI, setPaymentDeviceUPI] = useState([]);
   const [UpiPayOption, setUpiPayOption] = useState([]);
+  console.log(UpiPayOption, "UpiPayOption")
   const [BusinessPayOption, setBusinessPayoption] = useState([]);
   const [CardPayOption, setCardPayOption] = useState([]);
   const [Splitpayment, setSplitpayment] = useState(false);
@@ -483,6 +483,7 @@ const BSBillingTable3Pay = () => {
 
   const [OrderStatus, setOrderStatus] = useState(true);
   const GlobaluseOptions = useSelector(GlobalCommonPaymentOptions);
+  console.log(GlobaluseOptions, "GlobaluseOptions")
   const [useOptions, setuseOptions] = useState([]);
   const paymentloader = useSelector(GlobalPayementloader);
   const [UnpaidConfirmation, setUnpaidConfirmation] = useState(false);
@@ -1011,7 +1012,7 @@ const BSBillingTable3Pay = () => {
 
     const selectedStyle =
       stylesMap[
-        printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
+      printerTemplateStyle == undefined ? 'Style 13' : printerTemplateStyle
       ];
 
     if (selectedStyle) {
@@ -1091,8 +1092,8 @@ const BSBillingTable3Pay = () => {
       }
     };
     // if (salesBillEdit) {
-      setDefaultPaymentOption();
-    // }
+    setDefaultPaymentOption();
+    // } 
   }, [defaultPaymentTrigger, salesBillEdit]);
 
   const TokenPrint = async (index) => {
@@ -1632,6 +1633,7 @@ const BSBillingTable3Pay = () => {
   //dhana
 
   const getPaymentOptionFeature = async () => {
+
     const FiltersalesPayment = GlobaluseOptions?.filter(
       (item) => item.FlowName?.toLowerCase() === 'sales'
     );
@@ -1666,6 +1668,7 @@ const BSBillingTable3Pay = () => {
       filterpaymentdevice?.[0]?.ModeDetails?.filter((item) =>
         item?.ModeName?.toLowerCase()?.includes('upi')
       ) || [];
+
     setPaymentOptions(filterpaycounter?.[0]?.ModeDetails);
     setPaymentUpiOptions(
       FiltersalesPayment?.[0]?.PaymentDetails?.Payatthecounter
@@ -2207,6 +2210,7 @@ const BSBillingTable3Pay = () => {
   };
 
   const Booking = async (value, pay) => {
+
     const TakAwayId = ConfigDataList?.find(
       (a) => a?.ConfigName === 'TakeAway'
     )?.ConfigId;
@@ -2232,15 +2236,15 @@ const BSBillingTable3Pay = () => {
       OrderStatus: 'O',
       OrderType:
         BookingType === 'Dine In' ||
-        BookingTypeBoth ||
-        Estimation?.SettingValue == 'N'
+          BookingTypeBoth ||
+          Estimation?.SettingValue == 'N'
           ? 'S'
           : GlobEstBooking === 'OvrAllEst'
             ? 'E'
             : GlobEstBooking === 'ParEst'
               ? GlobProdwisedata?.includes(
-                  a.InwardDtlId + ' ' + a?.BookingTypeName
-                )
+                a.InwardDtlId + ' ' + a?.BookingTypeName
+              )
                 ? 'E'
                 : 'S'
               : 'S',
@@ -2257,6 +2261,10 @@ const BSBillingTable3Pay = () => {
       BatchRef: a.BatchRef,
       PackageDtl: a.PackageDtl,
       SetCount: a.SetCount,
+      ...(a?.DiscountValue && { DiscountValue: a.DiscountValue }),
+      ...(a?.DiscountType && { DiscountType: a.DiscountType }),
+      ...(a?.DiscountAmt && { DiscountAmt: a.DiscountAmt })
+
     }));
     const NotSlectedTypeFind = temporderdetail?.find(
       (a) => a?.BookingType != SelectedBookingType
@@ -2332,7 +2340,7 @@ const BSBillingTable3Pay = () => {
           : Paybtnnameselected?.toLowerCase() === 'credit'
             ? 'S'
             : Paybtnnameselected?.toLowerCase() === 'upi' &&
-                SelectedUPIPayOption?.toLowerCase() === 'default'
+              SelectedUPIPayOption?.toLowerCase() === 'default'
               ? 'S'
               : 'P',
       OrderDtlDetails:
@@ -2349,9 +2357,9 @@ const BSBillingTable3Pay = () => {
           ? globalTipAmount === 0
             ? SelectedTableDetails
             : SelectedTableDetails?.map((item) => ({
-                ...item,
-                TipsAmount: globalTipAmount,
-              }))
+              ...item,
+              TipsAmount: globalTipAmount,
+            }))
           : null,
       SalesPaymentType: 'normal',
       PaymentDetail: [
@@ -2366,8 +2374,8 @@ const BSBillingTable3Pay = () => {
                     ? PaymentgatewayUPI?.[0]?.ModeId
                     : SelectedUPIPayOption?.toLowerCase() === 'business'
                       ? BusinessPayOption?.find(
-                          (busupi) => busupi?.ModeId === UpiId
-                        )?.ModeId
+                        (busupi) => busupi?.ModeId === UpiId
+                      )?.ModeId
                       : paybtnselected
                 : paybtnselected
                   ? paybtnselected
@@ -2380,15 +2388,15 @@ const BSBillingTable3Pay = () => {
             salesBillEdit && currentOrderNetAmount < previousNetAmount
               ? null
               : Paybtnnameselected?.toLowerCase() === 'upi' &&
-                  SelectedUPIPayOption?.toLowerCase() === 'business'
+                SelectedUPIPayOption?.toLowerCase() === 'business'
                 ? BusinessPayOption?.find((busupi) => busupi?.ModeId === UpiId)
-                    ?.MerchantId
+                  ?.MerchantId
                 : null,
           PaymentOptionType:
             salesBillEdit &&
-            currentOrderNetAmount < previousNetAmount &&
-            (refundPaySelectedName?.toLowerCase() === 'cash' ||
-              refundPaySelectedName?.toLowerCase() === 'credit')
+              currentOrderNetAmount < previousNetAmount &&
+              (refundPaySelectedName?.toLowerCase() === 'cash' ||
+                refundPaySelectedName?.toLowerCase() === 'credit')
               ? 'PC'
               : Paybtnnameselected?.toLowerCase() === 'cash'
                 ? 'PC'
@@ -2408,29 +2416,29 @@ const BSBillingTable3Pay = () => {
               ? null
               : SelectedUPIPayOption?.toLowerCase() === 'default'
                 ? PaymentUpiOptions?.find((upipay) => upipay?.UPIId === UpiId)
-                    ?.UPIDetailId
+                  ?.UPIDetailId
                 : SelectedUPIPayOption?.toLowerCase() === 'business'
                   ? BusinessPayOption?.find(
-                      (busupi) => busupi?.ModeId === UpiId
-                    )?.MerchantUPIId
+                    (busupi) => busupi?.ModeId === UpiId
+                  )?.MerchantUPIId
                   : null,
           AccountDtl:
             salesBillEdit && currentOrderNetAmount < previousNetAmount
               ? []
               : Paybtnnameselected?.toLowerCase() === 'upi' &&
-                  SelectedUPIPayOption?.toLowerCase() === 'default'
+                SelectedUPIPayOption?.toLowerCase() === 'default'
                 ? useOptions?.[0]?.PaymentDetails?.Payatthecounter?.find(
-                    (upipay) => upipay?.UPIId === UpiId
-                  )
+                  (upipay) => upipay?.UPIId === UpiId
+                )
                 : (Paybtnnameselected?.toLowerCase() === 'upi' &&
-                      SelectedUPIPayOption?.toLowerCase() === 'pd') ||
-                    (Paybtnnameselected?.toLowerCase() === 'card' &&
-                      SelectedCardOption?.toLowerCase() === 'pd')
+                  SelectedUPIPayOption?.toLowerCase() === 'pd') ||
+                  (Paybtnnameselected?.toLowerCase() === 'card' &&
+                    SelectedCardOption?.toLowerCase() === 'pd')
                   ? useOptions?.[0]?.PaymentDetails?.PaymentDevice
                   : (Paybtnnameselected?.toLowerCase() === 'upi' &&
-                        SelectedUPIPayOption?.toLowerCase() === 'pg') ||
-                      (Paybtnnameselected?.toLowerCase() === 'card' &&
-                        SelectedCardOption?.toLowerCase() === 'pg')
+                    SelectedUPIPayOption?.toLowerCase() === 'pg') ||
+                    (Paybtnnameselected?.toLowerCase() === 'card' &&
+                      SelectedCardOption?.toLowerCase() === 'pg')
                     ? useOptions?.[0]?.PaymentDetails?.PaymentGateway
                     : [],
           PaymentStatus:
@@ -2441,13 +2449,13 @@ const BSBillingTable3Pay = () => {
                 : Paybtnnameselected?.toLowerCase() === 'credit'
                   ? 'S'
                   : Paybtnnameselected?.toLowerCase() === 'upi' &&
-                      SelectedUPIPayOption?.toLowerCase() === 'default'
+                    SelectedUPIPayOption?.toLowerCase() === 'default'
                     ? 'S'
                     : 'P',
           Debit:
             salesBillEdit &&
-            currentOrderNetAmount < previousNetAmount &&
-            refundPaySelectedName?.toLowerCase() === 'credit'
+              currentOrderNetAmount < previousNetAmount &&
+              refundPaySelectedName?.toLowerCase() === 'credit'
               ? Math.round(previousNetAmount - currentOrderNetAmount)
               : 0,
           Credit: salesBillEdit
@@ -2525,14 +2533,14 @@ const BSBillingTable3Pay = () => {
         setMessageType('success');
         setMessageData(
           response?.data?.response +
-            ' ' +
-            (response?.data?.OrderDetails?.length > 0
-              ? response?.data?.OrderId &&
-                extractLastNumberOrderId(
-                  response?.data?.OrderId,
-                  response?.data?.OrderDetails?.[0]?.FYStatus
-                )
-              : '')
+          ' ' +
+          (response?.data?.OrderDetails?.length > 0
+            ? response?.data?.OrderId &&
+            extractLastNumberOrderId(
+              response?.data?.OrderId,
+              response?.data?.OrderDetails?.[0]?.FYStatus
+            )
+            : '')
         );
         response?.data?.OrderDetails?.length > 0 &&
           setPrintOrderDetails([response?.data]);
@@ -2692,14 +2700,14 @@ const BSBillingTable3Pay = () => {
           setMessageType('success');
           setMessageData(
             response?.data?.response +
-              ' ' +
-              (response?.data?.OrderDetails?.length > 0
-                ? response?.data?.OrderId &&
-                  extractLastNumberOrderId(
-                    response?.data?.OrderId,
-                    response?.data?.OrderDetails?.[0]?.FYStatus
-                  )
-                : '')
+            ' ' +
+            (response?.data?.OrderDetails?.length > 0
+              ? response?.data?.OrderId &&
+              extractLastNumberOrderId(
+                response?.data?.OrderId,
+                response?.data?.OrderDetails?.[0]?.FYStatus
+              )
+              : '')
           );
           response?.data?.OrderDetails?.length > 0 &&
             setPrintOrderDetails([response?.data]);
@@ -2802,14 +2810,14 @@ const BSBillingTable3Pay = () => {
         }
         setMessageData(
           response?.data?.response +
-            ' ' +
-            (response?.data?.OrderDetails?.length > 0
-              ? response?.data?.OrderId &&
-                extractLastNumberOrderId(
-                  response?.data?.OrderId,
-                  response?.data?.OrderDetails?.[0]?.FYStatus
-                )
-              : '')
+          ' ' +
+          (response?.data?.OrderDetails?.length > 0
+            ? response?.data?.OrderId &&
+            extractLastNumberOrderId(
+              response?.data?.OrderId,
+              response?.data?.OrderDetails?.[0]?.FYStatus
+            )
+            : '')
         );
         if (response?.data?.OrderDetails?.length > 0) {
           setPrintOrderDetails([response?.data]);
@@ -2986,14 +2994,14 @@ const BSBillingTable3Pay = () => {
             setMessageType('success');
             setMessageData(
               bookingpaymentupdate?.data?.response +
-                ' ' +
-                (bookingpaymentupdate?.data?.OrderDetails?.length > 0
-                  ? bookingpaymentupdate?.data?.OrderId &&
-                    extractLastNumberOrderId(
-                      bookingpaymentupdate?.data?.OrderId,
-                      bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
-                    )
-                  : '')
+              ' ' +
+              (bookingpaymentupdate?.data?.OrderDetails?.length > 0
+                ? bookingpaymentupdate?.data?.OrderId &&
+                extractLastNumberOrderId(
+                  bookingpaymentupdate?.data?.OrderId,
+                  bookingpaymentupdate?.data?.OrderDetail?.[0]?.FYStatus
+                )
+                : '')
             );
             bookingpaymentupdate?.data?.OrderDetails?.length > 0 &&
               setPrintOrderDetails([bookingpaymentupdate?.data]);
@@ -3012,7 +3020,7 @@ const BSBillingTable3Pay = () => {
         if (
           Date.now() - startTime >
           useOptions?.[0]?.PDConfigDetails?.[0]?.AutoCancelDurationInMinutes *
-            60000
+          60000
         ) {
           // 60,000 ms = 1 minute
 
@@ -3731,9 +3739,9 @@ const BSBillingTable3Pay = () => {
                                     'not-allowed',
                                   color:
                                     OrderCardDetail?.length > 0 ||
-                                    (selOption?.value === undefined &&
-                                      GlobalAddCustomerDetails1?.length === 0 &&
-                                      GetCustId?.CustMobile === undefined)
+                                      (selOption?.value === undefined &&
+                                        GlobalAddCustomerDetails1?.length === 0 &&
+                                        GetCustId?.CustMobile === undefined)
                                       ? 'gray'
                                       : 'rgb(18, 146, 238)',
                                   fontSize: '28px',
@@ -3755,16 +3763,16 @@ const BSBillingTable3Pay = () => {
                       (BookingType === 'Dine In' ||
                         BookingTypeBoth ||
                         CheckOrderType?.length > 0) &&
-                      !unpaidFlow &&
-                      OrderStatus
+                        !unpaidFlow &&
+                        OrderStatus
                         ? 'none'
                         : 'auto',
                     opacity:
                       (BookingType === 'Dine In' ||
                         BookingTypeBoth ||
                         CheckOrderType?.length > 0) &&
-                      !unpaidFlow &&
-                      OrderStatus
+                        !unpaidFlow &&
+                        OrderStatus
                         ? 0.5
                         : 1,
                     width: '2rem',
@@ -3787,14 +3795,14 @@ const BSBillingTable3Pay = () => {
                           width: '1.5rem',
                           cursor:
                             OrderCardDetail?.length === 0 ||
-                            CheckBookingStatus == 'Close' ||
-                            addnewAccess
+                              CheckBookingStatus == 'Close' ||
+                              addnewAccess
                               ? 'not-allowed'
                               : 'pointer',
                           color:
                             OrderCardDetail?.length === 0 ||
-                            CheckBookingStatus == 'Close' ||
-                            addnewAccess
+                              CheckBookingStatus == 'Close' ||
+                              addnewAccess
                               ? 'gray'
                               : 'rgb(18, 146, 238)',
                           display: 'flex',
@@ -3811,38 +3819,38 @@ const BSBillingTable3Pay = () => {
               {/* Customer Orders */}
               {(SelCustId && tableOptions?.filter((item) => item.OptionName === 'PreviousBillFetch')
                 .length === 1) && (
-                <Tooltip title="Customer Orders" isMobile={isMobile}>
-                  {' '}
-                  <div
-                    className="BSBillingNav-icon-table-icon"
-                    onClick={() => {
-                      if (
-                        CheckBookingStatus !== 'Close' &&
-                        !addnewAccess &&
-                        !(OrderCardDetail?.length > 0)
-                      ) {
-                        setCustomerPreviesOrders(true);
-                      }
-                    }}
-                    style={{
-                      cursor: OrderCardDetail?.length > 0 && 'not-allowed',
-                      color:
-                        OrderCardDetail?.length > 0 ||
-                        (OrderCardDetail?.length > 0 &&
-                          GetCustId?.CustMobile === undefined)
-                          ? 'gray'
-                          : 'rgb(18, 146, 238)',
-                      fontSize: '25px',
-                      display: 'flex',
-                      alignItems: 'center',
-                      height: '2.46rem',
-                      width: '1.5rem',
-                    }}
-                  >
-                    <FaCartPlus />
-                  </div>
-                </Tooltip>
-              )}
+                  <Tooltip title="Customer Orders" isMobile={isMobile}>
+                    {' '}
+                    <div
+                      className="BSBillingNav-icon-table-icon"
+                      onClick={() => {
+                        if (
+                          CheckBookingStatus !== 'Close' &&
+                          !addnewAccess &&
+                          !(OrderCardDetail?.length > 0)
+                        ) {
+                          setCustomerPreviesOrders(true);
+                        }
+                      }}
+                      style={{
+                        cursor: OrderCardDetail?.length > 0 && 'not-allowed',
+                        color:
+                          OrderCardDetail?.length > 0 ||
+                            (OrderCardDetail?.length > 0 &&
+                              GetCustId?.CustMobile === undefined)
+                            ? 'gray'
+                            : 'rgb(18, 146, 238)',
+                        fontSize: '25px',
+                        display: 'flex',
+                        alignItems: 'center',
+                        height: '2.46rem',
+                        width: '1.5rem',
+                      }}
+                    >
+                      <FaCartPlus />
+                    </div>
+                  </Tooltip>
+                )}
               {tabledata?.length > 0 && (
                 <>
                   {tableOptions
@@ -3916,65 +3924,65 @@ const BSBillingTable3Pay = () => {
                     <>
                       {unpaidFlow == false
                         ? item?.OptionName == 'Hold' &&
-                          BookingType !== 'Dine In' &&
-                          !BookingTypeBoth &&
-                          OrderCardDetail?.length != 0 &&
-                          CheckOrderType?.length === 0 &&
-                          OrderType != 'Failed' &&
-                          CheckBookingStatus != 'Close' &&
-                          paybtns?.length > 0 &&
-                          !addnewAccess && (
-                            <TooltipWrapper
-                              title={'Hold (Alt+W)'}
-                              isMobile={isMobile}
-                            >
-                              {' '}
-                              <PozoHoldIcon
-                                className="BSBillingNav-icon-table-icon"
-                                onClick={() => AddBookingDetails('Hold', false)}
-                                style={{
-                                  fontSize: '30px',
-                                  cursor: 'pointer',
-                                  color: '' ? '#52c41a' : '#1292EE',
-                                }}
-                              />
-                            </TooltipWrapper>
-                          )
+                        BookingType !== 'Dine In' &&
+                        !BookingTypeBoth &&
+                        OrderCardDetail?.length != 0 &&
+                        CheckOrderType?.length === 0 &&
+                        OrderType != 'Failed' &&
+                        CheckBookingStatus != 'Close' &&
+                        paybtns?.length > 0 &&
+                        !addnewAccess && (
+                          <TooltipWrapper
+                            title={'Hold (Alt+W)'}
+                            isMobile={isMobile}
+                          >
+                            {' '}
+                            <PozoHoldIcon
+                              className="BSBillingNav-icon-table-icon"
+                              onClick={() => AddBookingDetails('Hold', false)}
+                              style={{
+                                fontSize: '30px',
+                                cursor: 'pointer',
+                                color: '' ? '#52c41a' : '#1292EE',
+                              }}
+                            />
+                          </TooltipWrapper>
+                        )
                         : ''}
-                        
+
                       {unpaidFlow == false
                         ? item?.OptionName == 'Hold' &&
-                          paybtns?.length > 0 &&
-                          BookingType !== 'Dine In' &&
-                          !BookingTypeBoth &&
-                          Holddata?.length > 0 &&
-                          OrderCardDetail?.length == 0 &&
-                          CheckBookingStatus != 'Close' &&
-                          !addnewAccess && (
-                            <TooltipWrapper
-                              title={'Recall (Alt+W)'}
-                              isMobile={isMobile}
+                        paybtns?.length > 0 &&
+                        BookingType !== 'Dine In' &&
+                        !BookingTypeBoth &&
+                        Holddata?.length > 0 &&
+                        OrderCardDetail?.length == 0 &&
+                        CheckBookingStatus != 'Close' &&
+                        !addnewAccess && (
+                          <TooltipWrapper
+                            title={'Recall (Alt+W)'}
+                            isMobile={isMobile}
+                          >
+                            {' '}
+                            <Badge
+                              count={Holddata?.length}
+                              size={'small'}
+                              offset={[0, 7]}
                             >
-                              {' '}
-                              <Badge
-                                count={Holddata?.length}
-                                size={'small'}
-                                offset={[0, 7]}
-                              >
-                                <PozoHoldIcon
-                                  className="BSBillingNav-icon-table-icon"
-                                  onClick={() => HandleholdModelOpen()}
-                                  style={{
-                                    fontSize: '28px',
-                                    cursor: 'pointer',
-                                    color: Holddata ? '#52c41a' : 'default',
-                                    pointerEvents:
-                                      OrderType === 'Failed' ? 'none' : 'auto',
-                                  }}
-                                />
-                              </Badge>
-                            </TooltipWrapper>
-                          )
+                              <PozoHoldIcon
+                                className="BSBillingNav-icon-table-icon"
+                                onClick={() => HandleholdModelOpen()}
+                                style={{
+                                  fontSize: '28px',
+                                  cursor: 'pointer',
+                                  color: Holddata ? '#52c41a' : 'default',
+                                  pointerEvents:
+                                    OrderType === 'Failed' ? 'none' : 'auto',
+                                }}
+                              />
+                            </Badge>
+                          </TooltipWrapper>
+                        )
                         : ''}
                     </>
                   ))}
@@ -4020,14 +4028,14 @@ const BSBillingTable3Pay = () => {
                       width: '1.5rem',
                       cursor:
                         OrderCardDetail?.length === 0 ||
-                        CheckBookingStatus == 'Close' ||
-                        addnewAccess
+                          CheckBookingStatus == 'Close' ||
+                          addnewAccess
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         OrderCardDetail?.length === 0 ||
-                        CheckBookingStatus == 'Close' ||
-                        addnewAccess
+                          CheckBookingStatus == 'Close' ||
+                          addnewAccess
                           ? 'gray'
                           : 'rgb(18, 146, 238)',
                       display: 'flex',
@@ -4089,31 +4097,31 @@ const BSBillingTable3Pay = () => {
                       (BookingType === 'Dine In' ||
                         BookingTypeBoth ||
                         CheckOrderType?.length > 0) &&
-                      !unpaidFlow &&
-                      OrderStatus
+                        !unpaidFlow &&
+                        OrderStatus
                         ? 'none'
                         : 'auto',
                     opacity:
                       (BookingType === 'Dine In' ||
                         BookingTypeBoth ||
                         CheckOrderType?.length > 0) &&
-                      !unpaidFlow &&
-                      OrderStatus
+                        !unpaidFlow &&
+                        OrderStatus
                         ? 0.5
                         : 1,
                   }}
                 >
                   {paybtns?.length > 0 &&
-                  currentOrderNetAmount >= previousNetAmount ? (
+                    currentOrderNetAmount >= previousNetAmount ? (
                     paybtns?.map((payment) => (
                       <div className="Table3-cash">
                         <button
                           className={
                             paybtnselected === payment.ModeId &&
-                            (UpinotSelected || CardoptionnotSelected)
+                              (UpinotSelected || CardoptionnotSelected)
                               ? 'Btn-payment-mode-notupisel'
                               : paybtnselected === payment.ModeId &&
-                                  (!UpinotSelected || !CardoptionnotSelected)
+                                (!UpinotSelected || !CardoptionnotSelected)
                                 ? 'Btn-payment-mode'
                                 : 'Btn-payment-mode-sel'
                           }
@@ -4127,13 +4135,13 @@ const BSBillingTable3Pay = () => {
                           onClick={() =>
                             payment?.ModeName?.toLowerCase() === 'upi' // Change the condition to payment.Id
                               ? handleUPIButtonClick(
-                                  payment.ModeId,
-                                  payment.ModeName
-                                )
+                                payment.ModeId,
+                                payment.ModeName
+                              )
                               : handlePaymentMode(
-                                  payment.ModeId,
-                                  payment.ModeName
-                                )
+                                payment.ModeId,
+                                payment.ModeName
+                              )
                           }
                         >
                           {/* {UpiOption === "" && payment?.ModeName?.toLowerCase() === "upi" && <p> UPI</p>} */}
@@ -4193,10 +4201,10 @@ const BSBillingTable3Pay = () => {
                         <button
                           className={
                             refundPaySelected === payment.ConfigId &&
-                            (UpinotSelected || CardoptionnotSelected)
+                              (UpinotSelected || CardoptionnotSelected)
                               ? 'Btn-payment-mode-notupisel'
                               : refundPaySelected === payment.ConfigId &&
-                                  (!UpinotSelected || !CardoptionnotSelected)
+                                (!UpinotSelected || !CardoptionnotSelected)
                                 ? 'Btn-payment-mode'
                                 : 'Btn-payment-mode-sel'
                           }
@@ -4468,9 +4476,9 @@ const BSBillingTable3Pay = () => {
                   addnewAccess
                     ? 'BSBillingTable3-paybtn-deactive'
                     : FirstPaymentclick === false &&
-                        OrderCardDetail?.length > 0 &&
-                        paybtnselected &&
-                        CheckBookingStatus != 'Close'
+                      OrderCardDetail?.length > 0 &&
+                      paybtnselected &&
+                      CheckBookingStatus != 'Close'
                       ? !OrderStatus
                         ? salesBillEdit &&
                           currentOrderNetAmount < previousNetAmount
@@ -4488,7 +4496,7 @@ const BSBillingTable3Pay = () => {
                   // financialYearError:
                   handleButtonClick
                 }
-                //dhana
+              //dhana
               >
                 {!OrderStatus ? (
                   salesBillEdit && currentOrderNetAmount < previousNetAmount ? (
@@ -4717,14 +4725,14 @@ const BSBillingTable3Pay = () => {
               OrderType === 'Failed'
                 ? FailedTotalAmt
                 : Math.round(
-                    OrderCardDetail?.reduce(
-                      (acc, data) => data?.TotalAmt + acc,
-                      0
-                    ) -
-                      ((OverAllSales > 0 ? OverAllSales : 0) +
-                        (OverAllEstimate > 0 ? OverAllEstimate : 0) +
-                        (Discount > 0 ? Discount : 0))
-                  )
+                  OrderCardDetail?.reduce(
+                    (acc, data) => data?.TotalAmt + acc,
+                    0
+                  ) -
+                  ((OverAllSales > 0 ? OverAllSales : 0) +
+                    (OverAllEstimate > 0 ? OverAllEstimate : 0) +
+                    (Discount > 0 ? Discount : 0))
+                )
             }
             failedOrderData={failedOrderData}
           />
@@ -4800,9 +4808,9 @@ const BSBillingTable3Pay = () => {
 
                 const qty = isGroup
                   ? OrderCardDetail.filter((o) => o.id === groupKey).reduce(
-                      (sum, o) => sum + (o.OrderQty || 1),
-                      0
-                    )
+                    (sum, o) => sum + (o.OrderQty || 1),
+                    0
+                  )
                   : item.OrderQty || 1;
 
                 return (