minor chnages

src/Pages/StockMaster/StockList.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect, useRef, useCallback } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { PlusOutlined, EyeOutlined, PrinterFilled } from '@ant-design/icons';
-import { Image, Pagination, Space, Table } from 'antd';
+import { Image, Pagination, Space, Table, Tooltip } from 'antd';
 import {
   changeBreadCrumb,
   getEmpAccess,
@@ -142,7 +142,6 @@ const StockList = () => {
   const [selectedRecords, setSelectedRecords] = useState([]);
   const [activeTab, setActiveTab] = useState('stock');
   const [MultiCode, setMultiCode] = useState(true);
-  const [TotalCount, setTotalCount] = useState(null);
   const [dateStrings, setDateStrings] = useState([
     dayjs().format('YYYY-MM-DD'),
     dayjs().format('YYYY-MM-DD'),
@@ -239,10 +238,9 @@ const StockList = () => {
       })
     ).unwrap();
     if (Response?.data?.statusCode === 1) {
-      setTotalCount(Response?.data?.TotalCount);
       return Response?.data?.data;
     } else {
-      setTotalCount(0);
+
       return [];
     }
   };
@@ -287,17 +285,16 @@ const StockList = () => {
         AppId: AppId,
         BranchId: BranchId,
         CompId: CompId,
-        OrderFromDate: dateStrings?.[0] ?? '',
+        // OrderFromDate: dateStrings?.[0] ?? '',
-        OrderToDate: dateStrings?.[1] ?? '',
+        // OrderToDate: dateStrings?.[1] ?? '',
         search: SearchText,
       })
     ).unwrap();
     if (Response?.data?.statusCode === 1) {
-      setTotalCount(Response?.data?.TotalCount);
       setpage(1);
       return Response?.data?.data;
     } else {
-      setTotalCount(0);
+  
       return [];
     }
   }
@@ -703,9 +700,9 @@ const StockList = () => {
     dispatch(
       getSupplierData({ AppId: AppId, BranchId: BranchId, CompId: CompId })
     );
-    dispatch(
+    // dispatch(
-      getPurchaseData({ AppId: AppId, BranchId: BranchId, CompId: CompId })
+    //   getPurchaseData({ AppId: AppId, BranchId: BranchId, CompId: CompId })
-    );
+    // );
 
     let ProdData = {
       AppId: AppId,
@@ -894,25 +891,25 @@ const StockList = () => {
           PaymentAmount: PaymentAmount.toFixed(2),
           InvoiceDate: groupInfo.InwardDate
             ? moment(groupInfo.InwardDate, 'YYYY-MM-DD').format(
-                'YYYY-MM-DDTHH:mm:ss'
+              'YYYY-MM-DDTHH:mm:ss'
-              )
+            )
             : null,
           SuppInvoiceNo: groupInfo.SupplierInvoiceNumber,
           SuppInvoiceDate: groupInfo.SupplierInvoiceDate
             ? moment(groupInfo.SupplierInvoiceDate, 'YYYY-MM-DD').format(
-                'YYYY-MM-DDTHH:mm:ss'
+              'YYYY-MM-DDTHH:mm:ss'
-              )
+            )
             : null,
           DeliveryChallanNo: groupInfo.DeliveryChallanNo,
           DeliveryInvoiceDate: groupInfo.DeliveryInvoiceDate
             ? moment(groupInfo.DeliveryInvoiceDate, 'YYYY-MM-DD').format(
-                'YYYY-MM-DDTHH:mm:ss'
+              'YYYY-MM-DDTHH:mm:ss'
-              )
+            )
             : null,
           DueDate: groupInfo.DueDate
             ? moment(groupInfo.DueDate, 'YYYY-MM-DD').format(
-                'YYYY-MM-DDTHH:mm:ss'
+              'YYYY-MM-DDTHH:mm:ss'
-              )
+            )
             : null,
           InvoiceAmount: Totalamount.toFixed(2),
           TaxAmount: Totaltax.toFixed(2),
