diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx
index 78151be..0c687f7 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/ListofInvoices/ListOfSalesInvoices.jsx
@@ -16,6 +16,8 @@ import { TiDelete } from 'react-icons/ti';
 import BSBillingEbill from '../BSBillingEwayBill/BSBillingEbill';
 import Search from '../../../../../Components/Forms/Search';
 import { IoEye } from 'react-icons/io5';
+// src\Styles\BookingScreen\Components\UtillComponents\BSNavBarComponents.scss
+import "../../../../../Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss"
 const { RangePicker } = DatePicker;
 
 const ListOfSalesInvoices = (props) => {
@@ -422,16 +424,6 @@ const ListOfSalesInvoices = (props) => {
                 />
               </div>
             </div>
-            {/* <Button
-                    className="BSC1Payment-HoldModel-cancleall"
-                    type="primary"
-                    danger
-                    onClick={removeAll}
-                  // onClick={() => statusFormatter(record,index)}
-    
-                  >
-                    Clear All
-                  </Button> */}
 
             <div className="BSC1Payment-Tablediv">
               <Tables
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx
index 0bd9acd..b3279a9 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSExpireProductsList.jsx
@@ -21,6 +21,7 @@ import { TbAlertTriangleFilled } from 'react-icons/tb';
 import { IoEye } from 'react-icons/io5';
 import { DefaultModal } from '../../../../Components/Modal/DefaultModal';
 import { Tables } from '../../../../Components/Tables/Table';
+ import '../../../../Styles/OverAllStyle/OverAllStyle.scss';
 
 const NoDataComponent = () => (
   <div style={{ textAlign: 'center', padding: 20 }}>
@@ -232,12 +233,12 @@ const BSExpireProductsList = () => {
     },
   ];
   const lowStockIwordCulumn = [
-     {
-          title: 'Stock Date',
-          dataIndex: 'InwardDate',
-          key: 'InwardDate',
-          render: (d) => (d ? ExtractDateFormate(d) : '-'),
-        },
+    {
+      title: 'Stock Date',
+      dataIndex: 'InwardDate',
+      key: 'InwardDate',
+      render: (d) => (d ? ExtractDateFormate(d) : '-'),
+    },
     {
       title: 'Balance Qty',
       align: 'right',
@@ -301,10 +302,12 @@ const BSExpireProductsList = () => {
         </span>
       ) : (
         (expiredList?.length > 0 || lowStockList?.length > 0) && (
-          <span style={{ position: 'relative', display: 'inline-block' }}  onClick={onClickExpiredIcon}>
+          <span
+            style={{ position: 'relative', display: 'inline-block' }}
+            onClick={onClickExpiredIcon}
+          >
             <AiFillAlert
               className="alert-badge stock-alert-animation"
-             
               style={{ fontSize: 23, cursor: 'pointer', color: '#ff4d4f' }}
             />
             {
@@ -332,7 +335,7 @@ const BSExpireProductsList = () => {
           </span>
         )
       )}
-    
+
       <Modal
         title="Low Stock / Expire Alerts"
         open={expireModelOpen}
@@ -341,6 +344,7 @@ const BSExpireProductsList = () => {
         footer={null} // You can enable this if you want default buttons
         width={700}
         centered
+        className="LowStockAlterModal"
       >
         <Messages
           messageType={message.type}
@@ -377,6 +381,7 @@ const BSExpireProductsList = () => {
         </div>
 
         <Table
+        className='LowStockAlterModalTable'
           rowKey="InwardDtlId"
           columns={
             selectedSegment === 'expired' ? expiredColumns : lowStockColumns
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx
index b83092c..6d84aae 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSNavBarDragItems.jsx
@@ -38,7 +38,7 @@ import { capitalizeFirstLetter } from '../../../../utils/calculations.js';
 const BSNavBarDragItems = ({
   type,
   drawerOpen = false,
-  setDrawerOpen = () => { },
+  setDrawerOpen = () => {},
 }) => {
   const draggingComponent = useSelector(GlobaldraggingComponent);
   const GlobalisFavClickedCheck = useSelector(GlobalisFavClicked);
@@ -73,27 +73,27 @@ const BSNavBarDragItems = ({
       BranchId: BranchId,
       ...(draggingComponent == 'sub-category'
         ? {
-          ProdCat: MapData?.[0]?.ProdCat,
-          ProductSubCatDtl: MapData.map((item, index) => ({
-            ProdSubCat: item?.ProdSubCat,
-            DisplayProdSubCatNo: index + 1,
-          })),
-        }
-        : draggingComponent == 'category'
-          ? {
-            ProductCatDtl: MapData.map((item, index) => ({
-              ProdCat: item?.ProdCat,
-              DisplayProdCatNo: index + 1,
+            ProdCat: MapData?.[0]?.ProdCat,
+            ProductSubCatDtl: MapData.map((item, index) => ({
+              ProdSubCat: item?.ProdSubCat,
+              DisplayProdSubCatNo: index + 1,
             })),
           }
+        : draggingComponent == 'category'
+          ? {
+              ProductCatDtl: MapData.map((item, index) => ({
+                ProdCat: item?.ProdCat,
+                DisplayProdCatNo: index + 1,
+              })),
+            }
           : {
-            ProdCat: MapData?.[0]?.ProdCat || null,
-            ProdSubCat: MapData?.[0]?.ProdSubCat || null,
-            ProductDtl: MapData.map((item, index) => ({
-              ProdId: item?.ProdId,
-              DisplayProductNo: index + 1,
-            })),
-          }),
+              ProdCat: MapData?.[0]?.ProdCat || null,
+              ProdSubCat: MapData?.[0]?.ProdSubCat || null,
+              ProductDtl: MapData.map((item, index) => ({
+                ProdId: item?.ProdId,
+                DisplayProductNo: index + 1,
+              })),
+            }),
 
       UpdatedBy: UserId,
     };
@@ -190,7 +190,15 @@ const BSNavBarDragItems = ({
       {Isdragging && favopen && (
         <div className="AddFavList addfavlist-master">
           <div className="AddFavList-subContainer">
-            <div style={{ display: 'flex', alignItems: 'center', gap: '5px' }}>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                gap: '5px',
+                justifyContent: 'space-between',
+                width: '100%',
+              }}
+            >
               <div className="DragChooseBTNs">
                 {PurProductdata.map((item) => (
                   <button
@@ -280,46 +288,46 @@ const BSNavBarDragItems = ({
                         (!GlobalisFavClickedCheck &&
                           draggingComponent !== 'card' &&
                           draggingComponent !== 'sub-category'))) ||
-                      (!GlobalisFavClickedCheck &&
-                        draggingComponent !== 'card' &&
-                        draggingComponent == 'sub-category') ||
-                      (!GlobalisFavClickedCheck &&
-                        draggingComponent == 'card' &&
-                        draggingComponent !== 'sub-category')
+                    (!GlobalisFavClickedCheck &&
+                      draggingComponent !== 'card' &&
+                      draggingComponent == 'sub-category') ||
+                    (!GlobalisFavClickedCheck &&
+                      draggingComponent == 'card' &&
+                      draggingComponent !== 'sub-category')
                       ? MapData?.map((item, index) => (
-                        <Draggable
-                          key={index}
-                          draggableId={index.toString()}
-                          index={index}
-                        >
-                          {(provided, snapshot) => (
-                            <div
-                              className="AddFavItemList4"
-                              ref={provided.innerRef}
-                              {...provided.draggableProps}
-                              {...provided.dragHandleProps}
-                              style={{
-                                ...provided.draggableProps.style,
-                                margin: 0,
-                                padding: '8px 12px',
-                                background: snapshot.isDragging
-                                  ? '#e0f7fa'
-                                  : '#fff',
-                                border: '1px solid #ccc',
-                                borderRadius: 4,
-                              }}
-                            >
-                              <p>
-                                {draggingComponent == 'category'
-                                  ? item?.ProdCatName
-                                  : draggingComponent == 'sub-category'
-                                    ? item?.ProdSubCatName
-                                    : item?.ProdName}
-                              </p>
-                            </div>
-                          )}
-                        </Draggable>
-                      ))
+                          <Draggable
+                            key={index}
+                            draggableId={index.toString()}
+                            index={index}
+                          >
+                            {(provided, snapshot) => (
+                              <div
+                                className="AddFavItemList4"
+                                ref={provided.innerRef}
+                                {...provided.draggableProps}
+                                {...provided.dragHandleProps}
+                                style={{
+                                  ...provided.draggableProps.style,
+                                  margin: 0,
+                                  padding: '8px 12px',
+                                  background: snapshot.isDragging
+                                    ? '#e0f7fa'
+                                    : '#fff',
+                                  border: '1px solid #ccc',
+                                  borderRadius: 4,
+                                }}
+                              >
+                                <p>
+                                  {draggingComponent == 'category'
+                                    ? item?.ProdCatName
+                                    : draggingComponent == 'sub-category'
+                                      ? item?.ProdSubCatName
+                                      : item?.ProdName}
+                                </p>
+                              </div>
+                            )}
+                          </Draggable>
+                        ))
                       : 'No Data Found'}
                     {provided.placeholder}
                   </div>
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx
index e6ef940..3ecf60b 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/BSPrinterSetting.jsx
@@ -285,7 +285,7 @@ const BSPrinterSetting = ({
                             onClick={openPrinter}
                           >
                             <button
-                              className={`printer-button ${showPrinter ? 'active' : ''}`}
+                              className={`printer-button ${showPrinter ? 'active' : ''}`} 
                             >
                               <LuPrinter
                                 size={20}
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx b/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
index c5ef7b5..407851a 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/ProductPriceChange.jsx
@@ -20,8 +20,8 @@ import { useDispatch } from 'react-redux';
 import { PutStockPrice } from '../../../../Features/StockPriceUpdate/StockPriceUpdateMaster';
 import PriceChange from '../../../../Images/PayOptImgs/PriceChange.svg';
 import { v4 as uuidv4 } from 'uuid';
-// src\Styles\BookingScreen\Template\BSLayout2\BSLayout2.scss
 import '../../../../Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss';
+import '../../../../Styles/OverAllStyle/OverAllStyle.scss';
 
 const ProductPriceChange = ({
   showButton = true,
diff --git a/src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx b/src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
index 4b076f2..c7bbee5 100644
--- a/src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
+++ b/src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
@@ -318,8 +318,7 @@ const BSLayout1 = () => {
   };
   const handleInvoiceClose = () => {
     setListOfInvoices(false);
-  };
-  // BSLayout1Data?.BookingNavbar?.[1]?.some((item) => item?.OptionName === "AddCustomer")
+  }; 
   return (
     <Suspense fallback={<CardSkeleton />}>
       {' '}
diff --git a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
index 63e91b5..32b2b3f 100644
--- a/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
+++ b/src/Pages/BookingScreen/Template/SalesCountForStandard.jsx
@@ -1,12 +1,4 @@
-import {
-  useEffect,
-  useState,
-  useMemo,
-  useCallback,
-  lazy,
-  Suspense,
-  useRef,
-} from 'react';
+import { useEffect, useState, useMemo, useCallback, lazy, useRef } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { FaChartLine, FaRupeeSign } from 'react-icons/fa';
 import { Badge, Popconfirm, Tooltip } from 'antd';
@@ -491,10 +483,10 @@ const SalesCountForStandard = React.memo(() => {
     return (
       DineInAccess?.SettingValue === 'Y' &&
       DineInOrderCount +
-      TakeAwayOrderCount +
-      SelfTakeAwayOrderCount +
-      SelfDineInOrderCount >
-      0 &&
+        TakeAwayOrderCount +
+        SelfTakeAwayOrderCount +
+        SelfDineInOrderCount >
+        0 &&
       (takeAwayPreference || dinePreference)
     );
   }, [DineInAccess, sales, dinePreference, takeAwayPreference]);
@@ -588,721 +580,716 @@ const SalesCountForStandard = React.memo(() => {
   };
 
   return (
-    <Suspense fallback={<div>Loading...</div>}>
-      <div className="NewLayoutBillContainer">
-        <Messages
-          messageType={messageType}
-          messageData={messageData}
-          onComplete={onComplete}
-        />
-        <div className="LicenseActive">
-          <div>
-            {showSalesTooltip ? (
-              <Tooltip
-                className="NetAmountNew"
-                placement="bottom"
-                title={
-                  <div style={{ display: 'flex', gap: '1rem' }}>
-                    {takeAwayPreference && (
-                      <div style={{ display: 'flex', gap: '5px' }}>
-                        <div>Takeaway:</div>
-                        <div>{TakeAwayOrderCount + SelfTakeAwayOrderCount}</div>
-                      </div>
-                    )}
-                    {dinePreference && (
-                      <div style={{ display: 'flex', gap: '5px' }}>
-                        <div>Dine-in:</div>
-                        <div>{DineInOrderCount + SelfDineInOrderCount}</div>
-                      </div>
-                    )}
-                  </div>
-                }
-                onClick={() =>
-                  (OverAllOrderCount || 0) > 0 && setIsModalOpen(true)
-                }
-              >
-                <FaChartLine color="#fde047" />
-                <div className="NetAmountNew">
-                  {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount}
-                </div>
-              </Tooltip>
-            ) : (
-              <div
-                style={{
-                  display: 'flex',
-                  gap: '5px',
-                  alignItems: 'center',
-                  fontSize: '0.9rem',
-                  cursor: 'pointer',
-                }}
-                onClick={() =>
-                  (OverAllOrderCount || 0) > 0 && setIsModalOpen(true)
-                }
-              >
-                <FaChartLine color="#ffffffff" />
-                <div className="NetAmountNew">
-                  {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount}
-                </div>
-              </div>
-            )}
-          </div>
-        </div>
-
-        {/* Rest of your component remains the same */}
-        {DineInAccess?.SettingValue === 'Y' &&
-          takeAwayPreference &&
-          (TakeAwayOrderCount || SelfTakeAwayOrderCount || PreOrderAmount) >
-          0 && (
+    <div className="NewLayoutBillContainer">
+      <Messages
+        messageType={messageType}
+        messageData={messageData}
+        onComplete={onComplete}
+      />
+      <div className="LicenseActive">
+        <div>
+          {showSalesTooltip ? (
             <Tooltip
-              className="standardTooltipDineIN"
-              title={renderBreakdown([
-                {
-                  label: 'Admin + Staff :',
-                  value: TakeAwayAmount,
-                  includeInTotal: true,
-                },
-                {
-                  label: 'Self Booking :',
-                  value: SelfTakeAwayAmount,
-                  includeInTotal: true,
-                },
-                {
-                  label: 'Preorder :',
-                  value: PreOrderAmount,
-                  includeInTotal: true,
-                },
-                {
-                  label: 'Offer(-) :',
-                  value: -OverAllTakeAwayOfferAmount,
-                  includeInTotal: true,
-                },
-              ])}
+              className="NetAmountNew"
+              placement="bottom"
+              title={
+                <div style={{ display: 'flex', gap: '1rem' }}>
+                  {takeAwayPreference && (
+                    <div style={{ display: 'flex', gap: '5px' }}>
+                      <div>Takeaway:</div>
+                      <div>{TakeAwayOrderCount + SelfTakeAwayOrderCount}</div>
+                    </div>
+                  )}
+                  {dinePreference && (
+                    <div style={{ display: 'flex', gap: '5px' }}>
+                      <div>Dine-in:</div>
+                      <div>{DineInOrderCount + SelfDineInOrderCount}</div>
+                    </div>
+                  )}
+                </div>
+              }
+              onClick={() =>
+                (OverAllOrderCount || 0) > 0 && setIsModalOpen(true)
+              }
             >
-              <div
-                className="standardTooltipDineIN"
-                style={{
-                  display: 'flex',
-                  gap: '5px',
-                  fontSize: '14px',
-                  color: '#fff',
-                }}
-              >
-                <div>{isMobile ? 'TA' : 'Take Away'} : </div>
-                <div>{`₹ ${safeRound(totalTakeAway)}`}</div>
+              <FaChartLine color="#fde047" />
+              <div className="NetAmountNew">
+                {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount}
               </div>
             </Tooltip>
-          )}
-
-        {DineInAccess?.SettingValue === 'Y' &&
-          dinePreference &&
-          (DineInOrderCount || SelfDineInOrderCount) > 0 && (
-            <Tooltip
-              className="standardTooltipDineIN"
-              title={renderBreakdown([
-                {
-                  label: 'Admin + Staff :',
-                  value: DineInAmount,
-                  includeInTotal: true,
-                },
-                {
-                  label: 'Self Booking :',
-                  value: SelfDineInAmount,
-                  includeInTotal: true,
-                },
-                {
-                  label: 'Offer(-) :',
-                  value: -OverAllDineInOfferAmount,
-                  includeInTotal: true,
-                },
-              ])}
-            >
-              <div
-                className="standardTooltipDineIN"
-                style={{
-                  display: 'flex',
-                  gap: '5px',
-                  fontSize: '14px',
-                  color: '#fff',
-                }}
-              >
-                <div>{isMobile ? 'DI' : 'Dine In'} : </div>
-                <div>{`₹ ${safeRound(totalDineIn)}`}</div>
-              </div>
-            </Tooltip>
-          )}
-
-        <div className="NetAmountIcons-Main">
-          <div
-            className="FaRupeeSign"
-            onClick={() => netAmount > 0 && setIsNetAmtModalOpen(true)}
-            style={{ cursor: 'pointer' }}
-          >
-            <FaRupeeSign color="#ffffffff" />
-            <div className="NetAmountNew">
-              {isMobile ? 'NA' : 'Net Amount'} : ₹ {safeRound(netAmount)}
-            </div>
-          </div>
-        </div>
-        {TableData?.length > 0 && !sportsAppPreference && AutoReceiveStock && (
-          <button
-            className="blink blinkStock"
-            onClick={() => setIsReceivedModelOpen(true)}
-          >
-            <MdOutlineCallReceived />
-            Stock
-          </button>
-        )}
-        {preferenceshortcutkey && (
-          <div className="KeyshortCutNav3">
-            <ShortcutKeyHelper />
-          </div>
-        )}
-        <AllSalesPageSettings />
-        <div style={{ display: 'flex', alignItems: 'center' }}>
-          {Customisebillno && <CustomisedInvoiceChange />}
-          {SessionData?.FeatureAddonData?.FeatureDtls?.find(
-            (item) => item?.FeatureAddonName?.toLowerCase() === 'kiosk sales'
-          ) &&
-            !sportsAppPreference && (
-              <div
-                style={{
-                  pointerEvents: OrderStatus > 0 ? 'none' : 'auto',
-                  opacity: OrderStatus > 0 ? 0.5 : 1,
-                }}
-              >
-                {!OtherServicesglobal && (
-                  <Tooltip title={'Kiosk Sales'}>
-                    <Badge count={badgeCount} offset={[-10, 3]} size="small">
-                      <PozoKioskIcon
-                        onClick={() => openModalKiosk()}
-                        style={{ cursor: 'pointer', fontSize: '1.5rem' }}
-                        className="iconsize"
-                      />
-                    </Badge>
-                  </Tooltip>
-                )}
-              </div>
-            )}
-          {Kioskopen && (
-            <BSKioskCounterPayment
-              Kioskopen={Kioskopen}
-              closeKioskModal={closeModalKiosk}
-            />
-          )}
-          <ProductPriceChange />
-          {!OtherServicesglobal && !sportsAppPreference && (
-            <TooltipWrapper title={'Low Stock Alerts'} isMobile={isMobile}>
-              {' '}
-              <BSExpireProductsList />
-            </TooltipWrapper>
-          )}
-
-          {!OtherServicesglobal && (
-            <>
-              {CheckBookingStatus == 'Open' ? (
-                <div style={{ marginLeft: '10px' }}>
-                  <TooltipWrapper title={'Booking Close'} isMobile={isMobile}>
-                    {' '}
-                    <BookingCloseIcon
-                      onClick={OpenBookingModal}
-                      bgFill={'#52c41a'}
-                      style={{
-                        fontSize: '16px',
-                        marginTop: '4px',
-                        color: '#52c41a',
-                        cursor: 'pointer',
-                      }}
-                    />
-                  </TooltipWrapper>
-                </div>
-              ) : (
-                <div style={{ marginLeft: '10px' }}>
-                  <TooltipWrapper title="Booking Open" isMobile={isMobile}>
-                    <Popconfirm
-                      placement="leftTop"
-                      title="Booking Open"
-                      description="Are you sure you want to Open the sales?"
-                      okText="Yes"
-                      cancelText="No"
-                      onConfirm={() => BookingOpenFun('Open')}
-                    >
-                      <span>
-                        <BookingCloseIcon
-                          bgFill="red"
-                          style={{
-                            fontSize: '16px',
-                            marginTop: '4px',
-                            color: '#52c41a',
-                            cursor: 'pointer',
-                          }}
-                        />
-                      </span>
-                    </Popconfirm>
-                  </TooltipWrapper>
-                </div>
-              )}
-              {!sportsAppPreference && (
-                <div style={{ marginLeft: '10px' }}>
-                  <TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
-                    {''}
-                    <BSEwayBillicon
-                      style={{ cursor: 'pointer', marginTop: '5px' }}
-                      onClick={OpenListOfInvoices}
-                    />
-                  </TooltipWrapper>
-                </div>
-              )}
-            </>
-          )}
-
-          {BookingModalOpen && (
-            <RetailBookingClosing
-              PaymentOpen={BookingModalOpen}
-              PaymentClose={HandleBookingModalClose}
-            />
-          )}
-          {ListOfInvoices && (
-            <ListOfSalesInvoices
-              ListOfInvoicesOpen={ListOfInvoices}
-              handleInvoiceClose={handleInvoiceClose}
-            />
-          )}
-        </div>
-
-        {/* Modal with table for multiple bookings */}
-
-        <DefaultModal
-          open={isModalOpen}
-          title="Sales Details"
-          handleCancel={() => setIsModalOpen(false)}
-          handleSubmit={() => setIsModalOpen(false)}
-          width={700}
-          footer={false}
-        >
-          <div style={{ overflowX: 'auto' }}>
-            <table
+          ) : (
+            <div
               style={{
-                width: '100%',
-                borderCollapse: 'collapse',
-                fontFamily: "'Segoe UI', Roboto, sans-serif",
+                display: 'flex',
+                gap: '5px',
+                alignItems: 'center',
+                fontSize: '0.9rem',
+                cursor: 'pointer',
+              }}
+              onClick={() =>
+                (OverAllOrderCount || 0) > 0 && setIsModalOpen(true)
+              }
+            >
+              <FaChartLine color="#ffffffff" />
+              <div className="NetAmountNew">
+                {isMobile ? 'Count' : 'Sales Count'} : {OverAllOrderCount}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+
+      {/* Rest of your component remains the same */}
+      {DineInAccess?.SettingValue === 'Y' &&
+        takeAwayPreference &&
+        (TakeAwayOrderCount || SelfTakeAwayOrderCount || PreOrderAmount) >
+          0 && (
+          <Tooltip
+            className="standardTooltipDineIN"
+            title={renderBreakdown([
+              {
+                label: 'Admin + Staff :',
+                value: TakeAwayAmount,
+                includeInTotal: true,
+              },
+              {
+                label: 'Self Booking :',
+                value: SelfTakeAwayAmount,
+                includeInTotal: true,
+              },
+              {
+                label: 'Preorder :',
+                value: PreOrderAmount,
+                includeInTotal: true,
+              },
+              {
+                label: 'Offer(-) :',
+                value: -OverAllTakeAwayOfferAmount,
+                includeInTotal: true,
+              },
+            ])}
+          >
+            <div
+              className="standardTooltipDineIN"
+              style={{
+                display: 'flex',
+                gap: '5px',
                 fontSize: '14px',
-                borderRadius: '8px',
-                overflow: 'hidden',
-                boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
+                color: '#fff',
               }}
             >
-              <thead>
-                <tr style={{ backgroundColor: '#003366', color: '#fff' }}>
-                  <th style={{ border: '1px solid #ddd', padding: '10px' }}>
-                    S.No
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '10px' }}>
-                    Order ID
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '10px' }}>
-                    Customer
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '10px' }}>
-                    Mobile
-                  </th>
-                  {/* <th style={{ border: "1px solid #ddd", padding: "10px" }}>Booked By</th> */}
-                  <th style={{ border: '1px solid #ddd', padding: '10px' }}>
-                    Payment Type
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '10px' }}>
-                    Amount (₹)
-                  </th>
-                </tr>
-              </thead>
+              <div>{isMobile ? 'TA' : 'Take Away'} : </div>
+              <div>{`₹ ${safeRound(totalTakeAway)}`}</div>
+            </div>
+          </Tooltip>
+        )}
 
-              <tbody>
-                {currentData?.length > 0 ? (
-                  currentData?.map((item, index) => (
-                    <tr
-                      key={item.OrderId}
-                      style={{
-                        backgroundColor:
-                          index % 2 === 0 ? '#f7faff' : '#e9f1ff',
-                        textAlign: 'center',
-                        transition: 'background 0.3s',
-                      }}
-                      onMouseEnter={(e) =>
-                        (e.currentTarget.style.backgroundColor = '#d6e4ff')
-                      }
-                      onMouseLeave={(e) =>
+      {DineInAccess?.SettingValue === 'Y' &&
+        dinePreference &&
+        (DineInOrderCount || SelfDineInOrderCount) > 0 && (
+          <Tooltip
+            className="standardTooltipDineIN"
+            title={renderBreakdown([
+              {
+                label: 'Admin + Staff :',
+                value: DineInAmount,
+                includeInTotal: true,
+              },
+              {
+                label: 'Self Booking :',
+                value: SelfDineInAmount,
+                includeInTotal: true,
+              },
+              {
+                label: 'Offer(-) :',
+                value: -OverAllDineInOfferAmount,
+                includeInTotal: true,
+              },
+            ])}
+          >
+            <div
+              className="standardTooltipDineIN"
+              style={{
+                display: 'flex',
+                gap: '5px',
+                fontSize: '14px',
+                color: '#fff',
+              }}
+            >
+              <div>{isMobile ? 'DI' : 'Dine In'} : </div>
+              <div>{`₹ ${safeRound(totalDineIn)}`}</div>
+            </div>
+          </Tooltip>
+        )}
+
+      <div className="NetAmountIcons-Main">
+        <div
+          className="FaRupeeSign"
+          onClick={() => netAmount > 0 && setIsNetAmtModalOpen(true)}
+          style={{ cursor: 'pointer' }}
+        >
+          <FaRupeeSign color="#ffffffff" />
+          <div className="NetAmountNew">
+            {isMobile ? 'NA' : 'Net Amount'} : ₹ {safeRound(netAmount)}
+          </div>
+        </div>
+      </div>
+      {TableData?.length > 0 && !sportsAppPreference && AutoReceiveStock && (
+        <button
+          className="blink blinkStock"
+          onClick={() => setIsReceivedModelOpen(true)}
+        >
+          <MdOutlineCallReceived />
+          Stock
+        </button>
+      )}
+      {preferenceshortcutkey && (
+        <div className="KeyshortCutNav3">
+          <ShortcutKeyHelper />
+        </div>
+      )}
+      <AllSalesPageSettings />
+      <div style={{ display: 'flex', alignItems: 'center' }}>
+        {Customisebillno && <CustomisedInvoiceChange />}
+        {SessionData?.FeatureAddonData?.FeatureDtls?.find(
+          (item) => item?.FeatureAddonName?.toLowerCase() === 'kiosk sales'
+        ) &&
+          !sportsAppPreference && (
+            <div
+              style={{
+                pointerEvents: OrderStatus > 0 ? 'none' : 'auto',
+                opacity: OrderStatus > 0 ? 0.5 : 1,
+              }}
+            >
+              {!OtherServicesglobal && (
+                <Tooltip title={'Kiosk Sales'}>
+                  <Badge count={badgeCount} offset={[-10, 3]} size="small">
+                    <PozoKioskIcon
+                      onClick={() => openModalKiosk()}
+                      style={{ cursor: 'pointer', fontSize: '1.5rem' }}
+                      className="iconsize"
+                    />
+                  </Badge>
+                </Tooltip>
+              )}
+            </div>
+          )}
+        {Kioskopen && (
+          <BSKioskCounterPayment
+            Kioskopen={Kioskopen}
+            closeKioskModal={closeModalKiosk}
+          />
+        )}
+        <ProductPriceChange />
+        {!OtherServicesglobal && !sportsAppPreference && (
+          <TooltipWrapper title={'Low Stock Alerts'} isMobile={isMobile}>
+            {' '}
+            <BSExpireProductsList />
+          </TooltipWrapper>
+        )}
+
+        {!OtherServicesglobal && (
+          <>
+            {CheckBookingStatus == 'Open' ? (
+              <div style={{ marginLeft: '10px' }}>
+                <TooltipWrapper title={'Booking Close'} isMobile={isMobile}>
+                  {' '}
+                  <BookingCloseIcon
+                    onClick={OpenBookingModal}
+                    bgFill={'#52c41a'}
+                    style={{
+                      fontSize: '16px',
+                      marginTop: '4px',
+                      color: '#52c41a',
+                      cursor: 'pointer',
+                    }}
+                  />
+                </TooltipWrapper>
+              </div>
+            ) : (
+              <div style={{ marginLeft: '10px' }}>
+                <TooltipWrapper title="Booking Open" isMobile={isMobile}>
+                  <Popconfirm
+                    placement="leftTop"
+                    title="Booking Open"
+                    description="Are you sure you want to Open the sales?"
+                    okText="Yes"
+                    cancelText="No"
+                    onConfirm={() => BookingOpenFun('Open')}
+                  >
+                    <span>
+                      <BookingCloseIcon
+                        bgFill="red"
+                        style={{
+                          fontSize: '16px',
+                          marginTop: '4px',
+                          color: '#52c41a',
+                          cursor: 'pointer',
+                        }}
+                      />
+                    </span>
+                  </Popconfirm>
+                </TooltipWrapper>
+              </div>
+            )}
+            {!sportsAppPreference && (
+              <div style={{ marginLeft: '10px' }}>
+                <TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
+                  {''}
+                  <BSEwayBillicon
+                    style={{ cursor: 'pointer', marginTop: '5px' }}
+                    onClick={OpenListOfInvoices}
+                  />
+                </TooltipWrapper>
+              </div>
+            )}
+          </>
+        )}
+
+        {BookingModalOpen && (
+          <RetailBookingClosing
+            PaymentOpen={BookingModalOpen}
+            PaymentClose={HandleBookingModalClose}
+          />
+        )}
+        {ListOfInvoices && (
+          <ListOfSalesInvoices
+            ListOfInvoicesOpen={ListOfInvoices}
+            handleInvoiceClose={handleInvoiceClose}
+          />
+        )}
+      </div>
+
+      {/* Modal with table for multiple bookings */}
+
+      <DefaultModal
+        open={isModalOpen}
+        title="Sales Details"
+        handleCancel={() => setIsModalOpen(false)}
+        handleSubmit={() => setIsModalOpen(false)}
+        width={700}
+        footer={false}
+      >
+        <div style={{ overflowX: 'auto' }}>
+          <table
+            style={{
+              width: '100%',
+              borderCollapse: 'collapse',
+              fontFamily: "'Segoe UI', Roboto, sans-serif",
+              fontSize: '14px',
+              borderRadius: '8px',
+              overflow: 'hidden',
+              boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
+            }}
+          >
+            <thead>
+              <tr style={{ backgroundColor: '#003366', color: '#fff' }}>
+                <th style={{ border: '1px solid #ddd', padding: '10px' }}>
+                  S.No
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '10px' }}>
+                  Order ID
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '10px' }}>
+                  Customer
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '10px' }}>
+                  Mobile
+                </th>
+                {/* <th style={{ border: "1px solid #ddd", padding: "10px" }}>Booked By</th> */}
+                <th style={{ border: '1px solid #ddd', padding: '10px' }}>
+                  Payment Type
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '10px' }}>
+                  Amount (₹)
+                </th>
+              </tr>
+            </thead>
+
+            <tbody>
+              {currentData?.length > 0 ? (
+                currentData?.map((item, index) => (
+                  <tr
+                    key={item.OrderId}
+                    style={{
+                      backgroundColor: index % 2 === 0 ? '#f7faff' : '#e9f1ff',
+                      textAlign: 'center',
+                      transition: 'background 0.3s',
+                    }}
+                    onMouseEnter={(e) =>
+                      (e.currentTarget.style.backgroundColor = '#d6e4ff')
+                    }
+                    onMouseLeave={(e) =>
                       (e.currentTarget.style.backgroundColor =
                         index % 2 === 0 ? '#f7faff' : '#e9f1ff')
-                      }
-                    >
-                      <td style={{ border: '1px solid #ddd', padding: '8px' }}>
-                        {startIndex + index + 1}
-                      </td>
-                      <td style={{ border: '1px solid #ddd', padding: '8px' }}>
-                        {extractLastNumberOrderId(item.OrderId)}
-                      </td>
-                      <td style={{ border: '1px solid #ddd', padding: '8px' }}>
-                        {item.CustName || '—'}
-                      </td>
-                      <td style={{ border: '1px solid #ddd', padding: '8px' }}>
-                        {item.CustMobile || '—'}
-                      </td>
-                      {/* <td style={{ border: "1px solid #ddd", padding: "8px" }}>
+                    }
+                  >
+                    <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                      {startIndex + index + 1}
+                    </td>
+                    <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                      {extractLastNumberOrderId(item.OrderId)}
+                    </td>
+                    <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                      {item.CustName || '—'}
+                    </td>
+                    <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                      {item.CustMobile || '—'}
+                    </td>
+                    {/* <td style={{ border: "1px solid #ddd", padding: "8px" }}>
                                             {item.BookedBy || "—"}
                                         </td> */}
-                      <td style={{ border: '1px solid #ddd', padding: '8px' }}>
-                        {item.PaymentTypeName || '—'}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          padding: '8px',
-                          fontWeight: '600',
-                          color: '#2e7d32',
-                          backgroundColor: '#eaf6ea',
-                        }}
-                      >
-                        ₹{item.Amount?.toLocaleString()}
-                      </td>
-                    </tr>
-                  ))
-                ) : (
-                  <tr>
+                    <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                      {item.PaymentTypeName || '—'}
+                    </td>
                     <td
-                      colSpan="7"
                       style={{
-                        textAlign: 'center',
-                        padding: '12px',
                         border: '1px solid #ddd',
-                        color: '#888',
+                        padding: '8px',
+                        fontWeight: '600',
+                        color: '#2e7d32',
+                        backgroundColor: '#eaf6ea',
                       }}
                     >
-                      No booking data available
+                      ₹{item.Amount?.toLocaleString()}
                     </td>
                   </tr>
-                )}
-              </tbody>
-            </table>
-
-            {/* Pagination */}
-            {totalPages > 1 && (
-              <div
-                style={{
-                  marginTop: '12px',
-                  display: 'flex',
-                  justifyContent: 'center',
-                  alignItems: 'center',
-                  gap: '8px',
-                }}
-              >
-                {currentPage == 1 ? (
-                  ''
-                ) : (
-                  <button
-                    onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
-                    disabled={currentPage === 1}
+                ))
+              ) : (
+                <tr>
+                  <td
+                    colSpan="7"
                     style={{
-                      padding: '5px 10px',
-                      backgroundColor: '#003366',
-                      color: '#fff',
-                      border: 'none',
-                      borderRadius: '4px',
-                      cursor: currentPage === 1 ? 'not-allowed' : 'pointer',
-                      opacity: currentPage === 1 ? 0.5 : 1,
+                      textAlign: 'center',
+                      padding: '12px',
+                      border: '1px solid #ddd',
+                      color: '#888',
                     }}
                   >
-                    Prev
-                  </button>
-                )}
-
-                <span style={{ fontWeight: '600' }}>
-                  Page {currentPage} of {totalPages}
-                </span>
+                    No booking data available
+                  </td>
+                </tr>
+              )}
+            </tbody>
+          </table>
 
+          {/* Pagination */}
+          {totalPages > 1 && (
+            <div
+              style={{
+                marginTop: '12px',
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+                gap: '8px',
+              }}
+            >
+              {currentPage == 1 ? (
+                ''
+              ) : (
                 <button
-                  onClick={() =>
-                    setCurrentPage((p) => Math.min(p + 1, totalPages))
-                  }
-                  disabled={currentPage === totalPages}
+                  onClick={() => setCurrentPage((p) => Math.max(p - 1, 1))}
+                  disabled={currentPage === 1}
                   style={{
                     padding: '5px 10px',
                     backgroundColor: '#003366',
                     color: '#fff',
                     border: 'none',
                     borderRadius: '4px',
-                    cursor:
-                      currentPage === totalPages ? 'not-allowed' : 'pointer',
-                    opacity: currentPage === totalPages ? 0.5 : 1,
+                    cursor: currentPage === 1 ? 'not-allowed' : 'pointer',
+                    opacity: currentPage === 1 ? 0.5 : 1,
                   }}
                 >
-                  Next
+                  Prev
                 </button>
-              </div>
-            )}
-          </div>
-        </DefaultModal>
+              )}
 
-        {/* Modal with table for multiple Net Amt */}
+              <span style={{ fontWeight: '600' }}>
+                Page {currentPage} of {totalPages}
+              </span>
 
-        <DefaultModal
-          open={isNetAmtModalOpen}
-          title="Sales Net Amount"
-          handleCancel={() => setIsNetAmtModalOpen(false)}
-          handleSubmit={() => setIsNetAmtModalOpen(false)}
-          width={800}
-          footer={false}
-        >
-          <div style={{ overflowX: 'auto' }}>
-            <table
-              style={{
-                width: '100%',
-                borderCollapse: 'collapse',
-                textAlign: 'center',
-                fontFamily: "'Segoe UI', Roboto, sans-serif",
-                fontSize: '14px',
-                borderRadius: '8px',
-                overflow: 'hidden',
-                boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
-              }}
-            >
-              <thead>
-                <tr style={{ backgroundColor: '#003366', color: '#fff' }}>
-                  <th
-                    colSpan="2"
-                    style={{ border: '1px solid #ddd', padding: '10px' }}
-                  >
-                    Cash
-                  </th>
-                  <th
-                    colSpan="2"
-                    style={{ border: '1px solid #ddd', padding: '10px' }}
-                  >
-                    UPI
-                  </th>
-                  <th
-                    colSpan="2"
-                    style={{ border: '1px solid #ddd', padding: '10px' }}
-                  >
-                    Card
-                  </th>
-                  <th
-                    colSpan="2"
-                    style={{ border: '1px solid #ddd', padding: '10px' }}
-                  >
-                    Credit
-                  </th>
-                  <th
-                    colSpan="2"
-                    style={{ border: '1px solid #ddd', padding: '10px' }}
-                  >
-                    Business UPI
-                  </th>
-                  <th
-                    rowSpan="2"
+              <button
+                onClick={() =>
+                  setCurrentPage((p) => Math.min(p + 1, totalPages))
+                }
+                disabled={currentPage === totalPages}
+                style={{
+                  padding: '5px 10px',
+                  backgroundColor: '#003366',
+                  color: '#fff',
+                  border: 'none',
+                  borderRadius: '4px',
+                  cursor:
+                    currentPage === totalPages ? 'not-allowed' : 'pointer',
+                  opacity: currentPage === totalPages ? 0.5 : 1,
+                }}
+              >
+                Next
+              </button>
+            </div>
+          )}
+        </div>
+      </DefaultModal>
+
+      {/* Modal with table for multiple Net Amt */}
+
+      <DefaultModal
+        open={isNetAmtModalOpen}
+        title="Sales Net Amount"
+        handleCancel={() => setIsNetAmtModalOpen(false)}
+        handleSubmit={() => setIsNetAmtModalOpen(false)}
+        width={800}
+        footer={false}
+      >
+        <div style={{ overflowX: 'auto' }}>
+          <table
+            style={{
+              width: '100%',
+              borderCollapse: 'collapse',
+              textAlign: 'center',
+              fontFamily: "'Segoe UI', Roboto, sans-serif",
+              fontSize: '14px',
+              borderRadius: '8px',
+              overflow: 'hidden',
+              boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
+            }} 
+            className='SCTableInPageSales'
+          >
+            <thead>
+              <tr style={{ backgroundColor: '#2c88ee', color: '#fff' }}>
+                <th
+                  colSpan="2"
+                  style={{ border: '1px solid #ddd', padding: '10px' }}
+                >
+                  Cash
+                </th>
+                <th
+                  colSpan="2"
+                  style={{ border: '1px solid #ddd', padding: '10px' }}
+                >
+                  UPI
+                </th>
+                <th
+                  colSpan="2"
+                  style={{ border: '1px solid #ddd', padding: '10px' }}
+                >
+                  Card
+                </th>
+                <th
+                  colSpan="2"
+                  style={{ border: '1px solid #ddd', padding: '10px' }}
+                >
+                  Credit
+                </th>
+                <th
+                  colSpan="2"
+                  style={{ border: '1px solid #ddd', padding: '10px' }}
+                >
+                  Business UPI
+                </th>
+                <th
+                  rowSpan="2"
+                  style={{
+                    border: '1px solid #ddd',
+                    padding: '10px',
+                    backgroundColor: '#055ec0',
+                    color: '#fff',
+                  }}
+                >
+                  Total
+                </th>
+              </tr>
+              <tr style={{ backgroundColor: '#2c88ee', color: '#fff' }}>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Count
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Amt
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Count
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Amt
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Count
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Amt
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Count
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Amt
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Count
+                </th>
+                <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+                  Amt
+                </th>
+              </tr>
+            </thead>
+
+            <tbody>
+              {orderDetails?.map((item, index) => {
+                const total =
+                  (item.CashAmount || 0) +
+                  (item.UpiAmount || 0) +
+                  (item.CardAmount || 0) +
+                  (item.CreditAmount || 0);
+
+                return (
+                  <tr
+                    key={index}
                     style={{
-                      border: '1px solid #ddd',
-                      padding: '10px',
-                      backgroundColor: '#002244',
-                      color: '#fff',
+                      backgroundColor: index % 2 === 0 ? '#f7faff' : '#ffffff',
+                      transition: 'background 0.3s',
                     }}
-                  >
-                    Total
-                  </th>
-                </tr>
-                <tr style={{ backgroundColor: '#004080', color: '#fff' }}>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Count
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Amt
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Count
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Amt
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Count
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Amt
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Count
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Amt
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Count
-                  </th>
-                  <th style={{ border: '1px solid #ddd', padding: '8px' }}>
-                    Amt
-                  </th>
-                </tr>
-              </thead>
-
-              <tbody>
-                {orderDetails?.map((item, index) => {
-                  const total =
-                    (item.CashAmount || 0) +
-                    (item.UpiAmount || 0) +
-                    (item.CardAmount || 0) +
-                    (item.CreditAmount || 0);
-
-                  return (
-                    <tr
-                      key={index}
-                      style={{
-                        backgroundColor:
-                          index % 2 === 0 ? '#f7faff' : '#ffffff',
-                        transition: 'background 0.3s',
-                      }}
-                      onMouseEnter={(e) =>
-                        (e.currentTarget.style.backgroundColor = '#e6f2ff')
-                      }
-                      onMouseLeave={(e) =>
+                    onMouseEnter={(e) =>
+                      (e.currentTarget.style.backgroundColor = '#e6f2ff')
+                    }
+                    onMouseLeave={(e) =>
                       (e.currentTarget.style.backgroundColor =
                         index % 2 === 0 ? '#f7faff' : '#ffffff')
-                      }
+                    }
+                  >
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
                     >
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.CashCount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.CashAmount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.UpiCount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.UpiAmount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.CardCount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.CardAmount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.CreditCount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.CreditAmount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.BusinessUpiCount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          fontWeight: '700',
-                          padding: '8px',
-                        }}
-                      >
-                        {item.BusinessUpiAmount}
-                      </td>
-                      <td
-                        style={{
-                          border: '1px solid #ddd',
-                          padding: '8px',
-                          fontWeight: '700',
-                          backgroundColor: '#eaf6ea',
-                          color: '#2e7d32',
-                        }}
-                      >
-                        {total}
-                      </td>
-                    </tr>
-                  );
-                })}
-              </tbody>
-            </table>
-          </div>
-        </DefaultModal>
+                      {item.CashCount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.CashAmount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.UpiCount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.UpiAmount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.CardCount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.CardAmount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.CreditCount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.CreditAmount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.BusinessUpiCount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        fontWeight: '700',
+                        padding: '8px',
+                      }}
+                    >
+                      {item.BusinessUpiAmount}
+                    </td>
+                    <td
+                      style={{
+                        border: '1px solid #ddd',
+                        padding: '8px',
+                        fontWeight: '700',
+                        backgroundColor: '#eaf6ea',
+                        color: '#2e7d32',
+                      }}
+                    >
+                      {total}
+                    </td>
+                  </tr>
+                );
+              })}
+            </tbody>
+          </table>
+        </div>
+      </DefaultModal>
 
-        <ReceivedStocksModal
-          open={isReceivedModelOpen}
-          onClose={() => {
-            setIsReceivedModelOpen(false);
-          }}
-          columns={columns}
-          tableData={TableData}
-          handlePageChange={handlePageChange}
-          customTable={false}
-        />
+      <ReceivedStocksModal
+        open={isReceivedModelOpen}
+        onClose={() => {
+          setIsReceivedModelOpen(false);
+        }}
+        columns={columns}
+        tableData={TableData}
+        handlePageChange={handlePageChange}
+        customTable={false}
+      />
 
-        <ProductDetailsModal
-          open={ProductDetailsModel}
-          onClose={handleModalCancel}
-          productDetails={modalProductDetails}
-          headerData={{
-            dateTime: dateFormatChange1(
-              TableData?.[SelectedIndex]?.CreatedDate
-            ),
-            fromBranch: TableData?.[SelectedIndex]?.FromBranchName,
-            Dispatch_Id: TableData?.[SelectedIndex]?.DispatchId,
-            Created_By: TableData?.[SelectedIndex]?.Created_By,
-          }}
-          onDataChange={(d) => setModalProductDetails(d)}
-          onSubmit={handleModalSubmit}
-        />
-      </div>
-    </Suspense>
+      <ProductDetailsModal
+        open={ProductDetailsModel}
+        onClose={handleModalCancel}
+        productDetails={modalProductDetails}
+        headerData={{
+          dateTime: dateFormatChange1(TableData?.[SelectedIndex]?.CreatedDate),
+          fromBranch: TableData?.[SelectedIndex]?.FromBranchName,
+          Dispatch_Id: TableData?.[SelectedIndex]?.DispatchId,
+          Created_By: TableData?.[SelectedIndex]?.Created_By,
+        }}
+        onDataChange={(d) => setModalProductDetails(d)}
+        onSubmit={handleModalSubmit}
+      />
+    </div>
   );
 });
 
