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

fixed bugs

This commit is contained in:
unknown 2026-02-25 19:27:02 +05:30
parent 7a6a888e34
commit f07880a1fd
16 changed files with 6869 additions and 6789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
View File

@ -99,6 +99,11 @@ const InvoiceTemplate = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
console.log(GlobalDiscount, Discount, 'Discount'); console.log(GlobalDiscount, Discount, 'Discount');
@ -944,7 +949,7 @@ const InvoiceTemplate = ({
{/* Invoice Title */} {/* Invoice Title */}
<div className="invoice-title"> <div className="invoice-title">
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: '14px', fontSize: '14px',
@ -2744,7 +2749,7 @@ const InvoiceTemplate = ({
{/* Invoice Title */} {/* Invoice Title */}
<div className="invoice-title"> <div className="invoice-title">
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: '14px', fontSize: '14px',

7
src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
View File

@ -106,6 +106,11 @@ const PrintA4Style11 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const currentDate = new Date(); const currentDate = new Date();
console.log(OrderDetailGST, 'OrderDetailGST'); console.log(OrderDetailGST, 'OrderDetailGST');
const day = currentDate.getDate().toString().padStart(2, '0'); const day = currentDate.getDate().toString().padStart(2, '0');
@ -394,7 +399,7 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
textTransform: 'uppercase', textTransform: 'uppercase',

5
src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
View File

@ -106,6 +106,11 @@ const PrintA5Style11 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const currentDate = new Date(); const currentDate = new Date();
console.log(FieldDetails, 'FieldDetails'); console.log(FieldDetails, 'FieldDetails');
const day = currentDate.getDate().toString().padStart(2, '0'); const day = currentDate.getDate().toString().padStart(2, '0');

7
src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
View File

@ -30,6 +30,11 @@ const TaxInvoice = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
let BillName = printDatas?.PrintHdrName; let BillName = printDatas?.PrintHdrName;
let companyColour = printDatas?.PrintHdrColor ?? '#00000'; let companyColour = printDatas?.PrintHdrColor ?? '#00000';
@ -374,7 +379,7 @@ const TaxInvoice = ({
> >
<div></div> <div></div>
<h2 style={{ margin: '0', fontSize: '20px', fontWeight: '700' }}> <h2 style={{ margin: '0', fontSize: '20px', fontWeight: '700' }}>
{table2Data?.OrderType === 'E' {table2Data?.OrderType === 'E' && estimateTitle
? 'Estimate' ? 'Estimate'
: BillName : BillName
? BillName ? BillName

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
View File

@ -106,6 +106,11 @@ const PrintStyle10 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -453,7 +458,7 @@ const PrintStyle10 = ({
? '8428XXXXXX' ? '8428XXXXXX'
: table2Data?.BrMobile} : table2Data?.BrMobile}
</p> </p>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}> <div style={{ textTransform: 'uppercase' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
@ -481,7 +486,7 @@ const PrintStyle10 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ textTransform: 'uppercase', textAlign: 'center' }} style={{ textTransform: 'uppercase', textAlign: 'center' }}
> >
@ -3113,7 +3118,7 @@ const PrintStyle10 = ({
Mobile:+91{' '} Mobile:+91{' '}
{GlobaldummyData ? '8428XXXXXX' : table2Data?.BrMobile} {GlobaldummyData ? '8428XXXXXX' : table2Data?.BrMobile}
</p> </p>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}> <div style={{ textTransform: 'uppercase' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
@ -3140,7 +3145,7 @@ const PrintStyle10 = ({
</div> </div>
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}> <div style={{ textTransform: 'uppercase' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
View File

@ -110,6 +110,11 @@ const PrintStyle11 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -481,7 +486,7 @@ const PrintStyle11 = ({
</div> </div>
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ textTransform: 'uppercase', textAlign: 'center' }} style={{ textTransform: 'uppercase', textAlign: 'center' }}
> >
@ -3132,7 +3137,7 @@ const PrintStyle11 = ({
</div> </div>
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase', textAlign: 'center' }}> <div style={{ textTransform: 'uppercase', textAlign: 'center' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
View File

@ -109,6 +109,11 @@ const Printstyle12 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -632,7 +637,7 @@ const Printstyle12 = ({
{table2Data?.SalesTableLinkDetails?.[0]?.WaiterName} {table2Data?.SalesTableLinkDetails?.[0]?.WaiterName}
</div> </div>
)} )}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)', fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',
@ -668,7 +673,7 @@ const Printstyle12 = ({
) : null} ) : null}
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)', fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',
@ -3284,7 +3289,7 @@ const Printstyle12 = ({
{table2Data?.SalesTableLinkDetails?.[0]?.WaiterName} {table2Data?.SalesTableLinkDetails?.[0]?.WaiterName}
</div> </div>
)} )}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)', fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',
@ -3317,7 +3322,7 @@ const Printstyle12 = ({
) : null} ) : null}
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: 'clamp(0.75rem, 2.5vw, 1rem)', fontSize: 'clamp(0.75rem, 2.5vw, 1rem)',

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
View File

@ -112,6 +112,11 @@ const Printstyle2 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -450,7 +455,7 @@ const Printstyle2 = ({
</div> </div>
)} )}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontWeight: '600', fontWeight: '600',
@ -3076,7 +3081,7 @@ const Printstyle2 = ({
</div> </div>
)} )}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontWeight: '600', fontWeight: '600',

