sales bill edit print

src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx

@@ -1,32 +1,18 @@
-import { shallowEqual, useSelector } from 'react-redux';
+import { shallowEqual, useSelector } from "react-redux";
-import {
+import { GlobalAccessForOthers, GlobalCardAccess, GlobalCombosearch, GlobalItemCard, GlobalProductCategorie, GlobalSelectedDatas, GlobalWithoutSubCatItemCard, triggerProductCard } from "../../../../Features/BookingScreen/BookingData/BookingData";
-  GlobalAccessForOthers,
+import { DefaultModal } from "../../../../Components/Modal/DefaultModal";
-  GlobalCardAccess,
+import { useCallback, useEffect, useRef, useState } from "react";
-  GlobalCombosearch,
+import { Tables } from "../../../../Components/Tables/Table";
-  GlobalItemCard,
+import { InputField } from "../../../../Components/Forms/InputField";
-  GlobalProductCategorie,
+import { Form, Pagination, Tooltip } from "antd";
-  GlobalSelectedDatas,
+import { getSession } from "../../../../Services/Others";
-  GlobalWithoutSubCatItemCard,
+import { Messages } from "../../../../Components/Notifications/Messages";
-  triggerProductCard,
+import { useDispatch } from "react-redux";
-} from '../../../../Features/BookingScreen/BookingData/BookingData';
+import { PutStockPrice } from "../../../../Features/StockPriceUpdate/StockPriceUpdateMaster";
-import { DefaultModal } from '../../../../Components/Modal/DefaultModal';
+import PriceChange from "../../../../Images/PayOptImgs/PriceChange.svg"
-import { useCallback, useEffect, useRef, useState } from 'react';
+
-import { Tables } from '../../../../Components/Tables/Table';
+const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, productPriceChange = false, setProductPriceChange = () => { }, setPriceChangeProduct = () => { } }) => {
-import { InputField } from '../../../../Components/Forms/InputField';
-import { Form, Pagination, Tooltip } from 'antd';
-import { getSession } from '../../../../Services/Others';
-import { Messages } from '../../../../Components/Notifications/Messages';
-import { useDispatch } from 'react-redux';
-import { PutStockPrice } from '../../../../Features/StockPriceUpdate/StockPriceUpdateMaster';
-import PriceChange from '../../../../Images/PayOptImgs/PriceChange.svg';
 
-const ProductPriceChange = ({
-  showButton = true,
-  priceChangeProduct = [],
-  productPriceChange = false,
-  setProductPriceChange = () => {},
-  setPriceChangeProduct = () => {},
-}) => {
     const formRef = useRef(null);
     const dispatch = useDispatch();
 
@@ -46,32 +32,20 @@ const ProductPriceChange = ({
     const comboSearch = useSelector(GlobalCombosearch);
     const ProdCat = useSelector(GlobalProductCategorie, shallowEqual);
     const ItemCard = useSelector(GlobalItemCard, shallowEqual);
-  const withoutSubCatItemCard = useSelector(
+    const withoutSubCatItemCard = useSelector(GlobalWithoutSubCatItemCard, shallowEqual);
-    GlobalWithoutSubCatItemCard,
-    shallowEqual
-  );
     const CardAccess = useSelector(GlobalCardAccess, shallowEqual);
-  const globalAccessForOthers = useSelector(
+    const globalAccessForOthers = useSelector(GlobalAccessForOthers, shallowEqual);
-    GlobalAccessForOthers,
-    shallowEqual
-  );
     const SelectedDatas = useSelector(GlobalSelectedDatas, shallowEqual);
     const [tableData, setTableData] = useState([]);
     const [editingKey, setEditingKey] = useState(null);
     const [priceChangedProducts, setPriceChangedProducts] = useState([]);
-  console.log(comboSearch, 'comboSearch');
+    console.log(comboSearch, "comboSearch")
 
     // console.log(noSubcatCardData, "noSubcatCardData")
 
     useEffect(() => {
-    if (
+        if (ProdCat && (ItemCard || withoutSubCatItemCard) && (!noSubcatCardData || noSubcatCardData?.length === 0)) {
-      ProdCat &&
+            setNoSubcatCardData(ItemCard?.length === 0 ? withoutSubCatItemCard : ItemCard);
-      (ItemCard || withoutSubCatItemCard) &&
-      (!noSubcatCardData || noSubcatCardData?.length === 0)
-    ) {
-      setNoSubcatCardData(
-        ItemCard?.length === 0 ? withoutSubCatItemCard : ItemCard
-      );
         }
     }, [ProdCat, ItemCard, withoutSubCatItemCard, noSubcatCardData]);
 
@@ -82,9 +56,7 @@ const ProductPriceChange = ({
             key: 'SlNo',
             width: '60px',
             align: 'center',
-      render: (text, record, index) => (
+            render: (text, record, index) => <div>{(currentPage - 1) * pageSize + index + 1}</div>
-        <div>{(currentPage - 1) * pageSize + index + 1}</div>
-      ),
         },
         {
             title: 'Product Name',
@@ -118,20 +90,22 @@ const ProductPriceChange = ({
                                     if (value === '') {
                                         return Promise.resolve();
                                     } else if (parseFloat(value) < 1) {
-                    return Promise.reject(`MRP should be greater than 0`);
+                                        return Promise.reject(`MRP should be greater than 0`)
                                     }
                                     return Promise.resolve();
                                 },
                             },
-            ]}
+                        ]}>
-          >
                         <InputField
                             value={text}
                             placeholder="Enter New MRP"
                             onChange={(e) => handleNewMRPChange(e?.target?.value, index)}
                             inputMode="decimal"
                             onInput={(e) => {
-                let cleanedValue = e.target.value.replace(/[^0-9.]/g, ''); // Remove invalid characters
+                                let cleanedValue = e.target.value.replace(
+                                    /[^0-9.]/g,
+                                    ''
+                                ); // Remove invalid characters
                                 const parts = cleanedValue.split('.');
 
                                 if (cleanedValue.startsWith('.')) {
@@ -175,9 +149,7 @@ const ProductPriceChange = ({
                                     if (value === '') {
                                         return Promise.resolve();
                                     } else if (parseFloat(value) < 1) {
-                    return Promise.reject(
+                                        return Promise.reject(`Sell Price should be greater than 0`)
-                      `Sell Price should be greater than 0`
-                    );
                                     }
                                     return Promise.resolve();
                                 },
@@ -187,12 +159,13 @@ const ProductPriceChange = ({
                         <InputField
                             value={text}
                             placeholder="Enter New Sell Price"
-              onChange={(e) =>
+                            onChange={(e) => handleNewSellPriceChange(e?.target?.value, index)}
-                handleNewSellPriceChange(e?.target?.value, index)
-              }
                             inputMode="decimal"
                             onInput={(e) => {
-                let cleanedValue = e.target.value.replace(/[^0-9.]/g, ''); // Remove invalid characters
+                                let cleanedValue = e.target.value.replace(
+                                    /[^0-9.]/g,
+                                    ''
+                                ); // Remove invalid characters
                                 const parts = cleanedValue.split('.');
 
                                 if (cleanedValue.startsWith('.')) {
@@ -218,58 +191,49 @@ const ProductPriceChange = ({
                 : SelectedDatas?.[0]?.AppId === 0 && SelectedDatas?.[0]?.CompId === 0
                     ? []
                     : SelectedDatas
-      : ItemCard?.length === 0 ||
+            : ItemCard?.length === 0 || (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0)
-          (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0)
                 ? noSubcatCardData
                 : ItemCard
-    : [];
+        : '';
 
-  console.log(cardData, 'noSubcatCardDatanoSubcatCardData', ItemCard);
+    console.log(cardData, "noSubcatCardDatanoSubcatCardData", ItemCard)
 
     useEffect(() => {
-   if (priceChangeModal || productPriceChange) {
         const extractStockDtls = (data) => {
-      if (data?.length === 0 || !data) return [];
+            if (data?.length === 0) return [];
 
             let stockDtls = [];
 
-      data?.forEach((item) => {
+            data?.forEach(item => {
-        let products = item?.ProductDetail?.flatMap((product) => product);
+                let products = item?.ProductDetail?.flatMap(product => product);
 
-        let variants = products?.flatMap(
+                let variants = products?.flatMap(product => product?.ProdVariantDetails);
-          (product) => product?.ProdVariantDetails
+                const filteredVariants = variants?.filter(variant => variant?.StockDetails?.length > 0);
-        );
+                const stocks = filteredVariants?.flatMap(variant =>
-        const filteredVariants = variants?.filter(
+                    variant?.StockDetails?.map(stock => ({
-          (variant) => variant?.StockDetails?.length > 0
-        );
-        const stocks = filteredVariants?.flatMap((variant) =>
-          variant?.StockDetails?.map((stock) => ({
                         ...stock,
-            ProdName:
+                        ProdName: products?.[0]?.ProdName + (variant?.ProdVariantName ? ` (${variant?.ProdVariantName})` : ''),
-              products?.[0]?.ProdName +
-              (variant?.ProdVariantName
-                ? ` (${variant?.ProdVariantName})`
-                : ''),
                         StockAvailable: products?.[0]?.StockAvailable,
-            ProdVariantName: variant?.ProdVariantName,
+                        ProdVariantName: variant?.ProdVariantName
                     }))
                 );
 
-        stockDtls.push(
+                stockDtls.push(...stocks?.filter(stock =>
-          ...stocks?.filter((stock) =>
+                    stock?.StockAvailable === 'Y'
-            stock?.StockAvailable === 'Y' ? stock?.BatchRef : true
+                        ? stock?.BatchRef
-          )
+                        : true
-        );
+                ));
+
             });
-      console.log('extractStockDtls', stockDtls);
+            console.log("extractStockDtls", stockDtls);
             return stockDtls;
-    };
-    setTableData(extractStockDtls(priceChangeProduct || cardData || []));
-    setCurrentPage(1);
         }
-  }, [cardData, priceChangeProduct, priceChangeModal, productPriceChange]);
+        setTableData(extractStockDtls(priceChangeProduct || cardData))
+        setCurrentPage(1)
+    }, [cardData, priceChangeProduct])
 
     const handleNewMRPChange = (value, index) => {
+
         const updatedTableData = [...tableData];
         updatedTableData[index].NewMRP = value;
         setTableData(updatedTableData);
@@ -280,9 +244,7 @@ const ProductPriceChange = ({
         });
 
         const priceChangedProdList = [...priceChangedProducts];
-    const prodIndex = priceChangedProdList?.findIndex(
+        const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
-      (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
-    );
         if (prodIndex !== -1) {
             priceChangedProdList[prodIndex] = {
                 ...priceChangedProdList?.[prodIndex],
@@ -291,7 +253,7 @@ const ProductPriceChange = ({
             };
         }
         setPriceChangedProducts(priceChangedProdList);
-  };
+    }
 
     const handleNewSellPriceChange = (value, index) => {
         const updatedTableData = [...tableData];
@@ -305,9 +267,7 @@ const ProductPriceChange = ({
                 updatedTableData[index].NewSellPrice = null;
                 setTableData(updatedTableData);
                 const priceChangedProdList = [...priceChangedProducts];
-        const prodIndex = priceChangedProdList?.findIndex(
+                const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
-          (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
-        );
 
                 if (prodIndex !== -1) {
                     priceChangedProdList.splice(prodIndex, 1);
@@ -326,9 +286,7 @@ const ProductPriceChange = ({
                 updatedTableData[index].NewSellPrice = null;
                 setTableData(updatedTableData);
                 const priceChangedProdList = [...priceChangedProducts];
-        const prodIndex = priceChangedProdList?.findIndex(
+                const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
-          (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
-        );
 
                 if (prodIndex !== -1) {
                     priceChangedProdList.splice(prodIndex, 1);
@@ -344,47 +302,41 @@ const ProductPriceChange = ({
         });
 
         const priceChangedProdList = [...priceChangedProducts];
-    const prodIndex = priceChangedProdList?.findIndex(
+        const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
-      (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
-    );
 
         if (prodIndex !== -1) {
             priceChangedProdList[prodIndex] = {
                 ...priceChangedProdList[prodIndex],
-        SellPrice: String(value),
+                SellPrice: String(value)
             };
         } else {
             priceChangedProdList.push({
                 ProdId: updatedTableData[index]?.ProdId,
                 ProdName: updatedTableData[index]?.ProdName,
-        MRP: String(
+                MRP: String(updatedTableData[index]?.NewMRP || updatedTableData[index]?.MRP),
-          updatedTableData[index]?.NewMRP || updatedTableData[index]?.MRP
-        ),
                 SellPrice: String(value),
-        AdjComment: 'string',
+                AdjComment: "string",
-        InwardDtlId: updatedTableData[index]?.InwardDtlId,
+                InwardDtlId: updatedTableData[index]?.InwardDtlId
             });
         }
 
         setPriceChangedProducts(priceChangedProdList);
-  };
+    }
 
     const edit = (record, index) => {
-    console.log('edit', record, index);
+        console.log("edit", record, index);
         setEditingKey(index);
-  };
+    }
 
     const handleSubmit = async () => {
-    console.log('submit');
+        console.log("submit");
 
         if (priceChangedProducts?.length > 0) {
-      console.log('priceChangedProducts', priceChangedProducts);
+            console.log("priceChangedProducts", priceChangedProducts);
             const validation = priceChangedProducts?.every((prod) => {
                 if (parseFloat(prod?.MRP) < parseFloat(prod?.SellPrice)) {
                     setMessageType('error');
-          setMessageData(
+                    setMessageData(`${prod?.ProdName}: MRP cannot be less than Sell Price`);
-            `${prod?.ProdName}: MRP cannot be less than Sell Price`
-          );
                     return false;
                 }
                 if (!parseFloat(prod?.SellPrice) || !parseFloat(prod?.MRP)) {
@@ -402,7 +354,7 @@ const ProductPriceChange = ({
                 BranchId: BranchId,
                 ProductDetails: priceChangedProducts,
                 UpdatedBy: UserId,
-      };
+            }
 
             const res = await dispatch(PutStockPrice(data))?.unwrap();
             if (res?.data?.statusCode === 1) {
@@ -413,52 +365,42 @@ const ProductPriceChange = ({
                 setEditingKey(null);
                 setPriceChangedProducts([]);
                 setTableData([]);
-        dispatch(triggerProductCard());
+                dispatch(triggerProductCard())
                 setPriceChangeProduct(null);
                 formRef.current.resetFields();
             } else {
-        setMessageData('Error Updating Product Price');
+                setMessageData('Error Updating Product Price')
                 setMessageType('error');
             }
         } else {
             setMessageType('error');
             setMessageData('No changes made / No sell price entered');
         }
-  };
+
+    }
 
     const onComplete = useCallback(() => {
         setMessageData(null);
         setMessageType(null);
-  }, []);
+    }, [])
 
     return (
         <>
-      <Messages
+
-        messageData={messageData}
+            <Messages messageData={messageData} messageType={messageType} onComplete={onComplete} />
-        messageType={messageType}
+            {showButton ? <Tooltip title="Price Change">
-        onComplete={onComplete}
+                <button className="price-change-btn" type="button" onClick={() => {
-      />
-      {showButton ? (
-        <Tooltip title="Price Change">
-          <button
-            className="price-change-btn"
-            type="button"
-            onClick={() => {
                     if (comboSearch) {
                         setMessageType('warning');
                         setMessageData('Price change will not work for combo products');
-                return;
+                        return
                     }
-              setPriceChangeModal(true);
+                    setPriceChangeModal(true)
-            }}
+                }}>
-          >
                     {/* <FaIndianRupeeSign size={35}/> */}
                     <img src={PriceChange} alt="" width={30} />
                 </button>
-        </Tooltip>
+            </Tooltip> : <></>}
-      ) : (
-        <></>
-      )}
             <DefaultModal
                 title="Price Change"
                 className={'price-change-modal'}
@@ -480,39 +422,28 @@ const ProductPriceChange = ({
                     <Form ref={formRef}>
                         <Tables
                             columns={priceChangeColumns}
-              data={tableData?.slice(
+                            data={tableData?.slice((currentPage - 1) * pageSize, currentPage * pageSize)}
-                (currentPage - 1) * pageSize,
-                currentPage * pageSize
-              )}
                             onRow={(record, index) => ({
                                 onClick: () => {
                                     edit(record, index);
                                 },
                             })}
                         />
-            <div
+                        <div style={{ display: 'flex', justifyContent: 'center', margin: '20px 0' }}>
-              style={{
-                display: 'flex',
-                justifyContent: 'center',
-                margin: '20px 0',
-              }}
-            >
                             <Pagination
                                 current={currentPage}
                                 pageSize={pageSize}
                                 total={tableData?.length}
                                 onChange={(page) => setCurrentPage(page)}
                                 showSizeChanger={false}
-                showTotal={(total, range) =>
+                                showTotal={(total, range) => `${range[0]}-${range[1]} of ${total} items`}
-                  `${range[0]}-${range[1]} of ${total} items`
-                }
                             />
                         </div>
                     </Form>
                 </div>
             </DefaultModal>
         </>
-  );
+    )
-};
+}
 
 export default ProductPriceChange;

src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx

@@ -104,6 +104,7 @@ const PrintStyle11 = ({
   const GlobalCashierName = useSelector(GlobalprintCashierName);
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
+  const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>

src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx

@@ -103,6 +103,7 @@ const Printstyle12 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>

src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx

@@ -103,6 +103,7 @@ const Printstyle6 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
   console.log(CashierNameField, "GlobaldummyData")
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(

src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx

@@ -99,6 +99,7 @@ const PrintStyle7 = ({
   const GlobalLogo = useSelector(GlobalprintLogo);
   const GlobalCredit = useSelector(GlobalprintCredit);
   const SettingData = useSelector(PreferenceData);
+  const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
   const estimatePrintHeader =
     SettingData?.[0]?.SettingDtlDetails?.find(
       (setting) =>