Merge branch 'feature/fixing-print-layout' into develop

This commit is contained in:
2025-12-22 15:14:35 +01:00
2 changed files with 11 additions and 7 deletions

View File

@@ -45,7 +45,8 @@ export const fetchBarcodeDataForPrint = withUser(async (user: AuthenticatedUser,
bills: 1,
barcodeImage: 1,
hub3aText: 1,
payedAmount: 1
payedAmount: 1,
paid: 1
}
})
.toArray();
@@ -55,11 +56,8 @@ export const fetchBarcodeDataForPrint = withUser(async (user: AuthenticatedUser,
for (const location of locations) {
for (const bill of location.bills) {
// Only include bills that have barcode images
if ( ( bill.hub3aText && bill.hub3aText.trim() !== "") ||
// LEGACY SUPPORT ... untill all bills have been migrated
(bill.barcodeImage && bill.barcodeImage.trim() !== "")
) {
// Only include bills that have barcode images and are NOT PAID
if ( ( bill.hub3aText && bill.hub3aText.trim() !== "" && !bill.paid) ) {
printData.push({
locationName: location.name,
billName: bill.name,

View File

@@ -24,6 +24,12 @@ export const PrintPreview: React.FC<PrintPreviewProps> = ({ data, year, month, t
return (
<>
{/* Print-specific CSS styles */}
<style jsx global>{`
html {
background-color: white !important;
color-scheme: light !important;
}
`}</style>
<style jsx>{`
@media print {
@page {
@@ -132,7 +138,7 @@ export const PrintPreview: React.FC<PrintPreviewProps> = ({ data, year, month, t
<td className="border-2 border-gray-800 px-3 py-1.5 text-center">
<div className="flex justify-center items-center">
{
item.hub3aText ? <Pdf417Barcode hub3aText={item.hub3aText} /> : null
item.hub3aText ? <Pdf417Barcode hub3aText={item.hub3aText} className="print:m-[5em_auto]" /> : null
}
</div>
</td>