15
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
View File

@ -80,7 +80,12 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const estimatePrintHeader = SettingData?.[0]?.SettingDtlDetails?.find(setting => setting?.SettingIdName?.toLowerCase() === 'estimateprintheader')?.SettingValue === 'Y' const estimatePrintHeader = SettingData?.[0]?.SettingDtlDetails?.find(setting => setting?.SettingIdName?.toLowerCase() === 'estimateprintheader')?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find((preference) => preference?.PreferredCatName === 'Booking Type')?.PreferenceCatDetails const bookingTypePreference = appPreferences?.find((preference) => preference?.PreferredCatName === 'Booking Type')?.PreferenceCatDetails
const dinePreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "dine in" && type?.PreferredStatus === 'Y') const dinePreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "dine in" && type?.PreferredStatus === 'Y')
const takeAwayPreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "take away" && type?.PreferredStatus === 'Y') const takeAwayPreference = bookingTypePreference?.find((type) => type?.PreferredSubCatName?.toLowerCase() === "take away" && type?.PreferredStatus === 'Y')
@ -223,13 +228,13 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{table2Data?.BrGSTIN && <div>GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : table2Data?.BrGSTIN},</div>} {table2Data?.BrGSTIN && <div>GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : table2Data?.BrGSTIN},</div>}
<div style={{ fontWeight: '600' }}> Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}</div> <div style={{ fontWeight: '600' }}> Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}</div>
{table2Data?.OrderType === "E" && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>} {table2Data?.OrderType === "E" && estimateTitle && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{table2Data?.OrderType === "E" ? "" : <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>{GlobaldummyData ? 'Cash Bill' : BillName ? BillName : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} </div>} {table2Data?.OrderType === "E" ? "" : <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>{GlobaldummyData ? 'Cash Bill' : BillName ? BillName : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName : ""} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} </div>}
</div> </div>
</div>)} </div>)}
{(!estimatePrintHeader && table2Data?.OrderType === "E") && <div style={{ fontSize: "14px", margin: "2px 0 0 0", textAlign: 'center', padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>} {(!estimatePrintHeader && table2Data?.OrderType === "E" && estimateTitle) && <div style={{ fontSize: "14px", margin: "2px 0 0 0", textAlign: 'center', padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
<hr className="PrintStyle3-print-dottline" /> <hr className="PrintStyle3-print-dottline" />
<div className="PrintStyle3-print-ordr-dtls"> <div className="PrintStyle3-print-ordr-dtls">
@ -1150,12 +1155,12 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{table2Data?.BrGSTIN && <div>GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : table2Data?.BrGSTIN},</div>} {table2Data?.BrGSTIN && <div>GST NO :{GlobaldummyData ? '334bhbsagbysfgbfgbu' : table2Data?.BrGSTIN},</div>}
<div style={{ fontWeight: '600' }}> Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}</div> <div style={{ fontWeight: '600' }}> Mobile : +91 {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}</div>
{table2Data?.OrderType === "E" && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>} {table2Data?.OrderType === "E" && estimateTitle && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
{table2Data?.OrderType === "E" ? "" : <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>{GlobaldummyData ? GlobalBilltext ? GlobalBilltext : "Cash" + ' Bill' : BillName ? BillName : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' : ""} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>} {table2Data?.OrderType === "E" ? "" : <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>{GlobaldummyData ? GlobalBilltext ? GlobalBilltext : "Cash" + ' Bill' : BillName ? BillName : PaymentStatusSuccess?.length === 1 ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' : ""} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
</div> </div>
</div>)} </div>)}
{(!estimatePrintHeader && table2Data?.OrderType === "E") && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>} {(!estimatePrintHeader && table2Data?.OrderType === "E" && estimateTitle) && <div style={{ fontSize: "14px", margin: "2px 0 0 0", padding: 0, fontWeight: 600 }}>Estimate Bill {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}</div>}
<hr className="PrintStyle3-print-dottline" /> <hr className="PrintStyle3-print-dottline" />
<div className="PrintStyle3-print-ordr-dtls"> <div className="PrintStyle3-print-ordr-dtls">
<div style={{ lineheight: '50px' }}> <div style={{ lineheight: '50px' }}>

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -119,6 +119,11 @@ const Printstyle4 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -495,7 +500,7 @@ const Printstyle4 = ({
{/* <div>{GlobaldummyData ? formattedDate : Date1}</div> */} {/* <div>{GlobaldummyData ? formattedDate : Date1}</div> */}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="PrintStyle4-FourthSpan" className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontSize: '12px' }} style={{ textTransform: 'uppercase', fontSize: '12px' }}
@ -3196,7 +3201,7 @@ const Printstyle4 = ({
</div> </div>
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="PrintStyle4-FourthSpan" className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontSize: '12px' }} style={{ textTransform: 'uppercase', fontSize: '12px' }}

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
View File

@ -108,6 +108,11 @@ const PrintStyle5 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -429,7 +434,7 @@ const PrintStyle5 = ({
? '1234567890' ? '1234567890'
: table2Data?.BrMobile}{' '} : table2Data?.BrMobile}{' '}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}> <div style={{ textTransform: 'uppercase' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
@ -455,7 +460,7 @@ const PrintStyle5 = ({
<hr /> <hr />
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ textTransform: 'uppercase', textAlign: 'center' }} style={{ textTransform: 'uppercase', textAlign: 'center' }}
> >
@ -2721,7 +2726,7 @@ const PrintStyle5 = ({
Mobile : Mobile :
{GlobaldummyData ? '1234567890' : table2Data?.BrMobile}{' '} {GlobaldummyData ? '1234567890' : table2Data?.BrMobile}{' '}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase' }}> <div style={{ textTransform: 'uppercase' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
@ -2749,7 +2754,7 @@ const PrintStyle5 = ({
<hr /> <hr />
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div style={{ textTransform: 'uppercase', textAlign: 'center' }}> <div style={{ textTransform: 'uppercase', textAlign: 'center' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
View File

@ -110,6 +110,11 @@ const Printstyle6 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -441,7 +446,7 @@ const Printstyle6 = ({
Mobile : {table2Data?.BrMobile} Mobile : {table2Data?.BrMobile}
</div>} </div>}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
textTransform: 'uppercase', textTransform: 'uppercase',
@ -478,7 +483,7 @@ const Printstyle6 = ({
)} )}
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
textTransform: 'uppercase', textTransform: 'uppercase',
@ -3297,7 +3302,7 @@ const Printstyle6 = ({
Mobile : {table2Data?.BrMobile} Mobile : {table2Data?.BrMobile}
</div>} </div>}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
textTransform: 'uppercase', textTransform: 'uppercase',
@ -3337,7 +3342,7 @@ const Printstyle6 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
textTransform: 'uppercase', textTransform: 'uppercase',

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
View File

@ -105,6 +105,11 @@ const PrintStyle7 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -453,7 +458,7 @@ const PrintStyle7 = ({
: '') + table2Data?.AddressDetails?.[0]?.Zip : '') + table2Data?.AddressDetails?.[0]?.Zip
: '')} : '')}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
@ -490,7 +495,7 @@ const PrintStyle7 = ({
)} )}
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
@ -2908,7 +2913,7 @@ const PrintStyle7 = ({
: '') + table2Data?.AddressDetails?.[0]?.Zip : '') + table2Data?.AddressDetails?.[0]?.Zip
: '')} : '')}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
@ -2947,7 +2952,7 @@ const PrintStyle7 = ({
)} )}
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',

