Fix inventory label duplicate color/finish display

- Suppress ColorName line if it matches the item Name (powders use color name as their item name, causing it to show twice) - Suppress Finish if already contained in the item Name - Always show Manufacturer regardless of whether it is populated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Patch export/import for missing fields; add CustomerContacts export
2026-06-10 16:07:43 -04:00 · 2026-06-10 15:14:27 -04:00 · 2026-06-10 14:39:35 -04:00 · 2026-06-10 14:20:20 -04:00 · 2026-06-10 13:59:14 -04:00 · 2026-06-10 12:46:08 -04:00
42 changed files with 25983 additions and 143 deletions
@@ -0,0 +1,403 @@
 -- =============================================================================
 -- Company Data Purge Script
 -- Removes financial, job, and quote data created before a cutoff date.
 -- Customers and Vendors are always preserved.
 --
 -- WHAT THIS DELETES (for records where CreatedAt < @CutoffDate):
 --   • Journal entries & bank reconciliations
 --   • Bills, bill payments, purchase orders, vendor credits, expenses
 --   • Invoices, invoice payments, credit memos, refunds, deposits
 --   • Jobs and all child records (items, coats, prep, notes, photos, etc.)
 --   • Quotes and all child records
 --
 -- WHAT THIS KEEPS (always):
 --   • Customers, customer notes, customer contacts, preferred powders
 --   • Vendors
 --   • Inventory items and inventory transactions
 --   • Equipment, catalog items, pricing tiers
 --   • Company settings and configuration
 --   • Any record with CreatedAt >= @CutoffDate
 --
 -- INSTRUCTIONS:
 --   1. Set @CompanyId  — find it with: SELECT Id, Name FROM Companies
 --   2. Set @CutoffDate — records created BEFORE this date are deleted
 --   3. Run with @DryRun = 1 first and review the row counts printed
 --   4. Back up the database before setting @DryRun = 0
 --   5. Set @DryRun = 0 and run again to apply
 -- =============================================================================
 DECLARE @CutoffDate  DATE = '2026-01-01';   -- Delete records created BEFORE this date
 DECLARE @CompanyId   INT  = 0;              -- !! Set to your company ID before running
 DECLARE @DryRun      BIT  = 1;              -- 1 = preview counts only  |  0 = apply deletes
 -- =============================================================================
 SET NOCOUNT ON;
 IF @CompanyId = 0
 BEGIN
    RAISERROR('ERROR: Set @CompanyId before running this script. Run: SELECT Id, Name FROM Companies', 16, 1);
    RETURN;
 END
 PRINT '============================================================';
 PRINT 'Purge run at: ' + CONVERT(NVARCHAR, GETDATE(), 120);
 PRINT 'Company ID  : ' + CAST(@CompanyId  AS NVARCHAR);
 PRINT 'Cutoff date : ' + CAST(@CutoffDate AS NVARCHAR) + ' (records BEFORE this date)';
 PRINT 'Dry run     : ' + CASE @DryRun WHEN 1 THEN 'YES — no changes will be made' ELSE 'NO — deletes will be applied' END;
 PRINT '============================================================';
 BEGIN TRANSACTION;
 -- ===========================================================================
 -- SECTION 1 — JOURNAL ENTRIES & GL
 -- ===========================================================================
 PRINT '';
 PRINT '--- Section 1: Journal Entries & GL ---';
 -- Null the self-referential ReversalOfId FK before deleting
 UPDATE JournalEntries
 SET    ReversalOfId = NULL
 WHERE  CompanyId = @CompanyId
  AND  ReversalOfId IN (SELECT Id FROM JournalEntries WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 DELETE FROM JournalEntryLines
 WHERE  JournalEntryId IN (
    SELECT Id FROM JournalEntries WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JournalEntryLines deleted : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JournalEntries
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'JournalEntries deleted    : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM BankReconciliations
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'BankReconciliations deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- ===========================================================================
 -- SECTION 2 — BILLS, PURCHASE ORDERS & EXPENSES
 -- ===========================================================================
 PRINT '';
 PRINT '--- Section 2: Bills, Purchase Orders & Expenses ---';
 -- Vendor credits (must come before Bills because VendorCreditApplications references both)
 DELETE FROM VendorCreditApplications
 WHERE  VendorCreditId IN (
    SELECT Id FROM VendorCredits WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'VendorCreditApplications deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM VendorCreditLineItems
 WHERE  VendorCreditId IN (
    SELECT Id FROM VendorCredits WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'VendorCreditLineItems deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM VendorCredits
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'VendorCredits deleted     : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Bills
 DELETE FROM BillPayments
 WHERE  BillId IN (
    SELECT Id FROM Bills WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'BillPayments deleted      : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM BillLineItems
 WHERE  BillId IN (
    SELECT Id FROM Bills WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'BillLineItems deleted     : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM Bills
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'Bills deleted             : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Purchase orders
 DELETE FROM PurchaseOrderItems
 WHERE  PurchaseOrderId IN (
    SELECT Id FROM PurchaseOrders WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'PurchaseOrderItems deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM PurchaseOrders
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'PurchaseOrders deleted    : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Expenses
 DELETE FROM Expenses
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'Expenses deleted          : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- ===========================================================================
 -- SECTION 3 — INVOICES, PAYMENTS & DEPOSITS
 -- ===========================================================================
 PRINT '';
 PRINT '--- Section 3: Invoices, Payments & Deposits ---';
 -- CreditMemos: NULL the OriginalInvoiceId FK before deleting the invoice it points to
 UPDATE CreditMemos
 SET    OriginalInvoiceId = NULL
 WHERE  CompanyId = @CompanyId
  AND  OriginalInvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 DELETE FROM CreditMemoApplications
 WHERE  InvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate)
  OR   CreditMemoId IN (
    SELECT Id FROM CreditMemos WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'CreditMemoApplications deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM CreditMemos
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'CreditMemos deleted       : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Refunds and gift-cert redemptions tied to deleted invoices
 DELETE FROM Refunds
 WHERE  InvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'Refunds deleted           : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM GiftCertificateRedemptions
 WHERE  InvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'GiftCertificateRedemptions deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Payments
 DELETE FROM Payments
 WHERE  InvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'Payments deleted          : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- InvoiceItems (NULL SourceJobItemId on any invoice items that survive but point at deleted jobs)
 UPDATE InvoiceItems
 SET    SourceJobItemId = NULL
 WHERE  SourceJobItemId IN (
    SELECT ji.Id FROM JobItems ji
    INNER JOIN Jobs j ON ji.JobId = j.Id
    WHERE  j.CompanyId = @CompanyId AND j.CreatedAt < @CutoffDate);
 DELETE FROM InvoiceItems
 WHERE  InvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'InvoiceItems deleted      : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Deposits: clear the AppliedToInvoiceId FK before deleting the invoices
 UPDATE Deposits
 SET    AppliedToInvoiceId = NULL,
       AppliedDate        = NULL
 WHERE  CompanyId = @CompanyId
  AND  AppliedToInvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- Now delete deposits that were created before the cutoff
 DELETE FROM Deposits
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'Deposits deleted          : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Notification logs referencing deleted invoices
 UPDATE NotificationLogs
 SET    InvoiceId = NULL
 WHERE  CompanyId = @CompanyId
  AND  InvoiceId IN (
    SELECT Id FROM Invoices WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 DELETE FROM Invoices
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'Invoices deleted          : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- ===========================================================================
 -- SECTION 4 — JOBS
 -- ===========================================================================
 PRINT '';
 PRINT '--- Section 4: Jobs ---';
 -- NULL FKs in other tables that point to jobs/job-items being deleted --
 -- BillLineItems.JobId (bill survived but referenced a deleted job)
 UPDATE BillLineItems
 SET    JobId = NULL
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- Expenses.JobId
 UPDATE Expenses
 SET    JobId = NULL
 WHERE  CompanyId = @CompanyId
  AND  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- Appointments.JobId
 UPDATE Appointments
 SET    JobId = NULL
 WHERE  CompanyId = @CompanyId
  AND  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- Deposits.JobId (NoAction FK — must NULL before deleting job)
 UPDATE Deposits
 SET    JobId = NULL
 WHERE  CompanyId = @CompanyId
  AND  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- NotificationLogs.JobId
 UPDATE NotificationLogs
 SET    JobId = NULL
 WHERE  CompanyId = @CompanyId
  AND  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- OvenBatchItems: delete before OvenBatches and before JobItems
 DELETE FROM OvenBatchItems
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'OvenBatchItems deleted    : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Clean up now-empty OvenBatches (batches belonging to this company with no remaining items)
 DELETE FROM OvenBatches
 WHERE  CompanyId = @CompanyId
  AND  CreatedAt < @CutoffDate
  AND  Id NOT IN (SELECT DISTINCT OvenBatchId FROM OvenBatchItems);
 PRINT 'OvenBatches deleted       : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- ReworkRecords (JobId required FK; ReworkJobId optional)
 DELETE FROM ReworkRecords
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate)
  OR  ReworkJobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'ReworkRecords deleted     : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- JobItem children (coats and prep services)
 DELETE FROM JobItemCoats
 WHERE  JobItemId IN (
    SELECT Id FROM JobItems WHERE JobId IN (
        SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate));
 PRINT 'JobItemCoats deleted      : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobItemPrepServices
 WHERE  JobItemId IN (
    SELECT Id FROM JobItems WHERE JobId IN (
        SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate));
 PRINT 'JobItemPrepServices deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobItems
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobItems deleted          : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- Job metadata tables
 DELETE FROM JobChangeHistories
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobChangeHistories deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobTimeEntries
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobTimeEntries deleted    : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobPhotos
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobPhotos deleted         : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobNotes
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobNotes deleted          : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobStatusHistory
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobStatusHistory deleted  : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM JobDailyPriorities
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'JobDailyPriorities deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM PowderUsageLogs
 WHERE  JobId IN (
    SELECT Id FROM Jobs WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'PowderUsageLogs deleted   : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM AiItemPredictions
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'AiItemPredictions deleted : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM Jobs
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'Jobs deleted              : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- ===========================================================================
 -- SECTION 5 — QUOTES
 -- ===========================================================================
 PRINT '';
 PRINT '--- Section 5: Quotes ---';
 -- NULL FKs that point to quotes being deleted
 UPDATE Deposits
 SET    QuoteId = NULL
 WHERE  CompanyId = @CompanyId
  AND  QuoteId IN (
    SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 UPDATE NotificationLogs
 SET    QuoteId = NULL
 WHERE  CompanyId = @CompanyId
  AND  QuoteId IN (
    SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 -- QuoteItem children
 DELETE FROM QuoteItemCoats
 WHERE  QuoteItemId IN (
    SELECT Id FROM QuoteItems WHERE QuoteId IN (
        SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate));
 PRINT 'QuoteItemCoats deleted    : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM QuoteItemPrepServices
 WHERE  QuoteItemId IN (
    SELECT Id FROM QuoteItems WHERE QuoteId IN (
        SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate));
 PRINT 'QuoteItemPrepServices deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM QuoteItems
 WHERE  QuoteId IN (
    SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'QuoteItems deleted        : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM QuoteChangeHistories
 WHERE  QuoteId IN (
    SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'QuoteChangeHistories deleted: ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM QuotePhotos
 WHERE  QuoteId IN (
    SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'QuotePhotos deleted       : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- QuotePrepServices are scoped to the quote's company via the quote FK, not directly
 DELETE FROM QuotePrepServices
 WHERE  QuoteId IN (
    SELECT Id FROM Quotes WHERE CompanyId = @CompanyId AND CreatedAt < @CutoffDate);
 PRINT 'QuotePrepServices deleted : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 DELETE FROM Quotes
 WHERE  CompanyId = @CompanyId AND CreatedAt < @CutoffDate;
 PRINT 'Quotes deleted            : ' + CAST(@@ROWCOUNT AS NVARCHAR);
 -- ===========================================================================
 -- SUMMARY & COMMIT / ROLLBACK
 -- ===========================================================================
 PRINT '';
 PRINT '============================================================';
 IF @DryRun = 1
 BEGIN
    PRINT 'DRY RUN complete — rolling back. No data was changed.';
    PRINT 'Set @DryRun = 0 and run again to apply the deletes.';
    ROLLBACK TRANSACTION;
 END
 ELSE
 BEGIN
    PRINT 'Purge complete — committing.';
    COMMIT TRANSACTION;
 END
@@ -0,0 +1,64 @@
 using System.ComponentModel.DataAnnotations;
 namespace PowderCoating.Application.DTOs.Customer;
 public class CustomerContactDto
 {
    public int Id { get; set; }
    public int CustomerId { get; set; }
    public string FirstName { get; set; } = string.Empty;
    public string? LastName { get; set; }
    public string? Title { get; set; }
    public string? ContactRole { get; set; }
    public string? Email { get; set; }
    public string? Phone { get; set; }
    public string? MobilePhone { get; set; }
    public string? Notes { get; set; }
    public string DisplayName => string.IsNullOrWhiteSpace(LastName) ? FirstName : $"{FirstName} {LastName}";
 }
 public class CreateCustomerContactDto
 {
    [Required(ErrorMessage = "First name is required.")]
    [StringLength(100)]
    [Display(Name = "First Name")]
    public string FirstName { get; set; } = string.Empty;
    [StringLength(100)]
    [Display(Name = "Last Name")]
    public string? LastName { get; set; }
    [StringLength(100)]
    [Display(Name = "Job Title")]
    public string? Title { get; set; }
    [StringLength(50)]
    [Display(Name = "Role")]
    public string? ContactRole { get; set; }
    [EmailAddress]
    [StringLength(200)]
    [Display(Name = "Email")]
    public string? Email { get; set; }
    [Phone]
    [StringLength(20)]
    [Display(Name = "Phone")]
    public string? Phone { get; set; }
    [Phone]
    [StringLength(20)]
    [Display(Name = "Mobile Phone")]
    public string? MobilePhone { get; set; }
    [StringLength(500)]
    [Display(Name = "Notes")]
    public string? Notes { get; set; }
 }
 public class UpdateCustomerContactDto : CreateCustomerContactDto
 {
    public int Id { get; set; }
    public int CustomerId { get; set; }
 }
@@ -0,0 +1,35 @@
 namespace PowderCoating.Application.DTOs.Customer;
 /// <summary>A single entry in the customer activity timeline feed on the Details page.</summary>
 public class CustomerTimelineEventDto
 {
    public DateTime Date { get; set; }
    public string Icon { get; set; } = string.Empty;
    public string BadgeColor { get; set; } = string.Empty;
    public string Title { get; set; } = string.Empty;
    public string? Subtitle { get; set; }
    public decimal? Amount { get; set; }
    public int? EntityId { get; set; }
    public string? LinkController { get; set; }
    public string? LinkAction { get; set; }
 }
 /// <summary>Aggregate lifetime metrics displayed in the CRM stats card on Customer Details.</summary>
 public class CustomerLifetimeStatsDto
 {
    public int TotalJobs { get; set; }
    public int ActiveJobs { get; set; }
    /// <summary>Sum of Total on non-voided invoices.</summary>
    public decimal TotalRevenue { get; set; }
    /// <summary>Sum of AmountPaid on non-voided invoices.</summary>
    public decimal TotalCollected { get; set; }
    /// <summary>Mean FinalPrice across all jobs for this customer.</summary>
    public decimal AverageJobValue { get; set; }
    public DateTime? LastJobDate { get; set; }
    public int? DaysSinceLastJob { get; set; }
    public int TotalQuotes { get; set; }
    public int TotalInvoices { get; set; }
    public decimal OpenBalance { get; set; }
    /// <summary>Id of the most recent job — used by the "Repeat Last Job" button on Customer Details.</summary>
    public int? LastJobId { get; set; }
 }
@@ -36,6 +36,16 @@ public class CustomerDto
    public bool NotifyBySms { get; set; }
    public DateTime? SmsConsentedAt { get; set; }
    public string? SmsConsentMethod { get; set; }
    // CRM
    public string? LeadSource { get; set; }
    // Ship-to address
    public string? ShipToAddress { get; set; }
    public string? ShipToCity { get; set; }
    public string? ShipToState { get; set; }
    public string? ShipToZipCode { get; set; }
    public string? ShipToCountry { get; set; }
 }
 public class CreateCustomerDto : IValidatableObject
@@ -115,6 +125,31 @@ public class CreateCustomerDto : IValidatableObject
    [StringLength(2000)]
    public string? GeneralNotes { get; set; }
    [Display(Name = "How did you find us?")]
    [StringLength(100)]
    public string? LeadSource { get; set; }
    // Ship-to / alternate address
    [Display(Name = "Ship-To Street Address")]
    [StringLength(500)]
    public string? ShipToAddress { get; set; }
    [Display(Name = "City")]
    [StringLength(100)]
    public string? ShipToCity { get; set; }
    [Display(Name = "State")]
    [StringLength(50)]
    public string? ShipToState { get; set; }
    [Display(Name = "Zip Code")]
    [StringLength(20)]
    public string? ShipToZipCode { get; set; }
    [Display(Name = "Country")]
    [StringLength(100)]
    public string? ShipToCountry { get; set; }
    [Display(Name = "Notify by Email")]
    public bool NotifyByEmail { get; set; } = true;
@@ -63,4 +63,22 @@ public class CustomerImportDto
    [Name("Notes")]
    public string? Notes { get; set; }
    [Name("LeadSource")]
    public string? LeadSource { get; set; }
    [Name("ShipToAddress")]
    public string? ShipToAddress { get; set; }
    [Name("ShipToCity")]
    public string? ShipToCity { get; set; }
    [Name("ShipToState")]
    public string? ShipToState { get; set; }
    [Name("ShipToZipCode")]
    public string? ShipToZipCode { get; set; }
    [Name("ShipToCountry")]
    public string? ShipToCountry { get; set; }
 }
@@ -33,6 +33,9 @@ public class InvoiceImportDto
    [Name("DueDate")]
    public DateTime? DueDate { get; set; }
    [Name("Project Name", "ProjectName")]
    public string? ProjectName { get; set; }
    [Name("SubTotal")]
    public decimal SubTotal { get; set; }
@@ -49,6 +49,9 @@ public class JobImportDto
    [Name("SpecialInstructions")]
    public string? SpecialInstructions { get; set; }
    [Name("ProjectName")]
    public string? ProjectName { get; set; }
    [Name("Notes")]
    public string? Notes { get; set; }
 }
@@ -38,6 +38,9 @@ public class QuoteImportDto
    [Name("ExpirationDate")]
    public DateTime? ExpirationDate { get; set; }
    [Name("ProjectName")]
    public string? ProjectName { get; set; }
    [Name("Subtotal")]
    public decimal Subtotal { get; set; }
@@ -41,5 +41,12 @@ public class CustomerProfile : Profile
                      opt => opt.MapFrom(src => !string.IsNullOrEmpty(src.ContactFirstName) || !string.IsNullOrEmpty(src.ContactLastName)
                          ? $"{src.ContactFirstName} {src.ContactLastName}".Trim()
                          : string.Empty));
        // CustomerContact
        CreateMap<CustomerContact, CustomerContactDto>();
        CreateMap<CreateCustomerContactDto, CustomerContact>();
        CreateMap<UpdateCustomerContactDto, CustomerContact>()
            .ForMember(dest => dest.Id, opt => opt.Ignore()); // Id is set by the controller, not mapped
        CreateMap<CustomerContact, UpdateCustomerContactDto>();
    }
 }
@@ -41,6 +41,17 @@ public class Customer : BaseEntity
    public bool IsActive { get; set; } = true;
    public DateTime? LastContactDate { get; set; }
    // CRM fields
    /// <summary>How the customer found the shop (Walk-In, Google Search, Customer Referral, etc.).</summary>
    public string? LeadSource { get; set; }
    // Ship-to / alternate address (separate from billing address above)
    public string? ShipToAddress { get; set; }
    public string? ShipToCity { get; set; }
    public string? ShipToState { get; set; }
    public string? ShipToZipCode { get; set; }
    public string? ShipToCountry { get; set; }
    // Notification preferences
    public bool NotifyByEmail { get; set; } = true;
    // NotifyBySms is only set to true after explicit staff-recorded consent (TCPA compliance)
@@ -55,4 +66,5 @@ public class Customer : BaseEntity
    public virtual ICollection<NotificationLog> NotificationLogs { get; set; } = new List<NotificationLog>();
    public virtual ICollection<Invoice> Invoices { get; set; } = new List<Invoice>();
    public virtual ICollection<CustomerContact> CustomerContacts { get; set; } = new List<CustomerContact>();
 }
@@ -0,0 +1,42 @@
 using System.ComponentModel.DataAnnotations;
 namespace PowderCoating.Core.Entities;
 /// <summary>
 /// An additional contact person associated with a customer account.
 /// Commercial customers frequently have separate billing, operations, and drop-off contacts.
 /// The primary contact remains on the Customer entity; these are supplementary.
 /// </summary>
 public class CustomerContact : BaseEntity
 {
    public int CustomerId { get; set; }
    [Required]
    [StringLength(100)]
    public string FirstName { get; set; } = string.Empty;
    [StringLength(100)]
    public string? LastName { get; set; }
    /// <summary>Job title / role at the company, e.g. "Purchasing Manager".</summary>
    [StringLength(100)]
    public string? Title { get; set; }
    /// <summary>Functional role: Billing, Operations, Drop-off, Sales, General, etc.</summary>
    [StringLength(50)]
    public string? ContactRole { get; set; }
    [StringLength(200)]
    public string? Email { get; set; }
    [StringLength(20)]
    public string? Phone { get; set; }
    [StringLength(20)]
    public string? MobilePhone { get; set; }
    [StringLength(500)]
    public string? Notes { get; set; }
    public virtual Customer? Customer { get; set; }
 }
@@ -152,6 +152,20 @@ public class CustomerNote : BaseEntity
    public virtual Customer Customer { get; set; } = null!;
 }
 /// <summary>
 /// Records an inventory item as a preferred powder for a specific customer.
 /// Shown on Customer Details for faster quoting of repeat orders.
 /// </summary>
 public class CustomerPreferredPowder : BaseEntity
 {
    public int CustomerId { get; set; }
    public int InventoryItemId { get; set; }
    public string? Notes { get; set; }
    public virtual Customer Customer { get; set; } = null!;
    public virtual InventoryItem InventoryItem { get; set; } = null!;
 }
 public class JobStatusHistory : BaseEntity
 {
    public int JobId { get; set; }
@@ -43,6 +43,8 @@ public interface IUnitOfWork : IDisposable
    IJobPhotoRepository JobPhotos { get; }
    IRepository<JobNote> JobNotes { get; }
    IRepository<CustomerNote> CustomerNotes { get; }
    IRepository<CustomerContact> CustomerContacts { get; }
    IRepository<CustomerPreferredPowder> CustomerPreferredPowders { get; }
    IRepository<JobStatusHistory> JobStatusHistory { get; }
    IRepository<PricingTier> PricingTiers { get; }
@@ -230,6 +230,10 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
    public DbSet<JobNote> JobNotes { get; set; }
    /// <summary>Free-text notes added to a customer record by staff; tenant-filtered with soft delete.</summary>
    public DbSet<CustomerNote> CustomerNotes { get; set; }
    /// <summary>Additional contacts (billing, ops, drop-off) associated with a customer; tenant-filtered with soft delete.</summary>
    public DbSet<CustomerContact> CustomerContacts { get; set; }
    /// <summary>Inventory items marked as frequently used for a customer; shown on Customer Details for faster quoting.</summary>
    public DbSet<CustomerPreferredPowder> CustomerPreferredPowders { get; set; }
    /// <summary>Audit trail of every status transition on a job, referencing the lookup-table statuses.</summary>
    public DbSet<JobStatusHistory> JobStatusHistory { get; set; }
    /// <summary>Customer pricing tiers (Standard, Preferred, Premium); tenant-filtered with soft delete.</summary>
@@ -551,6 +555,8 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
        modelBuilder.Entity<CustomerNote>().HasQueryFilter(e =>
            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
        modelBuilder.Entity<CustomerPreferredPowder>().HasQueryFilter(e =>
            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
        modelBuilder.Entity<JobStatusHistory>().HasQueryFilter(e =>
            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
 modelBuilder.Entity<ReworkRecord>().HasQueryFilter(e =>
@@ -1719,6 +1725,23 @@ modelBuilder.Entity<Job>()
            .HasIndex(cn => new { cn.CustomerId, cn.CreatedAt })
            .HasDatabaseName("IX_CustomerNotes_CustomerId_CreatedAt");
        modelBuilder.Entity<CustomerPreferredPowder>()
            .HasIndex(p => new { p.CustomerId, p.InventoryItemId })
            .IsUnique()
            .HasDatabaseName("IX_CustomerPreferredPowders_CustomerId_InventoryItemId");
        modelBuilder.Entity<CustomerPreferredPowder>()
            .HasOne(p => p.Customer)
            .WithMany()
            .HasForeignKey(p => p.CustomerId)
            .OnDelete(DeleteBehavior.Cascade);
        modelBuilder.Entity<CustomerPreferredPowder>()
            .HasOne(p => p.InventoryItem)
            .WithMany()
            .HasForeignKey(p => p.InventoryItemId)
            .OnDelete(DeleteBehavior.Restrict);
        // ===================================================================
        // END PERFORMANCE OPTIMIZATION INDEXES
        // ===================================================================
@@ -0,0 +1,110 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 #nullable disable
 namespace PowderCoating.Infrastructure.Migrations
 {
    /// <inheritdoc />
    public partial class AddCustomerPreferredPowders : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.CreateTable(
                name: "CustomerPreferredPowders",
                columns: table => new
                {
                    Id = table.Column<int>(type: "int", nullable: false)
                        .Annotation("SqlServer:Identity", "1, 1"),
                    CustomerId = table.Column<int>(type: "int", nullable: false),
                    InventoryItemId = table.Column<int>(type: "int", nullable: false),
                    Notes = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    CompanyId = table.Column<int>(type: "int", nullable: false),
                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
                    UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
                    CreatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    UpdatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
                    DeletedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
                    DeletedBy = table.Column<string>(type: "nvarchar(max)", nullable: true)
                },
                constraints: table =>
                {
                    table.PrimaryKey("PK_CustomerPreferredPowders", x => x.Id);
                    table.ForeignKey(
                        name: "FK_CustomerPreferredPowders_Customers_CustomerId",
                        column: x => x.CustomerId,
                        principalTable: "Customers",
                        principalColumn: "Id",
                        onDelete: ReferentialAction.Cascade);
                    table.ForeignKey(
                        name: "FK_CustomerPreferredPowders_InventoryItems_InventoryItemId",
                        column: x => x.InventoryItemId,
                        principalTable: "InventoryItems",
                        principalColumn: "Id",
                        onDelete: ReferentialAction.Restrict);
                });
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 1,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 23, 42, 41, 419, DateTimeKind.Utc).AddTicks(9947));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 2,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 23, 42, 41, 419, DateTimeKind.Utc).AddTicks(9953));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 3,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 23, 42, 41, 419, DateTimeKind.Utc).AddTicks(9954));
            migrationBuilder.CreateIndex(
                name: "IX_CustomerPreferredPowders_CustomerId_InventoryItemId",
                table: "CustomerPreferredPowders",
                columns: new[] { "CustomerId", "InventoryItemId" },
                unique: true);
            migrationBuilder.CreateIndex(
                name: "IX_CustomerPreferredPowders_InventoryItemId",
                table: "CustomerPreferredPowders",
                column: "InventoryItemId");
        }
        /// <inheritdoc />
        protected override void Down(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.DropTable(
                name: "CustomerPreferredPowders");
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 1,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 12, 48, 23, 21, DateTimeKind.Utc).AddTicks(2471));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 2,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 12, 48, 23, 21, DateTimeKind.Utc).AddTicks(2477));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 3,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 12, 48, 23, 21, DateTimeKind.Utc).AddTicks(2478));
        }
    }
 }
