diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx index 42068aa..b0f5e73 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx @@ -12,7 +12,6 @@ import { useNavigate } from 'react-router-dom'; const UserRelieveManager = lazy(() => import('../../Template/RealivingUser')); // Scss import '../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss'; -import NavbarSkeleton from '../../../../Components/Skeleton/NavbarSkeleton'; const subDirectory = import.meta.env.ENV_BASE_URL; const BSNavBarUserInfo = ({ diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx index faa6430..db85226 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx @@ -151,13 +151,12 @@ import PozoMenuIcon from '../UtillComponents/Pozo retail icons/PozoMenuIcon.jsx' import TooltipWrapper from '../../../../Components/Tooltip/Tooltip'; import { IoMdClose } from 'react-icons/io'; -import { CgSearchLoading } from 'react-icons/cg'; +import { TbSettingsSearch } from 'react-icons/tb'; import BSNavBarUserInfo from './BSNavBarUserInfo'; import { FaParking } from 'react-icons/fa'; import { isMobile } from 'react-device-detect'; import { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx'; import '../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss'; -import NavbarSkeleton from '../../../../Components/Skeleton/NavbarSkeleton.jsx'; const subDirectory = import.meta.env.ENV_BASE_URL; const commonUrl = import.meta.env.ENV_COMMON_BASE_URL; @@ -678,7 +677,7 @@ const BSNavbar1 = (props) => { {/* Multiple search */}
- setMultiple(true)} /> + setMultiple(true)} />
diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx index ebd2316..11323cd 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx @@ -98,7 +98,7 @@ import { getUserProfile, userDataByUserId, } from '../../../../Features/UserAccount/userData.js'; -import { CgSearchLoading } from 'react-icons/cg'; + import { TbSettingsSearch } from 'react-icons/tb'; import { FaParking } from 'react-icons/fa'; import BSNavBarUserInfo from './BSNavBarUserInfo'; import { OtherServicesCardlistdata } from '../../../../Features/OtherServices/OtherServices.js'; @@ -130,7 +130,6 @@ const BSCustomerSelect = lazy( ); // Scss import '../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar2.scss'; -import NavbarSkeleton from '../../../../Components/Skeleton/NavbarSkeleton.jsx'; const subDirectory = import.meta.env.ENV_BASE_URL; const commonUrl = import.meta.env.ENV_COMMON_BASE_URL; @@ -625,12 +624,7 @@ const BSNavbar2 = () => { )} - {/* Multiple search */} - -
- setMultiple(true)} /> -
- +
{searchOption && !Comboglobal && @@ -643,6 +637,15 @@ const BSNavbar2 = () => { }} > + {/* Multiple search */} + +
+ setMultiple(true)} /> +
+
)} diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar3.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar3.jsx index 42dc0a1..57007df 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar3.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar3.jsx @@ -102,10 +102,9 @@ import BSNavBarWholeSale from '../UtillComponents/BSNavBarWholeSale.jsx'; import { Global_OfferStatus } from '../../../../Features/Offer/Offer.js'; import { globalholddata } from '../../../../Features/BookingScreen/HoldOption/HoldOption.js'; import BSNavBarWeightScale from '../UtillComponents/BSNavBarWeightScale.jsx'; -import { CgSearchLoading } from 'react-icons/cg'; +import { TbSettingsSearch } from 'react-icons/tb'; import { DefaultModal } from '../../../../Components/Modal/DefaultModal.jsx'; import MultipleSearch from '../UtillComponents/MultipleSearch.jsx'; -import NavbarSkeleton from '../../../../Components/Skeleton/NavbarSkeleton.jsx'; // Jsx Files const BSNavBarFavItems = lazy( @@ -630,18 +629,18 @@ const BSNavbar3 = ({ optionNames }) => { )} - {/* Multiple search */} - -
- setMultiple(true)} /> -
- {!sportsAppPreference && searchOption && (
searchInputRef.current?.focus()} > + {/* Multiple search */} + +
+ setMultiple(true)} /> +
+
)} diff --git a/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx b/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx index 882cd5c..dee81e5 100644 --- a/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx +++ b/src/Pages/BookingScreen/Components/UtillComponents/ShortcutKeyHelper.jsx @@ -2,8 +2,9 @@ import React, { useState } from 'react'; import { List, Typography, Tooltip } from 'antd'; import { FaKeyboard } from 'react-icons/fa'; import { DefaultModal } from '../../../../Components/Modal/DefaultModal'; +import '../../../../Styles/OverAllStyle/OverAllStyle.scss'; const { Title, Text } = Typography; -const ShortcutKeyHelper = ({ }) => { +const ShortcutKeyHelper = ({}) => { const [isModalOpen, setIsModalOpen] = useState(false); const shortcuts = [ @@ -55,11 +56,28 @@ const ShortcutKeyHelper = ({ }) => { width={500} > ( -
- +
+ {item.key} {item.description} @@ -72,4 +90,4 @@ const ShortcutKeyHelper = ({ }) => { ); }; -export default ShortcutKeyHelper; \ No newline at end of file +export default ShortcutKeyHelper; diff --git a/src/Pages/BookingScreen/Template/BSLayout2/BSLayout2.jsx b/src/Pages/BookingScreen/Template/BSLayout2/BSLayout2.jsx index f56ba00..4506527 100644 --- a/src/Pages/BookingScreen/Template/BSLayout2/BSLayout2.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout2/BSLayout2.jsx @@ -111,7 +111,6 @@ const SalesCountForStandard = lazy( ); import BsBookingitemCard from '../../Components/BSItemCards/BsBookingitemCard.jsx'; import LayoutSubCategoryFetcher from '../../LayoutSubCategoryFetcher.jsx'; -import NavbarSkeleton from '../../../../Components/Skeleton/NavbarSkeleton.jsx'; import CardSkeleton from '../../../../Components/Skeleton/CardSkeleton.jsx'; const ListOfSalesInvoices = lazy( () => diff --git a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx index dc8a430..b3b2f60 100644 --- a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx +++ b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx @@ -85,9 +85,11 @@ const AllSalesPageSettings = lazy( // Scss import '../../../Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss'; -import useWhyDidYouUpdate from '../../../Services/findrerender.js'; import React from 'react'; -import { SalesDetailsModal, SalesNetAmountModal } from '../Components/UtillComponents/SalesDetailsNetAmountModal.jsx'; +import { + SalesDetailsModal, + SalesNetAmountModal, +} from '../Components/UtillComponents/SalesDetailsNetAmountModal.jsx'; const SalesCountForStandard = React.memo(() => { const dispatch = useDispatch(); @@ -484,10 +486,10 @@ const SalesCountForStandard = React.memo(() => { return ( DineInAccess?.SettingValue === 'Y' && DineInOrderCount + - TakeAwayOrderCount + - SelfTakeAwayOrderCount + - SelfDineInOrderCount > - 0 && + TakeAwayOrderCount + + SelfTakeAwayOrderCount + + SelfDineInOrderCount > + 0 && (takeAwayPreference || dinePreference) ); }, [DineInAccess, sales, dinePreference, takeAwayPreference]); @@ -644,7 +646,7 @@ const SalesCountForStandard = React.memo(() => { {DineInAccess?.SettingValue === 'Y' && takeAwayPreference && (TakeAwayOrderCount || SelfTakeAwayOrderCount || PreOrderAmount) > - 0 && ( + 0 && ( { Stock )} - {preferenceshortcutkey && ( -
- -
- )} - -
+ +
+ {preferenceshortcutkey && ( +
+ +
+ )} + + {Customisebillno && } {SessionData?.FeatureAddonData?.FeatureDtls?.find( (item) => item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' diff --git a/src/Pages/Product/ProductForm.jsx b/src/Pages/Product/ProductForm.jsx index 1ee090d..ce32a4d 100644 --- a/src/Pages/Product/ProductForm.jsx +++ b/src/Pages/Product/ProductForm.jsx @@ -127,7 +127,7 @@ const ProductForm = ({ formType }) => { UomTypePreference?.some?.( (e) => e?.PreferredSubCatName?.toLowerCase() == - item?.ConfigName?.toLowerCase() && e?.PreferredStatus == 'Y' + item?.ConfigName?.toLowerCase() && e?.PreferredStatus == 'Y' ) ); console.log(UomTypePreference, 'UomTypePreference'); @@ -820,7 +820,10 @@ const ProductForm = ({ formType }) => { }; const handleInput = async (val) => { // normalize whether we receive an event (e.target.value) or a raw string - const inputVal = val && val.target && typeof val.target.value === 'string' ? val.target.value : val; + const inputVal = + val && val.target && typeof val.target.value === 'string' + ? val.target.value + : val; if (!inputVal) return; if (inputVal.length >= 5) { @@ -1138,7 +1141,7 @@ const ProductForm = ({ formType }) => { (item) => parseFloat(item.MRP) === parseFloat(subVariantPriceData?.MRP) && parseFloat(item.SellPrice) === - parseFloat(subVariantPriceData?.SellPrice) && + parseFloat(subVariantPriceData?.SellPrice) && //dhana 18-02-2025 item.ProdVariantName == subVariantPriceData?.ProdVariantName ); @@ -1153,20 +1156,20 @@ const ProductForm = ({ formType }) => { SellPrice: subVariantPriceData?.SellPrice, WhSalePrice: subVariantPriceData?.WhSalePrice == undefined || - subVariantPriceData?.WhSalePrice == null || - subVariantPriceData?.WhSalePrice == '' + subVariantPriceData?.WhSalePrice == null || + subVariantPriceData?.WhSalePrice == '' ? 0 : subVariantPriceData?.WhSalePrice, OfferPrice: subVariantPriceData?.OfferPrice == undefined || - subVariantPriceData?.OfferPrice == null || - subVariantPriceData?.OfferPrice == '' + subVariantPriceData?.OfferPrice == null || + subVariantPriceData?.OfferPrice == '' ? 0 : subVariantPriceData?.OfferPrice, SpecialPrice: subVariantPriceData?.SpecialPrice == undefined || - subVariantPriceData?.SpecialPrice == null || - subVariantPriceData?.SpecialPrice == '' + subVariantPriceData?.SpecialPrice == null || + subVariantPriceData?.SpecialPrice == '' ? 0 : subVariantPriceData?.SpecialPrice, InwardDtlId: null, @@ -1222,20 +1225,20 @@ const ProductForm = ({ formType }) => { SellPrice: subVariantPriceData?.SellPrice, WhSalePrice: subVariantPriceData?.WhSalePrice == undefined || - subVariantPriceData?.WhSalePrice == null || - subVariantPriceData?.WhSalePrice == '' + subVariantPriceData?.WhSalePrice == null || + subVariantPriceData?.WhSalePrice == '' ? 0 : subVariantPriceData?.WhSalePrice, OfferPrice: subVariantPriceData?.OfferPrice == undefined || - subVariantPriceData?.OfferPrice == null || - subVariantPriceData?.OfferPrice == '' + subVariantPriceData?.OfferPrice == null || + subVariantPriceData?.OfferPrice == '' ? 0 : subVariantPriceData?.OfferPrice, SpecialPrice: subVariantPriceData?.SpecialPrice == undefined || - subVariantPriceData?.SpecialPrice == null || - subVariantPriceData?.SpecialPrice == '' + subVariantPriceData?.SpecialPrice == null || + subVariantPriceData?.SpecialPrice == '' ? 0 : subVariantPriceData?.SpecialPrice, InwardDtlId: null, @@ -1301,20 +1304,20 @@ const ProductForm = ({ formType }) => { SellPrice: subVariantPriceData?.SellPrice, WhSalePrice: subVariantPriceData?.WhSalePrice == undefined || - subVariantPriceData?.WhSalePrice == null || - subVariantPriceData?.WhSalePrice == '' + subVariantPriceData?.WhSalePrice == null || + subVariantPriceData?.WhSalePrice == '' ? 0 : subVariantPriceData?.WhSalePrice, OfferPrice: subVariantPriceData?.OfferPrice == undefined || - subVariantPriceData?.OfferPrice == null || - subVariantPriceData?.OfferPrice == '' + subVariantPriceData?.OfferPrice == null || + subVariantPriceData?.OfferPrice == '' ? 0 : subVariantPriceData?.OfferPrice, SpecialPrice: subVariantPriceData?.SpecialPrice == undefined || - subVariantPriceData?.SpecialPrice == null || - subVariantPriceData?.SpecialPrice == '' + subVariantPriceData?.SpecialPrice == null || + subVariantPriceData?.SpecialPrice == '' ? 0 : subVariantPriceData?.SpecialPrice, InwardDtlId: null, @@ -1369,20 +1372,20 @@ const ProductForm = ({ formType }) => { SellPrice: subVariantPriceData?.SellPrice, WhSalePrice: subVariantPriceData?.WhSalePrice == undefined || - subVariantPriceData?.WhSalePrice == null || - subVariantPriceData?.WhSalePrice == '' + subVariantPriceData?.WhSalePrice == null || + subVariantPriceData?.WhSalePrice == '' ? 0 : subVariantPriceData?.WhSalePrice, OfferPrice: subVariantPriceData?.OfferPrice == undefined || - subVariantPriceData?.OfferPrice == null || - subVariantPriceData?.OfferPrice == '' + subVariantPriceData?.OfferPrice == null || + subVariantPriceData?.OfferPrice == '' ? 0 : subVariantPriceData?.OfferPrice, SpecialPrice: subVariantPriceData?.SpecialPrice == undefined || - subVariantPriceData?.SpecialPrice == null || - subVariantPriceData?.SpecialPrice == '' + subVariantPriceData?.SpecialPrice == null || + subVariantPriceData?.SpecialPrice == '' ? 0 : subVariantPriceData?.SpecialPrice, InwardDtlId: null, @@ -1451,17 +1454,17 @@ const ProductForm = ({ formType }) => { (item) => parseFloat(item.MRP) === parseFloat(subVariantPriceData?.MRP) && parseFloat(item.SellPrice) === - parseFloat(subVariantPriceData?.SellPrice) + parseFloat(subVariantPriceData?.SellPrice) ); if ( existsData?.length == 0 || (parseFloat(variantPriceData[variantEditIndex]?.MRP) === parseFloat(subVariantPriceData?.MRP) && parseFloat(variantPriceData[variantEditIndex]?.SellPrice) === - parseFloat(subVariantPriceData?.SellPrice) && + parseFloat(subVariantPriceData?.SellPrice) && //dhana 18-02-2025 variantPriceData[variantEditIndex]?.ProdVariantName == - subVariantPriceData?.ProdVariantName) + subVariantPriceData?.ProdVariantName) ) { let editVariantData = [...variantPriceData]; if ( @@ -1479,20 +1482,20 @@ const ProductForm = ({ formType }) => { SellPrice: subVariantPriceData?.SellPrice, WhSalePrice: subVariantPriceData?.WhSalePrice == undefined || - subVariantPriceData?.WhSalePrice == null || - subVariantPriceData?.WhSalePrice == '' + subVariantPriceData?.WhSalePrice == null || + subVariantPriceData?.WhSalePrice == '' ? 0 : subVariantPriceData?.WhSalePrice, OfferPrice: subVariantPriceData?.OfferPrice == undefined || - subVariantPriceData?.OfferPrice == null || - subVariantPriceData?.OfferPrice == '' + subVariantPriceData?.OfferPrice == null || + subVariantPriceData?.OfferPrice == '' ? 0 : subVariantPriceData?.OfferPrice, SpecialPrice: subVariantPriceData?.SpecialPrice == undefined || - subVariantPriceData?.SpecialPrice == null || - subVariantPriceData?.SpecialPrice == '' + subVariantPriceData?.SpecialPrice == null || + subVariantPriceData?.SpecialPrice == '' ? 0 : subVariantPriceData?.SpecialPrice, InwardDtlId: editVariantData[variantEditIndex]?.InwardDtlId, @@ -1506,20 +1509,20 @@ const ProductForm = ({ formType }) => { SellPrice: subVariantPriceData?.SellPrice, WhSalePrice: subVariantPriceData?.WhSalePrice == undefined || - subVariantPriceData?.WhSalePrice == null || - subVariantPriceData?.WhSalePrice == '' + subVariantPriceData?.WhSalePrice == null || + subVariantPriceData?.WhSalePrice == '' ? 0 : subVariantPriceData?.WhSalePrice, OfferPrice: subVariantPriceData?.OfferPrice == undefined || - subVariantPriceData?.OfferPrice == null || - subVariantPriceData?.OfferPrice == '' + subVariantPriceData?.OfferPrice == null || + subVariantPriceData?.OfferPrice == '' ? 0 : subVariantPriceData?.OfferPrice, SpecialPrice: subVariantPriceData?.SpecialPrice == undefined || - subVariantPriceData?.SpecialPrice == null || - subVariantPriceData?.SpecialPrice == '' + subVariantPriceData?.SpecialPrice == null || + subVariantPriceData?.SpecialPrice == '' ? 0 : subVariantPriceData?.SpecialPrice, InwardDtlId: editVariantData[variantEditIndex]?.InwardDtlId, @@ -1647,20 +1650,20 @@ const ProductForm = ({ formType }) => { SellPrice: row?.SellPrice, WhSalePrice: row?.WhSalePrice == undefined || - row?.WhSalePrice == null || - row?.WhSalePrice == '' + row?.WhSalePrice == null || + row?.WhSalePrice == '' ? 0 : row?.WhSalePrice, OfferPrice: row?.OfferPrice == undefined || - row?.OfferPrice == null || - row?.OfferPrice == '' + row?.OfferPrice == null || + row?.OfferPrice == '' ? 0 : row?.OfferPrice, SpecialPrice: row?.SpecialPrice == undefined || - row?.SpecialPrice == null || - row?.SpecialPrice == '' + row?.SpecialPrice == null || + row?.SpecialPrice == '' ? 0 : row?.SpecialPrice, InwardDtlId: row?.InwardDtlId, @@ -1674,20 +1677,20 @@ const ProductForm = ({ formType }) => { SellPrice: row?.SellPrice, WhSalePrice: row?.WhSalePrice == undefined || - row?.WhSalePrice == null || - row?.WhSalePrice == '' + row?.WhSalePrice == null || + row?.WhSalePrice == '' ? 0 : row?.WhSalePrice, OfferPrice: row?.OfferPrice == undefined || - row?.OfferPrice == null || - row?.OfferPrice == '' + row?.OfferPrice == null || + row?.OfferPrice == '' ? 0 : row?.OfferPrice, SpecialPrice: row?.SpecialPrice == undefined || - row?.SpecialPrice == null || - row?.SpecialPrice == '' + row?.SpecialPrice == null || + row?.SpecialPrice == '' ? 0 : row?.SpecialPrice, InwardDtlId: row?.InwardDtlId, @@ -1824,14 +1827,14 @@ const ProductForm = ({ formType }) => { postData['InwardDate'] = new Date().toJSON(); postData['AutoGenerateQr'] = values?.QRCode === undefined || - values?.QRCode === null || - values?.QRCode === '' + values?.QRCode === null || + values?.QRCode === '' ? QrcodeAuto : 'N'; postData['AutoGenerateSingleQr'] = values?.OnePcQR === undefined || - values?.OnePcQR === null || - values?.OnePcQR === '' + values?.OnePcQR === null || + values?.OnePcQR === '' ? QrcodeAutoSingle : 'N'; postData['CreatedBy'] = UserId; @@ -2189,7 +2192,6 @@ const ProductForm = ({ formType }) => {
- {/* dhana */}
{/*
*/} @@ -2222,8 +2224,8 @@ const ProductForm = ({ formType }) => { label={} isOnChange={ editstate?.ProdName || - QrcodeExistsData?.[0]?.ProdName || - voiceData?.product + QrcodeExistsData?.[0]?.ProdName || + voiceData?.product ? true : false } @@ -2259,8 +2261,8 @@ const ProductForm = ({ formType }) => { label={} isOnChange={ editstate?.Size || - QrcodeExistsData?.[0]?.Size || - voiceData?.qty + QrcodeExistsData?.[0]?.Size || + voiceData?.qty ? true : false } @@ -2288,20 +2290,20 @@ const ProductForm = ({ formType }) => { /> } - // inputMode="decimal" - // onInput={(e) => { - // let cleanedValue = e.target.value.replace(/[^0-9.]/g, ""); // Remove invalid characters - // const parts = cleanedValue.split("."); + // inputMode="decimal" + // onInput={(e) => { + // let cleanedValue = e.target.value.replace(/[^0-9.]/g, ""); // Remove invalid characters + // const parts = cleanedValue.split("."); - // if (cleanedValue.startsWith(".")) { - // cleanedValue = "0" + cleanedValue; - // } + // if (cleanedValue.startsWith(".")) { + // cleanedValue = "0" + cleanedValue; + // } - // e.target.value = - // parts.length > 2 - // ? `${parts[0]}.${parts.slice(1).join("")}` - // : cleanedValue; - // }} + // e.target.value = + // parts.length > 2 + // ? `${parts[0]}.${parts.slice(1).join("")}` + // : cleanedValue; + // }} /> { label={} isOnChange={ editstate?.SellPrice || - QrcodeExistsData?.[0]?.SellPrice + QrcodeExistsData?.[0]?.SellPrice ? true : false } @@ -2471,12 +2473,12 @@ const ProductForm = ({ formType }) => { } onChangeFunction={handleProdCatDropDownChange} valueData={SelectedProdCat} - // disabled={ - // editstate?.ProdTypeName == 'Others' || - // formType == 'add' - // ? false - // : true - // } + // disabled={ + // editstate?.ProdTypeName == 'Others' || + // formType == 'add' + // ? false + // : true + // } /> { } onChangeFunction={handleProdSubCatDropDownChange} valueData={SelectedProdSubCat} - // disabled={ - // editstate?.ProdTypeName == 'Others' || - // formType == 'add' - // ? false - // : true - // } + // disabled={ + // editstate?.ProdTypeName == 'Others' || + // formType == 'add' + // ? false + // : true + // } /> { ImageLink={imageUrl} updateImageUrl={updateImageUrl} /> -
+