revert 4a72a72078

revert Merge pull request 'Dashboard and qr generate page design changes' (#3) from vicky into main

Reviewed-on: Pozomind/pozo-retail-app#3

.gitignore

@@ -22,7 +22,3 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-
-
-# file 
-src/routesConfig.jsx

src/Components/Forms/main.scss

@@ -565,7 +565,6 @@ Button[disabled] {
   background: #fafafa7a;
   //vicky
   padding: 1px 8px !important;
-  border: 0.5px solid rgb(235, 235, 235);
 }
 
 .ant-input-affix-wrapper > input.ant-input {
@@ -968,21 +967,17 @@ Button[disabled] {
   }
 }
 
+
 //  writed by sree lowStock animated 
 
 .stock-alert-animation {
   // position: relative;
-  animation: blink 1s infinite;
+    animation: blink 1s infinite;
   cursor: pointer;
 }
 @keyframes blink {
-  0% {
+  0%   { opacity: 1; }
-    opacity: 1;
+  50%  { opacity: 0; }
-  }
+  100% { opacity: 1; }
-  50% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
 }
+

src/Components/Menu/SideMenuPozo.jsx

@@ -2,35 +2,16 @@ import React, { useState, useEffect, useRef } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import {
-  FaBars,
+  FaBars, FaThLarge, FaHome, FaCog, FaChartBar, FaFileAlt,
-  FaThLarge,
+  FaMobileAlt, FaSignOutAlt, FaSignInAlt, FaArrowRight,
-  FaHome,
+  FaCaretRight
-  FaCog,
-  FaChartBar,
-  FaFileAlt,
-  FaMobileAlt,
-  FaSignOutAlt,
-  FaSignInAlt,
-  FaArrowRight,
-  FaCaretRight,
 } from 'react-icons/fa';
-import {
+import { MdSettings, MdOutlineReport, MdOutlineHome, MdOutlineKeyboardArrowDown, MdOutlineKeyboardArrowRight, } from 'react-icons/md';
-  MdSettings,
-  MdOutlineReport,
-  MdOutlineHome,
-  MdOutlineKeyboardArrowDown,
-  MdOutlineKeyboardArrowRight,
-} from 'react-icons/md';
 import { BiLogOut, BiLogIn } from 'react-icons/bi';
-import {
+import { AiOutlineAppstore, AiOutlineSetting, AiOutlineBarChart, AiOutlineFileText } from 'react-icons/ai';
-  AiOutlineAppstore,
-  AiOutlineSetting,
-  AiOutlineBarChart,
-  AiOutlineFileText,
-} from 'react-icons/ai';
 import { GiHamburgerMenu } from 'react-icons/gi';
 import './SideMenuPozo.scss';
-import { FaCaretDown } from 'react-icons/fa';
+import { FaCaretDown } from "react-icons/fa";
 import { useDispatch } from 'react-redux';
 import { useContext } from 'react';
 import { AuthContext } from '../../AuthContext';
@@ -64,97 +45,68 @@ import {
 import { ChangeTotalAmount } from '../../Features/ExteraCharges/ExtraCharges';
 import * as Offer from '../../Features/Offer/Offer';
 import { FiMenu } from 'react-icons/fi';
-import POZOMIND from '../../Images/PozomindWLogo.png';
+import POZOMIND from "../../Images/PozomindWLogo.png";
-import {
+import { ChangeFullFreeProductList, changeFullOfferAppliedProducts, changeLoyaltyConsumedQuantities } from '../../Features/Offer/Offernew/BookingOffernew';
-  ChangeFullFreeProductList,
-  changeFullOfferAppliedProducts,
-  changeLoyaltyConsumedQuantities,
-} from '../../Features/Offer/Offernew/BookingOffernew';
 
 const subDirectory = import.meta.env.BASE_URL;
 
 // Filter functions (copied from AppPage.jsx)
 function filterMenuItems(menu, configList) {
   if (!Array.isArray(menu)) return [];
-  return menu
+  return menu.filter((item) => {
-    .filter((item) => {
+    if (!item) return false;
-      if (!item) return false;
+    if (item.label === "Sign Out") return true;
-      if (item.label === 'Sign Out') return true;
+    // For nested children, filter recursively
-      // For nested children, filter recursively
+    let filteredChildren = item.children ? filterMenuItems(item.children, configList) : undefined;
-      let filteredChildren = item.children
+    // Employee access: ConfigName
-        ? filterMenuItems(item.children, configList)
+    const config = configList?.find(
-        : undefined;
+      (config) => config.ConfigName === item.label && config.ReadAccess === 'Y'
-      // Employee access: ConfigName
+    );
-      const config = configList?.find(
+    // If this item or any of its children are accessible, include it
-        (config) =>
+    return (config || (filteredChildren && filteredChildren.length > 0));
-          config.ConfigName === item.label && config.ReadAccess === 'Y'
+  }).map(item => ({
-      );
+    ...item,
-      // If this item or any of its children are accessible, include it
+    children: item.children ? filterMenuItems(item.children, configList) : undefined
-      return config || (filteredChildren && filteredChildren.length > 0);
+  }));
-    })
-    .map((item) => ({
-      ...item,
-      children: item.children
-        ? filterMenuItems(item.children, configList)
-        : undefined,
-    }));
 }
 
 function filterSadminUserMenuItems(menu, configList) {
   if (!Array.isArray(menu)) return [];
-  return menu
+  return menu.filter((item) => {
-    .filter((item) => {
+    if (!item) return false;
-      if (!item) return false;
+    if (item.label === "Sign Out") return true;
-      if (item.label === 'Sign Out') return true;
 
-      let filteredChildren = item.children
+    let filteredChildren = item.children ? filterSadminUserMenuItems(item.children, configList) : undefined;
-        ? filterSadminUserMenuItems(item.children, configList)
+    // Super admin user access: MenuName
-        : undefined;
+    const config = configList?.find(
-      // Super admin user access: MenuName
+      (config) => config.MenuName === item.label && config.ReadAccess === 'Y'
-      const config = configList?.find(
+    );
-        (config) => config.MenuName === item.label && config.ReadAccess === 'Y'
+    return (config || (filteredChildren && filteredChildren.length > 0));
-      );
+  }).map(item => ({
-      return config || (filteredChildren && filteredChildren.length > 0);
+    ...item,
-    })
+    children: item.children ? filterSadminUserMenuItems(item.children, configList) : undefined
-    .map((item) => ({
+  }));
-      ...item,
-      children: item.children
-        ? filterSadminUserMenuItems(item.children, configList)
-        : undefined,
-    }));
 }
 
 // Capitalize helper
 function capitalizeWords(str) {
   if (typeof str !== 'string') return '';
-  return str.replace(
+  return str.replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
-    /\w\S*/g,
-    (txt) => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase()
-  );
 }
 
 // Recursively capitalize all menu item labels, filtering out falsy items and items without a label
 function capitalizeMenuLabels(items) {
   return (items || [])
-    .filter(
+    .filter(item => item && typeof item.label === 'string' && item.label.trim() !== '')
-      (item) =>
+    .map(item => ({
-        item && typeof item.label === 'string' && item.label.trim() !== ''
-    )
-    .map((item) => ({
       ...item,
       label: capitalizeWords(item.label),
-      children: item.children ? capitalizeMenuLabels(item.children) : undefined,
+      children: item.children ? capitalizeMenuLabels(item.children) : undefined
     }));
 }
 
 const SideMenuPozo = ({ items = [] }) => {
-  const {
+  const { freeProductsCount, setFreeProductsCount, UserType, Access, SadminuserAccess } = useContext(AuthContext);
-    freeProductsCount,
-    setFreeProductsCount,
-    UserType,
-    Access,
-    SadminuserAccess,
-  } = useContext(AuthContext);
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const location = useLocation();
@@ -168,6 +120,7 @@ const SideMenuPozo = ({ items = [] }) => {
   const DineinDefault = useSelector(GlobalDineinDefault);
   const [collapse, setCollapse] = useState(false);
 
+
   useEffect(() => {
     const handleResize = () => {
       setCollapse(window.innerWidth < 768);
@@ -194,6 +147,7 @@ const SideMenuPozo = ({ items = [] }) => {
     return () => document.removeEventListener('mousedown', handleClickOutside);
   }, []);
 
+
   useEffect(() => {
     const handleClickOutside = (event) => {
       if (window.innerWidth < 768) {
@@ -203,8 +157,8 @@ const SideMenuPozo = ({ items = [] }) => {
       }
     };
 
-    document.addEventListener('mousedown', handleClickOutside);
+    document.addEventListener("mousedown", handleClickOutside);
-    return () => document.removeEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener("mousedown", handleClickOutside);
   }, []);
 
   // Debug current pathname
@@ -218,7 +172,7 @@ const SideMenuPozo = ({ items = [] }) => {
   // Check if any child of this item is selected (for parent menu highlighting)
   const hasSelectedChild = (item) => {
     if (!item.children) return false;
-    return item.children.some((child) => {
+    return item.children.some(child => {
       if (child.children) {
         return hasSelectedChild(child);
       }
@@ -262,7 +216,7 @@ const SideMenuPozo = ({ items = [] }) => {
       dispatch(ChangeTotalAmount([]));
       dispatch(ChangeFullFreeProductList([]));
       dispatch(changeFullOfferAppliedProducts([]));
-      dispatch(changeLoyaltyConsumedQuantities({}));
+      dispatch(changeLoyaltyConsumedQuantities({}))
     }
     if (e == `${subDirectory}sales`) {
       dispatch(changeTipAmount(0));
@@ -286,7 +240,7 @@ const SideMenuPozo = ({ items = [] }) => {
       dispatch(ChangeFullFreeProductList([]));
       dispatch(changeFullOfferAppliedProducts([]));
       dispatch(ChangeTotalAmount([]));
-      dispatch(changeLoyaltyConsumedQuantities({}));
+      dispatch(changeLoyaltyConsumedQuantities({}))
     }
     if (e == `${subDirectory}saleslayouts/print-selection`) {
       dispatch(changeSelectedPrintdummyData(true));
@@ -297,7 +251,7 @@ const SideMenuPozo = ({ items = [] }) => {
   const handleMenuClick = (item, parentKeys = [], event, level = 0) => {
     if (item.children) {
       if (openKeys.includes(item.key)) {
-        setOpenKeys(openKeys.filter((k) => k !== item.key));
+        setOpenKeys(openKeys.filter(k => k !== item.key));
         const newPositions = { ...dropdownPosition };
         delete newPositions[item.key];
         setDropdownPosition(newPositions);
@@ -310,7 +264,7 @@ const SideMenuPozo = ({ items = [] }) => {
           newOpenKeys = [];
         } else {
           // Keep only the parent chain, remove siblings
-          newOpenKeys = openKeys.filter((key) => {
+          newOpenKeys = openKeys.filter(key => {
             // Keep if it's in the parent chain
             return parentKeys.includes(key);
           });
@@ -323,53 +277,50 @@ const SideMenuPozo = ({ items = [] }) => {
         if (level === 0) {
           position = {
             top: rect.top,
-            left: collapsed ? rect.right + 1 : 10,
+            left: collapsed ? rect.right + 1 : 10
           };
         } else {
           position = {
             top: rect.top,
-            left: rect.right + 1,
+            left: rect.right + 1
           };
         }
 
-        setDropdownPosition((prev) => ({ ...prev, [item.key]: position }));
+        setDropdownPosition(prev => ({ ...prev, [item.key]: position }));
         setOpenKeys([...newOpenKeys, item.key]);
       }
     } else {
       if (DineinDefault && item.key == `${subDirectory}sales`) {
         navigatefun(`${subDirectory}sales/dine-in`);
         setOpenKeys([]);
-      } else {
+      }
+      else {
         navigatefun(item.key);
         setOpenKeys([]);
+
       }
+
+
+
     }
   };
-  console.log(items, Access, 'Employee items');
+  console.log(items, Access, "Employee items")
   // Filter menu items based on access
   let filteredMenuItems = (items || []).filter(Boolean);
   if (UserType === 'Employee' && Array.isArray(Access) && Access.length > 0) {
     filteredMenuItems = filterMenuItems(filteredMenuItems, Access);
-  } else if (
+  } else if (UserType === 'Super Admin User' && Array.isArray(SadminuserAccess) && SadminuserAccess.length > 0) {
-    UserType === 'Super Admin User' &&
+    filteredMenuItems = filterSadminUserMenuItems(filteredMenuItems, SadminuserAccess);
-    Array.isArray(SadminuserAccess) &&
-    SadminuserAccess.length > 0
-  ) {
-    filteredMenuItems = filterSadminUserMenuItems(
-      filteredMenuItems,
-      SadminuserAccess
-    );
   }
 
   // Capitalize all labels, filter out items without a label
-  const menuItemsWithCapitalizedLabels =
+  const menuItemsWithCapitalizedLabels = capitalizeMenuLabels(filteredMenuItems);
-    capitalizeMenuLabels(filteredMenuItems);
   const bottomKeys = ['Support', 'Settings', 'Download', 'Sign Out'];
-  const bottomMenuItems = menuItemsWithCapitalizedLabels.filter((item) =>
+  const bottomMenuItems = menuItemsWithCapitalizedLabels.filter(item =>
     bottomKeys.includes(item.label)
   );
-  const mainMenuItems = menuItemsWithCapitalizedLabels.filter(
+  const mainMenuItems = menuItemsWithCapitalizedLabels.filter(item =>
-    (item) => !bottomKeys.includes(item.label)
+    !bottomKeys.includes(item.label)
   );
   // Recursive render for menu and submenus
   const renderMenuItems = (items, parentKeys = [], level = 0) => (
@@ -378,45 +329,26 @@ const SideMenuPozo = ({ items = [] }) => {
         <div key={item.key}>
           <div
             className={`${level > 0 ? 'dropdown-submenu-item' : 'menu-item'}${isSelected(item.key) || (level === 0 && hasSelectedChild(item)) ? ' selecteded' : ''}${isOpen(item.key) ? ' open' : ''}${item.children ? ' has-children' : ''}`}
-            onClick={(e) => {
+            onClick={(e) => { e.stopPropagation(); handleMenuClick(item, parentKeys, e, level); }}
-              e.stopPropagation();
+          // style={{ paddingLeft: `${level * 10 + 1}px` }}
-              handleMenuClick(item, parentKeys, e, level);
-            }}
-            // style={{ paddingLeft: `${level * 10 + 1}px` }}
           >
-            {item.icon && level === 0 && (
+            {item.icon && level === 0 && <span className='menu-icon' style={{
-              <span
+              fontSize: collapse ? "1.5rem" : ""
-                className="menu-icon"
+            }}>{item.icon}</span>}
-                style={{
+            {!collapse && <span className='menu-label'>{item.label}</span>}
-                  fontSize: collapse ? '1.5rem' : '',
+            {!collapse && <span className='menu-labelDot'>{isDropdownItemSelected(item) ? '●' : ''}</span>}
-                }}
-              >
-                {item.icon}
-              </span>
-            )}
-            {!collapse && <span className="menu-label">{item.label}</span>}
-            {!collapse && (
-              <span className="menu-labelDot">
-                {isDropdownItemSelected(item) ? '●' : ''}
-              </span>
-            )}
             {item.children && !collapse && (
-              <span className="menu-arrow">
+              <span className='menu-arrow'>
-                {level === 0 ? (
+                {level === 0 ? <FaCaretRight size={14} /> : <MdOutlineKeyboardArrowRight />}
-                  <FaCaretRight size={14} />
-                ) : (
-                  <MdOutlineKeyboardArrowRight />
-                )}
               </span>
             )}
           </div>
           {item.children && isOpen(item.key) && !collapse && (
-            <div className={`dropdown-submenu${level > 0 ? ' nested' : ''}`}>
+            <div
-              {renderMenuItems(
+              className={`dropdown-submenu${level > 0 ? ' nested' : ''}`}
-                item.children,
+
-                [...parentKeys, item.key],
+            >
-                level + 1
+              {renderMenuItems(item.children, [...parentKeys, item.key], level + 1)}
-              )}
             </div>
           )}
         </div>
@@ -438,45 +370,32 @@ const SideMenuPozo = ({ items = [] }) => {
   const isMobile = /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent);
   const isAndroid = /Android/i.test(navigator.userAgent);
 
+
   return (
-    <div
+    <div className={`SideMenuPozo-Master${collapse ? ' collapsed' : ''}`} ref={menuRef}
-      className={`SideMenuPozo-Master${collapse ? ' collapsed' : ''}`}
+      style={{ height: isMobile ? "88%" : "" }}
-      ref={menuRef}
-      style={{ height: isMobile ? '88%' : '' }}
     >
-      <div
+      <div style={{
-        style={{
+        width: "100%", display: "flex", flexDirection: "column", gap: "10px",
-          width: '100%',
+        height: "68vh", overflow: "auto"
-          display: 'flex',
+      }}>
-          flexDirection: 'column',
-          gap: '6px',
-          height: '68vh',
-          overflow: 'auto',
-        }}
-      >
         <div className="paypreLogoDiv">
-          <div className="shopNameNav" style={{ width: '100%' }}>
+          <div className="shopNameNav" style={{ width: "100%" }}>
-            <div
+            <div style={{
-              style={{
+              display: "flex", flexDirection: "row",
-                display: 'flex',
+              alignItems: "center", gap: "4px", padding: "0px 10px", justifyContent: "space-between"
-                flexDirection: 'row',
+            }}>
-                alignItems: 'center',
-                gap: '4px',
-                padding: '0px 10px',
-                justifyContent: 'space-between',
-              }}
-            >
               <FiMenu
                 size={26}
                 onClick={() => setCollapse((prev) => !prev)}
                 style={{ cursor: 'pointer' }}
               />
-              {collapse ? (
+              {collapse ? "" :
-                ''
-              ) : (
                 // <img src={POZOMIND} alt="PozoMindLogo" width="80px" height={"45px"} className='PozoMindLogo' />
-                <div>PozoApp</div>
+                <div>
-              )}
+                  PozoApp
+                </div>
+              }
             </div>
             {/* <div> */}
             {/* <div>{branchName}</div> */}
@@ -485,7 +404,7 @@ const SideMenuPozo = ({ items = [] }) => {
           </div>
         </div>
         {/* Top Menu using PozoMenu */}
-        <div className="top-menu">
+        <div className='top-menu'>
           <PozoMenu
             items={mainMenuItems}
             mode="vertical"
@@ -494,19 +413,16 @@ const SideMenuPozo = ({ items = [] }) => {
             style={{
               width: collapse ? '60px' : '200px',
               background: 'transparent',
-              boxShadow: 'none',
+              boxShadow: 'none'
             }}
             onClick={handlePozoMenuClick}
           />
         </div>
       </div>
       {/* Bottom Menu using PozoMenu */}
-      <div
+      <div className='bottom-menu' style={{
-        className="bottom-menu"
+        height: isMobile ? "30vh" : ""
-        style={{
+      }}>
-          height: isMobile ? '30vh' : '',
-        }}
-      >
         <PozoMenu
           items={bottomMenuItems}
           mode="vertical"
@@ -516,7 +432,7 @@ const SideMenuPozo = ({ items = [] }) => {
           style={{
             width: collapse ? '60px' : '200px',
             background: 'transparent',
-            boxShadow: 'none',
+            boxShadow: 'none'
           }}
           onClick={handlePozoMenuClick}
         />

src/Pages/DashBoard/RetailDashboard.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, {useCallback, useEffect, useRef, useState } from 'react';
 import '../../Styles/DashBoard/RetailDashBoard.scss';
 import GraphChart from './Chart/GraphChart';
 import { DatePicker, Space, Tooltip } from 'antd';
@@ -423,10 +423,8 @@ const RetailDashboard = () => {
       EmpId: UserId,
     };
     let response = await dispatch(getEmpAccess(data)).unwrap();
-    let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter((item) =>
+    let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
-      ['Add Product', 'Product Receipt', 'Daily Sales', 'Sales'].includes(
+      (item) => ['Add Product', 'Product Receipt', 'Daily Sales', 'Sales'].includes(item.ConfigName)
-        item.ConfigName
-      )
     );
     console.log(datas, 'ffsasasf');
     setEmpData(datas);
@@ -1559,19 +1557,12 @@ const RetailDashboard = () => {
             </div>
 
             <div className="dashboardMainCenter">
+              <p style={{ fontSize: '12px', marginBottom: '0.2rem', fontWeight: '500', fontFamily: 'Inter' }}>
+                Today's Snapshot
+              </p>
               <div className="todaySnapshotRow">
-                <p
-                  style={{
-                    fontSize: '13px',
-                    marginBottom: '0.2rem',
-                    fontWeight: '500',
-                    fontFamily: 'Inter',
-                  }}
-                >
-                  Today's Snapshot
-                </p>
                 {selectedBranchForFilter === 'all' ? (
-                  <div className="todaySnapFlex">
+                  <>
                     <Tooltip
                       title={
                         <div
@@ -1671,9 +1662,9 @@ const RetailDashboard = () => {
                         </div>
                       </Tooltip>
                     )}
-                  </div>
+                  </>
                 ) : (
-                  <div>
+                  <>
                     <div className="todaySnapshotBox orders">
                       {ApiData?.[0]?.DineInOrderCount +
                         ApiData?.[0]?.TakeAwayOrderCount +
@@ -1699,29 +1690,27 @@ const RetailDashboard = () => {
                         <div>Pending Bills</div>
                       </div>
                     )}
-                  </div>
+                  </>
                 )}
               </div>
               <div className="quickActionsRow">
                 <div
                   onClick={() => {
                     const hasEmpAccess = EmpData?.find(
-                      (item) =>
+                      item => item.ConfigName === "Add Product" && item.ReadAccess === "Y"
-                        item.ConfigName === 'Add Product' &&
-                        item.ReadAccess === 'Y'
                     );
-                    if (!hasEmpAccess && UserType === 'Employee') {
+                    if (!hasEmpAccess && UserType === "Employee") {
-                      setMessageData('Please contact your admin to get access');
+                      setMessageData("Please contact your admin to get access");
                       setMessageType('error');
                     }
                     if (isCheckSportsApp) {
                       navigate(`${subDirectory}setting/products-master/new`);
                     }
                     if (
-                      (UserType === 'Employee' && hasEmpAccess) ||
+                      (UserType === "Employee" && hasEmpAccess) ||
-                      UserType === 'Admin' ||
+                      UserType === "Admin" ||
-                      UserType === 'Super Admin' ||
+                      UserType === "Super Admin" ||
-                      UserType === 'Super Admin User'
+                      UserType === "Super Admin User"
                     ) {
                       navigate(`${subDirectory}setting/product-master/new`);
                     }
@@ -1741,24 +1730,21 @@ const RetailDashboard = () => {
                   <div
                     onClick={() => {
                       const hasEmpAccess = EmpData?.find(
-                        (item) =>
+                        item => item.ConfigName === "Product Receipt" && item.ReadAccess === "Y"
-                          item.ConfigName === 'Product Receipt' &&
-                          item.ReadAccess === 'Y'
                       );
-                      if (!hasEmpAccess && UserType === 'Employee') {
+                      if (!hasEmpAccess && UserType === "Employee") {
-                        setMessageData(
+                        setMessageData("Please contact your admin to get access");
-                          'Please contact your admin to get access'
-                        );
                         setMessageType('error');
                       }
                       if (
-                        (UserType === 'Employee' && hasEmpAccess) ||
+                        (UserType === "Employee" && hasEmpAccess) ||
-                        UserType === 'Admin' ||
+                        UserType === "Admin" ||
-                        UserType === 'Super Admin' ||
+                        UserType === "Super Admin" ||
-                        UserType === 'Super Admin User'
+                        UserType === "Super Admin User"
                       ) {
                         navigate(`${subDirectory}setting/purchase-entry/new`);
                       }
+
                     }}
                     className="quickActionBox"
                   >
@@ -1769,19 +1755,17 @@ const RetailDashboard = () => {
                 <div
                   onClick={() => {
                     const hasEmpAccess = EmpData?.find(
-                      (item) =>
+                      item => item.ConfigName === "Daily Sales" && item.ReadAccess === "Y"
-                        item.ConfigName === 'Daily Sales' &&
-                        item.ReadAccess === 'Y'
                     );
-                    if (!hasEmpAccess && UserType === 'Employee') {
+                    if (!hasEmpAccess && UserType === "Employee") {
-                      setMessageData('Please contact your admin to get access');
+                      setMessageData("Please contact your admin to get access");
                       setMessageType('error');
                     }
                     if (
-                      (UserType === 'Employee' && hasEmpAccess) ||
+                      (UserType === "Employee" && hasEmpAccess) ||
-                      UserType === 'Admin' ||
+                      UserType === "Admin" ||
-                      UserType === 'Super Admin' ||
+                      UserType === "Super Admin" ||
-                      UserType === 'Super Admin User'
+                      UserType === "Super Admin User"
                     ) {
                       navigate(`${subDirectory}report/datewisereport`);
                     }
@@ -1795,18 +1779,17 @@ const RetailDashboard = () => {
                   className="quickActionBox"
                   onClick={() => {
                     const hasEmpAccess = EmpData?.find(
-                      (item) =>
+                      item => item.ConfigName === "Sales" && item.ReadAccess === "Y"
-                        item.ConfigName === 'Sales' && item.ReadAccess === 'Y'
                     );
-                    if (!hasEmpAccess && UserType === 'Employee') {
+                    if (!hasEmpAccess && UserType === "Employee") {
-                      setMessageData('Please contact your admin to get access');
+                      setMessageData("Please contact your admin to get access");
                       setMessageType('error');
                     }
                     if (
-                      (UserType === 'Employee' && hasEmpAccess) ||
+                      (UserType === "Employee" && hasEmpAccess) ||
-                      UserType === 'Admin' ||
+                      UserType === "Admin" ||
-                      UserType === 'Super Admin' ||
+                      UserType === "Super Admin" ||
-                      UserType === 'Super Admin User'
+                      UserType === "Super Admin User"
                     ) {
                       navigate(`${subDirectory}sales`);
                     }
@@ -2043,16 +2026,14 @@ const RetailDashboard = () => {
                           placement="bottom"
                         >
                           <div>
-                            <p>{AllProdIds?.[0]?.TotalProductCount}</p>
+                             <p>{AllProdIds?.[0]?.TotalProductCount}</p>
                             <div>TOTAL PRODUCTS</div>
                           </div>
                         </Tooltip>
                       ) : (
                         <div>
-                          <p>
+                           <p>{AllProdIds?.[0]?.TotalProductCount ||
-                            {AllProdIds?.[0]?.TotalProductCount ||
+                            AllProdIds?.length}</p>
-                              AllProdIds?.length}
-                          </p>
                           <div>TOTAL PRODUCTS</div>
                         </div>
                       )}
@@ -2203,18 +2184,7 @@ const RetailDashboard = () => {
                       Low Stock count {lowStockList?.length}
                     </div>
                   )}
-
+                  {/* <div className="notificationViewAll">View All</div> */}
-                  {!expiredList?.length && !lowStockList?.length && (
-                    <div
-                      style={{
-                        fontSize: '12px',
-                        width: '100%',
-                        textAlign: 'center',
-                      }}
-                    >
-                      Notification Empty
-                    </div>
-                  )}
                 </div>
               </div>
             )}
@@ -2414,7 +2384,7 @@ const RetailDashboard = () => {
                         </div>
                       ))
                     ) : (
-                      <div style={{ textAlign: 'center', fontSize: '12px' }}>
+                      <div style={{ textAlign: 'center' }}>
                         No Low Stock Product
                       </div>
                     )}

src/Pages/Dining/DiningList.jsx

@@ -183,7 +183,7 @@ const DiningList = () => {
       title: 'Table Name',
       dataIndex: 'TableName',
       key: 'TableName',
-      width: '120px',
+      width: '150px',
       render: (text) => <a style={{ color: 'black' }}>{text}</a>,
       filteredValue: [searchedText],
       onFilter: (value, record) => {
@@ -213,7 +213,7 @@ const DiningList = () => {
       title: 'Chair Count',
       dataIndex: 'ChairCount',
       key: 'ChairCount',
-      width: 120,
+      width: '100px',
       align: 'right',
       render: (text) => <a style={{ color: 'black' }}>{text}</a>,
       filteredValue: filteredInfo.ChairCount || null,
@@ -234,8 +234,7 @@ const DiningList = () => {
       sortOrder:
         sortedInfo.columnKey === 'DineInTypeName' ? sortedInfo.order : null,
       ellipsis: true,
-      align: 'center',
+      align: "center"
-      width: 120,
     },
     {
       title: 'Chair Level Serve',
@@ -248,8 +247,7 @@ const DiningList = () => {
       sortOrder:
         sortedInfo.columnKey === 'ChairLevelSer' ? sortedInfo.order : null,
       ellipsis: true,
-      align: 'center',
+      align: "center", 
-      width: 160,
     },
     {
       title: 'Chair Name',

src/Pages/Reports/MenuQRCode/MenuQRCode.jsx

@@ -380,7 +380,7 @@ const MenuQRCode = () => {
               style={{
                 width: 420,
                 margin: '0 auto',
-                padding: 16,
+                padding: 24,
                 background: '#fff',
                 borderRadius: 12,
                 boxShadow: '0 6px 18px rgba(0,0,0,0.08)',
@@ -392,7 +392,7 @@ const MenuQRCode = () => {
               <h3
                 style={{
                   fontSize: 16,
-                  marginBottom: 0,
+                  marginBottom: 12,
                   fontWeight: 500,
                   fontFamily: 'Poppins',
                 }}

src/Pages/Reports/PublicQrCode.jsx

@@ -10,7 +10,6 @@ import {
 } from '../../Features/ConfigMasterPage/ConfigMasterPage';
 import Buttons from '../../Components/Forms/Buttons';
 import { PlusOutlined, DownloadOutlined, EyeOutlined } from '@ant-design/icons';
-import { MdClear } from 'react-icons/md';
 import { getDineinTableData } from '../../Features/Dinein/Dinein';
 import { encryptObject, getSession } from '../../Services/Others';
 import QRCode from 'react-qr-code';
@@ -397,75 +396,24 @@ const PublicQrCode = () => {
 
       // Add content to the temporary div
       tempDiv.innerHTML = `
-<div style=" 
+                <div style="margin-bottom: 10px; border-bottom: 2px solid #eee; padding-bottom: 10px;">
-    margin: auto;
+                    ${companyLogo ? `<div style="margin-bottom: 10px;"><img id="company-logo" src="${companyLogo}" style="max-width: 120px; max-height: 80px; object-fit: contain;" crossorigin="anonymous" /></div>` : ''}
-    font-family: 'Arial', sans-serif;
+                    <h1 style="color: #333; margin: 10px 0; font-size: 24px; font-weight: bold;">${branchName ? branchName : ''}</h1>
-    background: linear-gradient(180deg, #f9fbff, #eef4ff);
+                    <p style="color: #666; margin: 5px 0; font-size: 14px;">${branchAddress ? branchAddress : ''}</p>
-    border-radius: 16px;
+                    <p style="color: #666; margin: 5px 0; font-size: 14px;"><strong>Mobile:</strong> ${branchMobile ? branchMobile : ''}</p>
-    padding: 12px;
+                </div>
-    box-shadow: 0 6px 20px rgba(0,0,0,0.12);
+                <div style="margin-bottom: 30px;">
-    text-align: center;
+                    <h2 style="color: #666; margin-bottom: 20px; font-size: 20px;">Self Booking QR Code</h2>
-">
+                </div>
-
+                <div style="margin-bottom: 30px;">
-    ${
+                    <div style="display: inline-block; padding: 20px; background: white; border-radius: 8px; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
-      companyLogo
+                        <div id="qr-code-container"></div>
-        ? `
+                    </div>
-    <div style="margin-bottom: 12px;">
+                </div>
-        <img id="company-logo"
+                <div style="margin-top: 20px;">
-            src="${companyLogo}"
+                    <p style="font-size: 12px; color: #666; word-break: break-all;">URL: ${encrypted}</p>
-            style="max-width: 140px; max-height: 90px; object-fit: contain;"
+                </div>
-            crossorigin="anonymous" />
+            `;
-    </div>`
-        : ''
-    }
-
-    <h1 style="
-        color: #2b2b2b;
-        font-size: 22px;
-        margin: 6px 0;
-        font-weight: bold;
-    ">
-        ${branchName || ''}
-    </h1>
-
-    <p style="color:#555; font-size:13px; margin:4px 0;">
-        ${branchAddress || ''}
-    </p>
-
-    <p style="color:#333; font-size:14px; margin:6px 0;">
-      <strong>${branchMobile || ''}</strong>
-    </p>
-
-    <hr style="margin:18px 0; border:none; border-top:2px dashed #d6e0ff;" />
-
-    <h2 style="
-        color:#4a6cff;
-        font-size:18px;
-        margin-bottom:14px;
-    ">
-        Scan & Book Easily 
-    </h2>
-
-    <div style="
-        display:inline-block;
-        padding:18px;
-        background:#ffffff;
-        border-radius:14px;
-        box-shadow:0 4px 12px rgba(0,0,0,0.15);
-    ">
-        <div id="qr-code-container"></div>
-    </div>
-
-    <p style="
-        margin-top:14px;
-        font-size:12px;
-        color:#777;
-        word-break:break-all;
-    ">
-        🔗 ${encrypted}
-    </p>
-</div>
-`;
 
       // Add the temporary div to the document
       document.body.appendChild(tempDiv);
@@ -762,7 +710,7 @@ const PublicQrCode = () => {
               {qrCodeUrl && (
                 <>
                   {!sportsAppPreference && (
-                    <div className="productMaster-input clearGenQRCode">
+                    <div className="productMaster-input">
                       <Buttons
                         buttonText="Clear"
                         className="secondary_Button"
@@ -776,7 +724,6 @@ const PublicQrCode = () => {
                           setPdfPreviewUrl('');
                           setIsPreviewModalOpen(false);
                         }}
-                        icon={<MdClear size={17} />}
                       >
                         CLEAR
                       </Buttons>
@@ -795,7 +742,7 @@ const PublicQrCode = () => {
                 display: 'flex',
                 flexDirection: 'column',
                 alignItems: 'center',
-                padding: '10px',
+                padding: '20px',
                 backgroundColor: '#f9f9f9',
                 borderRadius: '8px',
                 margin: '8px 0',
@@ -803,7 +750,7 @@ const PublicQrCode = () => {
             >
               <h3
                 style={{
-                  marginBottom: '16px',
+                  marginBottom: '20px',
                   color: '#333',
                   fontFamily: 'Poppins',
                   fontWeight: '500',

src/Pages/StockinHand/stockinhand.scss

@@ -86,6 +86,13 @@
     font-size: 12px;
     font-weight: 500;
     font-family: 'Poppins';
+
+    // .no-data {
+    //     text-align: center;
+    //     padding: 20px;
+    //     font-weight: 500;
+    //     color: #888;
+    // }
   }
 
   .product-table-stockinHand th {

src/Styles/DashBoard/RetailDashBoard.scss

@@ -1061,7 +1061,7 @@
     flex-direction: column;
     align-items: center;
     background-color: #fff;
-    border-radius: 8px;
+    border-radius: 12px;
     padding: 6px;
     border: 2px solid #eeeeee;
   }
@@ -1124,7 +1124,7 @@
     }
 
     @media (max-width: 768px) {
-      width: 100% !important;
+      width: 100%;
     }
   }
 
@@ -1600,9 +1600,6 @@
 .dashboardMainRight {
   flex: 0.8;
   min-width: 260px;
-  background-color: #fff;
-  padding: 12px;
-  border-radius: 8px;
 }
 
 .chartCard {
@@ -1692,19 +1689,12 @@
   gap: 0;
   margin-bottom: 1rem;
   background-color: #ffffff;
-  border-radius: 8px;
+  border-radius: 10px;
-  flex-direction: column;
-  padding: 12px;
 }
 
-.todaySnapFlex {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
 .todaySnapshotBox {
   flex: 1;
-  padding: 10px 2px;
+  padding: 16px 2px;
   text-align: center;
   font-weight: 600;
   -webkit-text-stroke-width: 0.2px;
@@ -1745,13 +1735,13 @@
   gap: 10px;
   margin-bottom: 1rem;
   background-color: #fff;
-  border-radius: 8px;
+  border-radius: 10px;
   padding: 10px;
 }
 
 .quickActionBox {
   flex: 1;
-  border-radius: 8px;
+  border-radius: 12px;
   border: 1px solid #e0e6ed;
   padding: 0.5;
   text-align: center;
@@ -1810,9 +1800,9 @@
 .salesBreakdownBox {
   flex: 1;
   background: #fff;
-  border-radius: 8px;
+  border-radius: 12px;
-  box-shadow: 0 1px 2px #e0e6ed;
+  box-shadow: 0 2px 8px #e0e6ed;
-  padding: 12px;
+  padding: 0.9rem;
   text-align: center;
   color: #686868;
   font-size: 0.85rem;
@@ -1833,6 +1823,9 @@
 
 .productSummaryCard {
   background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px #e0e6ed;
+  padding: 0px;
   margin-bottom: 0.5rem;
 }
 
@@ -1840,7 +1833,7 @@
   color: #000000;
   font-weight: 600;
   margin-bottom: 0.3rem;
-  font-size: 13px;
+  font-size: 12px;
   font-weight: 500;
 }
 
@@ -1850,7 +1843,7 @@
   gap: 0.5rem;
   flex-wrap: wrap;
   border-radius: 6px;
-  padding-top: 7px;
+  padding: 7px;
 }
 
 .productSummaryBox {
@@ -1878,6 +1871,22 @@
   }
 }
 
+// .productSummaryBox.live {
+//   background: linear-gradient(90deg, #e3fcec, #e3fcec);
+// }
+
+// .productSummaryBox.low {
+//   background: linear-gradient(90deg, #fffbe3, #fffbe3);
+// }
+
+// .productSummaryBox.nostock {
+//   background: linear-gradient(90deg, #ffe3e3, #ffe3e3);
+
+//   div {
+//     color: #e53935;
+//     font-weight: 600;
+//   }
+// }
 
 .lastbillcount {
   width: 99%;
@@ -1893,20 +1902,19 @@
 .notificationCenterCard {
   background: #fff;
   border-radius: 12px;
+  box-shadow: 0 2px 8px #e0e6ed;
   padding: 1rem;
   position: relative;
-  height: max-content;
+  height: 14vh;
-  max-height: 14vh;
   overflow: scroll;
   border: 1px solid #eeeeee;
 }
 
 .notificationCenterTitle {
-  color: #333;
+  color: #2a2a2a;
-  font-weight: 500;
+  font-weight: 600;
-  font-family: 'Poppins';
   margin-bottom: 0.5rem;
-  font-size: 13px;
+  font-size: 12px;
 }
 
 .notificationStock {
@@ -1933,7 +1941,7 @@
 .preOrderSummaryCardMain {
   display: flex;
   align-items: flex-start;
-  gap: 8px;
+  gap: 3px;
   width: 60%;
   flex-wrap: wrap;
 
@@ -1961,7 +1969,7 @@
   // flex: 1;
   width: 38%;
   background: #fff;
-  border-radius: 8px;
+  border-radius: 12px;
   box-shadow: 0 2px 8px #e0e6ed;
   padding: 0 1rem 1rem 1rem;
   position: relative;
@@ -2051,26 +2059,28 @@
 .preOrderSummaryCard {
   flex: 0.7;
   min-width: 220px;
-  border-radius: 8px;
+  border-radius: 12px;
-  background-color: #fff;
-  padding: 12px;
 }
 
 .preOrderSummaryTitle {
   font-weight: 500;
   margin-bottom: 0.2rem;
-  font-size: 13px;
+  font-size: 12px;
   color: #2a2a2a;
 }
 
 .preOrderSummaryRow {
+  padding: 10px;
   height: 16vh;
   display: flex;
   gap: 0.5rem;
+  box-shadow: 0 2px 8px #e0e6ed;
+  background: #fff;
   margin-bottom: 0.5rem;
   align-items: center;
   justify-content: center;
   border-radius: 10px;
+  border: 1px solid #eeeeee;
 }
 
 .preOrderSummaryBox {
@@ -2105,12 +2115,9 @@
 
 .creditListCardMain {
   min-width: 220px;
-  height: 25.5vh;
+  height: 23vh;
   flex: 0.7;
   overflow: scroll;
-  border-radius: 8px;
-  background-color: #fff;
-  padding: 8px;
 
   @media (max-width: 768px) {
     width: 100%;
@@ -2118,6 +2125,8 @@
 }
 
 .creditListCard {
+  padding: 1rem;
+  box-shadow: 0 2px 8px #e0e6ed;
   position: relative;
   background: #fff;
   min-width: 220px;
@@ -2125,12 +2134,14 @@
   height: 16vh;
   overflow: auto;
   scrollbar-width: thin;
+  padding-top: 0px;
+  border: 1px solid #eeeeee;
 }
 
 .creditListTitle {
   font-weight: 500;
   margin-bottom: 0.2rem;
-  font-size: 13px;
+  font-size: 12px;
   color: #2a2a2a;
 }
 
@@ -2170,9 +2181,9 @@
 
 .stockAlertsCard {
   background: #ffffff;
-  border-radius: 8px;
+  border-radius: 10px;
   box-shadow: none;
-  padding: 12px;
+  padding: 1rem 1rem 0.5rem 1rem;
   min-width: 320px;
   position: relative;
   flex: 1;
@@ -2186,8 +2197,6 @@
   position: sticky;
   top: -15px;
   background-color: #fff;
-  font-size: 13px;
-  font-weight: 500;
 }
 
 .stockAlertsHeaderRow {
@@ -2208,7 +2217,7 @@
   color: #222;
   border-bottom: 1px solid #e0e0e0;
   padding-bottom: 4px;
-  margin-bottom: 6px;
+  margin-bottom: 2px;
 }
 
 .stockAlertsRow {

src/routesConfig.jsx

@@ -267,7 +267,7 @@ const fetchComponent = async () => {
     sessionStore('userName', 'Karthiga');
     sessionStorage.setItem(
       'auth',
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiOTM2MDY0MjI0NCIsIlBhc3N3b3JkIjoiWkB6NjUzOTU0IiwiYXVkIjpbImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxMyIsImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxMiIsImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxNCIsImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxMyJdLCJleHAiOjE3Njk2MjY3NTcsImlzcyI6Imh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAwMSJ9.Zm9iKUTOTx780VfHtgXwmdz6aYl_0oRjL5DNqo2T9pI'
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiOTM2MDY0MjI0NCIsIlBhc3N3b3JkIjoiWkB6MTIzNCIsImF1ZCI6WyJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTMiLCJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTIiLCJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTQiLCJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTMiXSwiZXhwIjoxNzY5NTQwNDg2LCJpc3MiOiJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMDEifQ.dk6WOA7_jjKUv94Ni9RjMxHGgZRdpGj2QqXyyQMcFpo'
     );
 
     const AppId = getSession('AppId');
@@ -372,7 +372,7 @@ const fetchHomeComponent = async () => {
     sessionStore('userName', 'Karthiga');
     sessionStorage.setItem(
       'auth',
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiOTM2MDY0MjI0NCIsIlBhc3N3b3JkIjoiWkB6NjUzOTU0IiwiYXVkIjpbImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxMyIsImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxMiIsImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxNCIsImh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAxMyJdLCJleHAiOjE3Njk2MjY3NTcsImlzcyI6Imh0dHA6Ly8xOTIuMTY4LjEuMzc6ODAwMSJ9.Zm9iKUTOTx780VfHtgXwmdz6aYl_0oRjL5DNqo2T9pI'
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiOTM2MDY0MjI0NCIsIlBhc3N3b3JkIjoiWkB6MTIzNCIsImF1ZCI6WyJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTMiLCJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTIiLCJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTQiLCJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMTMiXSwiZXhwIjoxNzY5NTQwNDg2LCJpc3MiOiJodHRwOi8vMTkyLjE2OC4xLjM3OjgwMDEifQ.dk6WOA7_jjKUv94Ni9RjMxHGgZRdpGj2QqXyyQMcFpo'
     );
     const AppId = getSession('AppId');
     if (AppId) {

vite.config.js

@@ -23,7 +23,7 @@ export default defineConfig(({ command, mode }) => {
       envDir: "src",
       envPrefix: "ENV_",
       server: {
-        host: "192.168.1.50",
+        host: "192.168.1.22",
         port: process.env.PORT || 3015,
       },
       optimizeDeps: {