@@ -0,0 +1,164 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 #nullable disable
 namespace PowderCoating.Infrastructure.Migrations
 {
    /// <inheritdoc />
    public partial class AddCustomerContactsAndCrmFields : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.AddColumn<string>(
                name: "LeadSource",
                table: "Customers",
                type: "nvarchar(max)",
                nullable: true);
            migrationBuilder.AddColumn<string>(
                name: "ShipToAddress",
                table: "Customers",
                type: "nvarchar(max)",
                nullable: true);
            migrationBuilder.AddColumn<string>(
                name: "ShipToCity",
                table: "Customers",
                type: "nvarchar(max)",
                nullable: true);
            migrationBuilder.AddColumn<string>(
                name: "ShipToCountry",
                table: "Customers",
                type: "nvarchar(max)",
                nullable: true);
            migrationBuilder.AddColumn<string>(
                name: "ShipToState",
                table: "Customers",
                type: "nvarchar(max)",
                nullable: true);
            migrationBuilder.AddColumn<string>(
                name: "ShipToZipCode",
                table: "Customers",
                type: "nvarchar(max)",
                nullable: true);
            migrationBuilder.CreateTable(
                name: "CustomerContacts",
                columns: table => new
                {
                    Id = table.Column<int>(type: "int", nullable: false)
                        .Annotation("SqlServer:Identity", "1, 1"),
                    CustomerId = table.Column<int>(type: "int", nullable: false),
                    FirstName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
                    LastName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
                    Title = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
                    ContactRole = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
                    Email = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
                    Phone = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
                    MobilePhone = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
                    Notes = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
                    CompanyId = table.Column<int>(type: "int", nullable: false),
                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
                    UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
                    CreatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    UpdatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
                    DeletedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
                    DeletedBy = table.Column<string>(type: "nvarchar(max)", nullable: true)
                },
                constraints: table =>
                {
                    table.PrimaryKey("PK_CustomerContacts", x => x.Id);
                    table.ForeignKey(
                        name: "FK_CustomerContacts_Customers_CustomerId",
                        column: x => x.CustomerId,
                        principalTable: "Customers",
                        principalColumn: "Id",
                        onDelete: ReferentialAction.Cascade);
                });
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 1,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 10, 16, 17, 57, 120, DateTimeKind.Utc).AddTicks(9129));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 2,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 10, 16, 17, 57, 120, DateTimeKind.Utc).AddTicks(9137));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 3,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 10, 16, 17, 57, 120, DateTimeKind.Utc).AddTicks(9138));
            migrationBuilder.CreateIndex(
                name: "IX_CustomerContacts_CustomerId",
                table: "CustomerContacts",
                column: "CustomerId");
        }
        /// <inheritdoc />
        protected override void Down(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.DropTable(
                name: "CustomerContacts");
            migrationBuilder.DropColumn(
                name: "LeadSource",
                table: "Customers");
            migrationBuilder.DropColumn(
                name: "ShipToAddress",
                table: "Customers");
            migrationBuilder.DropColumn(
                name: "ShipToCity",
                table: "Customers");
            migrationBuilder.DropColumn(
                name: "ShipToCountry",
                table: "Customers");
            migrationBuilder.DropColumn(
                name: "ShipToState",
                table: "Customers");
            migrationBuilder.DropColumn(
                name: "ShipToZipCode",
                table: "Customers");
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 1,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 23, 42, 41, 419, DateTimeKind.Utc).AddTicks(9947));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 2,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 23, 42, 41, 419, DateTimeKind.Utc).AddTicks(9953));
            migrationBuilder.UpdateData(
                table: "PricingTiers",
                keyColumn: "Id",
                keyValue: 3,
                column: "CreatedAt",
                value: new DateTime(2026, 6, 9, 23, 42, 41, 419, DateTimeKind.Utc).AddTicks(9954));
        }
    }
 }
@@ -2818,6 +2818,9 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Property<DateTime?>("LastContactDate")
                        .HasColumnType("datetime2");
                    b.Property<string>("LeadSource")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("MobilePhone")
                        .HasColumnType("nvarchar(max)");
@@ -2836,6 +2839,21 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Property<int?>("PricingTierId")
                        .HasColumnType("int");
                    b.Property<string>("ShipToAddress")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("ShipToCity")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("ShipToCountry")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("ShipToState")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("ShipToZipCode")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("SmsConsentMethod")
                        .HasColumnType("nvarchar(max)");