@@ -930,13 +927,13 @@ const StockList = () => {
             FreeQty: item.FreeQty,
             ManufDate: item.ManufactureDate
               ? moment(item.ManufactureDate, 'YYYY-MM-DD').format(
-                  'YYYY-MM-DDTHH:mm:ss'
+                'YYYY-MM-DDTHH:mm:ss'
-                )
+              )
               : null,
             ExpDate: item.ExpireDate
               ? moment(item.ExpireDate, 'YYYY-MM-DD').format(
-                  'YYYY-MM-DDTHH:mm:ss'
+                'YYYY-MM-DDTHH:mm:ss'
-                )
+              )
               : null,
             BatchNo: item.BatchNo,
             ModelNo: item.ModelNo,
@@ -989,14 +986,10 @@ const StockList = () => {
     const productName = checkComponent('Product Name');
     setPrintProductName(productName);
   };
-  // const ProductName = Productdata ?.map((e)=>e.ProdName+' '(+e.Size+' '+e.UomName))
   const ProductName = Productdata?.map(
     (e) => `${e.ProdName} (${e.Size} ${e.UomName})`
   );
-  //  const   ProductName = Varientdata?.map((e)=>e.ProdName)
+
-  // const   ProductName = Productdata?.map((e)=>e.ProdName)
-  // const ProductSize = Productdata ?.map((e)=>e.Size)
-  // const ProductUomName = Productdata ?.map((e)=>e.UomName)
 
   const SupplierNames = SupplierData?.map((e) => e.SuppName);
 
@@ -1012,33 +1005,8 @@ const StockList = () => {
   const InwardDtlIds = Varientdata?.map((e) => e.InwardDtlId);
   const StockProductId = Varientdata?.map((e) => e.ProdId);
 
-  //   let proddetail = StockData?.map((e) => {
-  //     return {
-  //         ...e,
-  //         ProdDetails: e.ProdDetails?.map((d) => ({
-  //             ...d,
-  //             InvoiceNo: e.InvoiceNo,
-  //             InvoiceDate: e.InvoiceDate,
-  //             InvoiceAmt: e.InvoiceAmount
-  //         }))
-  //     };
-  // });
-  //  let subObjectsArray = [];
-  //  // Iterate over mainObjects and concatenate subObjects arrays
-  //  proddetail.forEach(obj => {
-  //      subObjectsArray = subObjectsArray.concat(obj.ProdDetails);
-  //  });
 
-  // function safeRound(amountStr) {
-  //   if (amountStr == null) return allowDecimal ? '0.00' : '0';
 
-  //   const cleaned = String(amountStr).replace(/[^0-9.-]+/g, '');
-  //   const num = Number(cleaned);
-
-  //   if (isNaN(num)) return allowDecimal ? '0.00' : '0';
-
-  //   return allowDecimal ? num.toFixed(2) : Math.round(num).toString();
-  // }
 
   const onFinish = async () => {
     const template = barcodeTemplateDetails?.find(
@@ -1194,7 +1162,8 @@ const StockList = () => {
     ? countData?.length
       ? countData?.length
       : 0
-    : TotalCount;
+    : data?.[0]?.TotalCount;
+    console.log(debouncedSearchText,countData,data,"kkkk",countOfProduct)
   return (
     <div className="userPageTable">
       <div className="userPageContent">
@@ -1210,14 +1179,15 @@ const StockList = () => {
           <div
             className="searchAddDiv"
             style={{ justifyContent: 'flex-start' }}
-          >
+          ><Tooltip title="Search using Invoice No,Supp Name">
-            <div className="formSearch" style={{ Width: '200px' }}>
+              <div className="formSearch" style={{ Width: '200px' }}>
-              <Search
+                <Search
-                placeholder="Search by Invoice No"
+                  placeholder="Search by Invoice No"
-                onSearch={onSearch}
+                  onSearch={onSearch}
-                onSearchChange={onSearchChange}
+                  onSearchChange={onSearchChange}
-              />
+                />
-            </div>
+              </div>
+            </Tooltip>
             <div style={{ width: '200px' }}>
               <RangePicker
                 placeholder={['Start Date', 'End Date']}
@@ -1258,7 +1228,7 @@ const StockList = () => {
             data={filteredData}
             dataSource={filteredData}
             onChange={handleChange}
-            // pagination={handlePageChange}
+          // pagination={handlePageChange}
           />{' '}
           {countOfProduct > 10 && (
             <Pagination