diff --git a/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx b/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx
index cb938f0..1f34fbf 100644
--- a/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx
+++ b/src/Pages/CounterCategoryMapping/CounterCategoryMappingForm.jsx
@@ -743,7 +743,7 @@ const CounterCategoryMappingForm = () => {
           </Form> */}
 
           {CounterDetail?.length > 0 && (
-            <div style={{ height: '400px', overflowY: 'scroll' }}>
+            <div style={{ height: '400px', overflowY: 'scroll',scrollbarWidth:"thin" }}>
               <Table
                 dataSource={CounterDetail}
                 columns={TableColumns}
diff --git a/src/Pages/DashBoard/TopSellingProductsChart.scss b/src/Pages/DashBoard/TopSellingProductsChart.scss
index b1be867..0566ccd 100644
--- a/src/Pages/DashBoard/TopSellingProductsChart.scss
+++ b/src/Pages/DashBoard/TopSellingProductsChart.scss
@@ -3,7 +3,7 @@
     // background-color: #f3f4f6;
     // padding: 1.5rem;
     width: 100%;
-    font-family: 'Poppins', sans-serif !important;
+    font-family: "Poppins", sans-serif !important;
     scrollbar-width: thin;
     height: 88vh;
     overflow: auto;
@@ -11,12 +11,10 @@
     background: #fff !important;
     // padding-right: 1rem;
 
-
     .header-title {
         font-size: 1.5rem;
         font-weight: 600;
         padding: 0.1rem 0;
-
     }
 
     .header-date-picker {
@@ -59,7 +57,6 @@
         color: #1d4ed8;
     }
 
-
     .header-actions {
         display: flex;
         gap: 0.5rem;
@@ -88,7 +85,6 @@
         // justify-content: space-between;
     }
 
-
     .metric-controls {
         display: flex;
         gap: 0.5rem;
@@ -99,20 +95,19 @@
         align-items: center;
         border-radius: 6px;
 
-        >div:nth-child(1) {
+        > div:nth-child(1) {
             border-radius: 6px 0 0 6px;
         }
 
-        >div:nth-child(2) {
+        > div:nth-child(2) {
             border-radius: 0 6px 6px 0;
         }
     }
 
     .bar-pie-switch {
-
         .ant-switch-inner-checked,
         .ant-switch-inner-unchecked {
-            font-family: 'Poppins';
+            font-family: "Poppins";
             font-weight: 500;
         }
 
@@ -126,7 +121,6 @@
             background-color: #52c41a !important;
             background: #52c41a !important;
         }
-
     }
 
     .btn-chart-type {
@@ -196,7 +190,6 @@
         border-radius: 0.5rem;
         box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
         padding: 1rem;
-
     }
 
     .stat-card1 {
@@ -472,7 +465,6 @@
         align-items: center;
         outline: none !important;
 
-
         .chart-data-item {
             display: flex;
             align-items: center;
@@ -497,8 +489,6 @@
             // >div:nth-child(2) {
             //     width: 5%;
             // }
-
-
         }
     }
 }
@@ -525,11 +515,11 @@
 .chart-data {
     width: 60%;
 
-    @media (max-width:768px) {
+    @media (max-width: 768px) {
         width: 100%;
     }
 
-    @media (max-width:1000px) {
+    @media (max-width: 1000px) {
         width: 100%;
     }
 }
@@ -548,7 +538,7 @@
     padding: 0 !important;
     margin: 0 !important;
 
-    >div:nth-child(1) {
+    > div:nth-child(1) {
         width: 25%;
     }
 
@@ -558,7 +548,6 @@
         justify-content: space-between;
         align-items: center;
         gap: 10px;
-
     }
 
     .axis-label-wrapper {
@@ -582,7 +571,7 @@
         margin-bottom: 4px;
     }
 
-    >div:nth-child(3) {
+    > div:nth-child(3) {
         width: 10%;
     }
 }
@@ -629,7 +618,7 @@
         position: relative;
 
         &::after {
-            content: '';
+            content: "";
             position: absolute;
             bottom: -4px;
             left: 50%;
@@ -750,17 +739,18 @@
 
     .pie-legend {
         flex: 1 1 100%;
-        max-width: 100%;
+        width: 100%;
+        justify-content: center;
     }
 }
 
-@media (max-width:990px) {
+@media (max-width: 990px) {
     .wrapaanaClass {
         justify-content: center !important;
     }
 }
 
-@media (max-width:932px) {
+@media (max-width: 932px) {
     .date-wrapper-class {
         width: 100%;
         justify-content: center !important;
@@ -773,4 +763,4 @@
     .ant-select-arrow {
         top: 70%;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss b/src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss
index 4f47d94..3d3710a 100644
--- a/src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss
+++ b/src/Pages/Reports/PurchaseReport/PurchaseOrderReport.scss
@@ -228,16 +228,13 @@
     background-color: #e9e8e8 !important;
     border: none;
   }
-
-  //dhana
-  // height: clamp(30vh, 50vh, 95vh);
 }
 
-// writed by sree
 .ItemWiseReport-table1 {
   overflow: auto;
   height: clamp(40vh, 30vh, 95vh);
   width: 79vw !important;
+  scrollbar-width: thin;
 }
 
 .ItemWiseReport-table .ant-table-thead tr .ant-table-cell {
diff --git a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
index 9fadde1..191af8a 100644
--- a/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
+++ b/src/Styles/BookingScreen/Components/BSNavbar/BSNavbar3.scss
@@ -84,6 +84,15 @@
   .BsnavbarSearchMain {
     width: 25vw;
     position: relative;
+    .BarCodeScanMaster {
+      position: absolute;
+      right: 0;
+      padding: 0 !important;
+      top: 30%;
+      svg {
+        font-size: 20px !important;
+      }
+    }
 
     .searchDiv .ant-input {
       color: #fff !important;
diff --git a/src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss b/src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss
index 42d6a69..7b04919 100644
--- a/src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss
+++ b/src/Styles/BookingScreen/Components/UtillComponents/BSNavBarComponents.scss
@@ -296,7 +296,7 @@
 }
 
 .BSC1Payment-Tablediv .ant-table-wrapper .ant-table-thead > tr > th {
-  color: black !important;
+  color: rgb(255, 255, 255) !important;
   font-weight: 600 !important;
   font-size: 14px;
 }
@@ -325,9 +325,7 @@
     box-shadow: unset !important;
   }
 
-  .ant-select:not(.ant-select-customize-input)
-    .ant-select-selector
-    .ant-select-selection-search-input {
+  .ant-select:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-search-input {
     bottom: 14px;
   }
 
diff --git a/src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss b/src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss
index 45d029b..ee7c277 100644
--- a/src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss
+++ b/src/Styles/BookingScreen/Template/BSLayout2/BSLayout2.scss
@@ -373,7 +373,7 @@ body {
   @media (max-width: 768px) {
     display: none;
   }
-  
+
   div {
     gap: 4px;
     display: flex;
@@ -469,3 +469,15 @@ body {
   font-size: 14px;
   background-color: rgb(240, 240, 240);
 }
+.SCTableInPageSales {
+  th {
+    font-weight: 500;
+    text-transform: uppercase;
+    font-size: 12px !important;
+    letter-spacing: 0.1px;
+  }
+  td {
+    font-weight: 500 !important;
+    font-family: "Poppins" !important;
+  }
+}
diff --git a/src/Styles/OverAllStyle/OverAllStyle.scss b/src/Styles/OverAllStyle/OverAllStyle.scss
index f28d105..233f5ed 100644
--- a/src/Styles/OverAllStyle/OverAllStyle.scss
+++ b/src/Styles/OverAllStyle/OverAllStyle.scss
@@ -851,6 +851,9 @@
 }
 
 .price-change-table {
+  .ant-table-thead tr {
+    background-color: #2c88ee !important;
+  }
   .ant-form-item {
     margin-bottom: 0 !important;
   }
@@ -1634,3 +1637,17 @@ table {
     }
   }
 }
+.LowStockAlterModal {
+  .ant-input-affix-wrapper {
+    width: 300px !important;
+  }
+  .ant-input {
+    padding: 5px 14px 6px 11px !important;
+  }
+}
+.LowStockAlterModalTable {
+  margin-top: 1rem;
+  .ant-table-thead tr {
+    background-color: #2c88ee !important;
+  }
+}
diff --git a/src/Styles/PrinterSetting/PrinterSetting.scss b/src/Styles/PrinterSetting/PrinterSetting.scss
index 7d3b2f8..b30d06c 100644
--- a/src/Styles/PrinterSetting/PrinterSetting.scss
+++ b/src/Styles/PrinterSetting/PrinterSetting.scss
@@ -204,3 +204,8 @@
 .printer-settings-tabs {
   font-family: "Poppins";
 }
+.PrinterSettingTab {
+  .ant-tabs-tab-active {
+    background-color: #2c5282 !important;
+  }
+}
diff --git a/src/Styles/Reports/DateWiseReport/DateWiseReport.scss b/src/Styles/Reports/DateWiseReport/DateWiseReport.scss
index 052c64a..ad936a6 100644
--- a/src/Styles/Reports/DateWiseReport/DateWiseReport.scss
+++ b/src/Styles/Reports/DateWiseReport/DateWiseReport.scss
@@ -8,7 +8,8 @@
   flex-grow: 1;
   width: 100%;
   height: 40vh;
-  overflow: scroll;
+  overflow: auto;
+  scrollbar-width: thin;
 }
 
 .DateWiseReport-denomination {
diff --git a/src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss b/src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss
index e680394..3d2ce5a 100644
--- a/src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss
+++ b/src/Styles/Reports/ItemWiseReport/ItemWiseReport.scss
@@ -228,16 +228,14 @@
     background-color: #e9e8e8 !important;
     border: none;
   }
-
-  //dhana
-  // height: clamp(30vh, 50vh, 95vh);
+ 
 }
-
-// writed by sree
+ 
 .ItemWiseReport-table1 {
   overflow: auto;
   height: clamp(40vh, 30vh, 95vh);
   width: 79vw !important;
+  scrollbar-width: thin;
 }
 
 .ItemWiseReport-table .ant-table-thead tr .ant-table-cell {