@@ -2894,6 +2912,81 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.ToTable("Customers");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.CustomerContact", b =>
                {
                    b.Property<int>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("int");
                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
                    b.Property<int>("CompanyId")
                        .HasColumnType("int");
                    b.Property<string>("ContactRole")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
                    b.Property<DateTime>("CreatedAt")
                        .HasColumnType("datetime2");
                    b.Property<string>("CreatedBy")
                        .HasColumnType("nvarchar(max)");
                    b.Property<int>("CustomerId")
                        .HasColumnType("int");
                    b.Property<DateTime?>("DeletedAt")
                        .HasColumnType("datetime2");
                    b.Property<string>("DeletedBy")
                        .HasColumnType("nvarchar(max)");
                    b.Property<string>("Email")
                        .HasMaxLength(200)
                        .HasColumnType("nvarchar(200)");
                    b.Property<string>("FirstName")
                        .IsRequired()
                        .HasMaxLength(100)
                        .HasColumnType("nvarchar(100)");
                    b.Property<bool>("IsDeleted")
                        .HasColumnType("bit");
                    b.Property<string>("LastName")
                        .HasMaxLength(100)
                        .HasColumnType("nvarchar(100)");
                    b.Property<string>("MobilePhone")
                        .HasMaxLength(20)
                        .HasColumnType("nvarchar(20)");
                    b.Property<string>("Notes")
                        .HasMaxLength(500)
                        .HasColumnType("nvarchar(500)");
                    b.Property<string>("Phone")
                        .HasMaxLength(20)
                        .HasColumnType("nvarchar(20)");
                    b.Property<string>("Title")
                        .HasMaxLength(100)
                        .HasColumnType("nvarchar(100)");
                    b.Property<DateTime?>("UpdatedAt")
                        .HasColumnType("datetime2");
                    b.Property<string>("UpdatedBy")
                        .HasColumnType("nvarchar(max)");
                    b.HasKey("Id");
                    b.HasIndex("CustomerId");
                    b.ToTable("CustomerContacts");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.CustomerNote", b =>
                {
                    b.Property<int>("Id")
@@ -2944,6 +3037,58 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.ToTable("CustomerNotes");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.CustomerPreferredPowder", b =>
                {
                    b.Property<int>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("int");
                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
                    b.Property<int>("CompanyId")
                        .HasColumnType("int");
                    b.Property<DateTime>("CreatedAt")
                        .HasColumnType("datetime2");
                    b.Property<string>("CreatedBy")
                        .HasColumnType("nvarchar(max)");
                    b.Property<int>("CustomerId")
                        .HasColumnType("int");
                    b.Property<DateTime?>("DeletedAt")
                        .HasColumnType("datetime2");
                    b.Property<string>("DeletedBy")
                        .HasColumnType("nvarchar(max)");
                    b.Property<int>("InventoryItemId")
                        .HasColumnType("int");
                    b.Property<bool>("IsDeleted")
                        .HasColumnType("bit");
                    b.Property<string>("Notes")
                        .HasColumnType("nvarchar(max)");
                    b.Property<DateTime?>("UpdatedAt")
                        .HasColumnType("datetime2");
                    b.Property<string>("UpdatedBy")
                        .HasColumnType("nvarchar(max)");
                    b.HasKey("Id");
                    b.HasIndex("InventoryItemId");
                    b.HasIndex("CustomerId", "InventoryItemId")
                        .IsUnique()
                        .HasDatabaseName("IX_CustomerPreferredPowders_CustomerId_InventoryItemId");
                    b.ToTable("CustomerPreferredPowders");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.DashboardTip", b =>
                {
                    b.Property<int>("Id")
@@ -7059,7 +7204,7 @@ namespace PowderCoating.Infrastructure.Migrations
                        {
                            Id = 1,
                            CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 6, 9, 12, 48, 23, 21, DateTimeKind.Utc).AddTicks(2471),
+                            CreatedAt = new DateTime(2026, 6, 10, 16, 17, 57, 120, DateTimeKind.Utc).AddTicks(9129),
                            Description = "Standard pricing for regular customers",
                            DiscountPercent = 0m,
                            IsActive = true,
@@ -7070,7 +7215,7 @@ namespace PowderCoating.Infrastructure.Migrations
                        {
                            Id = 2,
                            CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 6, 9, 12, 48, 23, 21, DateTimeKind.Utc).AddTicks(2477),
+                            CreatedAt = new DateTime(2026, 6, 10, 16, 17, 57, 120, DateTimeKind.Utc).AddTicks(9137),
                            Description = "5% discount for preferred customers",
                            DiscountPercent = 5m,
                            IsActive = true,
@@ -7081,7 +7226,7 @@ namespace PowderCoating.Infrastructure.Migrations
                        {
                            Id = 3,
                            CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 6, 9, 12, 48, 23, 21, DateTimeKind.Utc).AddTicks(2478),
+                            CreatedAt = new DateTime(2026, 6, 10, 16, 17, 57, 120, DateTimeKind.Utc).AddTicks(9138),
                            Description = "10% discount for premium customers",
                            DiscountPercent = 10m,
                            IsActive = true,
@@ -9483,6 +9628,17 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Navigation("PricingTier");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.CustomerContact", b =>
                {
                    b.HasOne("PowderCoating.Core.Entities.Customer", "Customer")
                        .WithMany("CustomerContacts")
                        .HasForeignKey("CustomerId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
                    b.Navigation("Customer");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.CustomerNote", b =>
                {
                    b.HasOne("PowderCoating.Core.Entities.Customer", "Customer")
@@ -9494,6 +9650,25 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Navigation("Customer");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.CustomerPreferredPowder", b =>
                {
                    b.HasOne("PowderCoating.Core.Entities.Customer", "Customer")
                        .WithMany()
                        .HasForeignKey("CustomerId")
                        .OnDelete(DeleteBehavior.Cascade)
                        .IsRequired();
                    b.HasOne("PowderCoating.Core.Entities.InventoryItem", "InventoryItem")
                        .WithMany()
                        .HasForeignKey("InventoryItemId")
                        .OnDelete(DeleteBehavior.Restrict)
                        .IsRequired();
                    b.Navigation("Customer");
                    b.Navigation("InventoryItem");
                });
            modelBuilder.Entity("PowderCoating.Core.Entities.Deposit", b =>
                {
                    b.HasOne("PowderCoating.Core.Entities.Invoice", "AppliedToInvoice")
@@ -10989,6 +11164,8 @@ namespace PowderCoating.Infrastructure.Migrations
            modelBuilder.Entity("PowderCoating.Core.Entities.Customer", b =>
                {
                    b.Navigation("CustomerContacts");
                    b.Navigation("CustomerNotes");
                    b.Navigation("Invoices");
@@ -70,6 +70,8 @@ public class UnitOfWork : IUnitOfWork
    private IJobPhotoRepository? _jobPhotos;
    private IRepository<JobNote>? _jobNotes;
    private IRepository<CustomerNote>? _customerNotes;
    private IRepository<CustomerContact>? _customerContacts;
    private IRepository<CustomerPreferredPowder>? _customerPreferredPowders;
    private IRepository<JobStatusHistory>? _jobStatusHistory;
    private IRepository<PricingTier>? _pricingTiers;
@@ -321,6 +323,11 @@ public class UnitOfWork : IUnitOfWork
    /// <summary>Repository for <see cref="CustomerNote"/> free-text staff notes on customer records; tenant-filtered with soft delete.</summary>
    public IRepository<CustomerNote> CustomerNotes =>
        _customerNotes ??= new Repository<CustomerNote>(_context);
    /// <summary>Repository for <see cref="CustomerContact"/> additional contacts (billing, ops, drop-off) on commercial accounts; tenant-filtered with soft delete.</summary>
    public IRepository<CustomerContact> CustomerContacts =>
        _customerContacts ??= new Repository<CustomerContact>(_context);
    public IRepository<CustomerPreferredPowder> CustomerPreferredPowders =>
        _customerPreferredPowders ??= new Repository<CustomerPreferredPowder>(_context);
    /// <summary>Repository for <see cref="JobStatusHistory"/> status-transition audit records; tenant-filtered with soft delete.</summary>
    public IRepository<JobStatusHistory> JobStatusHistory =>
@@ -605,6 +605,12 @@ public class CsvImportService : ICsvImportService
                        PaymentTerms = record.PaymentTerms?.Trim() ?? "Net 30",
                        IsTaxExempt = record.TaxExempt ?? false,
                        GeneralNotes = record.Notes?.Trim(),
                        LeadSource = record.LeadSource?.Trim(),
                        ShipToAddress = record.ShipToAddress?.Trim(),
                        ShipToCity = record.ShipToCity?.Trim(),
                        ShipToState = record.ShipToState?.Trim(),
                        ShipToZipCode = record.ShipToZipCode?.Trim(),
                        ShipToCountry = record.ShipToCountry?.Trim(),
                        IsActive = record.IsActive ?? true,
                        CreatedAt = DateTime.UtcNow,
                        UpdatedAt = DateTime.UtcNow
@@ -1284,6 +1290,7 @@ public class CsvImportService : ICsvImportService
                        Total = record.Total,
                        Notes = record.Notes?.Trim(),
                        Terms = record.TermsAndConditions?.Trim(),
                        ProjectName = record.ProjectName?.Trim(),
                        IsCommercial = customerId.HasValue,
                        CreatedAt = DateTime.UtcNow,
                        UpdatedAt = DateTime.UtcNow
@@ -1557,6 +1564,7 @@ public class CsvImportService : ICsvImportService
                        CustomerPO = record.CustomerPO?.Trim(),
                        SpecialInstructions = record.SpecialInstructions?.Trim(),
                        InternalNotes = record.Notes?.Trim(),
                        ProjectName = record.ProjectName?.Trim(),
                        Description = record.Description?.Trim()
                            ?? record.SpecialInstructions?.Trim()
                            ?? "Imported job",
@@ -3146,9 +3154,10 @@ public class CsvImportService : ICsvImportService
                        existing.DiscountAmount  = record.DiscountAmount;
                        existing.Total           = record.Total;
                        existing.AmountPaid      = record.AmountPaid;
-                        existing.CustomerPO      = string.IsNullOrWhiteSpace(record.CustomerPO)  ? null : record.CustomerPO.Trim();
+                        existing.CustomerPO      = string.IsNullOrWhiteSpace(record.CustomerPO)   ? null : record.CustomerPO.Trim();
-                        existing.Terms           = string.IsNullOrWhiteSpace(record.Terms)       ? null : record.Terms.Trim();
+                        existing.Terms           = string.IsNullOrWhiteSpace(record.Terms)        ? null : record.Terms.Trim();
-                        existing.Notes           = string.IsNullOrWhiteSpace(record.Notes)       ? null : record.Notes.Trim();
+                        existing.Notes           = string.IsNullOrWhiteSpace(record.Notes)        ? null : record.Notes.Trim();
                        existing.ProjectName     = string.IsNullOrWhiteSpace(record.ProjectName)  ? null : record.ProjectName.Trim();
                        await _unitOfWork.CompleteAsync();
                        result.SuccessCount++;
                    }
@@ -3170,9 +3179,10 @@ public class CsvImportService : ICsvImportService
                            DiscountAmount = record.DiscountAmount,
                            Total          = record.Total,
                            AmountPaid     = record.AmountPaid,
-                            CustomerPO     = string.IsNullOrWhiteSpace(record.CustomerPO) ? null : record.CustomerPO.Trim(),
+                            CustomerPO     = string.IsNullOrWhiteSpace(record.CustomerPO)  ? null : record.CustomerPO.Trim(),
-                            Terms          = string.IsNullOrWhiteSpace(record.Terms)      ? null : record.Terms.Trim(),
+                            Terms          = string.IsNullOrWhiteSpace(record.Terms)       ? null : record.Terms.Trim(),
-                            Notes          = string.IsNullOrWhiteSpace(record.Notes)      ? null : record.Notes.Trim()
+                            Notes          = string.IsNullOrWhiteSpace(record.Notes)       ? null : record.Notes.Trim(),
                            ProjectName    = string.IsNullOrWhiteSpace(record.ProjectName) ? null : record.ProjectName.Trim()
                        };
                        await _unitOfWork.Invoices.AddAsync(invoice);
                        await _unitOfWork.CompleteAsync();
@@ -126,8 +126,9 @@ public class AccountDataExportController : Controller
        {
            switch (sheet)
            {
-                case "Customers":   await AddCustomersSheet(package, companyId, headerColor); break;
+                case "Customers":        await AddCustomersSheet(package, companyId, headerColor); break;
-                case "Jobs":        await AddJobsSheet(package, companyId, headerColor); break;
+                case "CustomerContacts": await AddCustomerContactsSheet(package, companyId, headerColor); break;
                case "Jobs":             await AddJobsSheet(package, companyId, headerColor); break;
                case "Quotes":      await AddQuotesSheet(package, companyId, headerColor); break;
                case "Invoices":    await AddInvoicesSheet(package, companyId, headerColor); break;
                case "Inventory":   await AddInventorySheet(package, companyId, headerColor); break;
@@ -174,8 +175,9 @@ public class AccountDataExportController : Controller
        {
            switch (sheet)
            {
-                case "Customers":   WriteCsvEntry(zip, "Customers.csv",   await BuildCustomersCsv(companyId)); break;
+                case "Customers":        WriteCsvEntry(zip, "Customers.csv",        await BuildCustomersCsv(companyId)); break;
-                case "Jobs":        WriteCsvEntry(zip, "Jobs.csv",        await BuildJobsCsv(companyId)); break;
+                case "CustomerContacts": WriteCsvEntry(zip, "CustomerContacts.csv", await BuildCustomerContactsCsv(companyId)); break;
                case "Jobs":             WriteCsvEntry(zip, "Jobs.csv",             await BuildJobsCsv(companyId)); break;
                case "Quotes":      WriteCsvEntry(zip, "Quotes.csv",      await BuildQuotesCsv(companyId)); break;
                case "Invoices":    WriteCsvEntry(zip, "Invoices.csv",    await BuildInvoicesCsv(companyId)); break;
                case "Inventory":   WriteCsvEntry(zip, "Inventory.csv",   await BuildInventoryCsv(companyId)); break;
@@ -299,7 +301,9 @@ public class AccountDataExportController : Controller
        var data = await FetchCustomersAsync(companyId);
        var ws = pkg.Workbook.Worksheets.Add("Customers");
        var headers = new[] { "ID", "Company Name", "First Name", "Last Name", "Email", "Phone",
-                               "Commercial", "City", "State", "Active", "Credit Limit", "Current Balance", "Created At" };
+                               "Commercial", "City", "State", "Active", "Credit Limit", "Current Balance",
                               "Lead Source", "Ship-To Address", "Ship-To City", "Ship-To State", "Ship-To Zip", "Ship-To Country",
                               "Created At" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
@@ -311,7 +315,34 @@ public class AccountDataExportController : Controller
            ws.Cells[r, 8].Value = c.City;          ws.Cells[r, 9].Value = c.State;
            ws.Cells[r, 10].Value = c.IsActive ? "Yes" : "No";
            ws.Cells[r, 11].Value = c.CreditLimit;  ws.Cells[r, 12].Value = c.CurrentBalance;
-            ws.Cells[r, 13].Value = c.CreatedAt.ToString("yyyy-MM-dd");
+            ws.Cells[r, 13].Value = c.LeadSource;
            ws.Cells[r, 14].Value = c.ShipToAddress; ws.Cells[r, 15].Value = c.ShipToCity;
            ws.Cells[r, 16].Value = c.ShipToState;  ws.Cells[r, 17].Value = c.ShipToZipCode;
            ws.Cells[r, 18].Value = c.ShipToCountry;
            ws.Cells[r, 19].Value = c.CreatedAt.ToString("yyyy-MM-dd");
        }
        AutoFit(ws, headers.Length);
    }
    private async Task AddCustomerContactsSheet(ExcelPackage pkg, int companyId, Color hdr)
    {
        var data = await _db.CustomerContacts.AsNoTracking()
            .Include(cc => cc.Customer)
            .Where(cc => cc.CompanyId == companyId && !cc.IsDeleted)
            .OrderBy(cc => cc.Customer!.CompanyName).ThenBy(cc => cc.LastName).ThenBy(cc => cc.FirstName)
            .ToListAsync();
        var ws = pkg.Workbook.Worksheets.Add("CustomerContacts");
        var headers = new[] { "CustomerEmail", "FirstName", "LastName", "Title", "ContactRole", "Email", "Phone", "MobilePhone", "Notes" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
            var r = i + 2; var cc = data[i];
            ws.Cells[r, 1].Value = cc.Customer?.Email;
            ws.Cells[r, 2].Value = cc.FirstName;   ws.Cells[r, 3].Value = cc.LastName;
            ws.Cells[r, 4].Value = cc.Title;        ws.Cells[r, 5].Value = cc.ContactRole;
            ws.Cells[r, 6].Value = cc.Email;        ws.Cells[r, 7].Value = cc.Phone;
            ws.Cells[r, 8].Value = cc.MobilePhone;  ws.Cells[r, 9].Value = cc.Notes;
        }
        AutoFit(ws, headers.Length);
    }
@@ -326,7 +357,7 @@ public class AccountDataExportController : Controller
        var data = await FetchJobsAsync(companyId);
        var ws = pkg.Workbook.Worksheets.Add("Jobs");
        var headers = new[] { "ID", "Job Number", "Customer", "Status", "Priority",
-                               "Description", "Due Date", "Final Price", "Created At" };
+                               "Description", "Project Name", "Due Date", "Final Price", "Created At" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
@@ -337,9 +368,10 @@ public class AccountDataExportController : Controller
            ws.Cells[r, 4].Value = j.JobStatus?.DisplayName ?? j.JobStatusId.ToString();
            ws.Cells[r, 5].Value = j.JobPriority?.DisplayName ?? j.JobPriorityId.ToString();
            ws.Cells[r, 6].Value = j.Description;
-            ws.Cells[r, 7].Value = j.DueDate?.ToString("yyyy-MM-dd");
+            ws.Cells[r, 7].Value = j.ProjectName;
-            ws.Cells[r, 8].Value = j.FinalPrice;
+            ws.Cells[r, 8].Value = j.DueDate?.ToString("yyyy-MM-dd");
-            ws.Cells[r, 9].Value = j.CreatedAt.ToString("yyyy-MM-dd");
+            ws.Cells[r, 9].Value = j.FinalPrice;
            ws.Cells[r, 10].Value = j.CreatedAt.ToString("yyyy-MM-dd");
        }
        AutoFit(ws, headers.Length);
    }
@@ -353,7 +385,7 @@ public class AccountDataExportController : Controller
        var data = await FetchQuotesAsync(companyId);
        var ws = pkg.Workbook.Worksheets.Add("Quotes");
        var headers = new[] { "ID", "Quote Number", "Customer / Prospect", "Status",
-                               "Quote Date", "Expiration Date", "Subtotal", "Tax", "Total" };
+                               "Quote Date", "Expiration Date", "Project Name", "Subtotal", "Tax", "Total" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
@@ -363,7 +395,8 @@ public class AccountDataExportController : Controller
            ws.Cells[r, 4].Value = q.QuoteStatus?.DisplayName ?? q.QuoteStatusId.ToString();
            ws.Cells[r, 5].Value = q.QuoteDate.ToString("yyyy-MM-dd");
            ws.Cells[r, 6].Value = q.ExpirationDate?.ToString("yyyy-MM-dd");
-            ws.Cells[r, 7].Value = q.SubTotal; ws.Cells[r, 8].Value = q.TaxAmount; ws.Cells[r, 9].Value = q.Total;
+            ws.Cells[r, 7].Value = q.ProjectName;
            ws.Cells[r, 8].Value = q.SubTotal; ws.Cells[r, 9].Value = q.TaxAmount; ws.Cells[r, 10].Value = q.Total;
        }
        AutoFit(ws, headers.Length);
    }
@@ -377,7 +410,7 @@ public class AccountDataExportController : Controller
        var data = await FetchInvoicesAsync(companyId);
        var ws = pkg.Workbook.Worksheets.Add("Invoices");
        var headers = new[] { "ID", "Invoice #", "Customer", "Status", "Invoice Date",
-                               "Due Date", "Subtotal", "Tax", "Total", "Amount Paid", "Balance Due" };
+                               "Due Date", "Project Name", "Subtotal", "Tax", "Total", "Amount Paid", "Balance Due" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
@@ -389,9 +422,10 @@ public class AccountDataExportController : Controller
            ws.Cells[r, 3].Value = cust;             ws.Cells[r, 4].Value = inv.Status.ToString();
            ws.Cells[r, 5].Value = inv.InvoiceDate.ToString("yyyy-MM-dd");
            ws.Cells[r, 6].Value = inv.DueDate?.ToString("yyyy-MM-dd");
-            ws.Cells[r, 7].Value = inv.SubTotal;     ws.Cells[r, 8].Value = inv.TaxAmount;
+            ws.Cells[r, 7].Value = inv.ProjectName;
-            ws.Cells[r, 9].Value = inv.Total;        ws.Cells[r, 10].Value = inv.AmountPaid;
+            ws.Cells[r, 8].Value = inv.SubTotal;     ws.Cells[r, 9].Value = inv.TaxAmount;
-            ws.Cells[r, 11].Value = inv.BalanceDue;
+            ws.Cells[r, 10].Value = inv.Total;       ws.Cells[r, 11].Value = inv.AmountPaid;
            ws.Cells[r, 12].Value = inv.BalanceDue;
        }
        AutoFit(ws, headers.Length);
    }
@@ -487,15 +521,30 @@ public class AccountDataExportController : Controller
    {
        var data = await FetchCustomersAsync(companyId);
        var sb = new StringBuilder();
-        sb.AppendLine("CompanyName,ContactFirstName,ContactLastName,Email,Phone,MobilePhone,Address,City,State,ZipCode,Country,CustomerType,PricingTierCode,CreditLimit,PaymentTerms,TaxExempt,TaxId,IsActive,Notes");
+        sb.AppendLine("CompanyName,ContactFirstName,ContactLastName,Email,Phone,MobilePhone,Address,City,State,ZipCode,Country,CustomerType,PricingTierCode,CreditLimit,PaymentTerms,TaxExempt,TaxId,IsActive,Notes,LeadSource,ShipToAddress,ShipToCity,ShipToState,ShipToZipCode,ShipToCountry");
        foreach (var c in data)
        {
            var customerType = c.IsCommercial ? "Commercial" : "Non-Commercial";
-            sb.AppendLine($"{CsvEscape(c.CompanyName)},{CsvEscape(c.ContactFirstName)},{CsvEscape(c.ContactLastName)},{CsvEscape(c.Email)},{CsvEscape(c.Phone)},{CsvEscape(c.MobilePhone)},{CsvEscape(c.Address)},{CsvEscape(c.City)},{CsvEscape(c.State)},{CsvEscape(c.ZipCode)},{CsvEscape(c.Country)},{customerType},{CsvEscape(c.PricingTier?.TierName)},{c.CreditLimit},{CsvEscape(c.PaymentTerms)},{c.IsTaxExempt.ToString().ToLower()},{CsvEscape(c.TaxId)},{c.IsActive.ToString().ToLower()},{CsvEscape(c.GeneralNotes)}");
+            sb.AppendLine($"{CsvEscape(c.CompanyName)},{CsvEscape(c.ContactFirstName)},{CsvEscape(c.ContactLastName)},{CsvEscape(c.Email)},{CsvEscape(c.Phone)},{CsvEscape(c.MobilePhone)},{CsvEscape(c.Address)},{CsvEscape(c.City)},{CsvEscape(c.State)},{CsvEscape(c.ZipCode)},{CsvEscape(c.Country)},{customerType},{CsvEscape(c.PricingTier?.TierName)},{c.CreditLimit},{CsvEscape(c.PaymentTerms)},{c.IsTaxExempt.ToString().ToLower()},{CsvEscape(c.TaxId)},{c.IsActive.ToString().ToLower()},{CsvEscape(c.GeneralNotes)},{CsvEscape(c.LeadSource)},{CsvEscape(c.ShipToAddress)},{CsvEscape(c.ShipToCity)},{CsvEscape(c.ShipToState)},{CsvEscape(c.ShipToZipCode)},{CsvEscape(c.ShipToCountry)}");
        }
        return sb.ToString();
    }
    /// <summary>Builds the customer contacts CSV. CustomerEmail is the join key for re-import.</summary>
    private async Task<string> BuildCustomerContactsCsv(int companyId)
    {
        var data = await _db.CustomerContacts.AsNoTracking()
            .Include(cc => cc.Customer)
            .Where(cc => cc.CompanyId == companyId && !cc.IsDeleted)
            .OrderBy(cc => cc.Customer!.CompanyName).ThenBy(cc => cc.LastName).ThenBy(cc => cc.FirstName)
            .ToListAsync();
        var sb = new StringBuilder();
        sb.AppendLine("CustomerEmail,FirstName,LastName,Title,ContactRole,Email,Phone,MobilePhone,Notes");
        foreach (var cc in data)
            sb.AppendLine($"{CsvEscape(cc.Customer?.Email)},{CsvEscape(cc.FirstName)},{CsvEscape(cc.LastName)},{CsvEscape(cc.Title)},{CsvEscape(cc.ContactRole)},{CsvEscape(cc.Email)},{CsvEscape(cc.Phone)},{CsvEscape(cc.MobilePhone)},{CsvEscape(cc.Notes)}");
        return sb.ToString();
    }
    /// <summary>
    /// Column names match <c>JobImportDto</c> exactly so the file can be re-imported.
    /// CustomerEmail is used (not display name) because the importer resolves the customer FK by email.
@@ -504,13 +553,13 @@ public class AccountDataExportController : Controller
    {
        var data = await FetchJobsAsync(companyId);
        var sb = new StringBuilder();
-        sb.AppendLine("JobNumber,CustomerEmail,CustomerName,Status,Priority,ScheduledDate,DueDate,FinalPrice,CustomerPO,SpecialInstructions,Notes");
+        sb.AppendLine("JobNumber,CustomerEmail,CustomerName,Status,Priority,ScheduledDate,DueDate,ProjectName,FinalPrice,CustomerPO,SpecialInstructions,Notes");
        foreach (var j in data)
        {
            var customerName = !string.IsNullOrWhiteSpace(j.Customer?.CompanyName)
                ? j.Customer.CompanyName
                : $"{j.Customer?.ContactFirstName} {j.Customer?.ContactLastName}".Trim();
-            sb.AppendLine($"{CsvEscape(j.JobNumber)},{CsvEscape(j.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(j.JobStatus?.DisplayName)},{CsvEscape(j.JobPriority?.DisplayName)},{j.ScheduledDate?.ToString("yyyy-MM-dd")},{j.DueDate?.ToString("yyyy-MM-dd")},{j.FinalPrice},{CsvEscape(j.CustomerPO)},{CsvEscape(j.SpecialInstructions)},{CsvEscape(j.InternalNotes)}");
+            sb.AppendLine($"{CsvEscape(j.JobNumber)},{CsvEscape(j.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(j.JobStatus?.DisplayName)},{CsvEscape(j.JobPriority?.DisplayName)},{j.ScheduledDate?.ToString("yyyy-MM-dd")},{j.DueDate?.ToString("yyyy-MM-dd")},{CsvEscape(j.ProjectName)},{j.FinalPrice},{CsvEscape(j.CustomerPO)},{CsvEscape(j.SpecialInstructions)},{CsvEscape(j.InternalNotes)}");
        }
        return sb.ToString();
    }
@@ -520,13 +569,13 @@ public class AccountDataExportController : Controller
    {
        var data = await FetchQuotesAsync(companyId);
        var sb = new StringBuilder();
-        sb.AppendLine("QuoteNumber,CustomerEmail,CustomerName,ProspectCompany,ProspectContact,ProspectEmail,ProspectPhone,Status,QuoteDate,ExpirationDate,Subtotal,TaxAmount,Total,Notes,TermsAndConditions");
+        sb.AppendLine("QuoteNumber,CustomerEmail,CustomerName,ProspectCompany,ProspectContact,ProspectEmail,ProspectPhone,Status,QuoteDate,ExpirationDate,ProjectName,Subtotal,TaxAmount,Total,Notes,TermsAndConditions");
        foreach (var q in data)
        {
            var customerName = !string.IsNullOrWhiteSpace(q.Customer?.CompanyName)
                ? q.Customer.CompanyName
                : $"{q.Customer?.ContactFirstName} {q.Customer?.ContactLastName}".Trim();
-            sb.AppendLine($"{CsvEscape(q.QuoteNumber)},{CsvEscape(q.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(q.ProspectCompanyName)},{CsvEscape(q.ProspectContactName)},{CsvEscape(q.ProspectEmail)},{CsvEscape(q.ProspectPhone)},{CsvEscape(q.QuoteStatus?.DisplayName)},{q.QuoteDate:yyyy-MM-dd},{q.ExpirationDate?.ToString("yyyy-MM-dd")},{q.SubTotal},{q.TaxAmount},{q.Total},{CsvEscape(q.Notes)},{CsvEscape(q.Terms)}");
+            sb.AppendLine($"{CsvEscape(q.QuoteNumber)},{CsvEscape(q.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(q.ProspectCompanyName)},{CsvEscape(q.ProspectContactName)},{CsvEscape(q.ProspectEmail)},{CsvEscape(q.ProspectPhone)},{CsvEscape(q.QuoteStatus?.DisplayName)},{q.QuoteDate:yyyy-MM-dd},{q.ExpirationDate?.ToString("yyyy-MM-dd")},{CsvEscape(q.ProjectName)},{q.SubTotal},{q.TaxAmount},{q.Total},{CsvEscape(q.Notes)},{CsvEscape(q.Terms)}");
        }
        return sb.ToString();
    }
@@ -539,13 +588,13 @@ public class AccountDataExportController : Controller
    {
        var data = await FetchInvoicesAsync(companyId);
        var sb = new StringBuilder();
-        sb.AppendLine("ID,Invoice #,Customer,Status,Invoice Date,Due Date,Subtotal,Tax,Total,Amount Paid,Balance Due");
+        sb.AppendLine("ID,Invoice #,Customer,Status,Invoice Date,Due Date,Project Name,Subtotal,Tax,Total,Amount Paid,Balance Due");
        foreach (var inv in data)
        {
            var cust = inv.Customer != null
                ? (inv.Customer.CompanyName ?? $"{inv.Customer.ContactFirstName} {inv.Customer.ContactLastName}".Trim())
                : $"Customer #{inv.CustomerId}";
-            sb.AppendLine($"{inv.Id},{CsvEscape(inv.InvoiceNumber)},{CsvEscape(cust)},{inv.Status},{inv.InvoiceDate:yyyy-MM-dd},{inv.DueDate?.ToString("yyyy-MM-dd")},{inv.SubTotal},{inv.TaxAmount},{inv.Total},{inv.AmountPaid},{inv.BalanceDue}");
+            sb.AppendLine($"{inv.Id},{CsvEscape(inv.InvoiceNumber)},{CsvEscape(cust)},{inv.Status},{inv.InvoiceDate:yyyy-MM-dd},{inv.DueDate?.ToString("yyyy-MM-dd")},{CsvEscape(inv.ProjectName)},{inv.SubTotal},{inv.TaxAmount},{inv.Total},{inv.AmountPaid},{inv.BalanceDue}");
        }
        return sb.ToString();
    }
@@ -144,9 +144,11 @@ public class CustomersController : Controller
    }
    /// <summary>
-    /// Renders the customer detail page, including the 10 most-recent non-voided credit memos.
+    /// Renders the customer detail page. In addition to basic info and credit memos, runs
-    /// Credit memos are loaded separately (not via eager loading) because the customer entity
+    /// four sequential queries (jobs, quotes, invoices, deposits) to build:
-    /// does not navigate to CreditMemo; this keeps the Customer aggregate lean.
+    /// (1) <see cref="CustomerLifetimeStatsDto"/> — aggregate KPIs for the stats card
    /// (2) <see cref="CustomerTimelineEventDto"/> list — last 15 events for the activity feed
    /// Credit memos are loaded separately because the Customer aggregate does not navigate to them.
    /// </summary>
    public async Task<IActionResult> Details(int? id)
    {
@@ -170,6 +172,120 @@ public class CustomersController : Controller
                .Take(10)
                .ToList();
            // CRM queries — must be sequential; EF Core's DbContext is not thread-safe
            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
            var jobs     = (await _unitOfWork.Jobs.FindAsync(j => j.CustomerId == id.Value && j.CompanyId == companyId, false, j => j.JobStatus)).ToList();
            var quotes   = (await _unitOfWork.Quotes.FindAsync(q => q.CustomerId == id.Value && q.CompanyId == companyId, false, q => q.QuoteStatus)).ToList();
            var invoices = (await _unitOfWork.Invoices.FindAsync(i => i.CustomerId == id.Value && i.CompanyId == companyId)).ToList();
            var deposits = (await _unitOfWork.Deposits.FindAsync(d => d.CustomerId == id.Value && d.CompanyId == companyId)).ToList();
            var pendingPickups = (await _unitOfWork.Jobs.FindAsync(
                    j => j.CustomerId == id.Value && j.CompanyId == companyId
                         && j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.ReadyForPickup,
                    false, j => j.JobStatus))
                .OrderBy(j => j.UpdatedAt)
                .ToList();
            ViewBag.PendingPickups = pendingPickups;
            var customerNotes = (await _unitOfWork.CustomerNotes.FindAsync(n => n.CustomerId == id.Value))
                .OrderByDescending(n => n.CreatedAt)
                .ToList();
            ViewBag.CustomerNotes = customerNotes;
            var preferredPowders = (await _unitOfWork.CustomerPreferredPowders.FindAsync(
                    p => p.CustomerId == id.Value, false, p => p.InventoryItem))
                .ToList();
            ViewBag.PreferredPowders = preferredPowders;
            var customerContacts = (await _unitOfWork.CustomerContacts.FindAsync(n => n.CustomerId == id.Value))
                .OrderBy(c => c.FirstName)
                .ToList();
            ViewBag.CustomerContacts = customerContacts;
            // Stats
            var nonVoided = invoices.Where(i => i.Status != InvoiceStatus.Voided).ToList();
            var stats = new CustomerLifetimeStatsDto
            {
                TotalJobs       = jobs.Count,
                ActiveJobs      = jobs.Count(j => j.JobStatus != null && !j.JobStatus.IsTerminalStatus),
                TotalRevenue    = nonVoided.Sum(i => i.Total),
                TotalCollected  = nonVoided.Sum(i => i.AmountPaid),
                AverageJobValue = jobs.Count > 0 ? jobs.Average(j => j.FinalPrice) : 0,
                LastJobDate     = jobs.Count > 0 ? jobs.Max(j => (DateTime?)j.CreatedAt) : null,
                LastJobId       = jobs.Count > 0 ? jobs.OrderByDescending(j => j.CreatedAt).First().Id : (int?)null,
                TotalQuotes     = quotes.Count,
                TotalInvoices   = invoices.Count,
                OpenBalance     = customer.CurrentBalance
            };
            stats.DaysSinceLastJob = stats.LastJobDate.HasValue
                ? (int)(DateTime.UtcNow - stats.LastJobDate.Value).TotalDays
                : null;
            // Timeline: merge all event types, sort descending, cap at 15
            var events = new List<CustomerTimelineEventDto>();
            foreach (var j in jobs)
                events.Add(new CustomerTimelineEventDto
                {
                    Date           = j.CreatedAt,
                    Icon           = "bi-briefcase",
                    BadgeColor     = "primary",
                    Title          = $"Job {j.JobNumber}",
                    Subtitle       = j.Description,
                    Amount         = j.FinalPrice > 0 ? j.FinalPrice : null,
                    EntityId       = j.Id,
                    LinkController = "Jobs",
                    LinkAction     = "Details"
                });
            foreach (var q in quotes)
                events.Add(new CustomerTimelineEventDto
                {
                    Date           = q.QuoteDate,
                    Icon           = "bi-file-text",
                    BadgeColor     = "info",
                    Title          = $"Quote {q.QuoteNumber}",
                    Subtitle       = q.QuoteStatus?.DisplayName,
                    Amount         = q.Total > 0 ? q.Total : null,
                    EntityId       = q.Id,
                    LinkController = "Quotes",
                    LinkAction     = "Details"
                });
            foreach (var inv in invoices)
                events.Add(new CustomerTimelineEventDto
                {
                    Date           = inv.InvoiceDate,
                    Icon           = inv.Status == InvoiceStatus.Paid ? "bi-receipt-cutoff" : "bi-receipt",
                    BadgeColor     = inv.Status == InvoiceStatus.Paid ? "success" : "warning",
                    Title          = $"Invoice {inv.InvoiceNumber}",
                    Subtitle       = inv.Status.ToString(),
                    Amount         = inv.Total,
                    EntityId       = inv.Id,
                    LinkController = "Invoices",
                    LinkAction     = "Details"
                });
            foreach (var dep in deposits)
                events.Add(new CustomerTimelineEventDto
                {
                    Date           = dep.ReceivedDate,
                    Icon           = "bi-cash-coin",
                    BadgeColor     = "success",
                    Title          = "Deposit received",
                    Subtitle       = dep.ReceiptNumber,
                    Amount         = dep.Amount,
                    EntityId       = dep.JobId,
                    LinkController = dep.JobId.HasValue ? "Jobs" : null,
                    LinkAction     = dep.JobId.HasValue ? "Details" : null
                });
            ViewBag.CrmStats = stats;
            ViewBag.Timeline = events
                .OrderByDescending(e => e.Date)
                .Take(15)
                .ToList();
            var customerDto = _mapper.Map<CustomerDto>(customer);
            return View(customerDto);
        }
@@ -938,6 +1054,308 @@ public class CustomersController : Controller
        return RedirectToAction(nameof(Details), new { id });
    }
    /// <summary>
    /// Adds a quick internal note to the customer record. Returns the rendered note HTML so
    /// the caller can prepend it to the notes list without a full page reload.
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> AddCustomerNote(int id, string note, bool isImportant = false)
    {
        if (string.IsNullOrWhiteSpace(note))
            return Json(new { success = false, message = "Note cannot be empty." });
        try
        {
            var customer = await _unitOfWork.Customers.GetByIdAsync(id);
            if (customer == null) return Json(new { success = false, message = "Customer not found." });
            var currentUser = await _userManager.GetUserAsync(User);
            var entity = new PowderCoating.Core.Entities.CustomerNote
            {
                CustomerId  = id,
                Note        = note.Trim(),
                IsImportant = isImportant,
                CreatedBy   = currentUser?.Email
            };
            await _unitOfWork.CustomerNotes.AddAsync(entity);
            await _unitOfWork.CompleteAsync();
            var displayDate = entity.CreatedAt.ToLocalTime().ToString("MMM dd, yyyy h:mm tt");
            var author      = currentUser?.Email ?? "Staff";
            var noteHtml = $@"<div class=""customer-note-item d-flex gap-2 py-2 border-bottom"" data-note-id=""{entity.Id}"">
  <div class=""flex-grow-1"">
    {(isImportant ? @"<span class=""text-warning me-1"" title=""Important"">&#9733;</span>" : "")}
    <span class=""note-text"">{System.Web.HttpUtility.HtmlEncode(entity.Note)}</span>
    <div class=""text-muted"" style=""font-size:0.75rem;"">{System.Web.HttpUtility.HtmlEncode(author)} &mdash; {displayDate}</div>
  </div>
  <button type=""button"" class=""btn btn-sm btn-link text-danger p-0 flex-shrink-0""
          onclick=""deleteCustomerNote({id}, {entity.Id})"" title=""Delete note"">
    <i class=""bi bi-trash""></i>
  </button>
 </div>";
            return Json(new { success = true, noteHtml });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error adding note to customer {CustomerId}", id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    /// <summary>
    /// Soft-deletes a single customer note. Only the owning company can delete their own notes
    /// (enforced via CompanyId on the entity + global query filter).
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> DeleteCustomerNote(int id, int noteId)
    {
        try
        {
            var note = await _unitOfWork.CustomerNotes.GetByIdAsync(noteId);
            if (note == null || note.CustomerId != id)
                return Json(new { success = false, message = "Note not found." });
            await _unitOfWork.CustomerNotes.SoftDeleteAsync(note);
            await _unitOfWork.CompleteAsync();
            return Json(new { success = true });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error deleting note {NoteId} for customer {CustomerId}", noteId, id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    /// <summary>
    /// Returns up to 10 inventory items matching the search term for the preferred-powder typeahead.
    /// Results are scoped to the current company and only include active items.
    /// </summary>
    [HttpGet]
    public async Task<IActionResult> SearchInventoryItems(string term)
    {
        if (string.IsNullOrWhiteSpace(term) || term.Length < 2)
            return Json(Array.Empty<object>());
        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
        var lower = term.ToLower();
        var items = (await _unitOfWork.InventoryItems.FindAsync(
                i => i.CompanyId == companyId && i.IsActive
                     && (i.Name.ToLower().Contains(lower) || (i.SKU != null && i.SKU.ToLower().Contains(lower)))))
            .OrderBy(i => i.Name)
            .Take(10)
            .Select(i => new { i.Id, i.Name, i.ColorName, sku = i.SKU })
            .ToList();
        return Json(items);
    }
    /// <summary>
    /// Associates an inventory item as a preferred powder for a customer.
    /// Silently succeeds if the association already exists (idempotent).
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> AddPreferredPowder(int id, int inventoryItemId, string? notes = null)
    {
        try
        {
            var customer = await _unitOfWork.Customers.GetByIdAsync(id);
            if (customer == null) return Json(new { success = false, message = "Customer not found." });
            var item = await _unitOfWork.InventoryItems.GetByIdAsync(inventoryItemId);
            if (item == null) return Json(new { success = false, message = "Inventory item not found." });
            var existing = (await _unitOfWork.CustomerPreferredPowders.FindAsync(
                p => p.CustomerId == id && p.InventoryItemId == inventoryItemId)).FirstOrDefault();
            if (existing != null)
                return Json(new { success = false, message = $"{item.Name} is already in preferred powders." });
            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
            await _unitOfWork.CustomerPreferredPowders.AddAsync(new PowderCoating.Core.Entities.CustomerPreferredPowder
            {
                CustomerId      = id,
                InventoryItemId = inventoryItemId,
                Notes           = notes?.Trim(),
                CompanyId       = companyId
            });
            await _unitOfWork.CompleteAsync();
            return Json(new { success = true, itemId = inventoryItemId, itemName = item.Name, notes = notes?.Trim() });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error adding preferred powder for customer {CustomerId}", id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    /// <summary>
    /// Removes a preferred-powder association by inventory item ID. Soft-deletes the record
    /// so the history is preserved but it no longer appears on the customer page.
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> RemovePreferredPowder(int id, int itemId)
    {
        try
        {
            var record = (await _unitOfWork.CustomerPreferredPowders.FindAsync(
                p => p.CustomerId == id && p.InventoryItemId == itemId)).FirstOrDefault();
            if (record == null) return Json(new { success = false, message = "Record not found." });
            await _unitOfWork.CustomerPreferredPowders.SoftDeleteAsync(record);
            await _unitOfWork.CompleteAsync();
            return Json(new { success = true });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error removing preferred powder {ItemId} for customer {CustomerId}", itemId, id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    // ── Customer Contacts ──────────────────────────────────────────────────
    /// <summary>
    /// Returns the JSON representation of a single contact for pre-populating the edit modal.
    /// </summary>
    [HttpGet]
    public async Task<IActionResult> GetContact(int id, int contactId)
    {
        var contact = await _unitOfWork.CustomerContacts.GetByIdAsync(contactId);
        if (contact == null || contact.CustomerId != id)
            return Json(new { success = false });
        var dto = _mapper.Map<PowderCoating.Application.DTOs.Customer.UpdateCustomerContactDto>(contact);
        return Json(new { success = true, contact = dto });
    }
    /// <summary>
    /// Adds a new contact to the customer record. Returns rendered row HTML so the
    /// caller can append it to the contacts table without a full reload.
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> AddContact(int id, PowderCoating.Application.DTOs.Customer.CreateCustomerContactDto dto)
    {
        if (!ModelState.IsValid)
            return Json(new { success = false, message = ModelState.Values.SelectMany(v => v.Errors).FirstOrDefault()?.ErrorMessage ?? "Invalid data." });
        try
        {
            var customer = await _unitOfWork.Customers.GetByIdAsync(id);
            if (customer == null) return Json(new { success = false, message = "Customer not found." });
            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
            var entity = _mapper.Map<PowderCoating.Core.Entities.CustomerContact>(dto);
            entity.CustomerId = id;
            entity.CompanyId = companyId;
            await _unitOfWork.CustomerContacts.AddAsync(entity);
            await _unitOfWork.CompleteAsync();
            var rowHtml = BuildContactRowHtml(id, entity);
            return Json(new { success = true, contactId = entity.Id, rowHtml });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error adding contact to customer {CustomerId}", id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    /// <summary>
    /// Updates an existing contact record in place. Returns the updated row HTML.
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> UpdateContact(int id, PowderCoating.Application.DTOs.Customer.UpdateCustomerContactDto dto)
    {
        if (!ModelState.IsValid)
            return Json(new { success = false, message = ModelState.Values.SelectMany(v => v.Errors).FirstOrDefault()?.ErrorMessage ?? "Invalid data." });
        try
        {
            var contact = await _unitOfWork.CustomerContacts.GetByIdAsync(dto.Id);
            if (contact == null || contact.CustomerId != id)
                return Json(new { success = false, message = "Contact not found." });
            _mapper.Map(dto, contact);
            contact.UpdatedAt = DateTime.UtcNow;
            await _unitOfWork.CustomerContacts.UpdateAsync(contact);
            await _unitOfWork.CompleteAsync();
            var rowHtml = BuildContactRowHtml(id, contact);
            return Json(new { success = true, contactId = contact.Id, rowHtml });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error updating contact {ContactId} for customer {CustomerId}", dto.Id, id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    /// <summary>
    /// Soft-deletes a contact. Only the owning company can delete their contacts
    /// (enforced via CompanyId + global query filter).
    /// </summary>
    [HttpPost, ValidateAntiForgeryToken]
    public async Task<IActionResult> DeleteContact(int id, int contactId)
    {
        try
        {
            var contact = await _unitOfWork.CustomerContacts.GetByIdAsync(contactId);
            if (contact == null || contact.CustomerId != id)
                return Json(new { success = false, message = "Contact not found." });
            await _unitOfWork.CustomerContacts.SoftDeleteAsync(contact);
            await _unitOfWork.CompleteAsync();
            return Json(new { success = true });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error deleting contact {ContactId} for customer {CustomerId}", contactId, id);
            return Json(new { success = false, message = "An error occurred." });
        }
    }
    /// <summary>
    /// Builds the table-row HTML for a contact. Kept server-side so the same markup is
    /// used for both the initial page render and the AJAX insert/replace path.
    /// </summary>
    private static string BuildContactRowHtml(int customerId, PowderCoating.Core.Entities.CustomerContact c)
    {
        var displayName = string.IsNullOrWhiteSpace(c.LastName) ? c.FirstName : $"{c.FirstName} {c.LastName}";
        var titlePart   = !string.IsNullOrWhiteSpace(c.Title) ? System.Web.HttpUtility.HtmlEncode(c.Title) : "";
        var roleBadge   = !string.IsNullOrWhiteSpace(c.ContactRole)
            ? $"<span class=\"badge bg-secondary bg-opacity-10 text-secondary ms-1\">{System.Web.HttpUtility.HtmlEncode(c.ContactRole)}</span>"
            : "";
        var email = !string.IsNullOrWhiteSpace(c.Email)
            ? $"<a href=\"mailto:{System.Web.HttpUtility.HtmlEncode(c.Email)}\" class=\"text-decoration-none small\">{System.Web.HttpUtility.HtmlEncode(c.Email)}</a>"
            : "<span class=\"text-muted small\">&mdash;</span>";
        var phone = !string.IsNullOrWhiteSpace(c.Phone ?? c.MobilePhone)
            ? $"<span class=\"small\">{System.Web.HttpUtility.HtmlEncode(c.Phone ?? c.MobilePhone)}</span>"
            : "<span class=\"text-muted small\">&mdash;</span>";
        return $@"<tr data-contact-id=""{c.Id}"">
  <td>
    <div class=""fw-semibold"">{System.Web.HttpUtility.HtmlEncode(displayName)}{roleBadge}</div>
    {(string.IsNullOrWhiteSpace(titlePart) ? "" : $"<div class=\"text-muted\" style=\"font-size:0.75rem;\">{titlePart}</div>")}
  </td>
  <td>{email}</td>
  <td>{phone}</td>
  <td class=""text-end"">
    <button type=""button"" class=""btn btn-sm btn-outline-secondary me-1""
            onclick=""editContact({customerId}, {c.Id})"" title=""Edit"">
      <i class=""bi bi-pencil""></i>
    </button>
    <button type=""button"" class=""btn btn-sm btn-outline-danger""
            onclick=""deleteContact({customerId}, {c.Id})"" title=""Delete"">
      <i class=""bi bi-trash""></i>
    </button>
  </td>
 </tr>";
    }
    /// <summary>
    /// Displays or downloads a dated activity statement for a customer.
    /// Pass <c>pdf=true</c> to download the QuestPDF version; otherwise renders the HTML view.
@@ -115,10 +115,11 @@ public class DataExportController : Controller
        {
            switch (sheet)
            {
-                case "Customers":   await AddCustomersSheet(package, companyId, headerColor); break;
+                case "Customers":         await AddCustomersSheet(package, companyId, headerColor); break;
-                case "Jobs":        await AddJobsSheet(package, companyId, headerColor); break;
+                case "CustomerContacts":  await AddCustomerContactsSheet(package, companyId, headerColor); break;
-                case "Quotes":      await AddQuotesSheet(package, companyId, headerColor); break;
+                case "Jobs":              await AddJobsSheet(package, companyId, headerColor); break;
-                case "Invoices":    await AddInvoicesSheet(package, companyId, headerColor); break;
+                case "Quotes":            await AddQuotesSheet(package, companyId, headerColor); break;
                case "Invoices":          await AddInvoicesSheet(package, companyId, headerColor); break;
                case "Inventory":   await AddInventorySheet(package, companyId, headerColor); break;
                case "Equipment":   await AddEquipmentSheet(package, companyId, headerColor); break;
                case "Vendors":     await AddVendorsSheet(package, companyId, headerColor); break;
@@ -164,10 +165,11 @@ public class DataExportController : Controller
        {
            switch (sheet)
            {
-                case "Customers":   WriteCsvEntry(zip, "Customers.csv",   await BuildCustomersCsv(companyId)); break;
+                case "Customers":        WriteCsvEntry(zip, "Customers.csv",        await BuildCustomersCsv(companyId)); break;
-                case "Jobs":        WriteCsvEntry(zip, "Jobs.csv",        await BuildJobsCsv(companyId)); break;
+                case "CustomerContacts": WriteCsvEntry(zip, "CustomerContacts.csv", await BuildCustomerContactsCsv(companyId)); break;
-                case "Quotes":      WriteCsvEntry(zip, "Quotes.csv",      await BuildQuotesCsv(companyId)); break;
+                case "Jobs":             WriteCsvEntry(zip, "Jobs.csv",             await BuildJobsCsv(companyId)); break;
-                case "Invoices":    WriteCsvEntry(zip, "Invoices.csv",    await BuildInvoicesCsv(companyId)); break;
+                case "Quotes":           WriteCsvEntry(zip, "Quotes.csv",           await BuildQuotesCsv(companyId)); break;
                case "Invoices":         WriteCsvEntry(zip, "Invoices.csv",         await BuildInvoicesCsv(companyId)); break;
                case "Inventory":   WriteCsvEntry(zip, "Inventory.csv",   await BuildInventoryCsv(companyId)); break;
                case "Equipment":   WriteCsvEntry(zip, "Equipment.csv",   await BuildEquipmentCsv(companyId)); break;
                case "Vendors":     WriteCsvEntry(zip, "Vendors.csv",     await BuildVendorsCsv(companyId)); break;
@@ -240,7 +242,9 @@ public class DataExportController : Controller
        var ws = pkg.Workbook.Worksheets.Add("Customers");
        var headers = new[] { "ID", "Company Name", "First Name", "Last Name", "Email", "Phone",
                               "Commercial", "City", "State", "Active", "Credit Limit",
-                               "Current Balance", "Created At" };
+                               "Current Balance", "Lead Source",
                               "Ship-To Address", "Ship-To City", "Ship-To State", "Ship-To Zip", "Ship-To Country",
                               "Created At" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
@@ -259,7 +263,13 @@ public class DataExportController : Controller
            ws.Cells[r, 10].Value = c.IsActive ? "Yes" : "No";
            ws.Cells[r, 11].Value = c.CreditLimit;
            ws.Cells[r, 12].Value = c.CurrentBalance;
-            ws.Cells[r, 13].Value = c.CreatedAt.ToString("yyyy-MM-dd");
+            ws.Cells[r, 13].Value = c.LeadSource;
            ws.Cells[r, 14].Value = c.ShipToAddress;
            ws.Cells[r, 15].Value = c.ShipToCity;
            ws.Cells[r, 16].Value = c.ShipToState;
            ws.Cells[r, 17].Value = c.ShipToZipCode;
            ws.Cells[r, 18].Value = c.ShipToCountry;
            ws.Cells[r, 19].Value = c.CreatedAt.ToString("yyyy-MM-dd");
        }
        AutoFit(ws, headers.Length);
    }
@@ -282,22 +292,23 @@ public class DataExportController : Controller
        var ws = pkg.Workbook.Worksheets.Add("Jobs");
        var headers = new[] { "ID", "Job Number", "Customer", "Status", "Priority",
-                               "Description", "Due Date", "Final Price", "Created At" };
+                               "Description", "Project Name", "Due Date", "Final Price", "Created At" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
            var r = i + 2;
            var j = data[i];
-            ws.Cells[r, 1].Value = j.Id;
+            ws.Cells[r, 1].Value  = j.Id;
-            ws.Cells[r, 2].Value = j.JobNumber;
+            ws.Cells[r, 2].Value  = j.JobNumber;
-            ws.Cells[r, 3].Value = j.Customer?.CompanyName ?? $"{j.Customer?.ContactFirstName} {j.Customer?.ContactLastName}".Trim();
+            ws.Cells[r, 3].Value  = j.Customer?.CompanyName ?? $"{j.Customer?.ContactFirstName} {j.Customer?.ContactLastName}".Trim();
-            ws.Cells[r, 4].Value = j.JobStatus?.DisplayName ?? j.JobStatusId.ToString();
+            ws.Cells[r, 4].Value  = j.JobStatus?.DisplayName ?? j.JobStatusId.ToString();
-            ws.Cells[r, 5].Value = j.JobPriority?.DisplayName ?? j.JobPriorityId.ToString();
+            ws.Cells[r, 5].Value  = j.JobPriority?.DisplayName ?? j.JobPriorityId.ToString();
-            ws.Cells[r, 6].Value = j.Description;
+            ws.Cells[r, 6].Value  = j.Description;
-            ws.Cells[r, 7].Value = j.DueDate?.ToString("yyyy-MM-dd");
+            ws.Cells[r, 7].Value  = j.ProjectName;
-            ws.Cells[r, 8].Value = j.FinalPrice;
+            ws.Cells[r, 8].Value  = j.DueDate?.ToString("yyyy-MM-dd");
-            ws.Cells[r, 9].Value = j.CreatedAt.ToString("yyyy-MM-dd");
+            ws.Cells[r, 9].Value  = j.FinalPrice;
            ws.Cells[r, 10].Value = j.CreatedAt.ToString("yyyy-MM-dd");
        }
        AutoFit(ws, headers.Length);
    }
@@ -318,22 +329,23 @@ public class DataExportController : Controller
        var ws = pkg.Workbook.Worksheets.Add("Quotes");
        var headers = new[] { "ID", "Quote Number", "Customer / Prospect", "Status",
-                               "Quote Date", "Expiration Date", "Subtotal", "Tax", "Total" };
+                               "Quote Date", "Expiration Date", "Project Name", "Subtotal", "Tax", "Total" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
            var r = i + 2;
            var q = data[i];
-            ws.Cells[r, 1].Value = q.Id;
+            ws.Cells[r, 1].Value  = q.Id;
-            ws.Cells[r, 2].Value = q.QuoteNumber;
+            ws.Cells[r, 2].Value  = q.QuoteNumber;
-            ws.Cells[r, 3].Value = string.IsNullOrEmpty(q.ProspectCompanyName) ? $"Customer #{q.CustomerId}" : q.ProspectCompanyName;
+            ws.Cells[r, 3].Value  = string.IsNullOrEmpty(q.ProspectCompanyName) ? $"Customer #{q.CustomerId}" : q.ProspectCompanyName;
-            ws.Cells[r, 4].Value = q.QuoteStatus?.DisplayName ?? q.QuoteStatusId.ToString();
+            ws.Cells[r, 4].Value  = q.QuoteStatus?.DisplayName ?? q.QuoteStatusId.ToString();
-            ws.Cells[r, 5].Value = q.QuoteDate.ToString("yyyy-MM-dd");
+            ws.Cells[r, 5].Value  = q.QuoteDate.ToString("yyyy-MM-dd");
-            ws.Cells[r, 6].Value = q.ExpirationDate?.ToString("yyyy-MM-dd");
+            ws.Cells[r, 6].Value  = q.ExpirationDate?.ToString("yyyy-MM-dd");
-            ws.Cells[r, 7].Value = q.SubTotal;
+            ws.Cells[r, 7].Value  = q.ProjectName;
-            ws.Cells[r, 8].Value = q.TaxAmount;
+            ws.Cells[r, 8].Value  = q.SubTotal;
-            ws.Cells[r, 9].Value = q.Total;
+            ws.Cells[r, 9].Value  = q.TaxAmount;
            ws.Cells[r, 10].Value = q.Total;
        }
        AutoFit(ws, headers.Length);
    }
@@ -456,7 +468,7 @@ public class DataExportController : Controller
        var ws = pkg.Workbook.Worksheets.Add("Invoices");
        var headers = new[] { "ID", "Invoice #", "Customer", "Status", "Invoice Date",
-                               "Due Date", "Subtotal", "Tax", "Total", "Amount Paid", "Balance Due" };
+                               "Due Date", "Project Name", "Subtotal", "Tax", "Total", "Amount Paid", "Balance Due" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
@@ -472,11 +484,12 @@ public class DataExportController : Controller
            ws.Cells[r, 4].Value  = inv.Status.ToString();
            ws.Cells[r, 5].Value  = inv.InvoiceDate.ToString("yyyy-MM-dd");
            ws.Cells[r, 6].Value  = inv.DueDate?.ToString("yyyy-MM-dd");
-            ws.Cells[r, 7].Value  = inv.SubTotal;
+            ws.Cells[r, 7].Value  = inv.ProjectName;
-            ws.Cells[r, 8].Value  = inv.TaxAmount;
+            ws.Cells[r, 8].Value  = inv.SubTotal;
-            ws.Cells[r, 9].Value  = inv.Total;
+            ws.Cells[r, 9].Value  = inv.TaxAmount;
-            ws.Cells[r, 10].Value = inv.AmountPaid;
+            ws.Cells[r, 10].Value = inv.Total;
-            ws.Cells[r, 11].Value = inv.BalanceDue;
+            ws.Cells[r, 11].Value = inv.AmountPaid;
            ws.Cells[r, 12].Value = inv.BalanceDue;
        }
        AutoFit(ws, headers.Length);
    }
@@ -530,11 +543,11 @@ public class DataExportController : Controller
            .Include(c => c.PricingTier)
            .Where(c => c.CompanyId == companyId && !c.IsDeleted).OrderBy(c => c.CompanyName).ToListAsync();
        var sb = new StringBuilder();
-        sb.AppendLine("CompanyName,ContactFirstName,ContactLastName,Email,Phone,MobilePhone,Address,City,State,ZipCode,Country,CustomerType,PricingTierCode,CreditLimit,PaymentTerms,TaxExempt,TaxId,IsActive,Notes");
+        sb.AppendLine("CompanyName,ContactFirstName,ContactLastName,Email,Phone,MobilePhone,Address,City,State,ZipCode,Country,CustomerType,PricingTierCode,CreditLimit,PaymentTerms,TaxExempt,TaxId,IsActive,Notes,LeadSource,ShipToAddress,ShipToCity,ShipToState,ShipToZipCode,ShipToCountry");
        foreach (var c in data)
        {
            var customerType = c.IsCommercial ? "Commercial" : "Non-Commercial";
-            sb.AppendLine($"{CsvEscape(c.CompanyName)},{CsvEscape(c.ContactFirstName)},{CsvEscape(c.ContactLastName)},{CsvEscape(c.Email)},{CsvEscape(c.Phone)},{CsvEscape(c.MobilePhone)},{CsvEscape(c.Address)},{CsvEscape(c.City)},{CsvEscape(c.State)},{CsvEscape(c.ZipCode)},{CsvEscape(c.Country)},{customerType},{CsvEscape(c.PricingTier?.TierName)},{c.CreditLimit},{CsvEscape(c.PaymentTerms)},{c.IsTaxExempt.ToString().ToLower()},{CsvEscape(c.TaxId)},{c.IsActive.ToString().ToLower()},{CsvEscape(c.GeneralNotes)}");
+            sb.AppendLine($"{CsvEscape(c.CompanyName)},{CsvEscape(c.ContactFirstName)},{CsvEscape(c.ContactLastName)},{CsvEscape(c.Email)},{CsvEscape(c.Phone)},{CsvEscape(c.MobilePhone)},{CsvEscape(c.Address)},{CsvEscape(c.City)},{CsvEscape(c.State)},{CsvEscape(c.ZipCode)},{CsvEscape(c.Country)},{customerType},{CsvEscape(c.PricingTier?.TierName)},{c.CreditLimit},{CsvEscape(c.PaymentTerms)},{c.IsTaxExempt.ToString().ToLower()},{CsvEscape(c.TaxId)},{c.IsActive.ToString().ToLower()},{CsvEscape(c.GeneralNotes)},{CsvEscape(c.LeadSource)},{CsvEscape(c.ShipToAddress)},{CsvEscape(c.ShipToCity)},{CsvEscape(c.ShipToState)},{CsvEscape(c.ShipToZipCode)},{CsvEscape(c.ShipToCountry)}");
        }
        return sb.ToString();
    }
@@ -552,13 +565,13 @@ public class DataExportController : Controller
            .Include(j => j.Customer).Include(j => j.JobStatus).Include(j => j.JobPriority)
            .OrderByDescending(j => j.CreatedAt).ToListAsync();
        var sb = new StringBuilder();
-        sb.AppendLine("JobNumber,CustomerEmail,CustomerName,Status,Priority,ScheduledDate,DueDate,FinalPrice,CustomerPO,SpecialInstructions,Notes");
+        sb.AppendLine("JobNumber,CustomerEmail,CustomerName,Status,Priority,ScheduledDate,DueDate,ProjectName,FinalPrice,CustomerPO,SpecialInstructions,Notes");
        foreach (var j in data)
        {
            var customerName = !string.IsNullOrWhiteSpace(j.Customer?.CompanyName)
                ? j.Customer.CompanyName
                : $"{j.Customer?.ContactFirstName} {j.Customer?.ContactLastName}".Trim();
-            sb.AppendLine($"{CsvEscape(j.JobNumber)},{CsvEscape(j.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(j.JobStatus?.DisplayName)},{CsvEscape(j.JobPriority?.DisplayName)},{j.ScheduledDate?.ToString("yyyy-MM-dd")},{j.DueDate?.ToString("yyyy-MM-dd")},{j.FinalPrice},{CsvEscape(j.CustomerPO)},{CsvEscape(j.SpecialInstructions)},{CsvEscape(j.InternalNotes)}");
+            sb.AppendLine($"{CsvEscape(j.JobNumber)},{CsvEscape(j.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(j.JobStatus?.DisplayName)},{CsvEscape(j.JobPriority?.DisplayName)},{j.ScheduledDate?.ToString("yyyy-MM-dd")},{j.DueDate?.ToString("yyyy-MM-dd")},{CsvEscape(j.ProjectName)},{j.FinalPrice},{CsvEscape(j.CustomerPO)},{CsvEscape(j.SpecialInstructions)},{CsvEscape(j.InternalNotes)}");
        }
        return sb.ToString();
    }
@@ -574,13 +587,13 @@ public class DataExportController : Controller
            .Where(q => q.CompanyId == companyId && !q.IsDeleted)
            .Include(q => q.Customer).Include(q => q.QuoteStatus).OrderByDescending(q => q.QuoteDate).ToListAsync();
        var sb = new StringBuilder();
-        sb.AppendLine("QuoteNumber,CustomerEmail,CustomerName,ProspectCompany,ProspectContact,ProspectEmail,ProspectPhone,Status,QuoteDate,ExpirationDate,Subtotal,TaxAmount,Total,Notes,TermsAndConditions");
+        sb.AppendLine("QuoteNumber,CustomerEmail,CustomerName,ProspectCompany,ProspectContact,ProspectEmail,ProspectPhone,Status,QuoteDate,ExpirationDate,ProjectName,Subtotal,TaxAmount,Total,Notes,TermsAndConditions");
        foreach (var q in data)
        {
            var customerName = !string.IsNullOrWhiteSpace(q.Customer?.CompanyName)
                ? q.Customer.CompanyName
                : $"{q.Customer?.ContactFirstName} {q.Customer?.ContactLastName}".Trim();
-            sb.AppendLine($"{CsvEscape(q.QuoteNumber)},{CsvEscape(q.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(q.ProspectCompanyName)},{CsvEscape(q.ProspectContactName)},{CsvEscape(q.ProspectEmail)},{CsvEscape(q.ProspectPhone)},{CsvEscape(q.QuoteStatus?.DisplayName)},{q.QuoteDate:yyyy-MM-dd},{q.ExpirationDate?.ToString("yyyy-MM-dd")},{q.SubTotal},{q.TaxAmount},{q.Total},{CsvEscape(q.Notes)},{CsvEscape(q.Terms)}");
+            sb.AppendLine($"{CsvEscape(q.QuoteNumber)},{CsvEscape(q.Customer?.Email)},{CsvEscape(customerName)},{CsvEscape(q.ProspectCompanyName)},{CsvEscape(q.ProspectContactName)},{CsvEscape(q.ProspectEmail)},{CsvEscape(q.ProspectPhone)},{CsvEscape(q.QuoteStatus?.DisplayName)},{q.QuoteDate:yyyy-MM-dd},{q.ExpirationDate?.ToString("yyyy-MM-dd")},{CsvEscape(q.ProjectName)},{q.SubTotal},{q.TaxAmount},{q.Total},{CsvEscape(q.Notes)},{CsvEscape(q.Terms)}");
        }
        return sb.ToString();
    }
@@ -596,17 +609,68 @@ public class DataExportController : Controller
            .Where(i => i.CompanyId == companyId && !i.IsDeleted)
            .Include(i => i.Customer).OrderByDescending(i => i.InvoiceDate).ToListAsync();
        var sb = new StringBuilder();
-        sb.AppendLine("ID,Invoice #,Customer,Status,Invoice Date,Due Date,Subtotal,Tax,Total,Amount Paid,Balance Due");
+        sb.AppendLine("ID,Invoice #,Customer,Status,Invoice Date,Due Date,Project Name,Subtotal,Tax,Total,Amount Paid,Balance Due");
        foreach (var inv in data)
        {
            var cust = inv.Customer != null
                ? (inv.Customer.CompanyName ?? $"{inv.Customer.ContactFirstName} {inv.Customer.ContactLastName}".Trim())
                : $"Customer #{inv.CustomerId}";
-            sb.AppendLine($"{inv.Id},{CsvEscape(inv.InvoiceNumber)},{CsvEscape(cust)},{inv.Status},{inv.InvoiceDate:yyyy-MM-dd},{inv.DueDate?.ToString("yyyy-MM-dd")},{inv.SubTotal},{inv.TaxAmount},{inv.Total},{inv.AmountPaid},{inv.BalanceDue}");
+            sb.AppendLine($"{inv.Id},{CsvEscape(inv.InvoiceNumber)},{CsvEscape(cust)},{inv.Status},{inv.InvoiceDate:yyyy-MM-dd},{inv.DueDate?.ToString("yyyy-MM-dd")},{CsvEscape(inv.ProjectName)},{inv.SubTotal},{inv.TaxAmount},{inv.Total},{inv.AmountPaid},{inv.BalanceDue}");
        }
        return sb.ToString();
    }
    /// <summary>
    /// Adds a CustomerContacts worksheet: one row per additional contact linked to the company's customers.
    /// CustomerEmail is the join key used by the importer to re-link contacts to their parent customer.
    /// </summary>
    private async Task AddCustomerContactsSheet(ExcelPackage pkg, int companyId, Color hdr)
    {
        var data = await _db.CustomerContacts.AsNoTracking().IgnoreQueryFilters()
            .Include(cc => cc.Customer)
            .Where(cc => cc.CompanyId == companyId && !cc.IsDeleted)
            .OrderBy(cc => cc.Customer!.CompanyName).ThenBy(cc => cc.LastName).ThenBy(cc => cc.FirstName)
            .ToListAsync();
        var ws = pkg.Workbook.Worksheets.Add("CustomerContacts");
        var headers = new[] { "CustomerEmail", "FirstName", "LastName", "Title", "ContactRole", "Email", "Phone", "MobilePhone", "Notes" };
        WriteHeader(ws, headers, hdr);
        for (int i = 0; i < data.Count; i++)
        {
            var r = i + 2;
            var cc = data[i];
            ws.Cells[r, 1].Value = cc.Customer?.Email;
            ws.Cells[r, 2].Value = cc.FirstName;
            ws.Cells[r, 3].Value = cc.LastName;
            ws.Cells[r, 4].Value = cc.Title;
            ws.Cells[r, 5].Value = cc.ContactRole;
            ws.Cells[r, 6].Value = cc.Email;
            ws.Cells[r, 7].Value = cc.Phone;
            ws.Cells[r, 8].Value = cc.MobilePhone;
            ws.Cells[r, 9].Value = cc.Notes;
        }
        AutoFit(ws, headers.Length);
    }
    /// <summary>
    /// Builds the customer contacts CSV string for the specified company.
    /// CustomerEmail is the join key used by the importer to re-link contacts to their parent customer.
    /// </summary>
    private async Task<string> BuildCustomerContactsCsv(int companyId)
    {
        var data = await _db.CustomerContacts.AsNoTracking().IgnoreQueryFilters()
            .Include(cc => cc.Customer)
            .Where(cc => cc.CompanyId == companyId && !cc.IsDeleted)
            .OrderBy(cc => cc.Customer!.CompanyName).ThenBy(cc => cc.LastName).ThenBy(cc => cc.FirstName)
            .ToListAsync();
        var sb = new StringBuilder();
        sb.AppendLine("CustomerEmail,FirstName,LastName,Title,ContactRole,Email,Phone,MobilePhone,Notes");
        foreach (var cc in data)
            sb.AppendLine($"{CsvEscape(cc.Customer?.Email)},{CsvEscape(cc.FirstName)},{CsvEscape(cc.LastName)},{CsvEscape(cc.Title)},{CsvEscape(cc.ContactRole)},{CsvEscape(cc.Email)},{CsvEscape(cc.Phone)},{CsvEscape(cc.MobilePhone)},{CsvEscape(cc.Notes)}");
        return sb.ToString();
    }
    /// <summary>
    /// Builds the inventory CSV string for the specified company, ordered alphabetically by name.
    /// Column names match <see cref="InventoryItemImportDto"/> exactly so the file can be re-imported.
@@ -152,6 +152,10 @@ public class JobsController : Controller
                        || j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.ReadyForPickup
                        || j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.Delivered;
                }
                else if (statusGroup == "ready")
                {
                    filter = j => j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.ReadyForPickup;
                }
                // "all" or unknown group: no filter applied (show every status)
            }
            else if (!string.IsNullOrWhiteSpace(searchTerm))
@@ -1981,6 +1985,146 @@ public class JobsController : Controller
    }
    /// <summary>
    /// <summary>
    /// Creates a new job that is a copy of an existing job. All items, coats, and prep services
    /// are deep-copied. Pricing-routing flags (IsAiItem, IsGenericItem, IsLaborItem, IsSalesItem)
    /// are preserved so pricing behaves identically. Dates, worker assignment, and invoice links
    /// are cleared; status resets to Pending so the job enters the normal workflow from the start.
    /// </summary>
    [Authorize(Policy = AppConstants.Policies.CanManageJobs)]
    public async Task<IActionResult> CloneJob(int id)
    {
        try
        {
            var source = await _unitOfWork.Jobs.LoadForDetailsAsync(id);
            if (source == null) return NotFound();
            var companyId   = _tenantContext.GetCurrentCompanyId() ?? 0;
            var pendingStatus = await _unitOfWork.JobStatusLookups.FirstOrDefaultAsync(
                s => s.StatusCode == AppConstants.StatusCodes.Job.Pending && s.CompanyId == companyId);
            if (pendingStatus == null)
            {
                this.ToastError("Could not find Pending status for this company.");
                return RedirectToAction(nameof(Details), new { id });
            }
            var newJob = new Job
            {
                JobNumber              = await GenerateJobNumber(),
                CustomerId             = source.CustomerId,
                CompanyId              = companyId,
                JobStatusId            = pendingStatus.Id,
                JobPriorityId          = source.JobPriorityId,
                Description            = source.Description,
                CustomerPO             = source.CustomerPO,
                ProjectName            = source.ProjectName,
                SpecialInstructions    = source.SpecialInstructions,
                InternalNotes          = source.InternalNotes,
                Tags                   = source.Tags,
                IsRushJob              = source.IsRushJob,
                RequiresCustomerApproval = source.RequiresCustomerApproval,
                DiscountType           = source.DiscountType,
                DiscountValue          = source.DiscountValue,
                DiscountReason         = source.DiscountReason,
                OvenCostId             = source.OvenCostId,
                OvenBatches            = source.OvenBatches,
                OvenCycleMinutes       = source.OvenCycleMinutes,
                ShopSuppliesPercent    = source.ShopSuppliesPercent,
                ShopAccessCode         = Guid.NewGuid()
            };
            await _unitOfWork.Jobs.AddAsync(newJob);
            await _unitOfWork.CompleteAsync();
            foreach (var srcItem in source.JobItems.Where(i => !i.IsDeleted))
            {
                var newItem = new JobItem
                {
                    JobId               = newJob.Id,
                    CompanyId           = companyId,
                    Description         = srcItem.Description,
                    Quantity            = srcItem.Quantity,
                    ColorName           = srcItem.ColorName,
                    ColorCode           = srcItem.ColorCode,
                    Finish              = srcItem.Finish,
                    SurfaceArea         = srcItem.SurfaceArea,
                    SurfaceAreaSqFt     = srcItem.SurfaceAreaSqFt,
                    CatalogItemId       = srcItem.CatalogItemId,
                    UnitPrice           = srcItem.UnitPrice,
                    TotalPrice          = srcItem.TotalPrice,
                    LaborCost           = srcItem.LaborCost,
                    IsGenericItem       = srcItem.IsGenericItem,
                    ManualUnitPrice     = srcItem.ManualUnitPrice,
                    PowderCostOverride  = srcItem.PowderCostOverride,
                    IsLaborItem         = srcItem.IsLaborItem,
                    IsSalesItem         = srcItem.IsSalesItem,
                    IsAiItem            = srcItem.IsAiItem,
                    AiTags              = srcItem.AiTags,
                    IsCustomFormulaItem = srcItem.IsCustomFormulaItem,
                    CustomItemTemplateId = srcItem.CustomItemTemplateId,
                    FormulaFieldValuesJson = srcItem.FormulaFieldValuesJson,
                    Sku                 = srcItem.Sku,
                    IncludePrepCost     = srcItem.IncludePrepCost,
                    RequiresSandblasting = srcItem.RequiresSandblasting,
                    RequiresMasking     = srcItem.RequiresMasking,
                    EstimatedMinutes    = srcItem.EstimatedMinutes,
                    Complexity          = srcItem.Complexity,
                    Notes               = srcItem.Notes
                    // AiPredictionId intentionally not copied — prediction belongs to original quote
                };
                await _unitOfWork.JobItems.AddAsync(newItem);
                await _unitOfWork.CompleteAsync();
                foreach (var srcCoat in srcItem.Coats.Where(c => !c.IsDeleted))
                {
                    await _unitOfWork.JobItemCoats.AddAsync(new JobItemCoat
                    {
                        JobItemId          = newItem.Id,
                        CompanyId          = companyId,
                        CoatName           = srcCoat.CoatName,
                        Sequence           = srcCoat.Sequence,
                        InventoryItemId    = srcCoat.InventoryItemId,
                        ColorName          = srcCoat.ColorName,
                        VendorId           = srcCoat.VendorId,
                        ColorCode          = srcCoat.ColorCode,
                        Finish             = srcCoat.Finish,
                        CoverageSqFtPerLb  = srcCoat.CoverageSqFtPerLb,
                        TransferEfficiency = srcCoat.TransferEfficiency,
                        PowderCostPerLb    = srcCoat.PowderCostPerLb,
                        PowderToOrder      = srcCoat.PowderToOrder,
                        NoExtraLayerCharge = srcCoat.NoExtraLayerCharge,
                        Notes              = srcCoat.Notes
                        // Powder ordering / receiving tracking fields intentionally not copied
                    });
                }
                foreach (var srcPrep in srcItem.PrepServices.Where(p => !p.IsDeleted))
                {
                    await _unitOfWork.JobItemPrepServices.AddAsync(new JobItemPrepService
                    {
                        JobItemId        = newItem.Id,
                        CompanyId        = companyId,
                        PrepServiceId    = srcPrep.PrepServiceId,
                        EstimatedMinutes = srcPrep.EstimatedMinutes,
                        BlastSetupId     = srcPrep.BlastSetupId
                    });
                }
            }
            await _unitOfWork.CompleteAsync();
            this.ToastSuccess($"Job cloned as {newJob.JobNumber} &mdash; review and update dates before scheduling.");
            return RedirectToAction(nameof(Details), new { id = newJob.Id });
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "Error cloning job {JobId}", id);
            this.ToastError("An error occurred while cloning the job.");
            return RedirectToAction(nameof(Details), new { id });
        }
    }
    /// Generates the next sequential job number in the format PREFIX-YYMM-#### (e.g. JOB-2404-0001).
    /// Uses IgnoreQueryFilters so soft-deleted jobs are included in the sequence counter —
    /// this prevents number reuse if a job is deleted after being created this month.
@@ -153,7 +153,7 @@ public static class HelpKnowledgeBase
        - *Commercial*: Businesses. Can have a pricing tier, credit limit, tax exempt status, and linked quotes/jobs.
        - *Non-Commercial*: Individual consumers. Simpler setup.
-        **Key fields:** Name, email, phone, address, customer type, pricing tier, credit limit, tax exempt (with certificate upload), notes.
+        **Key fields:** Name, email, phone, address, customer type, pricing tier, credit limit, tax exempt (with certificate upload), notes, lead source, ship-to address.
        **How to add a customer:**
        1. Go to [Customers](/Customers)
@@ -161,10 +161,20 @@ public static class HelpKnowledgeBase
        3. Fill in name, contact info, select type
        4. Save
-        **Customer Details page** (/Customers/Details/ID) shows: contact info, all linked jobs, quotes, invoices, deposits, balance, notes.
+        **Customer Details page** (/Customers/Details/ID) shows: contact info, all linked jobs, quotes, invoices, deposits, balance, notes, additional contacts.
        **Customer Notes:** Add internal notes on the Details page. Notes are private (not visible to the customer).
        **Additional Contacts:** Store billing contacts, ops contacts, drop-off contacts, etc. on the Customer Details page. These are for staff reference only — all automated notifications (emails, SMS) go to the primary email/phone on the main customer record, not to additional contacts. If invoices need to go to a separate address, use the Billing Email field on the main record.
        **Lead Source:** Optional field on the customer record indicating how they found the shop (Walk-In, Google Search, Customer Referral, Social Media, Website, Repeat Customer, Trade Show, Flyer/Print, Other).
        **Ship-To Address:** Optional separate address for pickups or deliveries. Shown alongside the billing address on the Customer Details page when set.
        **Preferred Powders:** On the Customer Details page, the Preferred Powders card lets staff tag inventory items that a customer regularly orders. Use the search box to find a powder by name or SKU and click Add. Remove with the × button. This is a staff-reference tool only — it does not auto-select powders on quotes or jobs. Items must already exist in Inventory to appear in the search.
        **Outstanding Pickups (Ready for Pickup card):** When one or more of a customer's jobs are in "Ready for Pickup" status, a highlighted card appears on their Customer Details page showing each job number and how many days it has been waiting. Color coding: amber = 3–6 days, red = 7+ days. The card disappears once all jobs move out of Ready for Pickup status. Useful for front desk staff to instantly see during a call whether parts are ready for this customer.
        **Deactivating a customer:** Use the Delete/Deactivate option — this soft-deletes (hides) the customer but does not erase data.
        **Pricing Tiers:** Assign a tier (configured at [Pricing Tiers](/PricingTiers)) to automatically apply a discount to that customer's quotes.
@@ -194,8 +204,9 @@ public static class HelpKnowledgeBase
        2. Choose Quick Quote (fast) or Full Quote (complete form) using the toggle at the top
        3. Select existing customer OR enter prospect info (name, email, phone)
        4. Add line items using the item wizard (3 item types below)
-        5. Review the pricing breakdown
+        5. Optionally enter a **Project Name** — a short label (e.g. "Shop Equipment Rack") that carries through to the job and invoice when the quote is converted.
-        6. Save as Draft or Send immediately
+        6. Review the pricing breakdown
        7. Save as Draft or Send immediately
        **Item types in the quote/job wizard:**
        1. *Product from Catalog* — pick a pre-priced catalog item; price is fixed, no surface-area calculation
@@ -286,8 +297,9 @@ public static class HelpKnowledgeBase
        2. Select customer
        3. Add line items (same wizard as quotes: Calculated, Custom Work, or AI Photo)
        4. Set priority, due date, assigned worker, special instructions
-        5. Optionally set Oven & Batch Settings — select a named oven, number of batches, and cycle time. These affect the oven cost in pricing.
+        5. Optionally enter a **Project Name** — a short label (e.g. "Front Gate Panels") that appears on the job, linked invoice, and printed documents to help the customer identify what the work is for.
-        6. Save
+        6. Optionally set Oven & Batch Settings — select a named oven, number of batches, and cycle time. These affect the oven cost in pricing.
        7. Save
        **Job Priority Board:** [/JobsPriority](/JobsPriority) — Kanban-style view of all active jobs sorted by priority and status.
@@ -328,6 +340,8 @@ public static class HelpKnowledgeBase
        **Job Templates:** [/JobTemplates](/JobTemplates) — Save a job's items as a template to reuse for common work types. When creating a new job, select a template to pre-fill items.
        **Cloning a Job:** On any Job Details page, click the **Clone Job** button (copy icon in the header toolbar). The system creates a new draft job immediately and redirects you to it. The clone copies: customer, description, PO number, project name, special instructions, tags, priority, discount %, oven settings, and all line items with their coats and prep services. It does NOT copy: due date, scheduled date, assigned worker, photos, notes, time entries, status history, or any linked invoice or payments. The clone starts in Pending status so it goes through the normal workflow.
        **Changing the customer on a job:** On the Job Details page, the Customer field is an always-visible dropdown. Select a different customer — a confirmation banner appears. Click **Save** to apply or **Cancel** to revert. Use this to correct a misassigned job or to move a walk-in job to a customer's proper record after they've been added to the system.
        **Inline item price editing:** On the Job Details page, any unit price, quantity, or item description can be edited in-place without opening the full edit form. Click the value — it becomes an input field. Type the new value, then press Enter or click away to save (Escape cancels). The pricing summary card (Items Subtotal, Subtotal, Tax, and Total) and the Job Costing card both update immediately without a page reload.
@@ -377,8 +391,10 @@ public static class HelpKnowledgeBase
        - *Voided* — cancelled invoice
        - *Written Off* — uncollectable, written off
        **Project Name on invoices:** If the linked job had a Project Name set, it auto-fills on the invoice and appears on the printed PDF to help the customer identify the work.
        **How to create an invoice:**
-        1. From the Job Details page → "Create Invoice" (recommended — pre-fills all items), OR
+        1. From the Job Details page → "Create Invoice" (recommended — pre-fills all items including Project Name), OR
        2. Go to [Invoices](/Invoices) → "New Invoice" and select a job
        **Recording a payment:**
@@ -470,6 +486,8 @@ public static class HelpKnowledgeBase
        - **Low Stock** (red) — quantity is greater than zero but at or below the reorder point; time to reorder
        - **Out of Stock** (dark/black) — quantity is zero; an alert banner appears on the Details page
        **Low Stock stat card (clickable filter):** The "Low Stock" KPI card at the top of the Inventory page is clickable. Click it to instantly filter the list to only items needing reorder. Click it again (or clear the filter banner) to return to the full list. This is the fastest way to generate a reorder checklist.
        **Stock Adjustment:** From Inventory Details, click "Stock Adjustment" to open the quick-adjust modal. Choose Add Stock, Remove Stock, or Set Exact, enter the quantity, select a reason (required), and optionally add notes. Every adjustment is automatically recorded as a transaction with the reason and notes included.
        **Inventory transactions:** Every stock movement is recorded automatically — Initial (item creation), Purchase (PO receipt), Adjustment (manual or edit), Job Usage (powder consumed on a job coat), Sale, Return, Waste, Transfer. Each record stores date, quantity delta, unit cost, and running balance after the change.
@@ -31,8 +31,9 @@
                <div class="row g-2 mb-4">
                    @foreach (var item in new[]
                    {
-                        ("Customers",   "people",              "Customers"),
+                        ("Customers",        "people",              "Customers"),
-                        ("Jobs",        "tools",               "Jobs"),
+                        ("CustomerContacts", "person-lines-fill",   "Customer Contacts"),
                        ("Jobs",             "tools",               "Jobs"),
                        ("Quotes",      "file-earmark-text",   "Quotes"),
                        ("Invoices",    "receipt",             "Invoices"),
                        ("Inventory",   "boxes",               "Inventory Items"),
@@ -209,6 +209,42 @@
                        </div>
                    </div>
                    <!-- Ship-To Address Section -->
                    <div class="mb-4">
                        <div class="d-flex align-items-center gap-2 border-bottom pb-2 mb-3">
                            <h5 class="mb-0"><i class="bi bi-truck me-2 text-primary"></i>Ship-To / Pickup Address</h5>
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Ship-To Address"
                               data-bs-content="Optional. Fill in only if this customer picks up or receives deliveries at a different address than their billing address. Leave blank to use the billing address above.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                            <span class="text-muted small fw-normal">(optional &mdash; leave blank if same as billing)</span>
                        </div>
                        <div class="row g-3">
                            <div class="col-12">
                                <label asp-for="ShipToAddress" class="form-label">Street Address</label>
                                <input asp-for="ShipToAddress" class="form-control" placeholder="Enter ship-to street address" />
                            </div>
                            <div class="col-md-5">
                                <label asp-for="ShipToCity" class="form-label">City</label>
                                <input asp-for="ShipToCity" class="form-control" placeholder="Enter city" />
                            </div>
                            <div class="col-md-3">
                                <label asp-for="ShipToState" class="form-label">State</label>
                                <input asp-for="ShipToState" class="form-control" placeholder="Enter state" />
                            </div>
                            <div class="col-md-2">
                                <label asp-for="ShipToZipCode" class="form-label">Zip Code</label>
                                <input asp-for="ShipToZipCode" class="form-control" placeholder="12345" />
                            </div>
                            <div class="col-md-2">
                                <label asp-for="ShipToCountry" class="form-label">Country</label>
                                <input asp-for="ShipToCountry" class="form-control" placeholder="USA" />
                            </div>
                        </div>
                    </div>
                    <!-- Business Information Section -->
                    <div class="mb-4">
                        <div class="d-flex align-items-center gap-2 border-bottom pb-2 mb-3">
@@ -282,6 +318,30 @@
                        </div>
                    </div>
                    <!-- Lead Source Section -->
                    <div class="mb-4">
                        <h5 class="border-bottom pb-2 mb-3">
                            <i class="bi bi-signpost me-2 text-primary"></i>How Did They Find Us?
                        </h5>
                        <div class="row g-3">
                            <div class="col-md-6">
                                <label asp-for="LeadSource" class="form-label">Lead Source</label>
                                <select asp-for="LeadSource" class="form-select">
                                    <option value="">&mdash; Not specified &mdash;</option>
                                    <option value="Walk-In">Walk-In</option>
                                    <option value="Google Search">Google Search</option>
                                    <option value="Customer Referral">Customer Referral</option>
                                    <option value="Social Media">Social Media</option>
                                    <option value="Website">Website</option>
                                    <option value="Repeat Customer">Repeat Customer</option>
                                    <option value="Trade Show / Event">Trade Show / Event</option>
                                    <option value="Flyer / Print Ad">Flyer / Print Ad</option>
                                    <option value="Other">Other</option>
                                </select>
                            </div>
                        </div>
                    </div>
                    <!-- Notes Section -->
                    <div class="mb-4">
                        <h5 class="border-bottom pb-2 mb-3">
@@ -216,27 +216,50 @@
                        </h5>
                    </div>
                    <div class="card-body">
-                        @if (!string.IsNullOrEmpty(Model.Address))
+                        @{
                            bool hasBilling = !string.IsNullOrEmpty(Model.Address);
                            bool hasShipTo  = !string.IsNullOrEmpty(Model.ShipToAddress) || !string.IsNullOrEmpty(Model.ShipToCity);
                        }
                        @if (hasShipTo)
                        {
                            <div class="row g-3">
                                <div class="col-md-6">
                                    <label class="text-muted small mb-1">Billing Address</label>
                                    @if (hasBilling)
                                    {
                                        <p class="mb-1">@Model.Address</p>
                                        <p class="mb-0">
                                            @if (!string.IsNullOrEmpty(Model.City)) { <span>@Model.City</span> }
                                            @if (!string.IsNullOrEmpty(Model.State)) { <span>, @Model.State</span> }
                                            @if (!string.IsNullOrEmpty(Model.ZipCode)) { <span> @Model.ZipCode</span> }
                                        </p>
                                        @if (!string.IsNullOrEmpty(Model.Country)) { <p class="mb-0 text-muted">@Model.Country</p> }
                                    }
                                    else { <p class="text-muted mb-0">Not provided</p> }
                                </div>
                                <div class="col-md-6">
                                    <label class="text-muted small mb-1">
                                        <i class="bi bi-truck me-1"></i>Ship-To / Pickup Address
                                    </label>
                                    <p class="mb-1">@Model.ShipToAddress</p>
                                    <p class="mb-0">
                                        @if (!string.IsNullOrEmpty(Model.ShipToCity)) { <span>@Model.ShipToCity</span> }
                                        @if (!string.IsNullOrEmpty(Model.ShipToState)) { <span>, @Model.ShipToState</span> }
                                        @if (!string.IsNullOrEmpty(Model.ShipToZipCode)) { <span> @Model.ShipToZipCode</span> }
                                    </p>
                                    @if (!string.IsNullOrEmpty(Model.ShipToCountry)) { <p class="mb-0 text-muted">@Model.ShipToCountry</p> }
                                </div>
                            </div>
                        }
                        else if (hasBilling)
                        {
                            <p class="mb-2">@Model.Address</p>
                            <p class="mb-0">
-                                @if (!string.IsNullOrEmpty(Model.City))
+                                @if (!string.IsNullOrEmpty(Model.City)) { <span>@Model.City</span> }
-                                {
+                                @if (!string.IsNullOrEmpty(Model.State)) { <span>, @Model.State</span> }
-                                    <span>@Model.City</span>
+                                @if (!string.IsNullOrEmpty(Model.ZipCode)) { <span> @Model.ZipCode</span> }
                                }
                                @if (!string.IsNullOrEmpty(Model.State))
                                {
                                    <span>, @Model.State</span>
                                }
                                @if (!string.IsNullOrEmpty(Model.ZipCode))
                                {
                                    <span> @Model.ZipCode</span>
                                }
                            </p>
-                            @if (!string.IsNullOrEmpty(Model.Country))
+                            @if (!string.IsNullOrEmpty(Model.Country)) { <p class="mb-0 text-muted">@Model.Country</p> }
                            {
                                <p class="mb-0 text-muted">@Model.Country</p>
                            }
                        }
                        else
                        {
@@ -262,6 +285,15 @@
                                <label class="text-muted small mb-1">Payment Terms</label>
                                <p class="mb-0">@(Model.PaymentTerms ?? "Not set")</p>
                            </div>
                            @if (!string.IsNullOrEmpty(Model.LeadSource))
                            {
                            <div class="col-md-6">
                                <label class="text-muted small mb-1">Lead Source</label>
                                <p class="mb-0">
                                    <i class="bi bi-signpost me-1 text-muted"></i>@Model.LeadSource
                                </p>
                            </div>
                            }
                            <div class="col-md-6">
                                <label class="text-muted small mb-1">Credit Limit</label>
                                <p class="mb-0 fw-semibold">@Model.CreditLimit.ToString("C")</p>
@@ -328,6 +360,211 @@
                        </div>
                    </div>
                }
                <!-- Additional Contacts -->
                @{
                    var customerContacts = ViewBag.CustomerContacts as List<PowderCoating.Core.Entities.CustomerContact>;
                }
                <div class="card border-0 shadow-sm mb-4">
                    <div class="card-header bg-white border-0 py-3 d-flex justify-content-between align-items-center">
                        <h5 class="mb-0 fw-semibold">
                            <i class="bi bi-people me-2 text-primary"></i>Additional Contacts
                        </h5>
                        <div class="d-flex align-items-center gap-2">
                            <span class="text-muted small">
                                <i class="bi bi-info-circle me-1"></i>For staff reference &mdash; automated notifications still go to the primary contact above.
                            </span>
                            <button type="button" class="btn btn-sm btn-outline-primary"
                                    data-bs-toggle="modal" data-bs-target="#contactModal"
                                    onclick="openAddContactModal()">
                                <i class="bi bi-plus-circle me-1"></i>Add Contact
                            </button>
                        </div>
                    </div>
                    <div class="card-body p-0">
                        <div class="table-responsive">
                            <table class="table table-sm table-hover mb-0">
                                <thead class="table-light">
                                    <tr>
                                        <th class="ps-3">Name / Role</th>
                                        <th>Email</th>
                                        <th>Phone</th>
                                        <th class="text-end pe-3"></th>
                                    </tr>
                                </thead>
                                <tbody id="contacts-table-body">
                                    @if (customerContacts != null && customerContacts.Count > 0)
                                    {
                                        @foreach (var c in customerContacts)
                                        {
                                            var displayName = string.IsNullOrWhiteSpace(c.LastName) ? c.FirstName : $"{c.FirstName} {c.LastName}";
                                            <tr data-contact-id="@c.Id">
                                                <td class="ps-3">
                                                    <div class="fw-semibold">
                                                        @displayName
                                                        @if (!string.IsNullOrEmpty(c.ContactRole))
                                                        {
                                                            <span class="badge bg-secondary bg-opacity-10 text-secondary ms-1">@c.ContactRole</span>
                                                        }
                                                    </div>
                                                    @if (!string.IsNullOrEmpty(c.Title))
                                                    {
                                                        <div class="text-muted" style="font-size:0.75rem;">@c.Title</div>
                                                    }
                                                </td>
                                                <td>
                                                    @if (!string.IsNullOrEmpty(c.Email))
                                                    {
                                                        <a href="mailto:@c.Email" class="text-decoration-none small">@c.Email</a>
                                                    }
                                                    else { <span class="text-muted small">&mdash;</span> }
                                                </td>
                                                <td>
                                                    @if (!string.IsNullOrEmpty(c.Phone ?? c.MobilePhone))
                                                    {
                                                        <span class="small">@(c.Phone ?? c.MobilePhone)</span>
                                                    }
                                                    else { <span class="text-muted small">&mdash;</span> }
                                                </td>
                                                <td class="text-end pe-3">
                                                    <button type="button" class="btn btn-sm btn-outline-secondary me-1"
                                                            onclick="editContact(@Model.Id, @c.Id)" title="Edit">
                                                        <i class="bi bi-pencil"></i>
                                                    </button>
                                                    <button type="button" class="btn btn-sm btn-outline-danger"
                                                            onclick="deleteContact(@Model.Id, @c.Id)" title="Delete">
                                                        <i class="bi bi-trash"></i>
                                                    </button>
                                                </td>
                                            </tr>
                                        }
                                    }
                                    else
                                    {
                                        <tr id="no-contacts-placeholder">
                                            <td colspan="4" class="text-muted small px-3 py-2">No additional contacts. Click &ldquo;Add Contact&rdquo; to add billing, ops, or drop-off contacts.</td>
                                        </tr>
                                    }
                                </tbody>
                            </table>
                        </div>
                    </div>
                </div>
                <!-- Customer Notes -->
                @{
                    var customerNotes = ViewBag.CustomerNotes as List<PowderCoating.Core.Entities.CustomerNote>;
                }
                <div class="card border-0 shadow-sm mb-4">
                    <div class="card-header bg-white border-0 py-3">
                        <h5 class="mb-0 fw-semibold">
                            <i class="bi bi-sticky me-2 text-primary"></i>Internal Notes
                        </h5>
                    </div>
                    <div class="card-body p-0">
                        <div id="customer-notes-list">
                            @if (customerNotes != null && customerNotes.Count > 0)
                            {
                                @foreach (var note in customerNotes)
                                {
                                    <div class="customer-note-item d-flex gap-2 px-3 py-2 border-bottom" data-note-id="@note.Id">
                                        <div class="flex-grow-1">
                                            @if (note.IsImportant)
                                            {
                                                <span class="text-warning me-1" title="Important">&#9733;</span>
                                            }
                                            <span class="note-text small">@note.Note</span>
                                            <div class="text-muted" style="font-size:0.75rem;">
                                                @(note.CreatedBy ?? "Staff") &mdash; @note.CreatedAt.Tz(ViewBag.CompanyTimeZone as string).ToString("MMM dd, yyyy h:mm tt")
                                            </div>
                                        </div>
                                        <button type="button" class="btn btn-sm btn-link text-danger p-0 flex-shrink-0 align-self-start"
                                                onclick="deleteCustomerNote(@Model.Id, @note.Id)" title="Delete note">
                                            <i class="bi bi-trash"></i>
                                        </button>
                                    </div>
                                }
                            }
                            else
                            {
                                <div id="no-notes-placeholder" class="px-3 py-2 text-muted small">No notes yet.</div>
                            }
                        </div>
                        <div class="px-3 py-3 border-top bg-light">
                            <div class="mb-2">
                                <textarea id="newNoteText" class="form-control form-control-sm" rows="2"
                                          placeholder="Add an internal note..." maxlength="2000"></textarea>
                            </div>
                            <div class="d-flex justify-content-between align-items-center">
                                <div class="form-check form-check-sm mb-0">
                                    <input class="form-check-input" type="checkbox" id="newNoteImportant">
                                    <label class="form-check-label small" for="newNoteImportant">
                                        <span class="text-warning">&#9733;</span> Mark important
                                    </label>
                                </div>
                                <button type="button" class="btn btn-sm btn-primary" onclick="addCustomerNote(@Model.Id)">
                                    <i class="bi bi-plus-circle me-1"></i>Add Note
                                </button>
                            </div>
                        </div>
                    </div>
                </div>
                <!-- Recent Activity Timeline -->
                @{
                    var timeline = ViewBag.Timeline as List<PowderCoating.Application.DTOs.Customer.CustomerTimelineEventDto>;
                }
                @if (timeline != null && timeline.Count > 0)
                {
                    <div class="card border-0 shadow-sm mb-4">
                        <div class="card-header bg-white border-0 py-3 d-flex justify-content-between align-items-center">
                            <h5 class="mb-0 fw-semibold">
                                <i class="bi bi-clock-history me-2 text-primary"></i>Recent Activity
                            </h5>
                            <a asp-action="Activity" asp-route-id="@Model.Id" class="btn btn-sm btn-outline-secondary">
                                View All
                            </a>
                        </div>
                        <div class="card-body p-0">
                            @foreach (var ev in timeline)
                            {
                                var hasLink = ev.LinkController != null && ev.EntityId.HasValue;
                                var rowTag  = hasLink ? "a" : "div";
                                var href    = hasLink
                                    ? Url.Action(ev.LinkAction, ev.LinkController, new { id = ev.EntityId })
                                    : null;
                                <div class="d-flex align-items-start gap-3 px-3 py-3 border-bottom @(hasLink ? "timeline-row" : "")">
                                    <div class="rounded-circle d-flex align-items-center justify-content-center flex-shrink-0 mt-1"
                                         style="width:34px;height:34px;background:var(--bs-@(ev.BadgeColor)-bg-subtle,#f0f0f0);">
                                        <i class="bi @ev.Icon text-@ev.BadgeColor" style="font-size:0.9rem;"></i>
                                    </div>
                                    <div class="flex-grow-1 min-width-0">
                                        @if (hasLink)
                                        {
                                            <a asp-controller="@ev.LinkController" asp-action="@ev.LinkAction" asp-route-id="@ev.EntityId"
                                               class="fw-semibold text-decoration-none text-body d-block text-truncate">@ev.Title</a>
                                        }
                                        else
                                        {
                                            <span class="fw-semibold d-block text-truncate">@ev.Title</span>
                                        }
                                        @if (!string.IsNullOrEmpty(ev.Subtitle))
                                        {
                                            <span class="text-muted small d-block text-truncate">@ev.Subtitle</span>
                                        }
                                        <span class="text-muted" style="font-size:0.75rem;">@ev.Date.Tz(ViewBag.CompanyTimeZone as string).ToString("MMM dd, yyyy")</span>
                                    </div>
                                    @if (ev.Amount.HasValue)
                                    {
                                        <div class="text-end flex-shrink-0">
                                            <span class="fw-semibold small">@ev.Amount.Value.ToString("C")</span>
                                        </div>
                                    }
                                </div>
                            }
                        </div>
                    </div>
                }
            </div>
            <!-- Right Column - Statistics -->
@@ -378,6 +615,41 @@
                    </div>
                </div>
                <!-- Outstanding Pickups -->
                @{
                    var pendingPickups = ViewBag.PendingPickups as List<PowderCoating.Core.Entities.Job>;
                }
                @if (pendingPickups != null && pendingPickups.Count > 0)
                {
                    <div class="card border-0 shadow-sm mb-4 border-warning border-opacity-50">
                        <div class="card-header bg-warning bg-opacity-10 border-0 py-3">
                            <h5 class="mb-0 fw-semibold text-warning-emphasis">
                                <i class="bi bi-truck me-2"></i>Ready for Pickup
                                <span class="badge bg-warning text-dark ms-2">@pendingPickups.Count</span>
                            </h5>
                        </div>
                        <div class="card-body p-0">
                            @foreach (var pickup in pendingPickups)
                            {
                                var daysWaiting = (int)(DateTime.UtcNow - (pickup.UpdatedAt ?? pickup.CreatedAt)).TotalDays;
                                <div class="d-flex align-items-center gap-2 px-3 py-2 border-bottom">
                                    <div class="flex-grow-1">
                                        <a asp-controller="Jobs" asp-action="Details" asp-route-id="@pickup.Id"
                                           class="fw-semibold text-decoration-none small">@pickup.JobNumber</a>
                                        @if (!string.IsNullOrEmpty(pickup.Description))
                                        {
                                            <div class="text-muted text-truncate" style="font-size:0.75rem;max-width:160px;">@pickup.Description</div>
                                        }
                                    </div>
                                    <span class="badge @(daysWaiting >= 7 ? "bg-danger" : daysWaiting >= 3 ? "bg-warning text-dark" : "bg-success")">
                                        @(daysWaiting == 0 ? "Today" : $"{daysWaiting}d waiting")
                                    </span>
                                </div>
                            }
                        </div>
                    </div>
                }
                <!-- Store Credit History -->
                @{
                    var creditMemos = ViewBag.CreditMemos as List<PowderCoating.Core.Entities.CreditMemo>;
@@ -430,30 +702,139 @@
                    </div>
                }
-                <!-- Activity -->
+                <!-- Customer Stats -->
                @{
                    var crmStats = ViewBag.CrmStats as PowderCoating.Application.DTOs.Customer.CustomerLifetimeStatsDto;
                }
                @if (crmStats != null)
                {
                    <div class="card border-0 shadow-sm mb-4">
                        <div class="card-header bg-white border-0 py-3">
                            <h5 class="mb-0 fw-semibold">
                                <i class="bi bi-bar-chart-line me-2 text-primary"></i>Customer Stats
                            </h5>
                        </div>
                        <div class="card-body">
                            <!-- Jobs row -->
                            <div class="row g-2 mb-3">
                                <div class="col-6 text-center p-2" style="border-right:1px solid #dee2e6;">
                                    <div class="text-muted small mb-1">Total Jobs</div>
                                    <div class="fs-4 fw-bold text-primary">@crmStats.TotalJobs</div>
                                    @if (crmStats.ActiveJobs > 0)
                                    {
                                        <span class="badge bg-success bg-opacity-10 text-success" style="font-size:0.7rem;">
                                            @crmStats.ActiveJobs active
                                        </span>
                                    }
                                </div>
                                <div class="col-6 text-center p-2">
                                    <div class="text-muted small mb-1">Avg Job Value</div>
                                    <div class="fs-4 fw-bold">@crmStats.AverageJobValue.ToString("C0")</div>
                                </div>
                            </div>
                            <hr class="my-2" />
                            <!-- Revenue row -->
                            <div class="row g-2 mb-2">
                                <div class="col-6">
                                    <div class="text-muted small mb-1">Lifetime Revenue</div>
                                    <div class="fw-bold">@crmStats.TotalRevenue.ToString("C")</div>
                                </div>
                                <div class="col-6">
                                    <div class="text-muted small mb-1">Total Collected</div>
                                    <div class="fw-bold text-success">@crmStats.TotalCollected.ToString("C")</div>
                                </div>
                            </div>
                            <hr class="my-2" />
                            <!-- Footer stats -->
                            <div class="d-flex justify-content-between text-muted small mt-2">
                                <span>
                                    @if (crmStats.DaysSinceLastJob.HasValue)
                                    {
                                        <i class="bi bi-calendar-check me-1"></i>
                                        @if (crmStats.DaysSinceLastJob == 0)
                                        {
                                            <span>Last job today</span>
                                        }
                                        else
                                        {
                                            <span>Last job @crmStats.DaysSinceLastJob days ago</span>
                                        }
                                    }
                                    else
                                    {
                                        <span>No jobs yet</span>
                                    }
                                </span>
                                <span>
                                    <i class="bi bi-file-text me-1"></i>@crmStats.TotalQuotes quote@(crmStats.TotalQuotes == 1 ? "" : "s")
                                </span>
                            </div>
                            <div class="text-muted small mt-1">
                                <i class="bi bi-person me-1"></i>Customer since @Model.CreatedAt.ToString("MMM yyyy")
                            </div>
                        </div>
                    </div>
                }
                <!-- Preferred Powders -->
                @{
                    var preferredPowders = ViewBag.PreferredPowders as List<PowderCoating.Core.Entities.CustomerPreferredPowder>;
                }
                <div class="card border-0 shadow-sm mb-4">
                    <div class="card-header bg-white border-0 py-3">
                        <h5 class="mb-0 fw-semibold">
-                            <i class="bi bi-clock-history me-2 text-primary"></i>Activity
+                            <i class="bi bi-droplet-fill me-2 text-primary"></i>Preferred Powders
                        </h5>
                    </div>
-                    <div class="card-body">
+                    <div class="card-body p-0">
-                        <div class="mb-3">
+                        <div id="preferred-powders-list">
-                            <label class="text-muted small mb-1">Last Contact</label>
+                            @if (preferredPowders != null && preferredPowders.Count > 0)
-                            <p class="mb-0">
+                            {
-                                @if (Model.LastContactDate.HasValue)
+                                @foreach (var p in preferredPowders)
                                {
-                                    <span>@Model.LastContactDate.Value.ToString("MMMM dd, yyyy")</span>
+                                    <div class="d-flex align-items-center gap-2 px-3 py-2 border-bottom" data-powder-id="@p.InventoryItemId">
                                        <i class="bi bi-droplet-fill text-primary flex-shrink-0" style="font-size:0.8rem;"></i>
                                        <div class="flex-grow-1">
                                            <span class="small fw-semibold">@p.InventoryItem.Name</span>
                                            @if (!string.IsNullOrEmpty(p.InventoryItem.ColorName))
                                            {
                                                <span class="text-muted small ms-1">&mdash; @p.InventoryItem.ColorName</span>
                                            }
                                            @if (!string.IsNullOrEmpty(p.Notes))
                                            {
                                                <div class="text-muted" style="font-size:0.75rem;">@p.Notes</div>
                                            }
                                        </div>
                                        <button type="button" class="btn btn-sm btn-link text-danger p-0 flex-shrink-0"
                                                onclick="removePreferredPowder(@Model.Id, @p.InventoryItemId)"
                                                title="Remove from preferred">&times;</button>
                                    </div>
                                }
-                                else
+                            }
-                                {
+                            else
-                                    <span class="text-muted">No contact recorded</span>
+                            {
-                                }
+                                <div id="no-powders-placeholder" class="px-3 py-2 text-muted small">No preferred powders yet.</div>
-                            </p>
+                            }
                        </div>
-                        <div>
+                        <div class="px-3 py-3 border-top bg-light position-relative">
-                            <label class="text-muted small mb-1">Customer Since</label>
+                            <div class="mb-2">
-                            <p class="mb-0">@Model.CreatedAt.ToString("MMMM dd, yyyy")</p>
+                                <input type="text" id="powderSearchInput" class="form-control form-control-sm"
                                       placeholder="Search powder by name or SKU..."
                                       oninput="searchInventoryItems(this.value)"
                                       autocomplete="off" />
                                <input type="hidden" id="selectedPowderId" />
                                <div id="powderSearchResults" class="dropdown-menu w-100 p-0"
                                     style="display:none;position:absolute;z-index:1000;max-height:200px;overflow-y:auto;"></div>
                            </div>
                            <div class="mb-2">
                                <input type="text" id="powderNotes" class="form-control form-control-sm"
                                       placeholder="Optional notes (e.g. &quot;customer prefers this for wheels&quot;)"
                                       maxlength="500" />
                            </div>
                            <button type="button" class="btn btn-sm btn-primary w-100"
                                    onclick="addPreferredPowder(@Model.Id)">
                                <i class="bi bi-plus-circle me-1"></i>Add Powder
                            </button>
                        </div>
                    </div>
                </div>
@@ -482,6 +863,17 @@
                            <a asp-controller="Jobs" asp-action="Create" asp-route-customerId="@Model.Id" class="btn btn-outline-success">
                                <i class="bi bi-plus-circle me-2"></i>New Job
                            </a>
                            @{
                                var crmStatsForActions = ViewBag.CrmStats as PowderCoating.Application.DTOs.Customer.CustomerLifetimeStatsDto;
                            }
                            @if (crmStatsForActions?.LastJobId != null)
                            {
                                <a asp-controller="Jobs" asp-action="CloneJob" asp-route-id="@crmStatsForActions.LastJobId"
                                   class="btn btn-outline-secondary"
                                   title="Create a new job pre-filled with the last job&apos;s items and settings">
                                    <i class="bi bi-arrow-repeat me-2"></i>Repeat Last Job
                                </a>
                            }
                            <a asp-controller="Quotes" asp-action="Create" asp-route-customerId="@Model.Id" class="btn btn-outline-info">
                                <i class="bi bi-file-text me-2"></i>New Quote
                            </a>
@@ -502,6 +894,72 @@
    </div>
 </div>
 <!-- Add / Edit Contact Modal -->
 <div class="modal fade" id="contactModal" tabindex="-1" aria-labelledby="contactModalLabel" aria-hidden="true">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
                <h5 class="modal-title" id="contactModalLabel">
                    <i class="bi bi-person-plus me-2 text-primary"></i><span id="contactModalTitle">Add Contact</span>
                </h5>
                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
            </div>
            <div class="modal-body">
                <input type="hidden" id="contactId" value="0" />
                <div class="row g-3">
                    <div class="col-md-6">
                        <label class="form-label fw-semibold">First Name <span class="text-danger">*</span></label>
                        <input type="text" id="contactFirstName" class="form-control" maxlength="100" placeholder="First name" />
                    </div>
                    <div class="col-md-6">
                        <label class="form-label">Last Name</label>
                        <input type="text" id="contactLastName" class="form-control" maxlength="100" placeholder="Last name" />
                    </div>
                    <div class="col-md-6">
                        <label class="form-label">Job Title</label>
                        <input type="text" id="contactTitle" class="form-control" maxlength="100" placeholder="e.g. Purchasing Manager" />
                    </div>
                    <div class="col-md-6">
                        <label class="form-label">Role</label>
                        <select id="contactRole" class="form-select">
                            <option value="">&mdash; Select &mdash;</option>
                            <option value="Billing">Billing</option>
                            <option value="Operations">Operations</option>
                            <option value="Drop-Off">Drop-Off</option>
                            <option value="Sales">Sales</option>
                            <option value="General">General</option>
                            <option value="Other">Other</option>
                        </select>
                    </div>
                    <div class="col-12">
                        <label class="form-label">Email</label>
                        <input type="email" id="contactEmail" class="form-control" maxlength="200" placeholder="email@example.com" />
                    </div>
                    <div class="col-md-6">
                        <label class="form-label">Phone</label>
                        <input type="tel" id="contactPhone" class="form-control" maxlength="20" placeholder="(555) 123-4567" />
                    </div>
                    <div class="col-md-6">
                        <label class="form-label">Mobile Phone</label>
                        <input type="tel" id="contactMobilePhone" class="form-control" maxlength="20" placeholder="(555) 123-4567" />
                    </div>
                    <div class="col-12">
                        <label class="form-label">Notes</label>
                        <textarea id="contactNotes" class="form-control" rows="2" maxlength="500" placeholder="Optional notes about this contact..."></textarea>
                    </div>
                </div>
                <div id="contactModalError" class="alert alert-danger alert-permanent mt-3 d-none"></div>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
                <button type="button" class="btn btn-primary" onclick="saveContact(@Model.Id)" id="saveContactBtn">
                    <i class="bi bi-check-circle me-1"></i>Save Contact
                </button>
            </div>
        </div>
    </div>
 </div>
 <!-- Add Store Credit Modal -->
@if (User.IsInRole("SuperAdmin") || User.IsInRole("Administrator"))
 {
@@ -213,6 +213,42 @@
                        </div>
                    </div>
                    <!-- Ship-To Address Section -->
                    <div class="mb-4">
                        <div class="d-flex align-items-center gap-2 border-bottom pb-2 mb-3">
                            <h5 class="mb-0"><i class="bi bi-truck me-2 text-primary"></i>Ship-To / Pickup Address</h5>
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Ship-To Address"
                               data-bs-content="Optional. Fill in only if this customer picks up or receives deliveries at a different address than their billing address. Leave blank to use the billing address above.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                            <span class="text-muted small fw-normal">(optional &mdash; leave blank if same as billing)</span>
                        </div>
                        <div class="row g-3">
                            <div class="col-12">
                                <label asp-for="ShipToAddress" class="form-label">Street Address</label>
                                <input asp-for="ShipToAddress" class="form-control" placeholder="Enter ship-to street address" />
                            </div>
                            <div class="col-md-5">
                                <label asp-for="ShipToCity" class="form-label">City</label>
                                <input asp-for="ShipToCity" class="form-control" placeholder="Enter city" />
                            </div>
                            <div class="col-md-3">
                                <label asp-for="ShipToState" class="form-label">State</label>
                                <input asp-for="ShipToState" class="form-control" placeholder="Enter state" />
                            </div>
                            <div class="col-md-2">
                                <label asp-for="ShipToZipCode" class="form-label">Zip Code</label>
                                <input asp-for="ShipToZipCode" class="form-control" placeholder="12345" />
                            </div>
                            <div class="col-md-2">
                                <label asp-for="ShipToCountry" class="form-label">Country</label>
                                <input asp-for="ShipToCountry" class="form-control" placeholder="USA" />
                            </div>
                        </div>
                    </div>
                    <!-- Business Information Section -->
                    <div class="mb-4">
                        <div class="d-flex align-items-center gap-2 border-bottom pb-2 mb-3">
@@ -270,6 +306,30 @@
                        </div>
                    </div>
                    <!-- Lead Source Section -->
                    <div class="mb-4">
                        <h5 class="border-bottom pb-2 mb-3">
                            <i class="bi bi-signpost me-2 text-primary"></i>How Did They Find Us?
                        </h5>
                        <div class="row g-3">
                            <div class="col-md-6">
                                <label asp-for="LeadSource" class="form-label">Lead Source</label>
                                <select asp-for="LeadSource" class="form-select">
                                    <option value="">&mdash; Not specified &mdash;</option>
                                    <option value="Walk-In">Walk-In</option>
                                    <option value="Google Search">Google Search</option>
                                    <option value="Customer Referral">Customer Referral</option>
                                    <option value="Social Media">Social Media</option>
                                    <option value="Website">Website</option>
                                    <option value="Repeat Customer">Repeat Customer</option>
                                    <option value="Trade Show / Event">Trade Show / Event</option>
                                    <option value="Flyer / Print Ad">Flyer / Print Ad</option>
                                    <option value="Other">Other</option>
                                </select>
                            </div>
                        </div>
                    </div>
                    <!-- Notes Section -->
                    <div class="mb-4">
                        <h5 class="border-bottom pb-2 mb-3">
@@ -180,6 +180,13 @@
                                    <i class="bi bi-people me-1 text-muted"></i>Customers
                                </label>
                            </div>
                            <div class="form-check mb-1">
                                <input class="form-check-input sheet-check" type="checkbox" name="sheets"
                                       value="CustomerContacts" id="chkCustomerContacts" checked />
                                <label class="form-check-label" for="chkCustomerContacts">
                                    <i class="bi bi-person-lines-fill me-1 text-muted"></i>Customer Contacts
                                </label>
                            </div>
                            <div class="form-check mb-1">
                                <input class="form-check-input sheet-check" type="checkbox" name="sheets"
                                       value="Jobs" id="chkJobs" checked />
@@ -136,8 +136,26 @@
            </p>
            <p>The details page shows:</p>
            <ul>
-                <li><strong>Contact information</strong> &mdash; name, email, phone, and address.</li>
+                <li><strong>Contact information</strong> &mdash; name, email, phone, address, and lead source.</li>
-                <li><strong>Account summary</strong> &mdash; current balance, credit limit, and pricing tier.</li>
+                <li><strong>Account summary</strong> &mdash; current balance, credit limit, store credit, and pricing tier.</li>
                <li>
                    <strong>Ready for Pickup</strong> &mdash; if any of this customer&rsquo;s jobs are in &ldquo;Ready for Pickup&rdquo; status,
                    a highlighted card appears in the right column showing each job number and how many days it has been waiting.
                    Jobs waiting 3&ndash;6 days show in amber; 7+ days in red.
                </li>
                <li>
                    <strong>Additional Contacts</strong> &mdash; billing contacts, ops contacts, drop-off contacts, and so on.
                    See the Additional Contacts section below.
                </li>
                <li>
                    <strong>Internal Notes</strong> &mdash; private notes added by your staff (not visible to the customer).
                    Notes can be marked as important <span class="text-warning">&#9733;</span> to highlight them for the team.
                </li>
                <li>
                    <strong>Preferred Powders</strong> &mdash; inventory items this customer frequently uses. Staff can
                    search and add powders here so that anyone creating a quote or job for this customer can quickly
                    see which colors they prefer. See the Preferred Powders section below.
                </li>
                <li>
                    <strong>Jobs tab</strong> &mdash; every job created for this customer, with status and date. Click
                    a job number to open it.
@@ -153,7 +171,7 @@
                <li>
                    <strong>Deposits tab</strong> &mdash; all deposits recorded for this customer across any job or quote.
                </li>
-                <li><strong>Notes</strong> &mdash; any notes saved against the customer record.</li>
+                <li><strong>Recent Activity</strong> &mdash; a combined timeline of the last 15 events (jobs, quotes, invoices, deposits) in reverse chronological order.</li>
            </ul>
        </section>
@@ -195,6 +213,122 @@
            </p>
        </section>
        <section id="additional-contacts" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-people text-primary me-2"></i>Additional Contacts
            </h2>
            <p>
                Commercial customers often have more than one person involved in their account &mdash; a purchasing
                manager, a billing contact, or the person who actually drops off and picks up parts. The
                <strong>Additional Contacts</strong> section on the Customer Details page lets you store all of
                them in one place so your team always knows who to call.
            </p>
            <p>To add a contact, open the Customer Details page and click <strong>Add Contact</strong> in the
            Additional Contacts card. You can record:</p>
            <ul class="mb-3">
                <li><strong>Name</strong> &mdash; first and last name.</li>
                <li><strong>Job Title</strong> &mdash; their role at the company (e.g., &ldquo;Purchasing Manager&rdquo;).</li>
                <li><strong>Role</strong> &mdash; a category tag: Billing, Operations, Drop-Off, Sales, General, or Other.</li>
                <li><strong>Email &amp; Phone</strong> &mdash; their direct contact details.</li>
                <li><strong>Notes</strong> &mdash; anything else your team should know about this person.</li>
            </ul>
            <div class="alert alert-permanent alert-warning d-flex gap-2 mb-0" role="alert">
                <i class="bi bi-exclamation-triangle-fill flex-shrink-0 mt-1"></i>
                <div>
                    <strong>Notifications always go to the primary contact.</strong> Additional contacts are for
                    staff reference only. All automated emails (job ready for pickup, invoice sent, quote
                    approval links, etc.) and SMS messages are sent to the email address and phone number on the
                    main customer record &mdash; not to the contacts listed here. If you need invoices routed to a
                    different address, use the <strong>Billing / Accounting Email</strong> field on the main
                    customer record instead.
                </div>
            </div>
        </section>
        <section id="ship-to-address" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-truck text-primary me-2"></i>Ship-To / Pickup Address
            </h2>
            <p>
                Some customers have a different address for pickups or deliveries than their billing address. You
                can record a separate <strong>Ship-To</strong> address on the Create or Edit form. Leave it blank
                if the customer picks up from the same address they bill from.
            </p>
            <p>
                When a ship-to address is on file, the Customer Details page splits the Address card into two
                columns &mdash; billing on the left, ship-to on the right &mdash; so the difference is immediately visible
                to anyone looking up the customer.
            </p>
        </section>
        <section id="lead-source" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-signpost text-primary me-2"></i>Lead Source
            </h2>
            <p>
                The <strong>Lead Source</strong> field lets you record how a customer found your shop. Options
                include Walk-In, Google Search, Customer Referral, Social Media, Website, Repeat Customer, Trade
                Show / Event, Flyer / Print Ad, and Other.
            </p>
            <p>
                This field is optional and is shown on the Customer Details page under Business Information. It
                is useful for understanding which marketing channels are bringing in customers over time.
            </p>
        </section>
        <section id="preferred-powders" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-droplet-half text-primary me-2"></i>Preferred Powders
            </h2>
            <p>
                The <strong>Preferred Powders</strong> card on the Customer Details page lets you tag inventory
                items that this customer regularly orders. It is a staff-reference tool &mdash; it does not auto-select
                powders on quotes or jobs, but it gives anyone creating a quote a quick look at what colors this
                customer has used before.
            </p>
            <p>To add a preferred powder:</p>
            <ol class="mb-3">
                <li class="mb-1">Open the Customer Details page.</li>
                <li class="mb-1">In the <strong>Preferred Powders</strong> card, type part of the powder name or SKU into the search box.</li>
                <li class="mb-1">Select the item from the dropdown and click <strong>Add</strong>.</li>
            </ol>
            <p>To remove a preferred powder, click the <strong>&times;</strong> button next to the item in the list.</p>
            <div class="alert alert-permanent alert-info d-flex gap-2 mb-0" role="alert">
                <i class="bi bi-info-circle-fill flex-shrink-0 mt-1"></i>
                <div>
                    Only items that already exist in your <strong>Inventory</strong> can be added as preferred powders.
                    If a color isn&rsquo;t appearing in the search, check that it has been added to inventory first.
                </div>
            </div>
        </section>
        <section id="outstanding-pickups" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-box-seam text-primary me-2"></i>Outstanding Pickups
            </h2>
            <p>
                When one or more of a customer&rsquo;s jobs are in <strong>Ready for Pickup</strong> status, a
                highlighted card appears in the right column of their Customer Details page. This lets your front desk
                staff immediately see &mdash; without opening the Jobs list &mdash; whether a customer calling or walking
                in has finished work waiting for them.
            </p>
            <p>The card shows:</p>
            <ul class="mb-3">
                <li>The job number (clickable, opens the Job Details page).</li>
                <li>How many days the job has been waiting in &ldquo;Ready for Pickup&rdquo; status.</li>
            </ul>
            <p>Color coding helps prioritize follow-up calls:</p>
            <ul class="mb-3">
                <li><span class="badge bg-warning text-dark">Amber</span> &mdash; waiting 3&ndash;6 days.</li>
                <li><span class="badge bg-danger">Red</span> &mdash; waiting 7 or more days.</li>
                <li>No color &mdash; waiting 0&ndash;2 days (recently completed).</li>
            </ul>
            <p>
                The card disappears automatically once all jobs for this customer have moved out of
                &ldquo;Ready for Pickup&rdquo; status (e.g., to Delivered).
            </p>
        </section>
        <section id="deactivating-a-customer" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-person-dash text-primary me-2"></i>Deactivating a Customer
@@ -235,6 +369,11 @@
                    <a class="nav-link py-1 px-3 small text-body" href="#customer-details">Customer Details Page</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#credit-limit">Credit Limit</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#tax-exempt">Tax Exempt</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#additional-contacts">Additional Contacts</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#ship-to-address">Ship-To Address</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#lead-source">Lead Source</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#preferred-powders">Preferred Powders</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#outstanding-pickups">Outstanding Pickups</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#deactivating-a-customer">Deactivating a Customer</a>
                </nav>
            </div>
@@ -415,7 +415,11 @@
                    An alert banner is shown on the item's Details page prompting you to use Stock Adjustment to add inventory.
                </li>
            </ul>
-            <p>Low Stock and Out of Stock items appear in the Inventory Alerts section on the Dashboard and in the Operations Report. Use the <strong>Low Stock</strong> filter on the Inventory list to see only items needing attention.</p>
+            <p>
                Low Stock and Out of Stock items appear in the Inventory Alerts section on the Dashboard and in the Operations Report.
                The <strong>Low Stock</strong> stat card at the top of the Inventory page is clickable &mdash; click it to instantly
                filter the list to only items needing attention. Click it again (or clear the filter) to return to the full list.
            </p>
            <div class="alert alert-permanent alert-warning d-flex gap-2 mb-0" role="alert">
                <i class="bi bi-exclamation-triangle-fill flex-shrink-0 mt-1"></i>
                <div>
@@ -59,6 +59,7 @@
                <li class="mb-2">Select the customer and then select the job this invoice is for.</li>
                <li class="mb-2">Add or adjust line items as needed.</li>
                <li class="mb-2">Set the invoice date, due date, and any notes.</li>
                <li class="mb-2">Optionally enter a <strong>Project Name</strong>. When creating from a job, this pre-fills from the job's project name automatically.</li>
                <li class="mb-2">Click <strong>Save Invoice</strong>.</li>
            </ol>
@@ -56,6 +56,7 @@
                <li class="mb-2">Choose a <strong>Priority</strong> &mdash; Normal is the default; see the Job Priority section below for all levels.</li>
                <li class="mb-2">Optionally assign a <strong>Worker</strong> from your shop workers list.</li>
                <li class="mb-2">Enter the customer's <strong>PO Number</strong> if they require one for their own records.</li>
                <li class="mb-2">Optionally enter a <strong>Project Name</strong> &mdash; a short label that groups related jobs (e.g., &ldquo;Spring Fleet Refresh&rdquo;). It appears on the job, its invoice, and printed work orders.</li>
                <li class="mb-2">Add any <strong>Special Instructions</strong> your team needs to know before starting work.</li>
                <li class="mb-2">Add one or more <strong>Line Items</strong> describing each piece being coated. See the Job Items section below.</li>
                <li class="mb-2">
@@ -553,6 +554,33 @@
            </ol>
        </section>
        <section id="clone-job" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-copy text-primary me-2"></i>Cloning a Job
            </h2>
            <p>
                If you need to create a new job that is identical or very similar to one you have already done,
                use the <strong>Clone</strong> button on the Job Details page. This saves you from re-entering
                all the line items and coatings from scratch.
            </p>
            <p>Cloning copies the following to a brand-new Pending job:</p>
            <ul class="mb-3">
                <li>Customer and all job settings (description, PO number, project name, special instructions, tags, priority, discount, oven settings)</li>
                <li>All line items with their coatings, colors, prep services, and pricing</li>
            </ul>
            <p>The following are <strong>not</strong> copied:</p>
            <ul class="mb-3">
                <li>Scheduled date, due date &mdash; you set these on the new job</li>
                <li>Assigned worker</li>
                <li>Photos, job notes, and time entries</li>
                <li>Invoice and payment records</li>
            </ul>
            <p>
                After cloning, the new job opens directly so you can review it, adjust dates, and save.
                A new unique job number (<code>JOB-YYMM-####</code>) is generated automatically.
            </p>
        </section>
        <section id="shop-display-and-board" class="mb-5">
            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
                <i class="bi bi-display text-primary me-2"></i>Shop Display and Priority Board
@@ -827,6 +855,7 @@
                    <a class="nav-link py-1 px-3 small text-body" href="#photos-notes">Photos and Notes</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#time-and-rework">Time Entries and Rework</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#job-templates">Job Templates</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#clone-job">Cloning a Job</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#shop-display-and-board">Shop Display &amp; Priority Board</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#part-intake">Part Intake</a>
                    <a class="nav-link py-1 px-3 small text-body" href="#shop-mobile">Shop Mobile</a>
@@ -74,6 +74,7 @@
                </li>
                <li class="mb-2">Set the <strong>Quote Date</strong> (defaults to today) and the <strong>Expiry Date</strong> (defaults to the system's configured validity period).</li>
                <li class="mb-2">Add a <strong>Subject</strong> or description to identify the work being quoted.</li>
                <li class="mb-2">Optionally enter a <strong>Project Name</strong> &mdash; a short label that groups related work (e.g., &ldquo;Fleet Refresh Q2&rdquo;). It appears on the quote PDF and carries over to the job and invoice when converted.</li>
                <li class="mb-2">Add one or more <strong>Line Items</strong> &mdash; see the Quote Items section below for item types.</li>
                <li class="mb-2">Add any <strong>Notes</strong> for the customer (these appear on the printed quote).</li>
                <li class="mb-2">Add any internal <strong>Notes</strong> that are for your team only.</li>
@@ -148,21 +148,18 @@
        <div class="label-sku">SKU: @Model.SKU</div>
-        @if (!string.IsNullOrEmpty(Model.ColorName))
+        @if (!string.IsNullOrEmpty(Model.ColorName) && !string.Equals(Model.ColorName, Model.Name, StringComparison.OrdinalIgnoreCase))
        {
            <div class="label-color">
                @Model.ColorName
-                @if (!string.IsNullOrEmpty(Model.Finish))
+                @if (!string.IsNullOrEmpty(Model.Finish) && Model.Name.IndexOf(Model.Finish, StringComparison.OrdinalIgnoreCase) < 0)
                {
                    <span> &mdash; @Model.Finish</span>
                }
            </div>
        }
-        @if (!string.IsNullOrEmpty(Model.Manufacturer))
+        <div class="label-sku" style="color:#777">@Model.Manufacturer</div>
        {
            <div class="label-sku" style="color:#777">@Model.Manufacturer</div>
        }
        @if (!string.IsNullOrEmpty(Model.Location))
        {
@@ -19,6 +19,10 @@
                        title="Save this job as a reusable template">
                    <i class="bi bi-layout-text-window-reverse me-2"></i>Save as Template
                </button>
                <a asp-action="CloneJob" asp-route-id="@Model.Id" class="btn btn-outline-secondary"
                   title="Create a new job pre-filled with this job&apos;s items and settings">
                    <i class="bi bi-arrow-repeat me-2"></i>Clone Job
                </a>
                <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-warning">
                    <i class="bi bi-pencil me-2"></i>Edit
                </a>
@@ -147,7 +147,7 @@
                <a href="@Url.Action("Index", new { statusGroup = "overdue" })" class="pcl-pill @(_activeGroup == "overdue" ? "active" : "")">
                    Overdue <span class="pcl-pill-count">@_overdue</span>
                </a>
-                <a href="@Url.Action("Index", new { searchTerm = "ReadyForPickup" })" class="pcl-pill @(_activeSearch == "ReadyForPickup" ? "active" : "")">
+                <a href="@Url.Action("Index", new { statusGroup = "ready" })" class="pcl-pill @(_activeGroup == "ready" ? "active" : "")">
                    Ready <span class="pcl-pill-count">@_ready</span>
                </a>
                <a href="@Url.Action("Index", new { statusGroup = "completed" })" class="pcl-pill @(_activeGroup == "completed" ? "active" : "")">
@@ -162,10 +162,20 @@
            <div class="text-center py-5">
                <i class="bi bi-inbox" style="font-size: 4rem; color: #d1d5db;"></i>
                <h5 class="mt-3 text-muted">No jobs found</h5>
-                <p class="text-muted mb-4">Get started by creating your first job</p>
+                @if (_allCount > 0)
-                <a asp-action="Create" class="btn btn-primary">
+                {
-                    <i class="bi bi-plus-circle me-2"></i>Create Your First Job
+                    <p class="text-muted mb-4">No jobs match your current filter.</p>
-                </a>
+                    <a href="@Url.Action("Index", new { statusGroup = "active" })" class="btn btn-outline-secondary">
                        <i class="bi bi-x-circle me-2"></i>Clear Filters
                    </a>
                }
                else
                {
                    <p class="text-muted mb-4">Get started by creating your first job.</p>
                    <a asp-action="Create" class="btn btn-primary">
                        <i class="bi bi-plus-circle me-2"></i>Create Your First Job
                    </a>
                }
            </div>
        }
        else
@@ -328,10 +338,20 @@
                    <div class="text-center py-5">
                        <i class="bi bi-inbox" style="font-size: 4rem; color: #d1d5db;"></i>
                        <h5 class="mt-3 text-muted">No jobs found</h5>
-                        <p class="text-muted mb-4">Get started by creating your first job</p>
+                        @if (_allCount > 0)
-                        <a asp-action="Create" class="btn btn-primary">
+                        {
-                            <i class="bi bi-plus-circle me-2"></i>Create Your First Job
+                            <p class="text-muted mb-4">No jobs match your current filter.</p>
-                        </a>
+                            <a href="@Url.Action("Index", new { statusGroup = "active" })" class="btn btn-outline-secondary">
                                <i class="bi bi-x-circle me-2"></i>Clear Filters
                            </a>
                        }
                        else
                        {
                            <p class="text-muted mb-4">Get started by creating your first job.</p>
                            <a asp-action="Create" class="btn btn-primary">
                                <i class="bi bi-plus-circle me-2"></i>Create Your First Job
                            </a>
                        }
                    </div>
                }
                else
@@ -294,9 +294,9 @@
            <div class="text-center py-5">
                <i class="bi bi-file-text" style="font-size: 4rem; color: #ccc;"></i>
                <p class="text-muted mt-3">No quotes found.</p>
-                @if (!string.IsNullOrEmpty(searchTerm) || statusFilter.HasValue)
+                @if (!string.IsNullOrEmpty(searchTerm) || statusFilter.HasValue || !string.IsNullOrEmpty(statusCode) || !string.IsNullOrEmpty(ViewBag.TagFilter as string))
                {
-                    <p class="text-muted">Try adjusting your filters or <a asp-action="Index" asp-controller="Quotes">view all quotes</a>.</p>
+                    <p class="text-muted">No quotes match your current filter. <a asp-action="Index" asp-controller="Quotes">View all quotes</a>.</p>
                }
                else
                {
@@ -38,6 +38,278 @@ async function cancelSmsConsent() {
    }
 }
 // ── Customer Notes ────────────────────────────────────────────────────────────
 async function addCustomerNote(customerId) {
    const textarea   = document.getElementById('newNoteText');
    const importantCb = document.getElementById('newNoteImportant');
    const note       = textarea?.value?.trim();
    if (!note) { toastr.warning('Please enter a note.'); return; }
    const tok = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    try {
        const res  = await fetch(`/Customers/AddCustomerNote/${customerId}`, {
            method:  'POST',
            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'RequestVerificationToken': tok },
            body:    `note=${encodeURIComponent(note)}&isImportant=${importantCb?.checked ?? false}`
        });
        const data = await res.json();
        if (data.success) {
            const list        = document.getElementById('customer-notes-list');
            const placeholder = document.getElementById('no-notes-placeholder');
            if (placeholder) placeholder.remove();
            list.insertAdjacentHTML('afterbegin', data.noteHtml);
            textarea.value = '';
            if (importantCb) importantCb.checked = false;
            toastr.success('Note added.');
        } else {
            toastr.error(data.message || 'Could not add note.');
        }
    } catch {
        toastr.error('An error occurred. Please try again.');
    }
 }
 async function deleteCustomerNote(customerId, noteId) {
    const tok = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    try {
        const res  = await fetch(`/Customers/DeleteCustomerNote/${customerId}`, {
            method:  'POST',
            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'RequestVerificationToken': tok },
            body:    `noteId=${noteId}`
        });
        const data = await res.json();
        if (data.success) {
            document.querySelector(`[data-note-id="${noteId}"]`)?.remove();
            const list = document.getElementById('customer-notes-list');
            if (list && list.querySelectorAll('.customer-note-item').length === 0)
                list.insertAdjacentHTML('afterbegin', '<div id="no-notes-placeholder" class="px-3 py-2 text-muted small">No notes yet.</div>');
        } else {
            toastr.error(data.message || 'Could not delete note.');
        }
    } catch {
        toastr.error('An error occurred. Please try again.');
    }
 }
 // ── Preferred Powders ─────────────────────────────────────────────────────────
 let _powderSearchTimer = null;
 function searchInventoryItems(term) {
    clearTimeout(_powderSearchTimer);
    const dropdown = document.getElementById('powderSearchResults');
    if (!term || term.length < 2) {
        if (dropdown) { dropdown.innerHTML = ''; dropdown.style.display = 'none'; }
        return;
    }
    _powderSearchTimer = setTimeout(async () => {
        try {
            const res  = await fetch(`/Customers/SearchInventoryItems?term=${encodeURIComponent(term)}`);
            const data = await res.json();
            if (!dropdown) return;
            dropdown.innerHTML = data.length === 0
                ? '<div class="dropdown-item text-muted small">No results</div>'
                : data.map(i => `<button type="button" class="dropdown-item small"
                    onclick="selectPowder(${i.id}, ${JSON.stringify(i.name + (i.colorName ? ' — ' + i.colorName : ''))})">${i.name}${i.colorName ? ' <span class=\'text-muted\'>' + i.colorName + '</span>' : ''} <span class="badge bg-light text-muted border">${i.sku ?? ''}</span></button>`).join('');
            dropdown.style.display = 'block';
        } catch { /* silent */ }
    }, 300);
 }
 function selectPowder(itemId, label) {
    document.getElementById('selectedPowderId').value  = itemId;
    document.getElementById('powderSearchInput').value = label;
    const dropdown = document.getElementById('powderSearchResults');
    if (dropdown) { dropdown.innerHTML = ''; dropdown.style.display = 'none'; }
 }
 async function addPreferredPowder(customerId) {
    const itemId = document.getElementById('selectedPowderId')?.value;
    const notes  = document.getElementById('powderNotes')?.value?.trim() ?? '';
    if (!itemId) { toastr.warning('Please search for and select a powder first.'); return; }
    const tok = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    try {
        const res  = await fetch(`/Customers/AddPreferredPowder/${customerId}`, {
            method:  'POST',
            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'RequestVerificationToken': tok },
            body:    `inventoryItemId=${itemId}&notes=${encodeURIComponent(notes)}`
        });
        const data = await res.json();
        if (data.success) {
            const list        = document.getElementById('preferred-powders-list');
            const placeholder = document.getElementById('no-powders-placeholder');
            if (placeholder) placeholder.remove();
            const notesHtml  = data.notes ? `<div class="text-muted" style="font-size:0.75rem;">${data.notes}</div>` : '';
            list.insertAdjacentHTML('beforeend',
                `<div class="d-flex align-items-center gap-2 px-3 py-2 border-bottom" data-powder-id="${data.itemId}">
                  <i class="bi bi-droplet-fill text-primary flex-shrink-0" style="font-size:0.8rem;"></i>
                  <div class="flex-grow-1"><span class="small fw-semibold">${data.itemName}</span>${notesHtml}</div>
                  <button type="button" class="btn btn-sm btn-link text-danger p-0"
                      onclick="removePreferredPowder(${customerId}, ${data.itemId})" title="Remove">&times;</button>
                </div>`);
            document.getElementById('powderSearchInput').value = '';
            document.getElementById('selectedPowderId').value  = '';
            if (document.getElementById('powderNotes')) document.getElementById('powderNotes').value = '';
            toastr.success(`${data.itemName} added to preferred powders.`);
        } else {
            toastr.warning(data.message || 'Could not add powder.');
        }
    } catch {
        toastr.error('An error occurred. Please try again.');
    }
 }
 async function removePreferredPowder(customerId, itemId) {
    const tok = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    try {
        const res  = await fetch(`/Customers/RemovePreferredPowder/${customerId}`, {
            method:  'POST',
            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'RequestVerificationToken': tok },
            body:    `itemId=${itemId}`
        });
        const data = await res.json();
        if (data.success) {
            document.querySelector(`[data-powder-id="${itemId}"]`)?.remove();
            const list = document.getElementById('preferred-powders-list');
            if (list && list.querySelectorAll('[data-powder-id]').length === 0)
                list.insertAdjacentHTML('afterbegin', '<div id="no-powders-placeholder" class="px-3 py-2 text-muted small">No preferred powders yet.</div>');
        } else {
            toastr.error(data.message || 'Could not remove powder.');
        }
    } catch {
        toastr.error('An error occurred. Please try again.');
    }
 }
 // ── Customer Contacts ──────────────────────────────────────────────────────
 function openAddContactModal() {
    document.getElementById('contactId').value = '0';
    document.getElementById('contactModalTitle').textContent = 'Add Contact';
    document.getElementById('contactFirstName').value = '';
    document.getElementById('contactLastName').value = '';
    document.getElementById('contactTitle').value = '';
    document.getElementById('contactRole').value = '';
    document.getElementById('contactEmail').value = '';
    document.getElementById('contactPhone').value = '';
    document.getElementById('contactMobilePhone').value = '';
    document.getElementById('contactNotes').value = '';
    document.getElementById('contactModalError').classList.add('d-none');
 }
 async function editContact(customerId, contactId) {
    const tok = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    try {
        const res  = await fetch(`/Customers/GetContact/${customerId}?contactId=${contactId}`);
        const data = await res.json();
        if (!data.success) { toastr.error('Could not load contact.'); return; }
        const c = data.contact;
        document.getElementById('contactId').value          = c.id;
        document.getElementById('contactModalTitle').textContent = 'Edit Contact';
        document.getElementById('contactFirstName').value   = c.firstName ?? '';
        document.getElementById('contactLastName').value    = c.lastName ?? '';
        document.getElementById('contactTitle').value       = c.title ?? '';
        document.getElementById('contactRole').value        = c.contactRole ?? '';
        document.getElementById('contactEmail').value       = c.email ?? '';
        document.getElementById('contactPhone').value       = c.phone ?? '';
        document.getElementById('contactMobilePhone').value = c.mobilePhone ?? '';
        document.getElementById('contactNotes').value       = c.notes ?? '';
        document.getElementById('contactModalError').classList.add('d-none');
        new bootstrap.Modal(document.getElementById('contactModal')).show();
    } catch {
        toastr.error('An error occurred loading the contact.');
    }
 }
 async function saveContact(customerId) {
    const tok       = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    const contactId = parseInt(document.getElementById('contactId').value ?? '0', 10);
    const firstName = document.getElementById('contactFirstName').value.trim();
    if (!firstName) {
        const err = document.getElementById('contactModalError');
        err.textContent = 'First name is required.';
        err.classList.remove('d-none');
        return;
    }
    const params = new URLSearchParams({
        FirstName:   firstName,
        LastName:    document.getElementById('contactLastName').value.trim(),
        Title:       document.getElementById('contactTitle').value.trim(),
        ContactRole: document.getElementById('contactRole').value,
        Email:       document.getElementById('contactEmail').value.trim(),
        Phone:       document.getElementById('contactPhone').value.trim(),
        MobilePhone: document.getElementById('contactMobilePhone').value.trim(),
        Notes:       document.getElementById('contactNotes').value.trim(),
    });
    const isEdit = contactId > 0;
    if (isEdit) { params.append('Id', contactId); params.append('CustomerId', customerId); }
    const url = isEdit ? `/Customers/UpdateContact/${customerId}` : `/Customers/AddContact/${customerId}`;
    try {
        const res  = await fetch(url, {
            method:  'POST',
            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'RequestVerificationToken': tok },
            body:    params.toString()
        });
        const data = await res.json();
        if (data.success) {
            bootstrap.Modal.getInstance(document.getElementById('contactModal'))?.hide();
            const tbody = document.getElementById('contacts-table-body');
            const placeholder = document.getElementById('no-contacts-placeholder');
            if (placeholder) placeholder.remove();
            if (isEdit) {
                const existing = tbody.querySelector(`tr[data-contact-id="${contactId}"]`);
                if (existing) existing.outerHTML = data.rowHtml;
                else tbody.insertAdjacentHTML('beforeend', data.rowHtml);
            } else {
                tbody.insertAdjacentHTML('beforeend', data.rowHtml);
            }
            toastr.success(isEdit ? 'Contact updated.' : 'Contact added.');
        } else {
            const err = document.getElementById('contactModalError');
            err.textContent = data.message || 'An error occurred.';
            err.classList.remove('d-none');
        }
    } catch {
        toastr.error('An error occurred. Please try again.');
    }
 }
 async function deleteContact(customerId, contactId) {
    if (!confirm('Delete this contact?')) return;
    const tok = document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '';
    try {
        const res  = await fetch(`/Customers/DeleteContact/${customerId}`, {
            method:  'POST',
            headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'RequestVerificationToken': tok },
            body:    `contactId=${contactId}`
        });
        const data = await res.json();
        if (data.success) {
            document.querySelector(`tr[data-contact-id="${contactId}"]`)?.remove();
            const tbody = document.getElementById('contacts-table-body');
            if (tbody && tbody.querySelectorAll('tr[data-contact-id]').length === 0)
                tbody.insertAdjacentHTML('afterbegin', '<tr id="no-contacts-placeholder"><td colspan="4" class="text-muted small px-3 py-2">No additional contacts.</td></tr>');
            toastr.success('Contact deleted.');
        } else {
            toastr.error(data.message || 'Could not delete contact.');
        }
    } catch {
        toastr.error('An error occurred. Please try again.');
    }
 }
 window.updateCustomerSmsStatus = function () {
    const section = document.getElementById('sms-status-section');
    if (!section) return;
@@ -0,0 +1,378 @@
 using AutoMapper;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Moq;
 using PowderCoating.Application.DTOs.Customer;
 using PowderCoating.Application.Interfaces;
 using PowderCoating.Core.Entities;
 using PowderCoating.Core.Enums;
 using PowderCoating.Core.Interfaces;
 using PowderCoating.Infrastructure.Data;
 using PowderCoating.Infrastructure.Repositories;
 using PowderCoating.Web.Controllers;
 using System.Security.Claims;
 namespace PowderCoating.UnitTests;
 public class CustomersControllerCrmTests
 {
    // ── Details — guard ───────────────────────────────────────────────────
    [Fact]
    public async Task Details_WhenCustomerNotFound_ReturnsNotFound()
    {
        await using var context = CreateContext();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 999);
        Assert.IsType<NotFoundResult>(result);
    }
    // ── Details — zero-history customer ───────────────────────────────────
    [Fact]
    public async Task Details_WithNoHistory_ProducesZeroStats()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var stats = view.ViewData["CrmStats"] as CustomerLifetimeStatsDto;
        Assert.NotNull(stats);
        Assert.Equal(0, stats.TotalJobs);
        Assert.Equal(0, stats.TotalQuotes);
        Assert.Equal(0m, stats.TotalRevenue);
        Assert.Equal(0m, stats.AverageJobValue);   // no divide-by-zero
        Assert.Null(stats.DaysSinceLastJob);
    }
    [Fact]
    public async Task Details_WithNoHistory_DoesNotRenderTimeline()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var timeline = view.ViewData["Timeline"] as List<CustomerTimelineEventDto>;
        Assert.NotNull(timeline);
        Assert.Empty(timeline);
    }
    // ── Details — stats calculation ───────────────────────────────────────
    [Fact]
    public async Task Details_WithJobsAndInvoices_CalculatesStatsCorrectly()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        var activeStatus = SeedJobStatus(context, id: 1, isTerminal: false);
        SeedJob(context, id: 1, customerId: 1, companyId: 1, statusId: activeStatus.Id, finalPrice: 300m);
        SeedJob(context, id: 2, customerId: 1, companyId: 1, statusId: activeStatus.Id, finalPrice: 700m);
        SeedInvoice(context, id: 1, customerId: 1, companyId: 1, total: 300m, amountPaid: 300m, status: InvoiceStatus.Paid);
        SeedInvoice(context, id: 2, customerId: 1, companyId: 1, total: 700m, amountPaid: 400m, status: InvoiceStatus.PartiallyPaid);
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var stats = view.ViewData["CrmStats"] as CustomerLifetimeStatsDto;
        Assert.NotNull(stats);
        Assert.Equal(2, stats.TotalJobs);
        Assert.Equal(2, stats.ActiveJobs);
        Assert.Equal(2, stats.TotalInvoices);
        Assert.Equal(1000m, stats.TotalRevenue);
        Assert.Equal(700m, stats.TotalCollected);
        Assert.Equal(500m, stats.AverageJobValue);
    }
    // ── Details — voided invoices excluded ────────────────────────────────
    [Fact]
    public async Task Details_VoidedInvoicesExcludedFromRevenueAndCollected()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        var status = SeedJobStatus(context, id: 1, isTerminal: false);
        SeedJob(context, id: 1, customerId: 1, companyId: 1, statusId: status.Id, finalPrice: 500m);
        SeedInvoice(context, id: 1, customerId: 1, companyId: 1, total: 500m, amountPaid: 500m, status: InvoiceStatus.Paid);
        SeedInvoice(context, id: 2, customerId: 1, companyId: 1, total: 999m, amountPaid: 0m,   status: InvoiceStatus.Voided);
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var stats = view.ViewData["CrmStats"] as CustomerLifetimeStatsDto;
        Assert.NotNull(stats);
        Assert.Equal(500m, stats.TotalRevenue);    // voided invoice excluded
        Assert.Equal(500m, stats.TotalCollected);   // voided invoice excluded
        Assert.Equal(2, stats.TotalInvoices);       // count includes voided (informational)
    }
    // ── Details — active-job count excludes terminal statuses ─────────────
    [Fact]
    public async Task Details_ActiveJobsExcludesTerminalStatuses()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        var active    = SeedJobStatus(context, id: 1, isTerminal: false);
        var completed = SeedJobStatus(context, id: 2, isTerminal: true);
        SeedJob(context, id: 1, customerId: 1, companyId: 1, statusId: active.Id,    finalPrice: 100m);
        SeedJob(context, id: 2, customerId: 1, companyId: 1, statusId: completed.Id, finalPrice: 200m);
        SeedJob(context, id: 3, customerId: 1, companyId: 1, statusId: completed.Id, finalPrice: 300m);
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var stats = view.ViewData["CrmStats"] as CustomerLifetimeStatsDto;
        Assert.NotNull(stats);
        Assert.Equal(3, stats.TotalJobs);
        Assert.Equal(1, stats.ActiveJobs);
    }
    // ── Details — timeline cap and sort ───────────────────────────────────
    [Fact]
    public async Task Details_TimelineCappedAt15Events()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        var status = SeedJobStatus(context, id: 1, isTerminal: false);
        for (int i = 1; i <= 18; i++)
        {
            context.Jobs.Add(new Job
            {
                Id          = i,
                CompanyId   = 1,
                CustomerId  = 1,
                JobStatusId = status.Id,
                JobNumber   = $"JOB-0001-{i:D4}",
                Description = $"Job {i}",
                FinalPrice  = 100m,
                CreatedAt   = new DateTime(2026, 1, i, 0, 0, 0, DateTimeKind.Utc)
            });
        }
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var timeline = view.ViewData["Timeline"] as List<CustomerTimelineEventDto>;
        Assert.NotNull(timeline);
        Assert.Equal(15, timeline.Count);
    }
    [Fact]
    public async Task Details_TimelineIsSortedNewestFirst()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        // Use Invoice.InvoiceDate for timeline dates — SaveChangesAsync stamps CreatedAt but
        // does not touch InvoiceDate, so we can seed distinct values that survive the save.
        SeedInvoice(context, id: 1, customerId: 1, companyId: 1, total: 100m, amountPaid: 100m,
            status: InvoiceStatus.Paid, invoiceDate: new DateTime(2026, 3, 1, 0, 0, 0, DateTimeKind.Utc));
        SeedInvoice(context, id: 2, customerId: 1, companyId: 1, total: 200m, amountPaid: 0m,
            status: InvoiceStatus.Sent, invoiceDate: new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc));
        SeedInvoice(context, id: 3, customerId: 1, companyId: 1, total: 300m, amountPaid: 0m,
            status: InvoiceStatus.Sent, invoiceDate: new DateTime(2026, 5, 1, 0, 0, 0, DateTimeKind.Utc));
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var timeline = view.ViewData["Timeline"] as List<CustomerTimelineEventDto>;
        Assert.NotNull(timeline);
        Assert.Equal(3, timeline.Count);
        Assert.True(timeline[0].Date > timeline[1].Date, "First event should be the newest");
        Assert.True(timeline[1].Date > timeline[2].Date, "Events should be descending");
    }
    // ── Details — tenant isolation ────────────────────────────────────────
    [Fact]
    public async Task Details_DoesNotIncludeJobsFromOtherCompanies()
    {
        await using var context = CreateContext();
        SeedCustomer(context, id: 1, companyId: 1);
        var status = SeedJobStatus(context, id: 1, isTerminal: false);
        SeedJob(context, id: 1, customerId: 1, companyId: 1, statusId: status.Id, finalPrice: 500m);  // this company
        SeedJob(context, id: 2, customerId: 1, companyId: 2, statusId: status.Id, finalPrice: 999m);  // other company
        await context.SaveChangesAsync();
        var controller = CreateController(context, companyId: 1);
        var result = await controller.Details(id: 1);
        var view = Assert.IsType<ViewResult>(result);
        var stats = view.ViewData["CrmStats"] as CustomerLifetimeStatsDto;
        Assert.NotNull(stats);
        Assert.Equal(1, stats.TotalJobs);
        Assert.Equal(500m, stats.AverageJobValue);
    }
    // ── Helpers ───────────────────────────────────────────────────────────
    private static CustomersController CreateController(ApplicationDbContext context, int companyId)
    {
        var uow = new UnitOfWork(context);
        // Tests cover CrmStats/Timeline logic, not DTO mapping — stub mapper to return a valid model
        var mapperMock = new Mock<IMapper>();
        mapperMock
            .Setup(m => m.Map<CustomerDto>(It.IsAny<Customer>()))
            .Returns((Customer c) => new CustomerDto { Id = c.Id, CompanyName = c.CompanyName, IsActive = c.IsActive });
        var mapper = mapperMock.Object;
        var tenantContext = new Mock<ITenantContext>();
        tenantContext.Setup(t => t.GetCurrentCompanyId()).Returns(companyId);
        var controller = new CustomersController(
            uow,
            mapper,
            Mock.Of<ILogger<CustomersController>>(),
            Mock.Of<INotificationService>(),
            Mock.Of<ISubscriptionService>(),
            tenantContext.Object,
            CreateUserManagerMock().Object,
            Mock.Of<IFinancialReportService>());
        controller.ControllerContext = new ControllerContext
        {
            HttpContext = new DefaultHttpContext()
        };
        return controller;
    }
    private static void SeedCustomer(ApplicationDbContext context, int id, int companyId)
    {
        context.Customers.Add(new Customer
        {
            Id          = id,
            CompanyId   = companyId,
            CompanyName = $"Test Customer {id}",
            IsActive    = true,
            CreatedAt   = DateTime.UtcNow
        });
    }
    private static JobStatusLookup SeedJobStatus(ApplicationDbContext context, int id, bool isTerminal)
    {
        var status = new JobStatusLookup
        {
            Id               = id,
            StatusCode       = isTerminal ? "COMPLETED" : "IN_PROGRESS",
            DisplayName      = isTerminal ? "Completed" : "In Progress",
            DisplayOrder     = id,
            IsTerminalStatus = isTerminal
        };
        context.JobStatusLookups.Add(status);
        return status;
    }
    private static void SeedJob(
        ApplicationDbContext context, int id, int customerId, int companyId, int statusId, decimal finalPrice)
    {
        context.Jobs.Add(new Job
        {
            Id          = id,
            CompanyId   = companyId,
            CustomerId  = customerId,
            JobStatusId = statusId,
            JobNumber   = $"JOB-0001-{id:D4}",
            Description = $"Job {id}",
            FinalPrice  = finalPrice,
            CreatedAt   = DateTime.UtcNow
        });
    }
    private static Job MakeJob(int id, int customerId, int companyId, int statusId, DateTime date) =>
        new Job
        {
            Id          = id,
            CompanyId   = companyId,
            CustomerId  = customerId,
            JobStatusId = statusId,
            JobNumber   = $"JOB-0001-{id:D4}",
            Description = $"Job {id}",
            FinalPrice  = 100m,
            CreatedAt   = date
        };
    private static void SeedInvoice(
        ApplicationDbContext context, int id, int customerId, int companyId,
        decimal total, decimal amountPaid, InvoiceStatus status,
        DateTime? invoiceDate = null)
    {
        context.Invoices.Add(new Invoice
        {
            Id            = id,
            CompanyId     = companyId,
            CustomerId    = customerId,
            InvoiceNumber = $"INV-0001-{id:D4}",
            InvoiceDate   = invoiceDate ?? DateTime.UtcNow,
            Total         = total,
            AmountPaid    = amountPaid,
            Status        = status
        });
    }
    private static Mock<UserManager<ApplicationUser>> CreateUserManagerMock()
    {
        var store = new Mock<IUserStore<ApplicationUser>>();
        return new Mock<UserManager<ApplicationUser>>(
            store.Object, null!, null!, null!, null!, null!, null!, null!, null!);
    }
    private static ApplicationDbContext CreateContext()
    {
        var options = new DbContextOptionsBuilder<ApplicationDbContext>()
            .UseInMemoryDatabase(Guid.NewGuid().ToString())
            .Options;
        // SuperAdmin principal: bypasses the CompanyId global query filter so all
        // seeded rows are visible, matching the same approach in DepositsControllerTests.
        var identity  = new ClaimsIdentity(new[] { new Claim(ClaimTypes.Role, "SuperAdmin") }, "Test");
        var principal = new ClaimsPrincipal(identity);
        byte[]? noBytes = null;
        var sessionMock = new Mock<ISession>();
        sessionMock.Setup(s => s.TryGetValue(It.IsAny<string>(), out noBytes)).Returns(false);
        var httpContextMock = new Mock<HttpContext>();
        httpContextMock.SetupGet(c => c.User).Returns(principal);
        httpContextMock.SetupGet(c => c.Session).Returns(sessionMock.Object);
        var accessor = new Mock<IHttpContextAccessor>();
        accessor.SetupGet(a => a.HttpContext).Returns(httpContextMock.Object);
        return new ApplicationDbContext(options, accessor.Object, null!);
    }
 }
