Merge pull request 'FIX #51 Issue Solving for updated' (#52) from newdeployment into main

Reviewed-on: Pozomind/pozo-retail-app#52
2026-02-02 19:36:00 +05:30 · 2026-02-02 19:36:00 +05:30 · 441aab2d70
parent e587232ec8 3676a3f41d
commit 441aab2d70
3 changed files with 480 additions and 409 deletions
--- a/src/Features/PurchaseOrder/PurchaseOrder.js
+++ b/src/Features/PurchaseOrder/PurchaseOrder.js
@ -101,7 +101,7 @@ export const getPurProdvaraiantdata = createAsyncThunk(
      data?.prodName !== undefined
    ) {
      return await axiosRetailInstanceData.get(
-        `/ProductCardList?CompId=${data?.CompId}&BranchId=${data?.BranchId}&AppId=${data?.AppId}&prodName=${encodeURIComponent(data?.prodName)}`
+        `/ProductCardList?CompId=${data?.CompId}&BranchId=${data?.BranchId}&AppId=${data?.AppId}&prodName=${encodeURIComponent(data?.prodName)}&type=S`
      );
    }
  }
--- a/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
+++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1Payment.jsx
@ -327,7 +327,10 @@ const BSC1Payment = (props) => {
  )?.PreferenceCatDetails;
  const sportsAppPreference = commonModulePreference?.find(
    (preference) => preference?.PreferredSubCatName === 'SportsApp'
+     &&
+      preference?.PreferredStatus == 'Y'
  );
+  console.log(sportsAppPreference,commonModulePreference,"sportsAppPreference")
  const bookingTypePreference = appPreferences?.find(
    (preference) => preference?.PreferredCatName === 'Booking Type'
  )?.PreferenceCatDetails;
--- a/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
@ -1,18 +1,32 @@
-import { shallowEqual, useSelector } from "react-redux";
-import { GlobalAccessForOthers, GlobalCardAccess, GlobalCombosearch, GlobalItemCard, GlobalProductCategorie, GlobalSelectedDatas, GlobalWithoutSubCatItemCard, triggerProductCard } from "../../../../Features/BookingScreen/BookingData/BookingData";
-import { DefaultModal } from "../../../../Components/Modal/DefaultModal";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { Tables } from "../../../../Components/Tables/Table";
-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 = null, productPriceChange = false, setProductPriceChange = () => { }, setPriceChangeProduct = () => { } }) => {
+import { shallowEqual, useSelector } from 'react-redux';
+import {
+  GlobalAccessForOthers,
+  GlobalCardAccess,
+  GlobalCombosearch,
+  GlobalItemCard,
+  GlobalProductCategorie,
+  GlobalSelectedDatas,
+  GlobalWithoutSubCatItemCard,
+  triggerProductCard,
+} from '../../../../Features/BookingScreen/BookingData/BookingData';
+import { DefaultModal } from '../../../../Components/Modal/DefaultModal';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { Tables } from '../../../../Components/Tables/Table';
+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();

@ -32,20 +46,32 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
  const comboSearch = useSelector(GlobalCombosearch);
  const ProdCat = useSelector(GlobalProductCategorie, shallowEqual);
  const ItemCard = useSelector(GlobalItemCard, shallowEqual);
-    const withoutSubCatItemCard = useSelector(GlobalWithoutSubCatItemCard, shallowEqual);
+  const withoutSubCatItemCard = useSelector(
+    GlobalWithoutSubCatItemCard,
+    shallowEqual
+  );
  const CardAccess = useSelector(GlobalCardAccess, shallowEqual);
-    const globalAccessForOthers = useSelector(GlobalAccessForOthers, shallowEqual);
+  const globalAccessForOthers = useSelector(
+    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 (ProdCat && (ItemCard || withoutSubCatItemCard) && (!noSubcatCardData || noSubcatCardData?.length === 0)) {
-            setNoSubcatCardData(ItemCard?.length === 0 ? withoutSubCatItemCard : ItemCard);
+    if (
+      ProdCat &&
+      (ItemCard || withoutSubCatItemCard) &&
+      (!noSubcatCardData || noSubcatCardData?.length === 0)
+    ) {
+      setNoSubcatCardData(
+        ItemCard?.length === 0 ? withoutSubCatItemCard : ItemCard
+      );
    }
  }, [ProdCat, ItemCard, withoutSubCatItemCard, noSubcatCardData]);

@ -56,7 +82,9 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
      key: 'SlNo',
      width: '60px',
      align: 'center',
-            render: (text, record, index) => <div>{(currentPage - 1) * pageSize + index + 1}</div>
+      render: (text, record, index) => (
+        <div>{(currentPage - 1) * pageSize + index + 1}</div>
+      ),
    },
    {
      title: 'Product Name',
@ -90,22 +118,20 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
                  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('.')) {
@ -149,7 +175,9 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
                  if (value === '') {
                    return Promise.resolve();
                  } else if (parseFloat(value) < 1) {
-                                        return Promise.reject(`Sell Price should be greater than 0`)
+                    return Promise.reject(
+                      `Sell Price should be greater than 0`
+                    );
                  }
                  return Promise.resolve();
                },
