karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Category conflict files' (#280) from SubCat-Optimization into main 

Reviewed-on: Pozomind/pozo-retail-app#280
This commit is contained in:
mohan 2026-03-12 18:24:54 +05:30
parent cc49fb12dd 9c0cc4d81c
commit cacf42a8fa
4 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
View File

@ -946,7 +946,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
)}
</>
)}
{!isMobile && (
{isMobile && (
<div className="PrinterSettingMB">
<BSMobilePrintSettings />
</div>

44
src/Pages/BookingScreen/Template/BSLayout1/BSLayout1.jsx
View File

@ -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 SubCategoryVertical from '../../Components/BSSubCategories/BSSubCategoryVertical';
import SubCategory from '../../Components/BSSubCategories/BSSubCategoryHorizontal';
import { dynamicComponentProps } from '../DynamicComponentProps.js';
import {
SelectedGlobalLayoutColorDetail,
@ -347,7 +347,7 @@ const BSLayout1 = () => {
</div>
<div
className={
BookingNavbar != 'Navbar3' ? 'BSLayout1' : 'BSLayout1Standard'
BookingNavbar != 'Navbar3' ? 'BSLayout1Main' : 'BSLayout1Standard'
}
style={{
backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
@ -514,8 +514,8 @@ const BSLayout1 = () => {
</div>
</div>
<div className="BSLayout1-ContentDiv">
<div className="BSCategory1-Contentcont">
<div className="BSLayout1Master">
<div className="BSCategoryCardDiv">
<div
style={{
backgroundColor:
@ -543,22 +543,26 @@ const BSLayout1 = () => {
</div>
<div className="BSCategory1-Cardcont">
<div
style={{
backgroundColor:
SelectedSubCatgColor?.['OverallBackgroundColor'],
}}
>
{Comboglobal === false && !OtherServicesglobal && (
<SubCategoryVertical
categoryFunction={dynamicComponentProps(
'SubCategory',
BSLayout1Data?.BookingSubCategory?.[1],
BSLayout1Data?.BookingSubCategory?.[0]
)}
/>
)}
</div>
{
<div
style={{
backgroundColor:
SelectedSubCatgColor?.['OverallBackgroundColor'],
display: BookingSubCategory ? 'block' : 'none',
}}
>
{Comboglobal === false && !OtherServicesglobal && (
<SubCategory
subCategoryType={'vertical'}
categoryFunction={dynamicComponentProps(
'SubCategory',
BSLayout1Data?.BookingSubCategory?.[1],
BSLayout1Data?.BookingSubCategory?.[0]
)}
/>
)}
</div>
}
<div
className="layout1-card-content"

16
src/Pages/BookingScreen/Template/BSLayout4/BSLayout4.jsx
View File

@ -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 CategoryVertical = lazy(
() => import('../../Components/BSCategories/BSCategoryVertical')
const CategoryHorizontal = lazy(
() => import('../../Components/BSCategories/BSCategoryHorizontal')
);
const BSItemCard = lazy(
() => import('../../Components/BSItemCards/BSItemCard')
@ -475,7 +475,14 @@ const BSLayout4 = () => {
backgroundColor: GlobalLayoutColorDetail?.OverallBackgroundColor,
}}
>
<div className="BSlayout_subdiv">
{/* <div className="BSlayout_subdiv"> */}
<div
className={
BookingCategory?.[0] === 'Category5'
? 'bslayout4Cat5Flex'
: 'BSlayout_subdiv'
}
>
<div
className="Bslayout4_ctg"
style={{
@ -484,12 +491,13 @@ const BSLayout4 = () => {
}}
>
{!OtherServicesglobal && (
<CategoryVertical
<CategoryHorizontal
categoryFunction={dynamicComponentProps(
'Category',
BookingCategory?.[1],
BookingCategory?.[0]
)}
categoryType={'vertical'}
/>
)}
{OtherServicesglobal && (

23
src/Pages/BookingScreen/Template/BSLayout5/BSLayout5.jsx
View File

@ -38,7 +38,9 @@ const BSBillingTable7 = lazy(
import('../../Components/BSBillingTables/BSBillingTable7/BSBillingTable7Overall.jsx')
);
import BSItemCard from '../../Components/BSItemCards/BSItemCard';
import CategoryVertical from '../../Components/BSCategories/BSCategoryVertical';
const CategoryHorizontal = lazy(
() => import('../../Components/BSCategories/BSCategoryHorizontal')
);
import { dynamicComponentProps } from '../DynamicComponentProps.js';
import {
GlobalPricingAppPricingName,
@ -503,20 +505,14 @@ const BSLayout5 = () => {
)}
</>
)}
{/* <div
className="salesStoreName"
style={{
color: SelectedBillColor?.['FontColor'],
backgroundColor: SelectedBillColor?.['BackgroundColor'],
}}
>
<BranchName />
</div> */}
</div>
<div
className="BSCategory5-Contentcont"
style={{ width: '100vw' }}
className={
BookingCategory?.[0] === 'Category5'
? 'BSlayout5Cat5Flex'
: 'BSCategory5-Contentcont'
}
>
<div
style={{
@ -525,12 +521,13 @@ const BSLayout5 = () => {
}}
>
{!OtherServicesglobal && (
<CategoryVertical
<CategoryHorizontal
categoryFunction={dynamicComponentProps(
'Category',
BookingCategory?.[1],
BookingCategory?.[0]
)}
categoryType={'vertical'}
/>
)}
{OtherServicesglobal && (