after resolved conflicts

src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx

@@ -16,7 +16,7 @@ import BSBillingTable6 from '../../Components/BSBillingTables/BSBillingTable6/BS
 import BSBillingTable7 from '../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx';
 import BSItemCard from '../../Components/BSItemCards/BSItemCard';
 import CategoryHorizontal from '../../Components/BSCategories/BSCategoryHorizontal';
-import SubCategory from '../../Components/BSSubCategories/BSSubCategoryHorizontal';
+import SubCategoryVertical from '../../Components/BSSubCategories/BSSubCategoryVertical';
 import { dynamicComponentProps } from '../DynamicComponentProps.js';
 import {
   SelectedGlobalLayoutColorDetail,
@@ -147,6 +147,7 @@ const BSLayout1 = () => {
   const BookingBilling = BSLayout1Data?.BookingBilling?.[0];
   const [messageType, setMessageType] = useState(null);
   const [messageData, setMessageData] = useState(null);
+  const [connectingState, setConnectingState] = useState({});
   // const [AppExpDate, setAppExpDate] = useState(0);
   const [screenHeight, setScreenHeight] = useState(window.innerHeight);
   const [Kioskopen, setKioskopen] = useState(false);
@@ -338,19 +339,20 @@ const BSLayout1 = () => {
           style={{ height: containerHeight, overflow: 'hidden' }}
         >
           <div className="BSLayout1-NavBar">
-            {BookingNavbar == 'Navbar1' && <BSNavbar1 />}
+            <BSNavbar1
-            {BookingNavbar == 'Navbar2' && <BSNavbar2 />}
+              BookingNavbar={BookingNavbar}
-            {BookingNavbar == 'Navbar3' && <BSNavbar3 />}
+              connectingState={connectingState}
+              setConnectingState={setConnectingState}
+            />
           </div>
           <div
             className={
-              BookingNavbar != 'Navbar3' ? 'BSLayout1Main' : 'BSLayout1Standard'
+              BookingNavbar != 'Navbar3' ? 'BSLayout1' : 'BSLayout1Standard'
             }
             style={{
               backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
             }}
           >
-            {BookingNavbar != 'Navbar3' ? (
             <div
               className="Layout-bill-container"
               style={{ marginTop: '12px' }}
@@ -386,6 +388,7 @@ const BSLayout1 = () => {
                   <SalesCountComponent
                     DineInAccess={DineInAccess}
                     GlobalsalesDetailData={GlobalsalesDetailData}
+                    BookingNavbar={BookingNavbar}
                   />
                 )}
                 {SessionData?.FeatureAddonData?.FeatureDtls?.find(
@@ -498,10 +501,7 @@ const BSLayout1 = () => {
                       )}
                     </div>
                     <div style={{ marginLeft: '10px' }}>
-                        <TooltipWrapper
+                      <TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
-                          title={'E-way Bill'}
-                          isMobile={isMobile}
-                        >
                         {''}
                         <BSEwayBillicon
                           style={{ cursor: 'pointer', marginTop: '5px' }}
@@ -513,15 +513,9 @@ const BSLayout1 = () => {
                 )}
               </div>
             </div>
-            ) : (
+
-              <SalesCountForStandard
+            <div className="BSLayout1-ContentDiv">
-                PricingAppPricingName={PricingAppPricingName}
+              <div className="BSCategory1-Contentcont">
-                DineInAccess={DineInAccess}
-                GlobalsalesDetailData={GlobalsalesDetailData}
-              />
-            )}
-            <div className="BSLayout1Master">
-              <div className="BSCategoryCardDiv">
                 <div
                   style={{
                     backgroundColor:
@@ -549,17 +543,14 @@ const BSLayout1 = () => {
                 </div>
 
                 <div className="BSCategory1-Cardcont">
-                  {
                   <div
                     style={{
                       backgroundColor:
                         SelectedSubCatgColor?.['OverallBackgroundColor'],
-                        display: BookingSubCategory ? 'block' : 'none',
                     }}
                   >
                     {Comboglobal === false && !OtherServicesglobal && (
-                        <SubCategory
+                      <SubCategoryVertical
-                          subCategoryType={'vertical'}
                         categoryFunction={dynamicComponentProps(
                           'SubCategory',
                           BSLayout1Data?.BookingSubCategory?.[1],
@@ -568,7 +559,6 @@ const BSLayout1 = () => {
                       />
                     )}
                   </div>
-                  }
 
                   <div
                     className="layout1-card-content"
@@ -592,6 +582,8 @@ const BSLayout1 = () => {
                         />
                       ) : (
                         <BSItemCard
+                          connectingState={connectingState}
+                          setConnectingState={setConnectingState}
                           screenHeight={screenHeight}
                           cardFunctionality={dynamicComponentProps(
                             'Card',

src/Pages/BookingScreen/Template/BSLayout4/BSLayout4.jsx

@@ -6,8 +6,8 @@ import { isMobile } from 'react-device-detect';
 import BookingCloseIcon from '../../Components/UtillComponents/BookingCloseIcon.jsx';
 const BSNavbar1 = lazy(() => import('../../Components/BSNavbar/BSNavbar1'));
 const BSNavbar2 = lazy(() => import('../../Components/BSNavbar/BSNavbar2'));
-const CategoryHorizontal = lazy(
+const CategoryVertical = lazy(
-  () => import('../../Components/BSCategories/BSCategoryHorizontal')
+  () => import('../../Components/BSCategories/BSCategoryVertical')
 );
 const BSItemCard = lazy(
   () => import('../../Components/BSItemCards/BSItemCard')
@@ -170,6 +170,7 @@ const BSLayout4 = () => {
   );
   // const [AppExpDate, setAppExpDate] = useState(0);
   const [Kioskopen, setKioskopen] = useState(false);
+  const [connectingState, setConnectingState] = useState({});
   const BookingStatus = useSelector(GlobalBookingStatus);
   const CheckBookingStatus =
     BookingStatus?.find((item) => item.ScreenType === 'Booking')
@@ -179,7 +180,7 @@ const BSLayout4 = () => {
   const BookingCategory = BSLayout4Data?.BookingCategory;
   const BookingCard = BSLayout4Data?.BookingCard;
   const BookingBilling = BSLayout4Data?.BookingBilling?.[0];
-  console.log('BSLayout4Data', BookingCategory);
+  console.log('BSLayout4Data', BookingBilling);
   const DineInAccess = SettingDataSelector?.[0]?.SettingDtlDetails.filter(
     (i) => i.SettingIdName === 'DineIn'
   )?.[0];
@@ -337,11 +338,13 @@ const BSLayout4 = () => {
           style={{ height: containerHeight, overflow: 'hidden' }}
         >
           <div className="Bslayout4_navbar">
-            {BookingNavbar == 'Navbar1' && <BSNavbar1 />}
+            <BSNavbar1
-            {BookingNavbar == 'Navbar2' && <BSNavbar2 />}
+              connectingState={connectingState}
-            {BookingNavbar == 'Navbar3' && <BSNavbar3 />}
+              setConnectingState={setConnectingState}
+              BookingNavbar={BookingNavbar}
+            />
           </div>
-          {BookingNavbar != 'Navbar3' ? (
+
           <div className="Layout-bill-container" style={{ margin: '0' }}>
             <div
               className="Layout-bill-Subcontainer"
@@ -358,6 +361,7 @@ const BSLayout4 = () => {
                 <SalesCountComponent
                   DineInAccess={DineInAccess}
                   GlobalsalesDetailData={GlobalsalesDetailData}
+                  BookingNavbar={BookingNavbar}
                 />
               )}
               {!OtherServicesglobal &&
@@ -373,11 +377,7 @@ const BSLayout4 = () => {
                     }}
                   >
                     <Tooltip title={'Kiosk Sales'}>
-                        <Badge
+                      <Badge count={badgeCount} offset={[-10, 3]} size="small">
-                          count={badgeCount}
-                          offset={[-10, 3]}
-                          size="small"
-                        >
                         <PozoKioskIcon
                           onClick={() => openModalKiosk()}
                           style={{ cursor: 'pointer', fontSize: '1.5rem' }}
@@ -388,10 +388,7 @@ const BSLayout4 = () => {
                   </div>
                 )}
               {!OtherServicesglobal && (
-                  <TooltipWrapper
+                <TooltipWrapper title={'Low Stock Alerts'} isMobile={isMobile}>
-                    title={'Low Stock Alerts'}
-                    isMobile={isMobile}
-                  >
                   {' '}
                   <BSExpireProductsList />
                 </TooltipWrapper>
@@ -402,8 +399,7 @@ const BSLayout4 = () => {
                   closeKioskModal={closeModalKiosk}
                 />
               )}
-                {SAdminuserPin?.length > 0 &&
+              {SAdminuserPin?.length > 0 && UserType != 'Super Admin User' && (
-                  UserType != 'Super Admin User' && (
                 <div>
                   <SAdminUserNotification
                     SAdminuserPin={SAdminuserPin}
@@ -416,10 +412,7 @@ const BSLayout4 = () => {
               {CheckBookingStatus == 'Open' ? (
                 !OtherServicesglobal && (
                   <div style={{ marginLeft: '10px' }}>
-                      <TooltipWrapper
+                    <TooltipWrapper title={'Booking Close'} isMobile={isMobile}>
-                        title={'Booking Close'}
-                        isMobile={isMobile}
-                      >
                       {' '}
                       <BookingCloseIcon
                         onClick={OpenBookingModal}
@@ -431,6 +424,8 @@ const BSLayout4 = () => {
                           cursor: 'pointer',
                         }}
                       />
+                      {/* <button className="BookingCloseButton"
+                                        >Booking Close</button> */}
                     </TooltipWrapper>
                   </div>
                 )
@@ -473,27 +468,14 @@ const BSLayout4 = () => {
               )}
             </div>
           </div>
-          ) : (
+
-            <SalesCountForStandard
-              PricingAppPricingName={PricingAppPricingName}
-              DineInAccess={DineInAccess}
-              GlobalsalesDetailData={GlobalsalesDetailData}
-            />
-          )}
           <div
             className="Bslayout4_overall"
             style={{
               backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
             }}
           >
-            {/* <div className="BSlayout_subdiv"> */}
+            <div className="BSlayout_subdiv">
-            <div
-              className={
-                BookingCategory?.[0] === 'Category5'
-                  ? 'bslayout4Cat5Flex'
-                  : 'BSlayout_subdiv'
-              }
-            >
               <div
                 className="Bslayout4_ctg"
                 style={{
@@ -502,13 +484,12 @@ const BSLayout4 = () => {
                 }}
               >
                 {!OtherServicesglobal && (
-                  <CategoryHorizontal
+                  <CategoryVertical
                     categoryFunction={dynamicComponentProps(
                       'Category',
                       BookingCategory?.[1],
                       BookingCategory?.[0]
                     )}
-                    categoryType={'vertical'}
                   />
                 )}
                 {OtherServicesglobal && (
@@ -532,6 +513,8 @@ const BSLayout4 = () => {
               >
                 {!OtherServicesglobal && Comboglobal === false && (
                   <BSItemCard
+                    connectingState={connectingState}
+                    setConnectingState={setConnectingState}
                     cardFunctionality={dynamicComponentProps(
                       'Card',
                       BookingCard?.[1],

src/Pages/BookingScreen/Template/BSLayout5/BSLayout5.jsx

@@ -38,9 +38,7 @@ const BSBillingTable7 = lazy(
     import('../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx')
 );
 import BSItemCard from '../../Components/BSItemCards/BSItemCard';
-const CategoryHorizontal = lazy(
+import CategoryVertical from '../../Components/BSCategories/BSCategoryVertical';
-  () => import('../../Components/BSCategories/BSCategoryHorizontal')
-);
 import { dynamicComponentProps } from '../DynamicComponentProps.js';
 import {
   GlobalPricingAppPricingName,
@@ -138,6 +136,7 @@ const BSLayout5 = () => {
   // const [AppExpDate, setAppExpDate] = useState(0);
   const [screenHeight, setScreenHeight] = useState(window.innerHeight);
   const [Kioskopen, setKioskopen] = useState(false);
+  const [connectingState, setConnectingState] = useState({});
   const PricingAppPricingName = useSelector(GlobalPricingAppPricingName);
   const SAdminuserPin = useSelector(GLobalSadminUserPin);
   const BookingNavbar = BSLayout5Data?.BookingNavbar?.[0];
@@ -327,9 +326,11 @@ const BSLayout5 = () => {
           style={{ height: containerHeight, overflow: 'hidden' }}
         >
           <div className="BSLayout5-NavBar">
-            {BSLayout5Data?.BookingNavbar?.[0] == 'Navbar1' && <BSNavbar1 />}
+            <BSNavbar1
-            {BSLayout5Data?.BookingNavbar?.[0] == 'Navbar2' && <BSNavbar2 />}
+              BookingNavbar={BookingNavbar}
-            {BSLayout5Data?.BookingNavbar?.[0] == 'Navbar3' && <BSNavbar3 />}
+              connectingState={connectingState}
+              setConnectingState={setConnectingState}
+            />
           </div>
 
           <div
@@ -338,7 +339,6 @@ const BSLayout5 = () => {
               backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
             }}
           >
-            {BookingNavbar != 'Navbar3' ? (
             <div className="Layout-bill-container">
               <div
                 className="Layout-bill-Subcontainer"
@@ -355,6 +355,7 @@ const BSLayout5 = () => {
                   <SalesCountComponent
                     DineInAccess={DineInAccess}
                     GlobalsalesDetailData={GlobalsalesDetailData}
+                    BookingNavbar={BookingNavbar}
                   />
                 )}
 
@@ -432,6 +433,8 @@ const BSLayout5 = () => {
                               cursor: 'pointer',
                             }}
                           />
+                          {/* <button className="BookingCloseButton"
+                                                      >Booking Close</button> */}
                         </TooltipWrapper>
                       </div>
                     ) : (
@@ -478,13 +481,6 @@ const BSLayout5 = () => {
                 )}
               </div>
             </div>
-            ) : (
-              <SalesCountForStandard
-                PricingAppPricingName={PricingAppPricingName}
-                DineInAccess={DineInAccess}
-                GlobalsalesDetailData={GlobalsalesDetailData}
-              />
-            )}
 
             <div className="BsLayout5-ContentDiv">
               <div className="BSCategory5-tablecont">
@@ -507,15 +503,20 @@ const BSLayout5 = () => {
                     )}
                   </>
                 )}
+                {/* <div
+                className="salesStoreName"
+                style={{
+                  color: SelectedBillColor?.['FontColor'],
+                  backgroundColor: SelectedBillColor?.['BackgroundColor'],
+                }}
+              >
+                <BranchName />
+              </div> */}
               </div>
 
-              {/* <div className="BSCategory5-Contentcont"> */}
               <div
-                className={
+                className="BSCategory5-Contentcont"
-                  BookingCategory?.[0] === 'Category5'
+                style={{ width: '100vw' }}
-                    ? 'BSlayout5Cat5Flex'
-                    : 'BSCategory5-Contentcont'
-                }
               >
                 <div
                   style={{
@@ -524,13 +525,12 @@ const BSLayout5 = () => {
                   }}
                 >
                   {!OtherServicesglobal && (
-                    <CategoryHorizontal
+                    <CategoryVertical
                       categoryFunction={dynamicComponentProps(
                         'Category',
                         BookingCategory?.[1],
                         BookingCategory?.[0]
                       )}
-                      categoryType={'vertical'}
                     />
                   )}
                   {OtherServicesglobal && (
@@ -555,6 +555,8 @@ const BSLayout5 = () => {
                 >
                   {!OtherServicesglobal && Comboglobal === false && (
                     <BSItemCard
+                      connectingState={connectingState}
+                      setConnectingState={setConnectingState}
                       cardFunctionality={dynamicComponentProps(
                         'Card',
                         BookingCard?.[1],