@ -159,13 +187,12 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
            <InputField
              value={text}
              placeholder="Enter New Sell Price"
-                            onChange={(e) => handleNewSellPriceChange(e?.target?.value, index)}
+              onChange={(e) =>
+                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('.')) {
@ -191,49 +218,57 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
        : SelectedDatas?.[0]?.AppId === 0 && SelectedDatas?.[0]?.CompId === 0
          ? []
          : SelectedDatas
-            : ItemCard?.length === 0 || (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0)
+      : ItemCard?.length === 0 ||
+          (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0)
        ? noSubcatCardData
        : ItemCard
-        : '';
+    : [];

-    console.log(cardData, "noSubcatCardDatanoSubcatCardData", ItemCard)
+  console.log(cardData, 'noSubcatCardDatanoSubcatCardData', ItemCard);

  useEffect(() => {
+   
    const extractStockDtls = (data) => {
-            if (data?.length === 0) return [];
+      if (data?.length === 0 || !data) return [];

-            let stockDtls = [];
+      let stockDtls = [];git 

-            data?.forEach(item => {
-                let products = item?.ProductDetail?.flatMap(product => product);
+      data?.forEach((item) => {
+        let products = item?.ProductDetail?.flatMap((product) => product);

-                let variants = products?.flatMap(product => product?.ProdVariantDetails);
-                const filteredVariants = variants?.filter(variant => variant?.StockDetails?.length > 0);
-                const stocks = filteredVariants?.flatMap(variant =>
-                    variant?.StockDetails?.map(stock => ({
+        let variants = products?.flatMap(
+          (product) => product?.ProdVariantDetails
+        );
+        const filteredVariants = variants?.filter(
+          (variant) => variant?.StockDetails?.length > 0
+        );
+        const stocks = filteredVariants?.flatMap((variant) =>
+          variant?.StockDetails?.map((stock) => ({
            ...stock,
-                        ProdName: products?.[0]?.ProdName + (variant?.ProdVariantName ? ` (${variant?.ProdVariantName})` : ''),
+            ProdName:
+              products?.[0]?.ProdName +
+              (variant?.ProdVariantName
+                ? ` (${variant?.ProdVariantName})`
+                : ''),
            StockAvailable: products?.[0]?.StockAvailable,
-                        ProdVariantName: variant?.ProdVariantName
+            ProdVariantName: variant?.ProdVariantName,
          }))
        );

-                stockDtls.push(...stocks?.filter(stock =>
-                    stock?.StockAvailable === 'Y'
-                        ? stock?.BatchRef
-                        : true
-                ));
-
+        stockDtls.push(
+          ...stocks?.filter((stock) =>
+            stock?.StockAvailable === 'Y' ? stock?.BatchRef : true
+          )
+        );
      });
-            console.log("extractStockDtls", stockDtls);
+      console.log('extractStockDtls', stockDtls);
      return stockDtls;
-        }
-        setTableData(extractStockDtls(priceChangeProduct || cardData))
-        setCurrentPage(1)
-    }, [cardData, priceChangeProduct])
+    };
+    setTableData(extractStockDtls(priceChangeProduct || cardData || []));
+    setCurrentPage(1);
+  }, [cardData, priceChangeProduct]);

  const handleNewMRPChange = (value, index) => {
-
    const updatedTableData = [...tableData];
    updatedTableData[index].NewMRP = value;
    setTableData(updatedTableData);
@ -244,7 +279,9 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
    });

    const priceChangedProdList = [...priceChangedProducts];
-        const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
+    const prodIndex = priceChangedProdList?.findIndex(
+      (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
+    );
    if (prodIndex !== -1) {
      priceChangedProdList[prodIndex] = {
        ...priceChangedProdList?.[prodIndex],
@ -253,7 +290,7 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
      };
    }
    setPriceChangedProducts(priceChangedProdList);
-    }
+  };

  const handleNewSellPriceChange = (value, index) => {
    const updatedTableData = [...tableData];
@ -267,7 +304,9 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
        updatedTableData[index].NewSellPrice = null;
        setTableData(updatedTableData);
        const priceChangedProdList = [...priceChangedProducts];
-                const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
+        const prodIndex = priceChangedProdList?.findIndex(
+          (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
+        );

        if (prodIndex !== -1) {
          priceChangedProdList.splice(prodIndex, 1);
@ -286,7 +325,9 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
        updatedTableData[index].NewSellPrice = null;
        setTableData(updatedTableData);
        const priceChangedProdList = [...priceChangedProducts];
-                const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
+        const prodIndex = priceChangedProdList?.findIndex(
+          (prod) => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId
+        );

        if (prodIndex !== -1) {
          priceChangedProdList.splice(prodIndex, 1);
@ -302,41 +343,47 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
    });

    const priceChangedProdList = [...priceChangedProducts];
-        const prodIndex = priceChangedProdList?.findIndex(prod => prod?.InwardDtlId === updatedTableData[index]?.InwardDtlId);
+    const prodIndex = priceChangedProdList?.findIndex(
+      (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(updatedTableData[index]?.NewMRP || updatedTableData[index]?.MRP),
+        MRP: String(
+          updatedTableData[index]?.NewMRP || updatedTableData[index]?.MRP
+        ),
        SellPrice: String(value),
-                AdjComment: "string",
-                InwardDtlId: updatedTableData[index]?.InwardDtlId
+        AdjComment: 'string',
+        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(`${prod?.ProdName}: MRP cannot be less than Sell Price`);
+          setMessageData(
+            `${prod?.ProdName}: MRP cannot be less than Sell Price`
+          );
          return false;
        }
        if (!parseFloat(prod?.SellPrice) || !parseFloat(prod?.MRP)) {
@ -354,7 +401,7 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
        BranchId: BranchId,
        ProductDetails: priceChangedProducts,
        UpdatedBy: UserId,
-            }
+      };

      const res = await dispatch(PutStockPrice(data))?.unwrap();
      if (res?.data?.statusCode === 1) {
@ -365,42 +412,52 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
        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} messageType={messageType} onComplete={onComplete} />
-            {showButton ? <Tooltip title="Price Change">
-                <button className="price-change-btn" type="button" onClick={() => {
+      <Messages
+        messageData={messageData}
+        messageType={messageType}
+        onComplete={onComplete}
+      />
+      {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'}
@ -422,28 +479,39 @@ const ProductPriceChange = ({ showButton = true, priceChangeProduct = null, prod
          <Form ref={formRef}>
            <Tables
              columns={priceChangeColumns}
-                            data={tableData?.slice((currentPage - 1) * pageSize, currentPage * pageSize)}
+              data={tableData?.slice(
+                (currentPage - 1) * pageSize,
+                currentPage * pageSize
+              )}
              onRow={(record, index) => ({
                onClick: () => {
                  edit(record, index);
                },
              })}
            />
-                        <div style={{ display: 'flex', justifyContent: 'center', margin: '20px 0' }}>
+            <div
+              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) => `${range[0]}-${range[1]} of ${total} items`}
+                showTotal={(total, range) =>
+                  `${range[0]}-${range[1]} of ${total} items`
+                }
              />
            </div>
          </Form>
        </div>
      </DefaultModal>
    </>
-    )
-}
+  );
+};

 export default ProductPriceChange;