after resolved conflicts

This commit is contained in:
vignesh 2026-03-12 16:36:49 +05:30
parent 4bc0e4e3f0
commit 7d070a1ca1
3 changed files with 459 additions and 482 deletions

View File

@ -16,7 +16,7 @@ import BSBillingTable6 from '../../Components/BSBillingTables/BSBillingTable6/BS
import BSBillingTable7 from '../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx'; import BSBillingTable7 from '../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx';
import BSItemCard from '../../Components/BSItemCards/BSItemCard'; import BSItemCard from '../../Components/BSItemCards/BSItemCard';
import CategoryHorizontal from '../../Components/BSCategories/BSCategoryHorizontal'; import CategoryHorizontal from '../../Components/BSCategories/BSCategoryHorizontal';
import SubCategory from '../../Components/BSSubCategories/BSSubCategoryHorizontal'; import SubCategoryVertical from '../../Components/BSSubCategories/BSSubCategoryVertical';
import { dynamicComponentProps } from '../DynamicComponentProps.js'; import { dynamicComponentProps } from '../DynamicComponentProps.js';
import { import {
SelectedGlobalLayoutColorDetail, SelectedGlobalLayoutColorDetail,
@ -147,6 +147,7 @@ const BSLayout1 = () => {
const BookingBilling = BSLayout1Data?.BookingBilling?.[0]; const BookingBilling = BSLayout1Data?.BookingBilling?.[0];
const [messageType, setMessageType] = useState(null); const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null); const [messageData, setMessageData] = useState(null);
const [connectingState, setConnectingState] = useState({});
// const [AppExpDate, setAppExpDate] = useState(0); // const [AppExpDate, setAppExpDate] = useState(0);
const [screenHeight, setScreenHeight] = useState(window.innerHeight); const [screenHeight, setScreenHeight] = useState(window.innerHeight);
const [Kioskopen, setKioskopen] = useState(false); const [Kioskopen, setKioskopen] = useState(false);
@ -338,190 +339,183 @@ const BSLayout1 = () => {
style={{ height: containerHeight, overflow: 'hidden' }} style={{ height: containerHeight, overflow: 'hidden' }}
> >
<div className="BSLayout1-NavBar"> <div className="BSLayout1-NavBar">
{BookingNavbar == 'Navbar1' && <BSNavbar1 />} <BSNavbar1
{BookingNavbar == 'Navbar2' && <BSNavbar2 />} BookingNavbar={BookingNavbar}
{BookingNavbar == 'Navbar3' && <BSNavbar3 />} connectingState={connectingState}
setConnectingState={setConnectingState}
/>
</div> </div>
<div <div
className={ className={
BookingNavbar != 'Navbar3' ? 'BSLayout1Main' : 'BSLayout1Standard' BookingNavbar != 'Navbar3' ? 'BSLayout1' : 'BSLayout1Standard'
} }
style={{ style={{
backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor, backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
}} }}
> >
{BookingNavbar != 'Navbar3' ? ( <div
className="Layout-bill-container"
style={{ marginTop: '12px' }}
>
<div <div
className="Layout-bill-container" className="Layout-bill-Subcontainer"
style={{ marginTop: '12px' }} style={{ width: OtherServicesglobal ? '10%' : '100%' }}
> >
<div {UserType !== 'Employee' && (
className="Layout-bill-Subcontainer" <div className="pricing-name-details">
style={{ width: OtherServicesglobal ? '10%' : '100%' }} {PricingAppPricingName?.[0]?.PricingName +
> ' / ' +
{UserType !== 'Employee' && ( PricingAppPricingName?.[0]?.Type}
<div className="pricing-name-details"> </div>
{PricingAppPricingName?.[0]?.PricingName + )}
' / ' + {AvailableDate && (
PricingAppPricingName?.[0]?.Type} <div
</div> style={{
)} padding: '3px 5px',
{AvailableDate && ( marginLeft: '1rem',
}}
>
<DatePicker
disabledDate={disablePastDates}
// defaultValue={moment()} // todays date
format="DD-MMM-YYYY"
value={selectedDate ? dayjs(selectedDate) : null}
onChange={(date) => setSelectedDate(date)}
/>
</div>
)}
{!OtherServicesglobal && (
<SalesCountComponent
DineInAccess={DineInAccess}
GlobalsalesDetailData={GlobalsalesDetailData}
BookingNavbar={BookingNavbar}
/>
)}
{SessionData?.FeatureAddonData?.FeatureDtls?.find(
(item) =>
item?.FeatureAddonName?.toLowerCase() === 'kiosk sales'
) &&
!sportsAppPreference && (
<div <div
style={{ style={{
padding: '3px 5px', pointerEvents: OrderStatus > 0 ? 'none' : 'auto',
marginLeft: '1rem', opacity: OrderStatus > 0 ? 0.5 : 1,
}} }}
> >
<DatePicker {!OtherServicesglobal && (
disabledDate={disablePastDates} <Tooltip title={'Kiosk Sales'}>
// defaultValue={moment()} // todays date <Badge
format="DD-MMM-YYYY" count={badgeCount}
value={selectedDate ? dayjs(selectedDate) : null} offset={[-10, 3]}
onChange={(date) => setSelectedDate(date)} size="small"
>
<PozoKioskIcon
onClick={() => openModalKiosk()}
style={{
cursor: 'pointer',
fontSize: '1.5rem',
}}
className="iconsize"
/>
</Badge>
</Tooltip>
)}
</div>
)}
{!OtherServicesglobal && (
<TooltipWrapper
title={'Low Stock Alerts'}
isMobile={isMobile}
>
{' '}
<BSExpireProductsList />
</TooltipWrapper>
)}
{Kioskopen && (
<BSKioskCounterPayment
Kioskopen={Kioskopen}
closeKioskModal={closeModalKiosk}
/>
)}
{SAdminuserPin?.length > 0 &&
UserType != 'Super Admin User' && (
<div>
<SAdminUserNotification
SAdminuserPin={SAdminuserPin}
popOverOpen={popOverOpen}
handleSupportUser={handleSupportUser}
handlePopOverOpen={handlePopOverOpen}
/> />
</div> </div>
)} )}
{!OtherServicesglobal && ( {!OtherServicesglobal && (
<SalesCountComponent <>
DineInAccess={DineInAccess} <div>
GlobalsalesDetailData={GlobalsalesDetailData} {CheckBookingStatus == 'Open' ? (
/> <div style={{ marginLeft: '10px' }}>
)} <TooltipWrapper
{SessionData?.FeatureAddonData?.FeatureDtls?.find( title={'Booking Close'}
(item) => isMobile={isMobile}
item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' >
) && {' '}
!sportsAppPreference && ( <BookingCloseIcon
<div onClick={OpenBookingModal}
style={{ bgFill={'#52c41a'}
pointerEvents: OrderStatus > 0 ? 'none' : 'auto', style={{
opacity: OrderStatus > 0 ? 0.5 : 1, fontSize: '16px',
}} marginTop: '4px',
> color: '#52c41a',
{!OtherServicesglobal && ( cursor: 'pointer',
<Tooltip title={'Kiosk Sales'}> }}
<Badge />
count={badgeCount} </TooltipWrapper>
offset={[-10, 3]} </div>
size="small" ) : (
> <div style={{ marginLeft: '10px' }}>
<PozoKioskIcon <TooltipWrapper
onClick={() => openModalKiosk()} title="Booking Open"
style={{ isMobile={isMobile}
cursor: 'pointer', >
fontSize: '1.5rem', <Popconfirm
}} placement="leftTop"
className="iconsize"
/>
</Badge>
</Tooltip>
)}
</div>
)}
{!OtherServicesglobal && (
<TooltipWrapper
title={'Low Stock Alerts'}
isMobile={isMobile}
>
{' '}
<BSExpireProductsList />
</TooltipWrapper>
)}
{Kioskopen && (
<BSKioskCounterPayment
Kioskopen={Kioskopen}
closeKioskModal={closeModalKiosk}
/>
)}
{SAdminuserPin?.length > 0 &&
UserType != 'Super Admin User' && (
<div>
<SAdminUserNotification
SAdminuserPin={SAdminuserPin}
popOverOpen={popOverOpen}
handleSupportUser={handleSupportUser}
handlePopOverOpen={handlePopOverOpen}
/>
</div>
)}
{!OtherServicesglobal && (
<>
<div>
{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" title="Booking Open"
isMobile={isMobile} description="Are you sure you want to Open the sales?"
okText="Yes"
cancelText="No"
onConfirm={() => BookingOpenFun('Open')}
> >
<Popconfirm <span>
placement="leftTop" <BookingCloseIcon
title="Booking Open" bgFill="red"
description="Are you sure you want to Open the sales?" style={{
okText="Yes" fontSize: '16px',
cancelText="No" marginTop: '4px',
onConfirm={() => BookingOpenFun('Open')} color: '#52c41a',
> cursor: 'pointer',
<span> }}
<BookingCloseIcon />
bgFill="red" </span>
style={{ </Popconfirm>
fontSize: '16px', </TooltipWrapper>
marginTop: '4px', </div>
color: '#52c41a', )}
cursor: 'pointer', </div>
}} <div style={{ marginLeft: '10px' }}>
/> <TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
</span> {''}
</Popconfirm> <BSEwayBillicon
</TooltipWrapper> style={{ cursor: 'pointer', marginTop: '5px' }}
</div> onClick={OpenListOfInvoices}
)} />
</div> </TooltipWrapper>
<div style={{ marginLeft: '10px' }}> </div>
<TooltipWrapper </>
title={'E-way Bill'} )}
isMobile={isMobile}
>
{''}
<BSEwayBillicon
style={{ cursor: 'pointer', marginTop: '5px' }}
onClick={OpenListOfInvoices}
/>
</TooltipWrapper>
</div>
</>
)}
</div>
</div> </div>
) : ( </div>
<SalesCountForStandard
PricingAppPricingName={PricingAppPricingName} <div className="BSLayout1-ContentDiv">
DineInAccess={DineInAccess} <div className="BSCategory1-Contentcont">
GlobalsalesDetailData={GlobalsalesDetailData}
/>
)}
<div className="BSLayout1Master">
<div className="BSCategoryCardDiv">
<div <div
style={{ style={{
backgroundColor: backgroundColor:
@ -549,26 +543,22 @@ const BSLayout1 = () => {
</div> </div>
<div className="BSCategory1-Cardcont"> <div className="BSCategory1-Cardcont">
{ <div
<div style={{
style={{ backgroundColor:
backgroundColor: SelectedSubCatgColor?.['OverallBackgroundColor'],
SelectedSubCatgColor?.['OverallBackgroundColor'], }}
display: BookingSubCategory ? 'block' : 'none', >
}} {Comboglobal === false && !OtherServicesglobal && (
> <SubCategoryVertical
{Comboglobal === false && !OtherServicesglobal && ( categoryFunction={dynamicComponentProps(
<SubCategory 'SubCategory',
subCategoryType={'vertical'} BSLayout1Data?.BookingSubCategory?.[1],
categoryFunction={dynamicComponentProps( BSLayout1Data?.BookingSubCategory?.[0]
'SubCategory', )}
BSLayout1Data?.BookingSubCategory?.[1], />
BSLayout1Data?.BookingSubCategory?.[0] )}
)} </div>
/>
)}
</div>
}
<div <div
className="layout1-card-content" className="layout1-card-content"
@ -592,6 +582,8 @@ const BSLayout1 = () => {
/> />
) : ( ) : (
<BSItemCard <BSItemCard
connectingState={connectingState}
setConnectingState={setConnectingState}
screenHeight={screenHeight} screenHeight={screenHeight}
cardFunctionality={dynamicComponentProps( cardFunctionality={dynamicComponentProps(
'Card', 'Card',

View File

@ -6,8 +6,8 @@ import { isMobile } from 'react-device-detect';
import BookingCloseIcon from '../../Components/UtillComponents/BookingCloseIcon.jsx'; import BookingCloseIcon from '../../Components/UtillComponents/BookingCloseIcon.jsx';
const BSNavbar1 = lazy(() => import('../../Components/BSNavbar/BSNavbar1')); const BSNavbar1 = lazy(() => import('../../Components/BSNavbar/BSNavbar1'));
const BSNavbar2 = lazy(() => import('../../Components/BSNavbar/BSNavbar2')); const BSNavbar2 = lazy(() => import('../../Components/BSNavbar/BSNavbar2'));
const CategoryHorizontal = lazy( const CategoryVertical = lazy(
() => import('../../Components/BSCategories/BSCategoryHorizontal') () => import('../../Components/BSCategories/BSCategoryVertical')
); );
const BSItemCard = lazy( const BSItemCard = lazy(
() => import('../../Components/BSItemCards/BSItemCard') () => import('../../Components/BSItemCards/BSItemCard')
@ -170,6 +170,7 @@ const BSLayout4 = () => {
); );
// const [AppExpDate, setAppExpDate] = useState(0); // const [AppExpDate, setAppExpDate] = useState(0);
const [Kioskopen, setKioskopen] = useState(false); const [Kioskopen, setKioskopen] = useState(false);
const [connectingState, setConnectingState] = useState({});
const BookingStatus = useSelector(GlobalBookingStatus); const BookingStatus = useSelector(GlobalBookingStatus);
const CheckBookingStatus = const CheckBookingStatus =
BookingStatus?.find((item) => item.ScreenType === 'Booking') BookingStatus?.find((item) => item.ScreenType === 'Booking')
@ -179,7 +180,7 @@ const BSLayout4 = () => {
const BookingCategory = BSLayout4Data?.BookingCategory; const BookingCategory = BSLayout4Data?.BookingCategory;
const BookingCard = BSLayout4Data?.BookingCard; const BookingCard = BSLayout4Data?.BookingCard;
const BookingBilling = BSLayout4Data?.BookingBilling?.[0]; const BookingBilling = BSLayout4Data?.BookingBilling?.[0];
console.log('BSLayout4Data', BookingCategory); console.log('BSLayout4Data', BookingBilling);
const DineInAccess = SettingDataSelector?.[0]?.SettingDtlDetails.filter( const DineInAccess = SettingDataSelector?.[0]?.SettingDtlDetails.filter(
(i) => i.SettingIdName === 'DineIn' (i) => i.SettingIdName === 'DineIn'
)?.[0]; )?.[0];
@ -337,93 +338,111 @@ const BSLayout4 = () => {
style={{ height: containerHeight, overflow: 'hidden' }} style={{ height: containerHeight, overflow: 'hidden' }}
> >
<div className="Bslayout4_navbar"> <div className="Bslayout4_navbar">
{BookingNavbar == 'Navbar1' && <BSNavbar1 />} <BSNavbar1
{BookingNavbar == 'Navbar2' && <BSNavbar2 />} connectingState={connectingState}
{BookingNavbar == 'Navbar3' && <BSNavbar3 />} setConnectingState={setConnectingState}
BookingNavbar={BookingNavbar}
/>
</div> </div>
{BookingNavbar != 'Navbar3' ? (
<div className="Layout-bill-container" style={{ margin: '0' }}> <div className="Layout-bill-container" style={{ margin: '0' }}>
<div <div
className="Layout-bill-Subcontainer" className="Layout-bill-Subcontainer"
style={{ width: OtherServicesglobal ? '10%' : '100%' }} style={{ width: OtherServicesglobal ? '10%' : '100%' }}
> >
{UserType !== 'Employee' && ( {UserType !== 'Employee' && (
<div className="pricing-name-details"> <div className="pricing-name-details">
{PricingAppPricingName?.[0]?.PricingName + {PricingAppPricingName?.[0]?.PricingName +
' / ' + ' / ' +
PricingAppPricingName?.[0]?.Type} PricingAppPricingName?.[0]?.Type}
</div>
)}
{!OtherServicesglobal && (
<SalesCountComponent
DineInAccess={DineInAccess}
GlobalsalesDetailData={GlobalsalesDetailData}
BookingNavbar={BookingNavbar}
/>
)}
{!OtherServicesglobal &&
SessionData?.FeatureAddonData?.FeatureDtls?.find(
(item) =>
item?.FeatureAddonName?.toLowerCase() === 'kiosk sales'
) &&
!sportsAppPreference && (
<div
style={{
pointerEvents: OrderStatus > 0 ? 'none' : 'auto',
opacity: OrderStatus > 0 ? 0.5 : 1,
}}
>
<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> </div>
)} )}
{!OtherServicesglobal && ( {!OtherServicesglobal && (
<SalesCountComponent <TooltipWrapper title={'Low Stock Alerts'} isMobile={isMobile}>
DineInAccess={DineInAccess} {' '}
GlobalsalesDetailData={GlobalsalesDetailData} <BSExpireProductsList />
</TooltipWrapper>
)}
{!OtherServicesglobal && Kioskopen && (
<BSKioskCounterPayment
Kioskopen={Kioskopen}
closeKioskModal={closeModalKiosk}
/>
)}
{SAdminuserPin?.length > 0 && UserType != 'Super Admin User' && (
<div>
<SAdminUserNotification
SAdminuserPin={SAdminuserPin}
popOverOpen={popOverOpen}
handleSupportUser={handleSupportUser}
handlePopOverOpen={handlePopOverOpen}
/> />
)} </div>
{!OtherServicesglobal && )}
SessionData?.FeatureAddonData?.FeatureDtls?.find( {CheckBookingStatus == 'Open' ? (
(item) => !OtherServicesglobal && (
item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' <div style={{ marginLeft: '10px' }}>
) && <TooltipWrapper title={'Booking Close'} isMobile={isMobile}>
!sportsAppPreference && ( {' '}
<div <BookingCloseIcon
style={{ onClick={OpenBookingModal}
pointerEvents: OrderStatus > 0 ? 'none' : 'auto', bgFill={'#52c41a'}
opacity: OrderStatus > 0 ? 0.5 : 1, style={{
}} fontSize: '16px',
> marginTop: '4px',
<Tooltip title={'Kiosk Sales'}> color: '#52c41a',
<Badge cursor: 'pointer',
count={badgeCount} }}
offset={[-10, 3]}
size="small"
>
<PozoKioskIcon
onClick={() => openModalKiosk()}
style={{ cursor: 'pointer', fontSize: '1.5rem' }}
className="iconsize"
/>
</Badge>
</Tooltip>
</div>
)}
{!OtherServicesglobal && (
<TooltipWrapper
title={'Low Stock Alerts'}
isMobile={isMobile}
>
{' '}
<BSExpireProductsList />
</TooltipWrapper>
)}
{!OtherServicesglobal && Kioskopen && (
<BSKioskCounterPayment
Kioskopen={Kioskopen}
closeKioskModal={closeModalKiosk}
/>
)}
{SAdminuserPin?.length > 0 &&
UserType != 'Super Admin User' && (
<div>
<SAdminUserNotification
SAdminuserPin={SAdminuserPin}
popOverOpen={popOverOpen}
handleSupportUser={handleSupportUser}
handlePopOverOpen={handlePopOverOpen}
/> />
</div> {/* <button className="BookingCloseButton"
)} >Booking Close</button> */}
{CheckBookingStatus == 'Open' ? ( </TooltipWrapper>
!OtherServicesglobal && ( </div>
<div style={{ marginLeft: '10px' }}> )
<TooltipWrapper ) : (
title={'Booking Close'} <div style={{ marginLeft: '10px' }}>
isMobile={isMobile} <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 <BookingCloseIcon
onClick={OpenBookingModal} bgFill="red"
bgFill={'#52c41a'}
style={{ style={{
fontSize: '16px', fontSize: '16px',
marginTop: '4px', marginTop: '4px',
@ -431,69 +450,32 @@ const BSLayout4 = () => {
cursor: 'pointer', cursor: 'pointer',
}} }}
/> />
</TooltipWrapper> </span>
</div> </Popconfirm>
) </TooltipWrapper>
) : ( </div>
<div style={{ marginLeft: '10px' }}> )}
<TooltipWrapper title="Booking Open" isMobile={isMobile}> {!OtherServicesglobal && (
<Popconfirm <div style={{ marginLeft: '10px' }}>
placement="leftTop" <TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
title="Booking Open" {''}
description="Are you sure you want to Open the sales?" <BSEwayBillicon
okText="Yes" style={{ cursor: 'pointer', marginTop: '5px' }}
cancelText="No" onClick={OpenListOfInvoices}
onConfirm={() => BookingOpenFun('Open')} />
> </TooltipWrapper>
<span> </div>
<BookingCloseIcon )}
bgFill="red"
style={{
fontSize: '16px',
marginTop: '4px',
color: '#52c41a',
cursor: 'pointer',
}}
/>
</span>
</Popconfirm>
</TooltipWrapper>
</div>
)}
{!OtherServicesglobal && (
<div style={{ marginLeft: '10px' }}>
<TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
{''}
<BSEwayBillicon
style={{ cursor: 'pointer', marginTop: '5px' }}
onClick={OpenListOfInvoices}
/>
</TooltipWrapper>
</div>
)}
</div>
</div> </div>
) : ( </div>
<SalesCountForStandard
PricingAppPricingName={PricingAppPricingName}
DineInAccess={DineInAccess}
GlobalsalesDetailData={GlobalsalesDetailData}
/>
)}
<div <div
className="Bslayout4_overall" className="Bslayout4_overall"
style={{ style={{
backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor, backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
}} }}
> >
{/* <div className="BSlayout_subdiv"> */} <div className="BSlayout_subdiv">
<div
className={
BookingCategory?.[0] === 'Category5'
? 'bslayout4Cat5Flex'
: 'BSlayout_subdiv'
}
>
<div <div
className="Bslayout4_ctg" className="Bslayout4_ctg"
style={{ style={{
@ -502,13 +484,12 @@ const BSLayout4 = () => {
}} }}
> >
{!OtherServicesglobal && ( {!OtherServicesglobal && (
<CategoryHorizontal <CategoryVertical
categoryFunction={dynamicComponentProps( categoryFunction={dynamicComponentProps(
'Category', 'Category',
BookingCategory?.[1], BookingCategory?.[1],
BookingCategory?.[0] BookingCategory?.[0]
)} )}
categoryType={'vertical'}
/> />
)} )}
{OtherServicesglobal && ( {OtherServicesglobal && (
@ -532,6 +513,8 @@ const BSLayout4 = () => {
> >
{!OtherServicesglobal && Comboglobal === false && ( {!OtherServicesglobal && Comboglobal === false && (
<BSItemCard <BSItemCard
connectingState={connectingState}
setConnectingState={setConnectingState}
cardFunctionality={dynamicComponentProps( cardFunctionality={dynamicComponentProps(
'Card', 'Card',
BookingCard?.[1], BookingCard?.[1],

View File

@ -38,9 +38,7 @@ const BSBillingTable7 = lazy(
import('../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx') import('../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx')
); );
import BSItemCard from '../../Components/BSItemCards/BSItemCard'; 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 { dynamicComponentProps } from '../DynamicComponentProps.js';
import { import {
GlobalPricingAppPricingName, GlobalPricingAppPricingName,
@ -138,6 +136,7 @@ const BSLayout5 = () => {
// const [AppExpDate, setAppExpDate] = useState(0); // const [AppExpDate, setAppExpDate] = useState(0);
const [screenHeight, setScreenHeight] = useState(window.innerHeight); const [screenHeight, setScreenHeight] = useState(window.innerHeight);
const [Kioskopen, setKioskopen] = useState(false); const [Kioskopen, setKioskopen] = useState(false);
const [connectingState, setConnectingState] = useState({});
const PricingAppPricingName = useSelector(GlobalPricingAppPricingName); const PricingAppPricingName = useSelector(GlobalPricingAppPricingName);
const SAdminuserPin = useSelector(GLobalSadminUserPin); const SAdminuserPin = useSelector(GLobalSadminUserPin);
const BookingNavbar = BSLayout5Data?.BookingNavbar?.[0]; const BookingNavbar = BSLayout5Data?.BookingNavbar?.[0];
@ -327,9 +326,11 @@ const BSLayout5 = () => {
style={{ height: containerHeight, overflow: 'hidden' }} style={{ height: containerHeight, overflow: 'hidden' }}
> >
<div className="BSLayout5-NavBar"> <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>
<div <div
@ -338,153 +339,148 @@ const BSLayout5 = () => {
backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor, backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
}} }}
> >
{BookingNavbar != 'Navbar3' ? ( <div className="Layout-bill-container">
<div className="Layout-bill-container"> <div
<div className="Layout-bill-Subcontainer"
className="Layout-bill-Subcontainer" style={{ width: OtherServicesglobal ? '10%' : '100%' }}
style={{ width: OtherServicesglobal ? '10%' : '100%' }} >
> {UserType !== 'Employee' && (
{UserType !== 'Employee' && ( <div className="pricing-name-details">
<div className="pricing-name-details"> {PricingAppPricingName?.[0]?.PricingName +
{PricingAppPricingName?.[0]?.PricingName + ' / ' +
' / ' + PricingAppPricingName?.[0]?.Type}
PricingAppPricingName?.[0]?.Type} </div>
</div> )}
)} {!OtherServicesglobal && (
{!OtherServicesglobal && ( <SalesCountComponent
<SalesCountComponent DineInAccess={DineInAccess}
DineInAccess={DineInAccess} GlobalsalesDetailData={GlobalsalesDetailData}
GlobalsalesDetailData={GlobalsalesDetailData} BookingNavbar={BookingNavbar}
/> />
)} )}
{!OtherServicesglobal && {!OtherServicesglobal &&
SessionData?.FeatureAddonData?.FeatureDtls?.find( SessionData?.FeatureAddonData?.FeatureDtls?.find(
(item) => (item) =>
item?.FeatureAddonName?.toLowerCase() === 'kiosk sales' item?.FeatureAddonName?.toLowerCase() === 'kiosk sales'
) && ) &&
!sportsAppPreference && ( !sportsAppPreference && (
<div <div
style={{ style={{
pointerEvents: OrderStatus > 0 ? 'none' : 'auto', pointerEvents: OrderStatus > 0 ? 'none' : 'auto',
opacity: OrderStatus > 0 ? 0.5 : 1, opacity: OrderStatus > 0 ? 0.5 : 1,
}} }}
>
<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>
)}
{!OtherServicesglobal && (
<TooltipWrapper
title={'Low Stock Alerts'}
isMobile={isMobile}
> >
{' '} <Tooltip title={'Kiosk Sales'}>
<BSExpireProductsList />
</TooltipWrapper>
)}
{!OtherServicesglobal && Kioskopen && (
<BSKioskCounterPayment
Kioskopen={Kioskopen}
closeKioskModal={closeModalKiosk}
/>
)}
{SAdminuserPin?.length > 0 &&
UserType != 'Super Admin User' && (
<div>
<SAdminUserNotification
SAdminuserPin={SAdminuserPin}
popOverOpen={popOverOpen}
handleSupportUser={handleSupportUser}
handlePopOverOpen={handlePopOverOpen}
/>
</div>
)}
{!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>
)}
</>
)}
{!OtherServicesglobal && (
<div style={{ marginLeft: '10px' }}>
<TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
{''} {''}
<BSEwayBillicon <Badge
style={{ cursor: 'pointer', marginTop: '5px' }} count={badgeCount}
onClick={OpenListOfInvoices} offset={[-10, 3]}
/> size="small"
</TooltipWrapper> >
<PozoKioskIcon
onClick={() => openModalKiosk()}
style={{ cursor: 'pointer', fontSize: '1.5rem' }}
className="iconsize"
/>
</Badge>
</Tooltip>
</div> </div>
)} )}
</div> {!OtherServicesglobal && (
<TooltipWrapper
title={'Low Stock Alerts'}
isMobile={isMobile}
>
{' '}
<BSExpireProductsList />
</TooltipWrapper>
)}
{!OtherServicesglobal && Kioskopen && (
<BSKioskCounterPayment
Kioskopen={Kioskopen}
closeKioskModal={closeModalKiosk}
/>
)}
{SAdminuserPin?.length > 0 &&
UserType != 'Super Admin User' && (
<div>
<SAdminUserNotification
SAdminuserPin={SAdminuserPin}
popOverOpen={popOverOpen}
handleSupportUser={handleSupportUser}
handlePopOverOpen={handlePopOverOpen}
/>
</div>
)}
{!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',
}}
/>
{/* <button className="BookingCloseButton"
>Booking Close</button> */}
</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>
)}
</>
)}
{!OtherServicesglobal && (
<div style={{ marginLeft: '10px' }}>
<TooltipWrapper title={'E-way Bill'} isMobile={isMobile}>
{''}
<BSEwayBillicon
style={{ cursor: 'pointer', marginTop: '5px' }}
onClick={OpenListOfInvoices}
/>
</TooltipWrapper>
</div>
)}
</div> </div>
) : ( </div>
<SalesCountForStandard
PricingAppPricingName={PricingAppPricingName}
DineInAccess={DineInAccess}
GlobalsalesDetailData={GlobalsalesDetailData}
/>
)}
<div className="BsLayout5-ContentDiv"> <div className="BsLayout5-ContentDiv">
<div className="BSCategory5-tablecont"> <div className="BSCategory5-tablecont">
@ -507,15 +503,20 @@ const BSLayout5 = () => {
)} )}
</> </>
)} )}
{/* <div
className="salesStoreName"
style={{
color: SelectedBillColor?.['FontColor'],
backgroundColor: SelectedBillColor?.['BackgroundColor'],
}}
>
<BranchName />
</div> */}
</div> </div>
{/* <div className="BSCategory5-Contentcont"> */}
<div <div
className={ className="BSCategory5-Contentcont"
BookingCategory?.[0] === 'Category5' style={{ width: '100vw' }}
? 'BSlayout5Cat5Flex'
: 'BSCategory5-Contentcont'
}
> >
<div <div
style={{ style={{
@ -524,13 +525,12 @@ const BSLayout5 = () => {
}} }}
> >
{!OtherServicesglobal && ( {!OtherServicesglobal && (
<CategoryHorizontal <CategoryVertical
categoryFunction={dynamicComponentProps( categoryFunction={dynamicComponentProps(
'Category', 'Category',
BookingCategory?.[1], BookingCategory?.[1],
BookingCategory?.[0] BookingCategory?.[0]
)} )}
categoryType={'vertical'}
/> />
)} )}
{OtherServicesglobal && ( {OtherServicesglobal && (
@ -555,6 +555,8 @@ const BSLayout5 = () => {
> >
{!OtherServicesglobal && Comboglobal === false && ( {!OtherServicesglobal && Comboglobal === false && (
<BSItemCard <BSItemCard
connectingState={connectingState}
setConnectingState={setConnectingState}
cardFunctionality={dynamicComponentProps( cardFunctionality={dynamicComponentProps(
'Card', 'Card',
BookingCard?.[1], BookingCard?.[1],