9
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
View File

@ -110,6 +110,11 @@ const Printstyle8 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -473,7 +478,7 @@ const Printstyle8 = ({
</div> </div>
</div> </div>
)} )}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="PrintStyle4-FourthSpan" className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontWeight: '600' }} style={{ textTransform: 'uppercase', fontWeight: '600' }}
@ -3276,7 +3281,7 @@ const Printstyle8 = ({
</div> </div>
</div> </div>
)} )}
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="PrintStyle4-FourthSpan" className="PrintStyle4-FourthSpan"
style={{ textTransform: 'uppercase', fontWeight: '600' }} style={{ textTransform: 'uppercase', fontWeight: '600' }}

13
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
View File

@ -107,6 +107,11 @@ const PrintStyle9 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -470,7 +475,7 @@ const PrintStyle9 = ({
Mobile : +91{' '} Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile} {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="" className=""
style={{ style={{
@ -527,7 +532,7 @@ const PrintStyle9 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="" className=""
style={{ style={{
@ -3211,7 +3216,7 @@ const PrintStyle9 = ({
Mobile : +91{' '} Mobile : +91{' '}
{GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile} {GlobaldummyData ? '986XXXXXXX' : table2Data?.BrMobile}
</div> </div>
{table2Data?.OrderType === 'E' && ( {table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="" className=""
style={{ style={{
@ -3276,7 +3281,7 @@ const PrintStyle9 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && ( {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
<div <div
className="" className=""
style={{ style={{

7
src/Pages/paymentpdfPage/PaymentPdfBooking.jsx
View File

@ -133,6 +133,11 @@ const PaymentPdfBooking = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimateprintheader' setting?.SettingIdName?.toLowerCase() === 'estimateprintheader'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find(
(setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
)?.PreferenceCatDetails; )?.PreferenceCatDetails;
@ -435,7 +440,7 @@ const PaymentPdfBooking = ({
</div> </div>
)} )}
<div className="Re-print-top"> <div className="Re-print-top">
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' && estimateTitle ? (
<div <div
style={{ style={{
display: 'flex', display: 'flex',