From 18b02ab6b7172aea96ee3c33ad34386046315e74 Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2026 08:59:48 +0000
Subject: [PATCH 1/4] Changes

Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com>
---
 src/integrations/supabase/types.ts                             | 3 +++
 .../20260426085945_fbe7902f-92cb-4dee-8b82-10246f03d39f.sql    | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 supabase/migrations/20260426085945_fbe7902f-92cb-4dee-8b82-10246f03d39f.sql

diff --git a/src/integrations/supabase/types.ts b/src/integrations/supabase/types.ts
index afed045..b04d819 100644
--- a/src/integrations/supabase/types.ts
+++ b/src/integrations/supabase/types.ts
@@ -1059,6 +1059,7 @@ export type Database = {
           notes: string | null
           phone: string | null
           postal_code: string | null
+          property_address: string | null
           state: string | null
           title: string | null
           updated_at: string
@@ -1079,6 +1080,7 @@ export type Database = {
           notes?: string | null
           phone?: string | null
           postal_code?: string | null
+          property_address?: string | null
           state?: string | null
           title?: string | null
           updated_at?: string
@@ -1099,6 +1101,7 @@ export type Database = {
           notes?: string | null
           phone?: string | null
           postal_code?: string | null
+          property_address?: string | null
           state?: string | null
           title?: string | null
           updated_at?: string
diff --git a/supabase/migrations/20260426085945_fbe7902f-92cb-4dee-8b82-10246f03d39f.sql b/supabase/migrations/20260426085945_fbe7902f-92cb-4dee-8b82-10246f03d39f.sql
new file mode 100644
index 0000000..a987bdf
--- /dev/null
+++ b/supabase/migrations/20260426085945_fbe7902f-92cb-4dee-8b82-10246f03d39f.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.contacts
+  ADD COLUMN IF NOT EXISTS property_address text;
\ No newline at end of file

From 352628459cf9530f015bcd67297e2cd9963dcc24 Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2026 09:00:03 +0000
Subject: [PATCH 2/4] Changes

Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com>
---
 src/components/contacts/contact-form-dialog.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/components/contacts/contact-form-dialog.tsx b/src/components/contacts/contact-form-dialog.tsx
index 2fb28eb..7d698b9 100644
--- a/src/components/contacts/contact-form-dialog.tsx
+++ b/src/components/contacts/contact-form-dialog.tsx
@@ -40,6 +40,7 @@ export interface ContactRecord {
   postal_code?: string | null;
   notes?: string | null;
   contact_type?: string | null;
+  property_address?: string | null;
 }
 
 export function ContactFormDialog({
@@ -92,6 +93,7 @@ export function ContactFormDialog({
       postal_code: form.postal_code || null,
       notes: form.notes || null,
       contact_type: form.contact_type || "other",
+      property_address: form.property_address || null,
     };
     let saved: { id: string; name: string } | null = null;
     if (contact?.id) {
@@ -185,6 +187,19 @@ export function ContactFormDialog({
             <Label>Postal code</Label>
             <Input value={form.postal_code ?? ""} onChange={(e) => set("postal_code", e.target.value)} />
           </div>
+          {form.contact_type === "homeowner" && (
+            <div className="space-y-1.5 sm:col-span-2">
+              <Label>Property address</Label>
+              <Input
+                placeholder="Street, unit, city, state ZIP"
+                value={form.property_address ?? ""}
+                onChange={(e) => set("property_address", e.target.value)}
+              />
+              <p className="text-xs text-muted-foreground">
+                Used as the property address on collection ledger statements.
+              </p>
+            </div>
+          )}
           <div className="space-y-1.5 sm:col-span-2">
             <Label>Notes</Label>
             <Textarea rows={3} value={form.notes ?? ""} onChange={(e) => set("notes", e.target.value)} />

From 1cc84bd885736bc58215dcf067163e781ff468c5 Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2026 09:00:15 +0000
Subject: [PATCH 3/4] Changes

Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com>
---
 src/routes/contacts.$contactId.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/routes/contacts.$contactId.tsx b/src/routes/contacts.$contactId.tsx
index 0aa683f..69864e4 100644
--- a/src/routes/contacts.$contactId.tsx
+++ b/src/routes/contacts.$contactId.tsx
@@ -128,6 +128,9 @@ function ContactDetail() {
               <DetailRow label="Company" value={contact.company} icon={Building2} />
               <DetailRow label="Title" value={contact.title} />
               <DetailRow label="Address" value={addr || null} icon={MapPin} />
+              {contact.contact_type === "homeowner" && (
+                <DetailRow label="Property address" value={contact.property_address || null} icon={MapPin} />
+              )}
             </dl>
             {contact.notes && (
               <div className="mt-4 pt-4 border-t">

From fc35e6936caf4592ce112b43f7ae0a9afc61f87d Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Sun, 26 Apr 2026 09:00:36 +0000
Subject: [PATCH 4/4] Changes

Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com>
---
 src/components/cases/collections-tab.tsx | 39 ++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/components/cases/collections-tab.tsx b/src/components/cases/collections-tab.tsx
index a874af3..da56bed 100644
--- a/src/components/cases/collections-tab.tsx
+++ b/src/components/cases/collections-tab.tsx
@@ -645,6 +645,33 @@ export function CollectionDetail({
       .maybeSingle();
     const firmName = (firm as any)?.company_name || "";
 
+    // Look up a linked Homeowner-type contact on this case to pull its
+    // property_address (preferred over the homeowner record's address).
+    let contactPropertyAddress: string | null = null;
+    try {
+      const { data: linkedContacts } = await supabase
+        .from("case_contacts")
+        .select("contact:contacts(name, email, contact_type, property_address)")
+        .eq("case_id", collection.case_id);
+      const homeownerContacts = (linkedContacts || [])
+        .map((r: any) => r.contact)
+        .filter((c: any) => c && c.contact_type === "homeowner");
+      // Prefer match by email or name to the collection's homeowner
+      const hoFullName = `${ho?.first_name ?? ""} ${ho?.last_name ?? ""}`.trim().toLowerCase();
+      const hoEmail = (ho?.email || "").toLowerCase();
+      const matched =
+        homeownerContacts.find(
+          (c: any) =>
+            (hoEmail && (c.email || "").toLowerCase() === hoEmail) ||
+            (hoFullName && (c.name || "").toLowerCase() === hoFullName),
+        ) || homeownerContacts[0];
+      if (matched?.property_address) {
+        contactPropertyAddress = matched.property_address;
+      }
+    } catch {
+      // ignore — fall back to homeowner record address
+    }
+
     const doc = new jsPDF({ orientation: "landscape", unit: "pt", format: "letter" });
     const pageWidth = doc.internal.pageSize.getWidth();
     const pageHeight = doc.internal.pageSize.getHeight();
@@ -673,8 +700,16 @@ export function CollectionDetail({
     doc.text("PROPERTY ADDRESS:", margin, 88);
     doc.setFont("helvetica", "normal");
     const addrLines: string[] = [];
-    if (ho?.address) addrLines.push(ho.address);
-    if (ho?.unit_number) addrLines.push(`Unit ${ho.unit_number}`);
+    if (contactPropertyAddress) {
+      // Split multi-line property address into lines
+      contactPropertyAddress.split(/\r?\n/).forEach((l) => {
+        const t = l.trim();
+        if (t) addrLines.push(t);
+      });
+    } else {
+      if (ho?.address) addrLines.push(ho.address);
+      if (ho?.unit_number) addrLines.push(`Unit ${ho.unit_number}`);
+    }
     if (addrLines.length === 0) addrLines.push("N/A");
     addrLines.forEach((line, i) => doc.text(line, margin, 102 + i * 12));