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

Merge pull request 'Invoice print footer style align' (#75) from invoice-print-style into main 

Reviewed-on: Pozomind/pozo-retail-app#75
This commit is contained in:
karthikalakshmi 2026-02-05 11:42:54 +05:30
parent 86e5011dbb 2568ff3308
commit d59d8bdee2
1 changed files with 125 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,12 +119,6 @@ const TaxInvoice = ({
const parts = dateStr.split(':'); const parts = dateStr.split(':');
return parts[0] || dateStr; return parts[0] || dateStr;
} }
console.log(
Date1,
moment(Date1).format('DD-MMM-YYYY'),
'datadatadatadatadatadata'
);
// Extract data from table2Data - mapping from A4Standard structure
const invoiceData = { const invoiceData = {
// Company Details - mapped from A4Standard // Company Details - mapped from A4Standard
companyName: table2Data?.CompName || table2Data?.BrName || '', companyName: table2Data?.CompName || table2Data?.BrName || '',
@ -250,13 +244,13 @@ const TaxInvoice = ({
? isMobile ? isMobile
? 7 ? 7
: PageSize == 'A5' : PageSize == 'A5'
? 9 ? 6
: 8 : 5
: isMobile : isMobile
? 10 ? 10
: PageSize == 'A5' : PageSize == 'A5'
? 12 ? 9
: 11; : 8;
let dataSource = []; let dataSource = [];
// Simplified data source logic - always use all product details // Simplified data source logic - always use all product details
@ -1368,7 +1362,7 @@ const TaxInvoice = ({
{/* Amount in Words */} {/* Amount in Words */}
<div <div
style={{ style={{
padding: '8px 10px', padding: '5px 10px',
borderBottom: '1px solid #000', borderBottom: '1px solid #000',
fontSize: '11px', fontSize: '11px',
display: 'flex', display: 'flex',
@ -1382,7 +1376,7 @@ const TaxInvoice = ({
flexDirection: 'column', flexDirection: 'column',
}} }}
> >
<div style={{ marginBottom: '3px' }}> <div style={{ marginBottom: '2px' }}>
Amount Chargeable (in words) Amount Chargeable (in words)
</div> </div>
<div style={{ fontWeight: '700', fontSize: '16px' }}> <div style={{ fontWeight: '700', fontSize: '16px' }}>
@ -2257,9 +2251,7 @@ const TaxInvoice = ({
</> </>
)} )}
{/* Bank Details and Signature */} {/* Bank Details and Signature */}
<div <div style={{ display: 'flex', minHeight: '100px', width: '100%' }}>
style={{ display: 'flex', minHeight: '120px', width: '100%' }}
>
{/* Declaration */} {/* Declaration */}
<div <div
style={{ style={{
@ -2292,7 +2284,6 @@ const TaxInvoice = ({
</div> </div>
</div> </div>
</div> </div>
{/* Signature Section */} {/* Signature Section */}
<div <div
style={{ style={{
@ -2369,8 +2360,8 @@ const TaxInvoice = ({
style={{ style={{
borderTop: '1px solid #000', borderTop: '1px solid #000',
borderLeft: '1px solid #000', borderLeft: '1px solid #000',
width: isMobile ? '100%' : '92%', width: isMobile ? '100%' : '94%',
padding: '15px', padding: '10px',
}} }}
> >
{!estimatePrintHeader && table2Data?.OrderType === 'E' ? ( {!estimatePrintHeader && table2Data?.OrderType === 'E' ? (
@ -2398,7 +2389,7 @@ const TaxInvoice = ({
<div <div
style={{ style={{
width: '70px', width: '70px',
height: '30px', height: '20px',
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',