Author	SHA1	Message	Date
spouliot	e313149f08	Fix inventory label duplicate color/finish display - Suppress ColorName line if it matches the item Name (powders use color name as their item name, causing it to show twice) - Suppress Finish if already contained in the item Name - Always show Manufacturer regardless of whether it is populated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-10 16:07:43 -04:00
spouliot	82fb48f7a5	Patch export/import for missing fields; add CustomerContacts export - DataExportController + AccountDataExportController: add ProjectName to Jobs, Quotes, Invoices (XLSX + CSV); add LeadSource + ShipTo fields to Customers (XLSX + CSV); add CustomerContacts sheet/CSV (new) - Both export views: add Customer Contacts checkbox (checked by default) - CustomerImportDto: add LeadSource + ShipTo* fields - JobImportDto: add ProjectName - QuoteImportDto: add ProjectName - InvoiceImportDto: add Project Name (dual-name alias for round-trip) - CsvImportService: wire all new import fields to entity creation; also patch invoice update path for ProjectName - Add scripts/purge_imported_data.sql (dry-run T-SQL for data cleanup) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-10 15:14:27 -04:00
spouliot	427c52a499	Fix Ready for Pickup filter returning no results The Ready pill passed searchTerm=ReadyForPickup which did a text search — "readyforpickup" (no spaces) never matched the display name "Ready for Pickup". Converted to statusGroup=ready and added the corresponding controller case. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-10 14:39:35 -04:00
spouliot	d92266b027	Fix empty state showing Create First button when a filter is active Jobs: use AllJobCount (global total) to distinguish truly-empty from filter-returned-nothing; show Clear Filters button in the latter case. Quotes: expand the filter-active check to include tagFilter and statusCode, which were missing from the condition. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-10 14:20:20 -04:00
spouliot	750e1b1c5b	Fix preferred powder search dropdown not appearing Inline display:none!important on the results div blocked all CSS rules from showing it, including the :not(:empty) trick. Switched to explicit JS show/hide so the dropdown is reliably visible after typing 2+ chars. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-10 13:59:14 -04:00
spouliot	94a89ee175	Add CRM features: Additional Contacts, Lead Source, Ship-To Address; update Help docs - New CustomerContact entity + migration (AddCustomerContactsAndCrmFields) - Customer.LeadSource + ShipToAddress/City/State/ZipCode/Country fields - Additional Contacts card on Customer Details with AJAX add/edit/delete - Lead Source dropdown on Create/Edit; Ship-To section on Create/Edit - Customer Details: side-by-side billing/ship-to when ship-to is set - Help docs: Customers (contacts, ship-to, lead source, preferred powders, outstanding pickups) - Help docs: Jobs (clone job, project name), Quotes (project name), Invoices (project name), Inventory (low stock clickable filter) - HelpKnowledgeBase.cs updated for all features above Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-10 12:46:08 -04:00
spouliot	711cd01cd3	Add CRM features: Outstanding Pickups, Customer Notes, Clone Job, Preferred Powders - Outstanding Pickups card on Customer Details shows jobs awaiting pickup with age badges - Customer Notes log: inline add/delete notes with important flag, AJAX-backed - Clone Job action on Jobs controller; Repeat Last Job button on Customer Details quick actions - Preferred Powders per customer: typeahead inventory search, AJAX add/remove - CustomerPreferredPowder entity + migration; unit tests for CRM stats/timeline logic - Fix EF Core concurrency bug: parallel Task.WhenAll FindAsync replaced with sequential awaits Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-06-09 19:59:32 -04:00