C

app/routes/invoices.py

@@ -15,7 +15,7 @@ from app.services.excel_service import ExcelService
 #from app.services.invoice_page2_service import InvoiceServicePage2
 from app.services.invoice_service_page2 import InvoiceServicePage2
 # Merge PDFs using PyPDF2
-from PyPDF2 import PdfMerger
+from pypdf import PdfWriter, PdfReader
 from io import BytesIO
 
 # Set up logging
@@ -139,18 +139,16 @@ async def generate_invoice_pdf(
         pdf_bytes1 = InvoiceService.generate_pdf(invoice)
         pdf_bytes2 = InvoiceServicePage2.generate_pdf(invoice)
         
-
-        
-        merger = PdfMerger()
+        # Create a PDF writer object
+        writer = PdfWriter()
         
-        # Add both pages to the merger
-        merger.append(BytesIO(pdf_bytes1))
-        merger.append(BytesIO(pdf_bytes2))
+        # Add pages from both PDFs using PdfReader
+        writer.add_page(PdfReader(BytesIO(pdf_bytes1)).pages[0])
+        writer.add_page(PdfReader(BytesIO(pdf_bytes2)).pages[0])
         
         # Write the merged PDF to a BytesIO object
         output = BytesIO()
-        merger.write(output)
-        merger.close()
+        writer.write(output)
         
         # Get the merged PDF bytes
         output.seek(0)