Update invoice.py

invoice.py

@@ -112,15 +112,30 @@ def _render_pdf_reportlab(payload: Dict[str, Any], pdf_path: str) -> bool:
     margin = 15 * mm
     c = canvas.Canvas(pdf_path, pagesize=A4)
 
-    # Header with company branding
+    # Header with logo (if exists)
     y = H - margin
-    c.setFont("Helvetica-Bold", 20)
-    c.setFillColor(colors.HexColor("#6FB643"))  # Green color
-    c.drawString(margin, y, "SPRINGY CONSULTING SERVICES")
-    y -= 15
-    c.setFont("Helvetica-Bold", 10)
-    c.drawString(margin, y, "HEAVY VEHICLE AUDITING & COMPLIANCE")
-    y -= 25
+    if os.path.exists(LOGO_PATH):
+        try:
+            c.drawImage(LOGO_PATH, margin, y - 50, width=W - 2*margin, height=40, preserveAspectRatio=True, mask='auto')
+            y -= 60
+        except Exception:
+            # Fallback to text header
+            c.setFont("Helvetica-Bold", 20)
+            c.setFillColor(colors.HexColor("#6FB643"))
+            c.drawString(margin, y, "SPRINGY CONSULTING SERVICES")
+            y -= 15
+            c.setFont("Helvetica-Bold", 10)
+            c.drawString(margin, y, "HEAVY VEHICLE AUDITING & COMPLIANCE")
+            y -= 25
+    else:
+        # Text header
+        c.setFont("Helvetica-Bold", 20)
+        c.setFillColor(colors.HexColor("#6FB643"))
+        c.drawString(margin, y, "SPRINGY CONSULTING SERVICES")
+        y -= 15
+        c.setFont("Helvetica-Bold", 10)
+        c.drawString(margin, y, "HEAVY VEHICLE AUDITING & COMPLIANCE")
+        y -= 25
 
     # Tax Invoice title
     c.setFillColor(colors.black)
@@ -140,20 +155,25 @@ def _render_pdf_reportlab(payload: Dict[str, Any], pdf_path: str) -> bool:
         y -= 12
     y -= 10
 
-    # Customer block
+    # Get invoice type from payload
+    inv_type = payload.get('inv_type', 'springy')  # Default to springy if not specified
+
+    # Customer block - behavior changes based on invoice type
     c.setFont("Helvetica-Bold", 10)
     c.drawString(margin, y, f"Customer: {payload.get('customer','Customer')}")
     y -= 12
-    c.setFont("Helvetica", 9)
-    for line in [payload.get("address",""), payload.get("email",""), payload.get("phone",""), payload.get("audit_date","")]:
-        if line:
-            c.drawString(margin, y, str(line))
-            y -= 11
+    
+    # For Springy invoices - show customer details under Customer
+    if inv_type == "springy":
+        c.setFont("Helvetica", 9)
+        for line in [payload.get("address",""), payload.get("email",""), payload.get("phone",""), payload.get("audit_date","")]:
+            if line:
+                c.drawString(margin, y, str(line))
+                y -= 11
     y -= 15
 
     # Table header
     c.setFont("Helvetica-Bold", 10)
-    table_y = y
     cols = [("Item", margin), ("Description", margin + 50), ("Qty/Hours", margin + 300), ("Unit Price", margin + 380), ("Price", margin + 460)]
     
     # Draw header background
@@ -165,12 +185,12 @@ def _render_pdf_reportlab(payload: Dict[str, Any], pdf_path: str) -> bool:
         c.drawString(x + 3, y - 12, title)
     y -= 20
 
-    # Table row
+    # First table row - main item
     c.setFont("Helvetica", 10)
     modules = payload.get("modules", 1)
     unit = float(payload.get("unit_price", 0.0))
     
-    # Draw table borders
+    # Draw table row border
     c.rect(margin, y-15, W-2*margin, 15, fill=0, stroke=1)
     
     c.drawString(margin + 15, y - 12, str(modules))
@@ -180,15 +200,38 @@ def _render_pdf_reportlab(payload: Dict[str, Any], pdf_path: str) -> bool:
     c.drawRightString(margin + 510, y - 12, f"{unit:.2f}")
     y -= 20
 
+    # For Third Party invoices - show customer details in table rows
+    if inv_type == "third_party":
+        customer_details = [
+            f"{payload.get('customer','')} NHVR audit {payload.get('audit_date','')}".strip(),
+            payload.get("address",""),
+            payload.get("email",""),
+            payload.get("phone","")
+        ]
+        
+        for detail in customer_details:
+            if detail:
+                c.rect(margin, y-15, W-2*margin, 15, fill=0, stroke=1)
+                c.setFont("Helvetica", 9)
+                c.drawString(margin + 53, y - 12, detail)
+                y -= 15
+    
+    # Add empty rows to match Excel table structure (show complete table)
+    empty_rows = 8 - (4 if inv_type == "third_party" else 0)  # Adjust based on customer detail rows
+    for i in range(empty_rows):
+        c.rect(margin, y-15, W-2*margin, 15, fill=0, stroke=1)
+        y -= 15
+
     # Third-party admin fee (if applicable)
     admin = float(payload.get("admin_fee", 0.0) or 0.0)
     if admin != 0:
         c.rect(margin, y-15, W-2*margin, 15, fill=0, stroke=1)
+        c.setFont("Helvetica", 10)
         c.drawString(margin + 53, y - 12, "JC Auditing administration fee")
         c.drawString(margin + 315, y - 12, "1")
         c.drawRightString(margin + 510, y - 12, f"{admin:.2f}")
         y -= 20
-
+    
     y -= 20
 
     # Payment information section (left side)
@@ -680,6 +723,7 @@ def do_generate(file_obj, inv_type, modules, audit_type, audit_date, name, addre
     inv_dt = today_str()
     admin, subtotal, gst, total = compute_totals(int(modules or 1), inv_type, unit)
 
+    # In do_generate function, add this line to the payload:
     payload = {
         "invoice_number": inv_num,
         "invoice_date": inv_dt,
@@ -697,6 +741,7 @@ def do_generate(file_obj, inv_type, modules, audit_type, audit_date, name, addre
         "tax_rate": "10%",
         "abn": "646 382 464 92",
         "audit_date": audit_date or "",
+        "inv_type": inv_type,  # <-- ADD THIS LINE
     }
     global _last_payload_cache
     _last_payload_cache = payload.copy()