From a69849d301b20bdba904aebdb6404e9e17e30b49 Mon Sep 17 00:00:00 2001
From: unknown <gokulerusappan10000@gmail.com>
Date: Fri, 20 Feb 2026 11:26:58 +0530
Subject: [PATCH] sales bill edit fix

---
 .../BookingFunctionality/FeaturesFunctionalities.jsx   |  5 +++--
 .../Components/UtillComponents/BSNavBarEst.jsx         | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Pages/BookingScreen/Components/BookingFunctionality/FeaturesFunctionalities.jsx b/src/Pages/BookingScreen/Components/BookingFunctionality/FeaturesFunctionalities.jsx
index 8fd9272..4a7f74b 100644
--- a/src/Pages/BookingScreen/Components/BookingFunctionality/FeaturesFunctionalities.jsx
+++ b/src/Pages/BookingScreen/Components/BookingFunctionality/FeaturesFunctionalities.jsx
@@ -141,6 +141,7 @@ const FeaturesFunctionalities = (props) => {
   const formRefExtraCharges = useRef();
   const ExtraChargesType = useSelector(globalExtraChargesType);
   const GlobalExtraCharge = useSelector(globalExtraTotalAmount);
+  console.log(GlobalExtraCharge, "GlobalExtraCharge")
   const ReorderHoldDetails = useSelector(GlobalReorderHoldDetails);
   const BookingType = useSelector(GlobalBookingType);
   const BookingTypeBoth = useSelector(GlobalBookingTypeBoth);
@@ -641,8 +642,8 @@ const FeaturesFunctionalities = (props) => {
         let globalexdata = GlobalExtraCharge?.map((item) => {
           let mappedItem = {
             UniqueId: item?.ExtraChargeId,
-            QTY: item?.OrderQty,
-            Price: item?.OrderRate,
+            QTY: item?.OrderQty || item?.SalesQty,
+            Price: item?.OrderRate || item?.Rate,
             ProdId: null,
             InwardDtlId: null,
             ExtraChargeType: item?.ExtraChargeType,
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarEst.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarEst.jsx
index 83a9e30..3adc848 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarEst.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarEst.jsx
@@ -9,6 +9,7 @@ import {
   changeSelProdWiseEst,
   ChangeOverAllDiscSales,
   ChangeOverAllDiscEstimate,
+  GlobalSalesBillEdit,
 } from '../../../../Features/BookingScreen/BookingData/BookingData';
 import BSEstimateModal from '../BookingFunctionality/BSEstModal';
 import { GlobalpreOrderOpen } from '../../../../Features/BookingScreen/PreOrder/PreOrder.js';
@@ -25,6 +26,7 @@ const BSNavBarEstimate = () => {
   const preOrderOpen = useSelector(GlobalpreOrderOpen);
   const EstBooking = useSelector(GlobalEstimateBooking);
   const [EstModalOpen, setEstModalOpen] = useState(false);
+  const salesBillEdit = useSelector(GlobalSalesBillEdit);
   const [PopOpen, setPopOpen] = useState(false);
   const ChangeEstMethod = () => {
     if (!preOrderOpen) {
@@ -37,7 +39,9 @@ const BSNavBarEstimate = () => {
     setEstModalOpen(false);
   };
   const EnableOptions = () => {
-    setPopOpen(!PopOpen);
+    if (!salesBillEdit) {
+      setPopOpen(!PopOpen);
+    }
   };
   const ChangeEstimateOption = (data) => {
     dispatch(changeEstimateBooking(data));
@@ -47,7 +51,9 @@ const BSNavBarEstimate = () => {
     setPopOpen(false);
   };
   const handlePopoverVisible = (visible) => {
-    setPopOpen(visible);
+    if (!salesBillEdit) {
+      setPopOpen(visible);
+    }
   };
   return (
     <div className="BSBilling7-icon-flex">