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

change Design add descriptions

This commit is contained in:
Tamilselvan 2026-03-02 13:45:58 +05:30
parent 544e282bd0
commit 5786040e3d
2 changed files with 119 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ const TaxInvoice = ({
ReprintType, ReprintType,
printDatas, printDatas,
}) => { }) => {
const GlobaldummyData = useSelector(GlobalPritdummyData); const GlobaldummyData = useSelector(GlobalPritdummyData);
const SettingData = useSelector(PreferenceData); const SettingData = useSelector(PreferenceData);
const estimatePrintHeader = const estimatePrintHeader =
@ -833,27 +834,25 @@ const TaxInvoice = ({
{item.BrandName}{' '} {item.BrandName}{' '}
</div> </div>
)} )}
{item?.ProductIdentifierDtls?.length > 0 <div>
? item?.ProductIdentifierDtls.filter( {item?.ProductIdentifierDtls?.map((id, i) => (
(items) => <div key={i}>
items.SerialNumber && items.SerialNumber !== '' <div style={{ display: "flex", gap: "5px", flexWrap: "wrap" }}>
)?.map((a, i) => ( {id?.SerialNumber && <span>{id.SerialNumber}</span>}
<div key={i}>{a.SerialNumber}</div> {(id?.IMEI1 || id?.IMEI2) && (
)) <span>{[id.IMEI1, id.IMEI2].filter(Boolean).join(",")}</span>
: ''} )}
{item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls.filter(
(id) => id.IMEI1 !== '' || id.IMEI2 !== ''
)?.map((id, i) => {
const imei1 = id.IMEI1 || '';
const imei2 = id.IMEI2 || '';
return (
<div key={i}>
{[imei1, imei2].filter(Boolean).join(',')}
</div> </div>
);
}) {id?.Description && (
: ''} <div style={{ marginTop: "3px", wordBreak: "break-word" }}>
{id.Description}
</div>
)}
</div>
))}
</div>
</div> </div>
<div <div
style={{ style={{

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

@ -67,7 +67,7 @@ const PrintStyle1 = ({
const FieldDetails = useSelector(GloabalFieldDetails); const FieldDetails = useSelector(GloabalFieldDetails);
const SLNO = FieldDetails?.['Sl.No']; const SLNO = FieldDetails?.['Sl.No'];
const Item = FieldDetails?.['Item']; const Item = FieldDetails?.['Item'];
console.log(Item, 'Item'); console.log(Item, 'PrintStyle1PrintStyle1');
const MRP = FieldDetails?.['MRP']; const MRP = FieldDetails?.['MRP'];
const Discount = FieldDetails?.['Discount']; const Discount = FieldDetails?.['Discount'];
const Tax = FieldDetails?.['Tax']; const Tax = FieldDetails?.['Tax'];
@ -495,8 +495,8 @@ const PrintStyle1 = ({
}} }}
> >
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {/* {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode})`} `(${table2Data?.SalesMode})`} */}
</div> </div>
)} )}
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' ? (
@ -520,8 +520,8 @@ const PrintStyle1 = ({
? PaymentStatusSuccess?.[0]?.PaymentTypeName + ? PaymentStatusSuccess?.[0]?.PaymentTypeName +
' Bill' ' Bill'
: ''} : ''}
{SalesModePref?.SettingValue == 'Y' && {/* {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode})`} `(${table2Data?.SalesMode})`} */}
</div> </div>
)} )}
</div> </div>
@ -538,8 +538,8 @@ const PrintStyle1 = ({
}} }}
> >
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {/* {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode})`} `(${table2Data?.SalesMode})`} */}
</div> </div>
)} )}
<hr className="PrintStyle1-print-dottline" /> <hr className="PrintStyle1-print-dottline" />
@ -605,6 +605,12 @@ const PrintStyle1 = ({
{' '} {' '}
Date : {GlobaldummyData ? formattedDate : Date1}{' '} Date : {GlobaldummyData ? formattedDate : Date1}{' '}
</div> </div>
{SalesModePref?.SettingValue == 'Y' && <div style={{ fontWeight: '600' }}>
{' '}
Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
</div>}
</div> </div>
</div> </div>
@ -748,10 +754,7 @@ const PrintStyle1 = ({
? GlobalItem && <td>{item?.ProdName}</td> ? GlobalItem && <td>{item?.ProdName}</td>
: Item == true && ( : Item == true && (
<td <td
style={{
display: 'flex',
flexDirection: 'column',
}}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{PackageDetails?.filter( {PackageDetails?.filter(
@ -789,37 +792,49 @@ const PrintStyle1 = ({
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? <div> {item?.BrandName}</div>
: ''} : ''}
&nbsp; &nbsp;
{item?.ProductIdentifierDtls?.length > 0 <div style={{ display: "flex", gap: "2px", flexDirection: "column" }}>
? item?.ProductIdentifierDtls?.filter( {item?.ProductIdentifierDtls?.length > 0
(items) => ? item?.ProductIdentifierDtls?.filter(
!( (items) =>
items.SerialNumber == '' || !(
items.SerialNumber == null items.SerialNumber == '' ||
) items.SerialNumber == null
)?.map((a) => { )
return <div>{a.SerialNumber}</div>; )?.map((a) => {
}) return <div>{a.SerialNumber}</div>;
: ''}{' '} })
{item?.ProductIdentifierDtls?.length > 0 : ''}{' '}
? item?.ProductIdentifierDtls.filter( {item?.ProductIdentifierDtls?.length > 0
(item1) => ? item?.ProductIdentifierDtls.filter(
item1.IMEI1 !== '' || (item1) =>
item1.IMEI2 !== '' item1.IMEI1 !== '' ||
)?.map((item2) => { item1.IMEI2 !== ''
const imei1 = item2.IMEI1 || ''; )?.map((item2) => {
const imei2 = item2.IMEI2 || ''; const imei1 = item2.IMEI1 || '';
return ( const imei2 = item2.IMEI2 || '';
<div> return (
{[imei1, imei2] <div>
.filter(Boolean) {[imei1, imei2]
.join(',')} .filter(Boolean)
</div> .join(',')}
); </div>
}) );
: ''} })
: ''}
{item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls.filter(
(items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => (
<span key={i}>{a.Description}</span>
))
: ''}
</div>
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -1026,10 +1041,7 @@ const PrintStyle1 = ({
? GlobalItem && <td>{item?.ProdName}</td> ? GlobalItem && <td>{item?.ProdName}</td>
: Item == true && ( : Item == true && (
<td <td
style={{
display: 'flex',
flexDirection: 'column',
}}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>
@ -3743,8 +3755,8 @@ const PrintStyle1 = ({
}} }}
> >
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {/* {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode})`} `(${table2Data?.SalesMode})`} */}
</div> </div>
)} )}
{table2Data?.OrderType === 'E' ? ( {table2Data?.OrderType === 'E' ? (
@ -3785,8 +3797,8 @@ const PrintStyle1 = ({
}} }}
> >
Estimate{' '} Estimate{' '}
{SalesModePref?.SettingValue == 'Y' && {/* {SalesModePref?.SettingValue == 'Y' &&
`(${table2Data?.SalesMode})`} `(${table2Data?.SalesMode})`} */}
</div> </div>
)} )}
<hr className="PrintStyle1-print-dottline" /> <hr className="PrintStyle1-print-dottline" />
@ -3958,10 +3970,7 @@ const PrintStyle1 = ({
? GlobalItem && <td>{item?.ProdName}</td> ? GlobalItem && <td>{item?.ProdName}</td>
: Item == true && ( : Item == true && (
<td <td
style={{
display: 'flex',
flexDirection: 'column',
}}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
{PackageDetails?.filter( {PackageDetails?.filter(
@ -3999,9 +4008,10 @@ const PrintStyle1 = ({
} (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`} } (${to12Hour(item?.AvailableFrom)} - ${to12Hour(item?.AvailableTo)})`}
&nbsp;{' '} &nbsp;{' '}
{item?.BrandName !== null {item?.BrandName !== null
? item?.BrandName ? <div> {item?.BrandName}</div>
: ''} : ''}
&nbsp; &nbsp;
{/*
{item?.ProductIdentifierDtls?.length > 0 {item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls?.filter( ? item?.ProductIdentifierDtls?.filter(
(items) => (items) =>
@ -4029,7 +4039,41 @@ const PrintStyle1 = ({
</div> </div>
); );
}) })
: ''} : ''} */}
<div style={{ display: 'flex', gap: "3px", flexDirection: "column" }}>
{item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls.filter(
(items) =>
items.SerialNumber &&
items.SerialNumber !== ''
).map((a, i) => (
<div key={i}>{a.SerialNumber}</div>
))
: ''}
{item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls.filter(
(id) => id.IMEI1 !== '' || id.IMEI2 !== ''
).map((id, i) => {
const imei1 = id.IMEI1 || '';
const imei2 = id.IMEI2 || '';
return (
<div key={i}>
{[imei1, imei2]
.filter(Boolean)
.join(',')}
</div>
);
})
: ''}
{item?.ProductIdentifierDtls?.length > 0
? item?.ProductIdentifierDtls.filter(
(items) =>
items.SerialNumber || items.IMEI1 || items.IMEI2
)?.map((a, i) => (
<span key={i}>{a.Description} </span>
))
: ''}
</div>
</td> </td>
)} )}
{GlobaldummyData {GlobaldummyData
@ -4217,10 +4261,7 @@ const PrintStyle1 = ({
? GlobalItem && <td>{item?.ProdName}</td> ? GlobalItem && <td>{item?.ProdName}</td>
: Item == true && ( : Item == true && (
<td <td
style={{
display: 'flex',
flexDirection: 'column',
}}
> >
<div>{item?.ProdName}</div> <div>{item?.ProdName}</div>
<div> <div>