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

Merge pull request '#183 Uom display based preference' (#184) from Uomdisplayinprint into main 

Reviewed-on: Pozomind/pozo-retail-app#184
This commit is contained in:
karthikalakshmi 2026-02-26 11:46:07 +05:30
parent bc8dafa167 aeb86992c7
commit aede4277a5
14 changed files with 7738 additions and 7396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,9 @@ const InvoiceTemplate = ({
const GlobalBilltext = useSelector(GlobalBillName); const GlobalBilltext = useSelector(GlobalBillName);
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -101,8 +104,7 @@ const InvoiceTemplate = ({
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
console.log(GlobalDiscount, Discount, 'Discount'); console.log(GlobalDiscount, Discount, 'Discount');
@ -154,7 +156,7 @@ const InvoiceTemplate = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => { const isEditedBill = PaymentStatus?.some((payment) => {
const type = payment?.AdjustmentType?.toLowerCase(); const type = payment?.AdjustmentType?.toLowerCase();
return ( return (
(type === 'extra' || type === 'refund') && (type === 'extra' || type === 'refund') &&
@ -164,15 +166,15 @@ const InvoiceTemplate = ({
}); });
const lastTransaction = PaymentStatus?.find( const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y' (ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
) );
const TakeawayTotal = TakeawayData?.reduce( const TakeawayTotal = TakeawayData?.reduce(
(accumulator, currentValue) => accumulator + currentValue.TotalAmt, (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
0, 0
); );
const PackageDetails = table2Data?.PackageDtl; const PackageDetails = table2Data?.PackageDtl;
const DineInTotal = DineInData?.reduce( const DineInTotal = DineInData?.reduce(
(accumulator, currentValue) => accumulator + currentValue.TotalAmt, (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
0, 0
); );
const aggregatedPayments = PaymentStatusSuccess?.reduce( const aggregatedPayments = PaymentStatusSuccess?.reduce(
(acc, paymentdata) => { (acc, paymentdata) => {
@ -187,7 +189,7 @@ const InvoiceTemplate = ({
return acc; return acc;
}, },
{}, {}
); );
const productsData = table2Data?.productDetails || []; const productsData = table2Data?.productDetails || [];
const offers = table2Data?.OrderOfferDetails || []; const offers = table2Data?.OrderOfferDetails || [];
@ -1286,6 +1288,7 @@ const InvoiceTemplate = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1295,6 +1298,7 @@ const InvoiceTemplate = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)
)} )}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
@ -1804,7 +1808,7 @@ const InvoiceTemplate = ({
{Number( {Number(
GlobaldummyData GlobaldummyData
? 736 ? 736
: table2Data?.NetAmount, : table2Data?.NetAmount
)?.toFixed(2)} )?.toFixed(2)}
</div> </div>
</div> </div>
@ -2382,7 +2386,7 @@ const InvoiceTemplate = ({
</div> </div>
<div className="total-amount"> <div className="total-amount">
{Number( {Number(
GlobaldummyData ? 736 : table2Data?.NetAmount, GlobaldummyData ? 736 : table2Data?.NetAmount
)?.toFixed(2)} )?.toFixed(2)}
</div> </div>
{isEditedBill && lastTransaction && ( {isEditedBill && lastTransaction && (
@ -2439,8 +2443,10 @@ const InvoiceTemplate = ({
'REFUND' 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -3001,13 +3007,15 @@ const InvoiceTemplate = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''}{' '}
</div> </div>
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
@ -3020,7 +3028,7 @@ const InvoiceTemplate = ({
!( !(
items.SerialNumber == '' || items.SerialNumber == '' ||
items.SerialNumber == null items.SerialNumber == null
), )
)?.map((a) => { )?.map((a) => {
return <div>{a.SerialNumber}</div>; return <div>{a.SerialNumber}</div>;
}) })
@ -3029,7 +3037,7 @@ const InvoiceTemplate = ({
? item?.ProductIdentifierDtls.filter( ? item?.ProductIdentifierDtls.filter(
(item1) => (item1) =>
item1.IMEI1 !== '' || item1.IMEI1 !== '' ||
item1.IMEI2 !== '', item1.IMEI2 !== ''
)?.map((item2) => { )?.map((item2) => {
const imei1 = item2.IMEI1 || ''; const imei1 = item2.IMEI1 || '';
const imei2 = item2.IMEI2 || ''; const imei2 = item2.IMEI2 || '';
@ -3169,7 +3177,7 @@ const InvoiceTemplate = ({
</td> </td>
)} )}
</tr> </tr>
), )
)} )}
</tbody> </tbody>
</table> </table>
@ -3352,13 +3360,13 @@ const InvoiceTemplate = ({
<span>Total Amount Payable</span> <span>Total Amount Payable</span>
<span> <span>
{Number( {Number(
GlobaldummyData ? 736 : table2Data?.NetAmount, GlobaldummyData ? 736 : table2Data?.NetAmount
)?.toFixed(2)} )?.toFixed(2)}
</span> </span>
</div> </div>
<div className="total-amount"> <div className="total-amount">
{Number( {Number(
GlobaldummyData ? 736 : table2Data?.NetAmount, GlobaldummyData ? 736 : table2Data?.NetAmount
)?.toFixed(2)} )?.toFixed(2)}
</div> </div>
{isEditedBill && lastTransaction && ( {isEditedBill && lastTransaction && (
@ -3391,7 +3399,7 @@ const InvoiceTemplate = ({
</span> </span>
<strong> <strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed( {(lastTransaction?.BeforeAdjustment || 0).toFixed(
2, 2
)} )}
</strong> </strong>
</div> </div>
@ -3411,8 +3419,10 @@ const InvoiceTemplate = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -3427,7 +3437,7 @@ const InvoiceTemplate = ({
</span> </span>
<strong> <strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed( {(lastTransaction?.AfterAdjustment || 0).toFixed(
2, 2
)} )}
</strong> </strong>
</div> </div>

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

@ -101,6 +101,9 @@ const PrintA4Style11 = ({
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -108,8 +111,7 @@ const PrintA4Style11 = ({
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const currentDate = new Date(); const currentDate = new Date();
console.log(OrderDetailGST, 'OrderDetailGST'); console.log(OrderDetailGST, 'OrderDetailGST');
@ -142,7 +144,7 @@ const PrintA4Style11 = ({
let PaymentStatusSuccess = PaymentStatus?.filter( let PaymentStatusSuccess = PaymentStatus?.filter(
(ps) => ps.PaymentStatus === 'S' (ps) => ps.PaymentStatus === 'S'
); );
const isEditedBill = PaymentStatus?.some(payment => { const isEditedBill = PaymentStatus?.some((payment) => {
const type = payment?.AdjustmentType?.toLowerCase(); const type = payment?.AdjustmentType?.toLowerCase();
return ( return (
(type === 'extra' || type === 'refund') && (type === 'extra' || type === 'refund') &&
@ -152,7 +154,7 @@ const PrintA4Style11 = ({
}); });
const lastTransaction = PaymentStatus?.find( const lastTransaction = PaymentStatus?.find(
(ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y' (ps) => ps.PaymentStatus === 'S' && ps?.LastOrderTran === 'Y'
) );
const TakeawayTotal = TakeawayData?.reduce( const TakeawayTotal = TakeawayData?.reduce(
(accumulator, currentValue) => accumulator + currentValue.TotalAmt, (accumulator, currentValue) => accumulator + currentValue.TotalAmt,
@ -399,7 +401,9 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && ( {!estimatePrintHeader &&
table2Data?.OrderType === 'E' &&
estimateTitle && (
<div <div
style={{ style={{
textTransform: 'uppercase', textTransform: 'uppercase',
@ -719,8 +723,13 @@ const PrintA4Style11 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue ===
'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} (
{item?.Size
? item?.Size
: '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type != 'C'
@ -728,6 +737,7 @@ const PrintA4Style11 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)
)} )}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
@ -952,20 +962,44 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && ( {isEditedBill && lastTransaction && (
<div style={{ <div
width: '100%', marginTop: '2px', style={{
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start', width: '100%',
flexDirection: 'column', borderTop: '1px dashed #000' marginTop: '2px',
}}> paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'flex-start',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
width: '100%' width: '100%',
}} }}
> >
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span> style={{
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
}}
>
<span
style={{
color: '#000',
fontWeight: 600,
}}
>
Bill Gross Amount
</span>
<strong>
{(
lastTransaction?.BeforeAdjustment ||
0
).toFixed(2)}
</strong>
</div> </div>
<div <div
style={{ style={{
@ -973,21 +1007,47 @@ const PrintA4Style11 = ({
justifyContent: 'space-between', justifyContent: 'space-between',
fontWeight: 600, fontWeight: 600,
color: color:
lastTransaction?.AdjustmentType === 'REFUND' lastTransaction?.AdjustmentType ===
'REFUND'
? '#000' ? '#000'
: '#000', : '#000',
}} }}
> >
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType ===
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - 'REFUND'
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} ? '-'
: '+'}
{Math.abs(
(lastTransaction?.BeforeAdjustment ??
0) -
(lastTransaction?.AfterAdjustment ??
0)
).toFixed(2)}
</span> </span>
</div> </div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}> <div
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span> style={{
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span
style={{
color: '#000',
fontWeight: 600,
}}
>
Net Bill Amount
</span>
<strong>
{(
lastTransaction?.AfterAdjustment ||
0
).toFixed(2)}
</strong>
</div> </div>
</div> </div>
</div> </div>
@ -1765,6 +1825,7 @@ const PrintA4Style11 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1774,6 +1835,7 @@ const PrintA4Style11 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
@ -1996,20 +2058,44 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && ( {isEditedBill && lastTransaction && (
<div style={{ <div
width: '100%', marginTop: '2px', style={{
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start', width: '100%',
flexDirection: 'column', borderTop: '1px dashed #000' marginTop: '2px',
}}> paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'flex-start',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
width: '100%' width: '100%',
}} }}
> >
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span> style={{
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
}}
>
<span
style={{
color: '#000',
fontWeight: 600,
}}
>
Bill Gross Amount
</span>
<strong>
{(
lastTransaction?.BeforeAdjustment ||
0
).toFixed(2)}
</strong>
</div> </div>
<div <div
style={{ style={{
@ -2017,21 +2103,47 @@ const PrintA4Style11 = ({
justifyContent: 'space-between', justifyContent: 'space-between',
fontWeight: 600, fontWeight: 600,
color: color:
lastTransaction?.AdjustmentType === 'REFUND' lastTransaction?.AdjustmentType ===
'REFUND'
? '#000' ? '#000'
: '#000', : '#000',
}} }}
> >
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType ===
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - 'REFUND'
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} ? '-'
: '+'}
{Math.abs(
(lastTransaction?.BeforeAdjustment ??
0) -
(lastTransaction?.AfterAdjustment ??
0)
).toFixed(2)}
</span> </span>
</div> </div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}> <div
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span> style={{
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span
style={{
color: '#000',
fontWeight: 600,
}}
>
Net Bill Amount
</span>
<strong>
{(
lastTransaction?.AfterAdjustment ||
0
).toFixed(2)}
</strong>
</div> </div>
</div> </div>
</div> </div>
@ -2552,7 +2664,7 @@ const PrintA4Style11 = ({
)} )}
</div> </div>
{(PaymentStatusSuccess?.length > 1 && !isEditedBill) && ( {PaymentStatusSuccess?.length > 1 && !isEditedBill && (
<> <>
{/* <p>Split Payment:</p> */} {/* <p>Split Payment:</p> */}
{Object.keys(aggregatedPayments).map((paymentType) => ( {Object.keys(aggregatedPayments).map((paymentType) => (
@ -2650,20 +2762,38 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && ( {isEditedBill && lastTransaction && (
<div style={{ <div
width: '100%', marginTop: '2px', style={{
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start', width: '100%',
flexDirection: 'column', borderTop: '1px dashed #000' marginTop: '2px',
}}> paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'flex-start',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
width: '100%' width: '100%',
}} }}
> >
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span> style={{
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: 600 }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(
2
)}
</strong>
</div> </div>
<div <div
style={{ style={{
@ -2678,14 +2808,30 @@ const PrintA4Style11 = ({
> >
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType === 'REFUND'
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - ? '-'
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} : '+'}
{Math.abs(
(lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}> <div
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span> style={{
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: 600 }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(
2
)}
</strong>
</div> </div>
</div> </div>
</div> </div>
@ -3217,20 +3363,36 @@ const PrintA4Style11 = ({
</div> </div>
</div> </div>
{isEditedBill && lastTransaction && ( {isEditedBill && lastTransaction && (
<div style={{ <div
width: '100%', marginTop: '2px', style={{
paddingTop: '2px', display: 'flex', justifyContent: 'center', alignItems: 'flex-start', width: '100%',
flexDirection: 'column', borderTop: '1px dashed #000' marginTop: '2px',
}}> paddingTop: '2px',
display: 'flex',
justifyContent: 'center',
alignItems: 'flex-start',
flexDirection: 'column',
borderTop: '1px dashed #000',
}}
>
<div <div
style={{ style={{
fontSize: '12px', fontSize: '12px',
width: '100%' width: '100%',
}} }}
> >
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div
<span style={{ color: '#000', fontWeight: 600, }}>Bill Gross Amount</span> style={{
<strong>{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
}}
>
<span style={{ color: '#000', fontWeight: 600 }}>
Bill Gross Amount
</span>
<strong>
{(lastTransaction?.BeforeAdjustment || 0).toFixed(2)}
</strong>
</div> </div>
<div <div
style={{ style={{
@ -3245,14 +3407,28 @@ const PrintA4Style11 = ({
> >
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType === 'REFUND'
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - ? '-'
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} : '+'}
{Math.abs(
(lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '4px' }}> <div
<span style={{ color: '#000', fontWeight: 600 }}>Net Bill Amount</span> style={{
<strong>{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}</strong> display: 'flex',
justifyContent: 'space-between',
marginTop: '4px',
}}
>
<span style={{ color: '#000', fontWeight: 600 }}>
Net Bill Amount
</span>
<strong>
{(lastTransaction?.AfterAdjustment || 0).toFixed(2)}
</strong>
</div> </div>
</div> </div>
</div> </div>

10
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
View File

@ -128,6 +128,10 @@ const PrintStyle1 = ({
(setting) => (setting) =>
setting?.SettingIdName?.toLowerCase() === 'estimatetitle' setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const keysLength = Object.keys(table2Data ?? {}).length; const keysLength = Object.keys(table2Data ?? {}).length;
const paymentTypeUPI = PaymentStatus?.find( const paymentTypeUPI = PaymentStatus?.find(
@ -772,6 +776,7 @@ const PrintStyle1 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1032,6 +1037,7 @@ const PrintStyle1 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1041,6 +1047,7 @@ const PrintStyle1 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`
@ -3982,6 +3989,7 @@ const PrintStyle1 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -4223,6 +4231,7 @@ const PrintStyle1 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -4232,6 +4241,7 @@ const PrintStyle1 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
{sportsAppPreference && {sportsAppPreference &&
`${item?.BookingDate?.trim() `${item?.BookingDate?.trim()
? `(${dateFormatChange(item.BookingDate)})` ? `(${dateFormatChange(item.BookingDate)})`

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

@ -101,6 +101,9 @@ const PrintStyle10 = ({
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -108,8 +111,7 @@ const PrintStyle10 = ({
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
@ -486,9 +488,14 @@ const PrintStyle10 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && ( {!estimatePrintHeader &&
table2Data?.OrderType === 'E' &&
estimateTitle && (
<div <div
style={{ textTransform: 'uppercase', textAlign: 'center' }} style={{
textTransform: 'uppercase',
textAlign: 'center',
}}
> >
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
@ -750,13 +757,15 @@ const PrintStyle10 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -1070,6 +1079,7 @@ const PrintStyle10 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1079,6 +1089,7 @@ const PrintStyle10 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -1866,8 +1877,10 @@ const PrintStyle10 = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -2816,8 +2829,10 @@ const PrintStyle10 = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -3145,7 +3160,9 @@ const PrintStyle10 = ({
</div> </div>
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && ( {!estimatePrintHeader &&
table2Data?.OrderType === 'E' &&
estimateTitle && (
<div style={{ textTransform: 'uppercase' }}> <div style={{ textTransform: 'uppercase' }}>
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {SalesModePref?.SettingValue == 'Y' &&
@ -3359,13 +3376,15 @@ const PrintStyle10 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -3634,6 +3653,7 @@ const PrintStyle10 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3643,6 +3663,7 @@ const PrintStyle10 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -4367,8 +4388,10 @@ const PrintStyle10 = ({
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div

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

@ -105,6 +105,9 @@ const PrintStyle11 = ({
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -717,13 +720,16 @@ const PrintStyle11 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''
}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -1014,6 +1020,8 @@ const PrintStyle11 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1023,6 +1031,7 @@ const PrintStyle11 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3328,13 +3337,16 @@ const PrintStyle11 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''
}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -3588,6 +3600,8 @@ const PrintStyle11 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3597,6 +3611,7 @@ const PrintStyle11 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

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

@ -104,6 +104,9 @@ const Printstyle12 = ({
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -880,13 +883,16 @@ const Printstyle12 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''
}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -1127,6 +1133,8 @@ const Printstyle12 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1136,6 +1144,7 @@ const Printstyle12 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3510,13 +3519,16 @@ const Printstyle12 = ({
</div> </div>
) : ( ) : (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''
}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -3739,6 +3751,8 @@ const Printstyle12 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y'
&&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3748,6 +3762,7 @@ const Printstyle12 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

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

@ -107,6 +107,9 @@ const Printstyle2 = ({
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -706,7 +709,8 @@ const Printstyle2 = ({
</span> </span>
))} ))}
</div> </div>
) : ( ) : UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1045,6 +1049,7 @@ const Printstyle2 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1054,6 +1059,7 @@ const Printstyle2 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3292,7 +3298,7 @@ const Printstyle2 = ({
</span> </span>
))} ))}
</div> </div>
) : ( ) : UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3592,6 +3598,7 @@ const Printstyle2 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3601,6 +3608,7 @@ const Printstyle2 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

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

@ -80,6 +80,9 @@ 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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
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 = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
@ -279,7 +282,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
</span> </span>
))} ))}
</div> </div>
: <div> : UomPrint?.SettingValue === 'Y' &&<div>
({item?.Size ? item?.Size : "1"}{" "} ({item?.Size ? item?.Size : "1"}{" "}
{item?.SinglePc == "Y" {item?.SinglePc == "Y"
? "PCS" ? "PCS"
@ -333,7 +336,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item && {GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item &&
<div style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}> <div style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div> {UomPrint?.SettingValue === 'Y' && <div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div>}
</div>} </div>}
{GlobaldummyData ? GlobalHsnCode && <div style={{ width: '100%', textAlign: 'right' }}>{item?.HSN}</div> : HsnCode && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.HSN}</div>} {GlobaldummyData ? GlobalHsnCode && <div style={{ width: '100%', textAlign: 'right' }}>{item?.HSN}</div> : HsnCode && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.HSN}</div>}
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>} {GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}
@ -1200,7 +1203,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
</span> </span>
))} ))}
</div> </div>
: <div> : UomPrint?.SettingValue === 'Y' && <div>
({item?.Size ? item?.Size : "1"}{" "} ({item?.Size ? item?.Size : "1"}{" "}
{item?.SinglePc == "Y" {item?.SinglePc == "Y"
? "PCS" ? "PCS"
@ -1254,7 +1257,7 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item && {GlobaldummyData ? GlobalItem && <div style={{ width: '300%', textAlign: 'left' }}>{item?.ProdName}</div> : Item &&
<div style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}> <div style={{ display: 'flex', flexDirection: 'column', width: '300%', textAlign: 'left', fontWeight: 600 }}>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div> { UomPrint?.SettingValue === 'Y' &&<div>({item?.Size ? item?.Size : "1"} {item?.SinglePc == 'Y' ? 'PCS' : item?.Type != "C" ? item?.UomName : "COMBO"})</div>}
</div>} </div>}
{GlobaldummyData ? GlobalHsnCode && <div style={{ width: '100%', textAlign: 'right' }}>{item?.HSN}</div> : HsnCode && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.HSN}</div>} {GlobaldummyData ? GlobalHsnCode && <div style={{ width: '100%', textAlign: 'right' }}>{item?.HSN}</div> : HsnCode && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.HSN}</div>}
{GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>} {GlobaldummyData ? GlobalMRP && <div style={{ width: '100%', textAlign: 'right', }}>{item?.MRP}</div> : MRP && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SinglePc === 'Y' ? item?.Rate : item?.MRP}</div>}

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

@ -114,6 +114,9 @@ const Printstyle4 = ({
), ),
]; ];
console.log(table2Data, 'table2Data'); console.log(table2Data, 'table2Data');
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -765,12 +768,14 @@ const Printstyle4 = ({
) : ( ) : (
<div> <div>
{( {(
(item?.Size || '1') + (UomPrint?.SettingValue === 'Y'
? (item?.Size || '1') +
(item?.SinglePc === 'Y' (item?.SinglePc === 'Y'
? ' PCS' ? ' PCS'
: item?.Type !== 'C' : item?.Type !== 'C'
? ` ${item?.UomName}` ? ` ${item?.UomName}`
: ' COMBO') + : ' COMBO')
: '') +
(item?.BrandName (item?.BrandName
? ` ${item?.BrandName}` ? ` ${item?.BrandName}`
: '') + : '') +
@ -1062,6 +1067,7 @@ const Printstyle4 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1071,6 +1077,7 @@ const Printstyle4 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -3368,12 +3375,6 @@ const Printstyle4 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
</td>
)}
{GlobaldummyData
? GlobalQuantity && (
<td style={{ textAlign: 'right' }}>
{item?.SalesQty}
<div> <div>
{PackageDetails?.filter( {PackageDetails?.filter(
(pkg) => pkg.ProdId === item.ProdId (pkg) => pkg.ProdId === item.ProdId
@ -3424,12 +3425,14 @@ const Printstyle4 = ({
) : ( ) : (
<div> <div>
{( {(
(item?.Size || '1') + (UomPrint?.SettingValue === 'Y'
? (item?.Size || '1') +
(item?.SinglePc === 'Y' (item?.SinglePc === 'Y'
? ' PCS' ? ' PCS'
: item?.Type !== 'C' : item?.Type !== 'C'
? ` ${item?.UomName}` ? ` ${item?.UomName}`
: ' COMBO') + : ' COMBO')
: '') +
(item?.BrandName (item?.BrandName
? ` ${item?.BrandName}` ? ` ${item?.BrandName}`
: '') + : '') +
@ -3464,6 +3467,13 @@ const Printstyle4 = ({
)} )}
</div> </div>
</td> </td>
)}
{GlobaldummyData
? GlobalQuantity && (
<td style={{ textAlign: 'right' }}>
{item?.SalesQty}
</td>
) )
: Quantity && ( : Quantity && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
@ -3829,6 +3839,7 @@ const Printstyle4 = ({
: Quantity && ( : Quantity && (
<td style={{ textAlign: 'right' }}> <td style={{ textAlign: 'right' }}>
{item?.SalesQty} {item?.SalesQty}
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3838,6 +3849,7 @@ const Printstyle4 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData

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

@ -103,6 +103,9 @@ const PrintStyle5 = ({
const GlobalCashierName = useSelector(GlobalprintCashierName); const GlobalCashierName = useSelector(GlobalprintCashierName);
const GlobalLogo = useSelector(GlobalprintLogo); const GlobalLogo = useSelector(GlobalprintLogo);
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -673,6 +676,7 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{ UomPrint?.SettingValue === 'Y' &&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -680,7 +684,7 @@ const PrintStyle5 = ({
(GlobaldummyData (GlobaldummyData
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty)} : item?.SalesQty)}
</div> </div>}
</> </>
)} )}
</div> </div>
@ -740,12 +744,12 @@ const PrintStyle5 = ({
</div> </div>
) : ( ) : (
<div> <div>
{(item?.Size || '1') + {UomPrint?.SettingValue === 'Y' ?((item?.Size || '1') +
(item?.SinglePc === 'Y' (item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type !== 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO') + : 'COMBO')) :"" +
(item?.BrandName || '') + (item?.BrandName || '') +
(item?.ProductIdentifierDtls?.filter( (item?.ProductIdentifierDtls?.filter(
(items) => (items) =>
@ -1052,6 +1056,7 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{ UomPrint?.SettingValue === 'Y' &&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -1060,6 +1065,7 @@ const PrintStyle5 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty)} : item?.SalesQty)}
</div> </div>
}
</> </>
)} )}
</div> </div>
@ -1076,6 +1082,7 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
{(item?.Size ? item?.Size : '1') + {(item?.Size ? item?.Size : '1') +
(item?.SinglePc == 'Y' (item?.SinglePc == 'Y'
@ -1088,6 +1095,7 @@ const PrintStyle5 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty)} : item?.SalesQty)}
</div> </div>
}
</> </>
)} )}
</div> </div>
@ -2955,6 +2963,7 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' && (
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -2963,6 +2972,7 @@ const PrintStyle5 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty)} : item?.SalesQty)}
</div> </div>
)}
</> </>
)} )}
</div> </div>
@ -3025,12 +3035,12 @@ const PrintStyle5 = ({
</div> </div>
) : ( ) : (
<div> <div>
{(item?.Size || '1') + {UomPrint?.SettingValue === 'Y' ?((item?.Size || '1') +
(item?.SinglePc === 'Y' (item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type !== 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO') + : 'COMBO')):"" +
(item?.BrandName || '') + (item?.BrandName || '') +
(item?.ProductIdentifierDtls?.filter( (item?.ProductIdentifierDtls?.filter(
(items) => (items) =>
@ -3307,6 +3317,7 @@ const PrintStyle5 = ({
) : ( ) : (
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y'&&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -3315,6 +3326,7 @@ const PrintStyle5 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty)} : item?.SalesQty)}
</div> </div>
}
</> </>
)} )}
</div> </div>
@ -3332,12 +3344,12 @@ const PrintStyle5 = ({
<> <>
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
{(item?.Size ? item?.Size : '1') + {UomPrint?.SettingValue === 'Y'? ((item?.Size ? item?.Size : '1') +
(item?.SinglePc == 'Y' (item?.SinglePc == 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type != 'C'
? item?.UomName ? item?.UomName
: 'COMBO') + : 'COMBO') ):""+
'-' + '-' +
(GlobaldummyData (GlobaldummyData
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty

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

@ -105,6 +105,9 @@ const Printstyle6 = ({
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
console.log(CashierNameField, "GlobaldummyData") console.log(CashierNameField, "GlobaldummyData")
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -730,6 +733,7 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -738,6 +742,7 @@ const Printstyle6 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty} : item?.SalesQty}
</div> </div>
}
</> </>
)} )}
</td> </td>
@ -779,6 +784,7 @@ const Printstyle6 = ({
</div> </div>
)) ))
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<span> <span>
({item?.Size ? item?.Size : '1'} ({item?.Size ? item?.Size : '1'}
{item?.SinglePc === 'Y' {item?.SinglePc === 'Y'
@ -1096,6 +1102,7 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -1104,6 +1111,7 @@ const Printstyle6 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty} : item?.SalesQty}
</div> </div>
}
</> </>
)} )}
</td> </td>
@ -1119,7 +1127,7 @@ const Printstyle6 = ({
`(${item?.Size + item?.UomName})` `(${item?.Size + item?.UomName})`
: Item && : Item &&
item?.ProdName + item?.ProdName +
`(${item?.Size ? item?.Size : '1'}${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})`) + UomPrint?.SettingValue === 'Y' ? `(${item?.Size ? item?.Size : '1'}${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})` : '' ) +
item?.BrandName !== item?.BrandName !==
null null
? item?.BrandName ? item?.BrandName
@ -3514,6 +3522,7 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -3522,6 +3531,7 @@ const Printstyle6 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty} : item?.SalesQty}
</div> </div>
}
</> </>
)} )}
</td> </td>
@ -3559,6 +3569,7 @@ const Printstyle6 = ({
</div> </div>
)) ))
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<span> <span>
({item?.Size ? item?.Size : '1'} ({item?.Size ? item?.Size : '1'}
{item?.SinglePc === 'Y' {item?.SinglePc === 'Y'
@ -3807,6 +3818,7 @@ const Printstyle6 = ({
) : ( ) : (
<> <>
<div> {item?.ProdName} </div> <div> {item?.ProdName} </div>
{UomPrint?.SettingValue === 'Y' &&
<div> <div>
{item?.Size + {item?.Size +
item?.UomName + item?.UomName +
@ -3815,6 +3827,7 @@ const Printstyle6 = ({
? GlobalQuantity && item?.SalesQty ? GlobalQuantity && item?.SalesQty
: item?.SalesQty} : item?.SalesQty}
</div> </div>
}
</> </>
)} )}
</td> </td>
@ -3830,7 +3843,7 @@ const Printstyle6 = ({
`(${item?.Size + item?.UomName})` `(${item?.Size + item?.UomName})`
: Item && : Item &&
item?.ProdName + item?.ProdName +
`(${item?.Size ? item?.Size : '1'}${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})`) + UomPrint?.SettingValue === 'Y' ? `(${item?.Size ? item?.Size : '1'}${item?.SinglePc == 'Y' ? 'PCS' : item?.Type != 'C' ? item?.UomName : 'COMBO'})` : '' ) +
item?.BrandName !== item?.BrandName !==
null null
? item?.BrandName ? item?.BrandName

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

@ -100,6 +100,9 @@ const PrintStyle7 = ({
const GlobalCredit = useSelector(GlobalprintCredit); const GlobalCredit = useSelector(GlobalprintCredit);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor); const SelectedHeaderColor = useSelector(GlobalSelectedPrintHeaderColor);
const UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -687,6 +690,7 @@ const PrintStyle7 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -909,13 +913,16 @@ const PrintStyle7 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''
}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -3122,6 +3129,7 @@ const PrintStyle7 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' &&
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3331,13 +3339,16 @@ const PrintStyle7 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''
}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}

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

@ -105,6 +105,9 @@ const Printstyle8 = ({
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -112,8 +115,7 @@ const Printstyle8 = ({
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
@ -769,6 +771,7 @@ const Printstyle8 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -778,6 +781,7 @@ const Printstyle8 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)
)} )}
</td> </td>
)} )}
@ -1095,13 +1099,15 @@ const Printstyle8 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -1743,8 +1749,10 @@ const Printstyle8 = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -2740,8 +2748,10 @@ const Printstyle8 = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -3491,6 +3501,7 @@ const Printstyle8 = ({
))} ))}
</div> </div>
) : ( ) : (
UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3500,6 +3511,7 @@ const Printstyle8 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)
)} )}
</td> </td>
)} )}
@ -3738,13 +3750,15 @@ const Printstyle8 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -4329,8 +4343,10 @@ const Printstyle8 = ({
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div

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

@ -102,6 +102,9 @@ const PrintStyle9 = ({
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 UomPrint = SettingData?.[0]?.SettingDtlDetails?.filter(
(i) => i.SettingIdName === 'PrintUom'
)?.[0];
const estimatePrintHeader = const estimatePrintHeader =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) =>
@ -109,8 +112,7 @@ const PrintStyle9 = ({
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const estimateTitle = const estimateTitle =
SettingData?.[0]?.SettingDtlDetails?.find( SettingData?.[0]?.SettingDtlDetails?.find(
(setting) => (setting) => setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
setting?.SettingIdName?.toLowerCase() === 'estimatetitle'
)?.SettingValue === 'Y'; )?.SettingValue === 'Y';
const bookingTypePreference = appPreferences?.find( const bookingTypePreference = appPreferences?.find(
(preference) => preference?.PreferredCatName === 'Booking Type' (preference) => preference?.PreferredCatName === 'Booking Type'
@ -532,7 +534,9 @@ const PrintStyle9 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && ( {!estimatePrintHeader &&
table2Data?.OrderType === 'E' &&
estimateTitle && (
<div <div
className="" className=""
style={{ style={{
@ -1062,6 +1066,7 @@ const PrintStyle9 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -1071,6 +1076,7 @@ const PrintStyle9 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -1892,8 +1898,10 @@ const PrintStyle9 = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -2875,8 +2883,10 @@ const PrintStyle9 = ({
{lastTransaction?.AdjustmentType === 'REFUND' {lastTransaction?.AdjustmentType === 'REFUND'
? '-' ? '-'
: '+'} : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div
@ -3281,7 +3291,9 @@ const PrintStyle9 = ({
</div> </div>
)} )}
{!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && ( {!estimatePrintHeader &&
table2Data?.OrderType === 'E' &&
estimateTitle && (
<div <div
className="" className=""
style={{ style={{
@ -3427,13 +3439,15 @@ const PrintStyle9 = ({
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} {UomPrint?.SettingValue === 'Y'
{item?.SinglePc == 'Y' ? `${item?.Size || '1'} ${
item?.SinglePc === 'Y'
? 'PCS' ? 'PCS'
: item?.Type != 'C' : item?.Type !== 'C'
? item?.UomName ? item?.UomName
: 'COMBO'} : 'COMBO'
) }`
: ''}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? item?.BrandName
: ''} : ''}
@ -3682,6 +3696,7 @@ const PrintStyle9 = ({
}} }}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{UomPrint?.SettingValue === 'Y' && (
<div> <div>
({item?.Size ? item?.Size : '1'}{' '} ({item?.Size ? item?.Size : '1'}{' '}
{item?.SinglePc == 'Y' {item?.SinglePc == 'Y'
@ -3691,6 +3706,7 @@ const PrintStyle9 = ({
: 'COMBO'} : 'COMBO'}
) )
</div> </div>
)}
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -4455,8 +4471,10 @@ const PrintStyle9 = ({
<span>{'Adjustment Amount'}</span> <span>{'Adjustment Amount'}</span>
<span> <span>
{lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'} {lastTransaction?.AdjustmentType === 'REFUND' ? '-' : '+'}
{Math.abs((lastTransaction?.BeforeAdjustment ?? 0) - {Math.abs(
(lastTransaction?.AfterAdjustment ?? 0)).toFixed(2)} (lastTransaction?.BeforeAdjustment ?? 0) -
(lastTransaction?.AfterAdjustment ?? 0)
).toFixed(2)}
</span> </span>
</div> </div>
<div <div