Merge dev into master for prod deploy

Fix equipment creation blocked by maintenance interval validation
RecommendedMaintenanceIntervalDays was a non-nullable int with [Range(1,3650)], so submitting the form without filling it in bound to 0 and failed validation. Made nullable on the entity, both DTOs, and the one controller callsite that calls .AddDays() (now uses .Value). Migration applied. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-24 10:46:23 -04:00 · 2026-05-24 10:38:05 -04:00 · 2026-05-23 10:48:00 -04:00 · 2026-05-23 10:02:23 -04:00 · 2026-05-23 09:59:14 -04:00 · 2026-05-23 09:52:34 -04:00
304 changed files with 36946 additions and 2225 deletions
@@ -1,180 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(dotnet build:*)",
-      "Bash(dir:*)",
-      "Bash(dotnet restore:*)",
-      "Bash(dotnet clean:*)",
-      "Bash(findstr:*)",
-      "Bash(dotnet ef migrations add:*)",
-      "Bash(dotnet ef migrations remove:*)",
-      "Bash(ls:*)",
-      "Bash(dotnet ef database update:*)",
-      "Bash(sqlcmd:*)",
-      "Bash(dotnet ef migrations script:*)",
-      "Bash(dotnet run:*)",
-      "Bash(timeout /t 15 dotnet run:*)",
-      "Bash(timeout /t 10 /nobreak)",
-      "Bash(ping:*)",
-      "Bash(start /B dotnet run:*)",
-      "Bash(test:*)",
-      "Bash(dotnet ef migrations:*)",
-      "Bash(grep:*)",
-      "Bash(xargs -I {} bash -c 'echo \"\"=== {} ===\"\" && head -20 {} | grep -E \"\"class|Authorize\"\"')",
-      "Bash(powershell:*)",
-      "Bash(dotnet tool install:*)",
-      "Bash(dotnet tool update:*)",
-      "Bash(xargs:*)",
-      "Bash(powershell -Command \"cd src\\\\PowderCoating.Web; dotnet ef migrations add UpdateQuoteForProspects --project ..\\\\PowderCoating.Infrastructure\")",
-      "Bash(powershell -Command:*)",
-      "Bash(taskkill:*)",
-      "Bash(netstat:*)",
-      "Bash(libman restore:*)",
-      "Bash(./start-app.bat)",
-      "Bash(dotnet-ef migrations add:*)",
-      "Bash(dotnet-ef database update:*)",
-      "Bash(./stop-app.bat)",
-      "Bash(timeout /t 3 /nobreak)",
-      "Bash(curl:*)",
-      "Bash(if [ -f \"stop-app.bat\" ])",
-      "Bash(then cmd.exe /c stop-app.bat)",
-      "Bash(else echo \"stop-app.bat not found\")",
-      "Bash(fi)",
-      "Bash(powershell.exe -Command \"Unblock-File -Path 'src/PowderCoating.Web/dotnet-tools.json'\":*)",
-      "Bash(powershell.exe -Command \"Get-Process | Where-Object {$_ProcessName -like ''*PowderCoating*''} | Stop-Process -Force\")",
-      "Bash(powershell.exe:*)",
-      "Bash(Select-String -Pattern \"error|Error\")",
-      "Bash(Select-String -NotMatch \"warning\")",
-      "Bash(tasklist:*)",
-      "Bash(dotnet add package:*)",
-      "Bash(start-process dotnet run:*)",
-      "Bash(Select-Object -ExpandProperty Id)",
-      "Bash(find:*)",
-      "Bash(cmd.exe:*)",
-      "Bash(dotnet ef dbcontext:*)",
-      "Bash(handle \"PowderCoating.Web.pdb\")",
-      "Bash(timeout:*)",
-      "Bash(del /F \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Web\\\\obj\\\\Debug\\\\net8.0\\\\PowderCoating.Web.pdb\")",
-      "Bash(Select-String -Pattern \"Build succeeded|Build FAILED|error\")",
-      "Bash(Select-Object -Last 10)",
-      "Bash(del \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Infrastructure\\\\Migrations\\\\20260211031319_RemovePreexistingCatalogData.cs\" \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Infrastructure\\\\Migrations\\\\20260211031319_RemovePreexistingCatalogData.Designer.cs\")",
-      "Bash(Select-String:*)",
-      "Bash(Select-Object -Last 5)",
-      "Bash(start-app.bat)",
-      "Bash(dotnet script:*)",
-      "Bash(dotnet list:*)",
-      "Bash(dotnet new:*)",
-      "Bash(stop-app.bat)",
-      "Bash(dotnet watch run:*)",
-      "Bash(cmd /c \"taskkill /F /PID 42108\")",
-      "Bash(cmd /c start-app.bat)",
-      "Bash(\"Y:/PCC/PowderCoatingApp/src/PowderCoating.Application/Services/PdfService.cs\":*)",
-      "Bash(/y/PCC/PowderCoatingApp/src/PowderCoating.Application/Services/PdfService.cs:*)",
-      "Bash(/tmp/remove_tempdata.pl:*)",
-      "Bash(chmod:*)",
-      "Bash(perl:*)",
-      "Bash(done)",
-      "Bash(cmd:*)",
-      "Bash(tail:*)",
-      "Bash(del:*)",
-      "Bash(dotnet add:*)",
-      "Bash(python3:*)",
-      "Bash(Stop-Process:*)",
-      "Bash(mv:*)",
-      "Bash(dotnet tool:*)",
-      "Bash(where libman:*)",
-      "Bash(find \"Y:/PCC/PowderCoatingApp\" -type f \\\\\\( -name \"*template*\" -o -name \"*import*\" -o -name \"*export*\" \\\\\\) -iname \"*.csv\" -o -iname \"*.xlsx\" -o -iname \"*.xls\" 2>/dev/null | head -50)",
-      "Bash(grep -n \"powderCostOverride\\\\|PowderCostOverride\\\\|pageMeta\\\\|quoteItems\\\\|existingItems\" \"Y:/PCC/PowderCoatingApp/src/PowderCoating.Web/Views/Quotes/Create.cshtml\" | head -20\ngrep -n \"powderCostOverride\\\\|PowderCostOverride\\\\|pageMeta\\\\|quoteItems\\\\|existingItems\" \"Y:/PCC/PowderCoatingApp/src/PowderCoating.Web/Views/Quotes/Edit.cshtml\" 2>/dev/null | head -20)",
-      "Bash(cat /tmp/sdktest/Program.cs | xxd | head -20)",
-      "Bash(cd /tmp/sdktest && rm -rf bin obj && cat Program.cs)",
-      "Bash(cat /tmp/sdktest/Program.cs | xxd | head -5)",
-      "WebSearch",
-      "WebFetch(domain:github.com)",
-      "WebFetch(domain:www.nuget.org)",
-      "Bash(wmic process:*)",
-      "Bash(grep -rn \"AI Photo\\\\|ai.*photo\\\\|photo.*quote\\\\|item-type\\\\|AiPhotoQuotes\\\\|ai_photo\" \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Web\\\\Views\\\\Quotes\\\\\" | grep -i \"photo\\\\|ai\" | head -20)",
-      "Bash(sed -i 's|\"aiAnalyzeUrl\": \"@Url.Action\\(\\\\\"AiAnalyzeItem\\\\\", \\\\\"Quotes\\\\\"\\)\",|\"aiAnalyzeUrl\": \"@Url.Action\\(\\\\\"AiAnalyzeItem\\\\\", \\\\\"Quotes\\\\\"\\)\",\\\\n    \"aiPhotoQuotesEnabled\": @Json.Serialize\\(\\(bool\\)\\(ViewBag.AiPhotoQuotesEnabled ?? true\\)\\),|g' \\\\\n  \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Web\\\\Views\\\\Quotes\\\\Edit.cshtml\" \\\\\n  \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Web\\\\Views\\\\Jobs\\\\Create.cshtml\" \\\\\n  \"Y:\\\\PCC\\\\PowderCoatingApp\\\\src\\\\PowderCoating.Web\\\\Views\\\\Jobs\\\\Edit.cshtml\")",
-      "Bash(cp:*)",
-      "Bash(dotnet fsi -e \":*)",
-      "Read(//y/tmp/**)",
-      "Bash(cp /c/Users/spoul/.nuget/packages/stripe.net/50.4.1/stripe.net.50.4.1.nupkg stripe.zip)",
-      "Bash(unzip -o stripe.zip *.cs -d stripe_src)",
-      "Bash(dotnet ef:*)",
-      "Bash(Payment)",
-      "Bash(Deposit \")",
-      "Bash(node:*)",
-      "WebFetch(domain:quickbooks.intuit.com)",
-      "WebFetch(domain:www.saasant.com)",
-      "WebFetch(domain:www.liveflow.com)",
-      "WebFetch(domain:www.gentlefrog.com)",
-      "WebFetch(domain:blog.coupler.io)",
-      "WebFetch(domain:litextension.com)",
-      "WebFetch(domain:www.dancingnumbers.com)",
-      "WebFetch(domain:www.bizbooks.pro)",
-      "WebFetch(domain:support.saasant.com)",
-      "WebFetch(domain:support.getcount.com)",
-      "WebFetch(domain:planergy.com)",
-      "WebFetch(domain:www.wizxpert.com)",
-      "WebFetch(domain:www.trykeep.com)",
-      "WebFetch(domain:gentlefrog.com)",
-      "WebFetch(domain:www.syscloud.com)",
-      "WebFetch(domain:interopay.zendesk.com)",
-      "WebFetch(domain:docs.d-tools.cloud)",
-      "WebFetch(domain:paygration.com)",
-      "Bash([ ! -d \"Y:/PCC/PowderCoatingApp/src/PowderCoating.Web/Views/$controller\" ])",
-      "Bash(bash /tmp/check_actions.sh)",
-      "Bash(bash /tmp/verify_endpoints.sh)",
-      "Bash(bash /tmp/verify_services.sh)",
-      "Read(//y/PCC/Deployments/**)",
-      "Bash(mkdir -p \"Y:/PCC/Deployments\")",
-      "Bash(dotnet-script -e \"using System.Reflection; var a = Assembly.LoadFrom\\(\\\\\"Anthropic.SDK.dll\\\\\"\\); var types = a.GetTypes\\(\\).Where\\(t => t.Name.Contains\\(\\\\\"Document\\\\\"\\) || t.Name.Contains\\(\\\\\"Content\\\\\"\\)\\).Select\\(t => t.Name\\).OrderBy\\(n => n\\); foreach\\(var t in types\\) Console.WriteLine\\(t\\);\")",
-      "Bash(sort -t'-' -k3 -r)",
-      "Bash(wsl grep:*)",
-      "Bash(find src:*)",
-      "Bash(dotnet csharp *)",
-      "Read(//c/Users/spoul/.nuget/packages/stripe.net/50.4.1/lib/netstandard2.0/**)",
-      "Bash(dotnet publish *)",
-      "Bash(Compress-Archive -Path * -DestinationPath \"..\\\\deploy.zip\" -Force)",
-      "Bash(az webapp *)",
-      "Read(//y/PCC/**)",
-      "Bash(Get-Date -Format 'yyyyMMdd_HHmmss')",
-      "PowerShell(Get-Content *)",
-      "PowerShell(dotnet build *)",
-      "PowerShell(New-Item *)",
-      "PowerShell(& \"Y:\\\\PCC\\\\PowderCoatingApp\\\\scripts\\\\generate-migration-script.ps1\")",
-      "PowerShell(if \\(Test-Path \"Y:\\\\pcc\\\\deployment\\\\migrations.sql\"\\) { $f = Get-Item \"Y:\\\\pcc\\\\deployment\\\\migrations.sql\"; Write-Host \"File exists: $\\($f.Length\\) bytes\" } else { Write-Host \"File not created\" })",
-      "Bash(git add *)",
-      "Bash(git commit -m ' *)",
-      "Bash(git push *)",
-      "Bash(git commit *)",
-      "Bash(git checkout *)",
-      "Bash(git merge *)",
-      "Bash(dotnet package *)",
-      "Bash(dotnet test *)",
-      "Bash(git rm *)",
-      "Bash(git stash *)",
-      "Bash(dotnet ef *)",
-      "Bash(sqlcmd -S \".\\\\SQLEXPRESS\" -d PowderCoatingDb -Q \"SELECT Id, DisplayName, IsCoating, IsActive FROM InventoryCategoryLookups ORDER BY DisplayOrder\" -W)",
-      "Skill(schedule)",
-      "Bash(git -C \"//192.168.0.37/SCPSoftware/tmp/PowderCoatingApp-dev-perf\" log --oneline -10)",
-      "Bash(git -C \"//192.168.0.37/SCPSoftware/tmp/PowderCoatingApp-dev-perf\" status --short)",
-      "Bash(git *)",
-      "Bash(get-childitem -Recurse -Filter \"QuotesController.cs\")",
-      "Bash(Select-Object -ExpandProperty FullName)",
-      "Bash(dotnet user-secrets *)",
-      "Bash(Get-ChildItem -Path \"Y:\\\\PCC\\\\PowderCoatingApp\" -Directory)",
-      "Bash(Select-Object Name)",
-      "Bash(Get-Content *)",
-      "Bash(python -c \"import json; data=json.load\\(open\\('prismatic_powders.json','r',encoding='utf-8'\\)\\); print\\(f'Total records: {len\\(data\\)}'\\); print\\('First record:'\\); print\\(json.dumps\\(data[0], indent=2\\)\\)\")",
-      "Bash(python -c \"import json; data=json.load\\(open\\('prismatic_powders.json','r',encoding='utf-8'\\)\\); keys=list\\(data.keys\\(\\)\\); print\\('Top-level keys:', keys[:10]\\); first=data[keys[0]]; print\\('First record key:', keys[0]\\); print\\(json.dumps\\(first, indent=2\\)\\)\")",
-      "PowerShell(Get-ChildItem *)",
-      "PowerShell(Select-String *)",
-      "Bash(Select-Object -First 20)",
-      "PowerShell(node -e \"require\\('fs'\\).existsSync\\(require\\('path'\\).join\\(process.cwd\\(\\), 'node_modules', 'sharp'\\)\\) ? console.log\\('sharp ok'\\) : console.log\\('no sharp'\\)\")",
-      "WebFetch(domain:www.powdercoatinglogix.com)",
-      "PowerShell($bytes = [System.IO.File]::ReadAllBytes\\('src/PowderCoating.Web/Views/Jobs/Details.cshtml'\\); $text = [System.Text.Encoding]::UTF8.GetString\\($bytes\\); $idx = $text.IndexOf\\('hasPowderData'\\); $snippet = $text.Substring\\($idx - 20, 250\\); [System.Text.Encoding]::Unicode.GetBytes\\($snippet\\) | Format-Hex | Select-Object -First 30)",
-      "PowerShell($dll = \"C:\\\\Users\\\\spoul\\\\.nuget\\\\packages\\\\questpdf\\\\2024.12.3\\\\lib\\\\net6.0\\\\QuestPDF.dll\"; $asm = [Reflection.Assembly]::LoadFile\\($dll\\); $asm.GetTypes\\(\\) | Where-Object { $_.Name -eq \"ContainerExtensions\" } | ForEach-Object { $_.GetMethods\\(\\) | Where-Object { $_.Name -match \"Canvas|Rotat|Layer\" } | Select-Object Name } | Sort-Object Name -Unique)",
-      "PowerShell(Get-ChildItem \"C:\\\\Users\\\\spoul\\\\.nuget\\\\packages\\\\\" -ErrorAction SilentlyContinue | Where-Object { $_.Name -match \"quest|skia\" } | Select-Object Name)"
-    ]
-  }
-}
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Pre-commit hook: block commits containing corrupted Unicode in .cshtml files.
+#
+# All corruption variants start with the UTF-8 byte sequence for a-circumflex
+# followed by euro-sign (bytes C3 A2 E2 82 AC), which is the first two chars
+# of every known corruption pattern. Grep for that byte sequence in staged files.
+
+STAGED=$(git diff --cached --name-only | grep '\.cshtml$')
+if [ -z "$STAGED" ]; then
+    exit 0
+fi
+
+# $'\xc3\xa2\xe2\x82\xac' = UTF-8 bytes for a-circumflex + euro-sign
+CORRUPT=$(echo "$STAGED" | xargs grep -l $'\xc3\xa2\xe2\x82\xac' 2>/dev/null)
+
+if [ -n "$CORRUPT" ]; then
+    echo ""
+    echo "ERROR: Corrupted Unicode characters detected in staged .cshtml files:"
+    echo "$CORRUPT" | sed 's/^/  /'
+    echo ""
+    echo "Fix by running:  .\\tools\\Fix-Encoding.ps1"
+    echo "Then re-stage the files and commit again."
+    echo ""
+    exit 1
+fi
+
+exit 0
@@ -1,6 +1,11 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

+# Claude Code tool settings and build logs
+.claude/settings.local.json
+.claude/settings.json
+BuildLog*.txt
+
 # User-specific files
 *.rsuser
 *.suo
@@ -0,0 +1,571 @@
+# AGENTS.md
+
+This file provides guidance to Codex (Codex.ai/code) when working with code in this repository.
+
+## Project Overview
+
+A production-ready ASP.NET Core 8.0 MVC application for managing powder coating business operations. The application implements Clean Architecture with six projects across three layers (Domain, Application, Infrastructure) plus two presentation layers (Web MVC, RESTful API).
+
+## Essential Commands
+
+### Building and Running
+
+```bash
+# Build entire solution
+dotnet build
+
+# Run web application (MVC)
+cd src/PowderCoating.Web
+dotnet run
+# Access at: https://localhost:58461
+
+# Run web with auto-reload
+dotnet watch run
+
+# Run API
+cd src/PowderCoating.Api
+dotnet run
+# Swagger UI at root URL
+
+# Run tests
+dotnet test                                    # All tests
+dotnet test tests/PowderCoating.UnitTests      # Unit tests only
+dotnet test tests/PowderCoating.IntegrationTests  # Integration tests only
+```
+
+### Database Operations
+
+```bash
+# All EF commands run from Web project directory
+cd src/PowderCoating.Web
+
+# Create migration (must specify Infrastructure project)
+dotnet ef migrations add MigrationName --project ../PowderCoating.Infrastructure
+
+# Apply migrations
+dotnet ef database update --project ../PowderCoating.Infrastructure
+
+# Reset database (WARNING: deletes all data)
+dotnet ef database drop --project ../PowderCoating.Infrastructure
+dotnet ef database update --project ../PowderCoating.Infrastructure
+
+# List migrations
+dotnet ef migrations list --project ../PowderCoating.Infrastructure
+
+# Remove last migration (if not applied)
+dotnet ef migrations remove --project ../PowderCoating.Infrastructure
+```
+
+### Default Credentials
+
+```
+SuperAdmin (break glass): artemis@powdercoatinglogix.com / SuperAdmin123!
+SuperAdmin (seed): superadmin@powdercoatinglogix.com / SuperAdmin123!
+SuperAdmin (seed): spouliot@powdercoatinglogix.com / SuperAdmin123!
+Company Admin (seed): demo@powdercoatinglogix.com / CompanyAdmin123!
+```
+
+## Architecture Overview
+
+### Clean Architecture Layers
+
+**Domain Layer (PowderCoating.Core)**
+- Contains business entities, enums, and repository interfaces
+- `BaseEntity` provides common properties for all entities (Id, CompanyId, CreatedAt, UpdatedAt, IsDeleted, audit fields)
+- All entities inherit from BaseEntity and support soft delete
+- No dependencies on other projects
+
+**Application Layer (PowderCoating.Application)**
+- DTOs organized by domain (Customer, Job, Equipment, Inventory, Maintenance)
+- AutoMapper profiles with reverse mappings
+- Service interfaces (IFileService, etc.)
+- No UI or infrastructure dependencies
+
+**Infrastructure Layer (PowderCoating.Infrastructure)**
+- `ApplicationDbContext` with global query filters for soft deletes and multi-tenancy
+- Generic `Repository<T>` implementing `IRepository<T>`
+- `UnitOfWork` implementing `IUnitOfWork` with lazy-loaded repositories
+- Seed data is triggered **manually** via Platform Management → Seed Data (not automatic on startup)
+
+**Presentation Layers**
+- `PowderCoating.Web`: MVC application with Razor views, Bootstrap 5 UI
+- `PowderCoating.Api`: RESTful API with JWT authentication, Swagger documentation
+
+### Key Design Patterns
+
+**Repository Pattern**
+- Generic `Repository<T>` in Infrastructure
+- All CRUD operations, search, pagination, eager loading support
+- Soft delete with `SoftDeleteAsync()` method
+
+**Unit of Work Pattern**
+- Coordinates multiple repositories
+- Transaction support: `BeginTransactionAsync()`, `CommitTransactionAsync()`, `RollbackTransactionAsync()`
+- Lazy instantiation of repositories
+- `SaveChangesAsync()` or `CompleteAsync()` to persist changes
+
+**Dependency Injection**
+- All dependencies registered in `Program.cs`
+- Controllers inject `IUnitOfWork` and `IMapper`
+- Services are scoped to request lifetime
+
+**Global Query Filters**
+- Soft deletes: All queries automatically filter `IsDeleted == false`
+- Multi-tenancy: Non-SuperAdmin users see only their company data
+- Bypass with `ignoreQueryFilters: true` parameter in repository methods
+
+### Multi-Tenancy Implementation
+
+- `CompanyId` foreign key on all business entities
+- `ITenantContext` injected into DbContext resolves current company
+- SuperAdmin role can view all companies
+- Global query filters enforce company isolation at database level
+- Users have both system role (SuperAdmin) and company role (CompanyAdmin, Manager, Worker, Viewer)
+
+## Data Access Rules (ENFORCE THESE)
+
+> **`ApplicationDbContext` is NEVER injected into a controller.**
+> All data access in controllers goes through `IUnitOfWork`. No exceptions outside the list below.
+> **This rule is enforced at startup:** `EnforceDataAccessArchitecture()` in `Program.cs` scans all
+> controllers at boot and throws if any non-exempt controller injects `ApplicationDbContext`.
+> Full rationale and permanent exceptions list: `docs/DATA_ACCESS_ARCHITECTURE.md`
+
+### Three tiers — use the right one:
+
+**Tier 1 — Simple CRUD** → `IUnitOfWork.EntityName` (generic `IRepository<T>`)
+```csharp
+var items = await _unitOfWork.CatalogItems.GetAllAsync();
+await _unitOfWork.Announcements.AddAsync(entity);
+await _unitOfWork.CompleteAsync();
+```
+
+**Tier 2 — Complex domain queries** → typed repositories on `IUnitOfWork`
+```csharp
+// Include chains and domain-specific queries belong in the repository, not the controller
+var job     = await _unitOfWork.Jobs.LoadForDetailsAsync(id);
+var invoice = await _unitOfWork.Invoices.LoadForViewAsync(id);
+var quote   = await _unitOfWork.Quotes.GetByApprovalTokenAsync(token);
+```
+Typed repositories: `IJobRepository`, `IInvoiceRepository`, `IQuoteRepository`,
+`ICustomerRepository`, `IBillRepository`, `IPurchaseOrderRepository`
+— defined in `Core/Interfaces/Repositories/`, implemented in `Infrastructure/Repositories/`
+
+**Tier 3 — Aggregate/reporting queries** → injected read services
+```csharp
+// P&L, AR aging, cycle time, powder usage — shaped DTOs, never tracked entities
+var aging = await _financialReports.GetArAgingAsync(companyId);
+```
+Services: `IFinancialReportService`, `IOperationalReportService`
+— defined in `Core/Interfaces/Services/`, implemented in `Infrastructure/Services/`
+
+### Permanent exceptions (ApplicationDbContext allowed — intentional, documented):
+`StripeWebhookController`, `WebhooksController`, `PaymentController`, `RegistrationController`,
+`DataExportController`, `AccountDataExportController`, `DataPurgeController`,
+`SystemInfoController`, `SystemLogsController`, `CompanyHealthController`
+
+If you think you need a new exception, you almost certainly don't. Check the spec first.
+
+---
+
+## Data Access Patterns
+
+### Common Controller Pattern
+
+```csharp
+public class ExampleController : Controller
+{
+    private readonly IUnitOfWork _unitOfWork;
+    private readonly IMapper _mapper;
+
+    public ExampleController(IUnitOfWork unitOfWork, IMapper mapper)
+    {
+        _unitOfWork = unitOfWork;
+        _mapper = mapper;
+    }
+
+    public async Task<IActionResult> Index()
+    {
+        var entities = await _unitOfWork.Examples.GetAllAsync();
+        var dtos = _mapper.Map<List<ExampleDto>>(entities);
+        return View(dtos);
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Create(CreateExampleDto dto)
+    {
+        var entity = _mapper.Map<Example>(dto);
+        await _unitOfWork.Examples.AddAsync(entity);
+        await _unitOfWork.CompleteAsync();
+        return RedirectToAction(nameof(Index));
+    }
+
+    public async Task<IActionResult> Delete(int id)
+    {
+        await _unitOfWork.Examples.SoftDeleteAsync(id);
+        await _unitOfWork.CompleteAsync();
+        return RedirectToAction(nameof(Index));
+    }
+}
+```
+
+### Using Unit of Work Repositories
+
+All entity repositories are available via `IUnitOfWork` properties:
+- `_unitOfWork.Customers`
+- `_unitOfWork.Jobs`
+- `_unitOfWork.JobItems`
+- `_unitOfWork.Quotes`
+- `_unitOfWork.InventoryItems`
+- `_unitOfWork.Equipment`
+- `_unitOfWork.MaintenanceRecords`
+- Plus additional entities (Suppliers, JobPhotos, JobNotes, etc.)
+
+### Eager Loading Related Data
+
+```csharp
+// Load customer with related data
+var customer = await _unitOfWork.Customers.GetByIdAsync(
+    id,
+    c => c.Jobs,
+    c => c.Quotes,
+    c => c.PricingTier
+);
+
+// Find with predicate and includes
+var activeJobs = await _unitOfWork.Jobs.FindAsync(
+    j => j.Status != JobStatus.Completed,
+    j => j.Customer,
+    j => j.JobItems
+);
+```
+
+### Pagination
+
+```csharp
+var pagedJobs = await _unitOfWork.Jobs.GetPagedAsync(
+    pageNumber: 1,
+    pageSize: 25,
+    j => j.Status == JobStatus.InPreparation,
+    j => j.Customer
+);
+```
+
+## Important Domain Concepts
+
+### Job Lifecycle
+
+Jobs progress through 16 statuses:
+1. **Pending** → Initial state
+2. **Quoted** → Quote generated
+3. **Approved** → Customer approved
+4. **InPreparation** → Job prep started
+5. **Sandblasting** → Surface prep
+6. **MaskingTaping** → Masking areas
+7. **Cleaning** → Pre-coat cleaning
+8. **InOven** → Pre-heating
+9. **Coating** → Applying powder
+10. **Curing** → Heat curing
+11. **QualityCheck** → Inspection
+12. **Completed** → Work finished
+13. **ReadyForPickup** → Awaiting customer
+14. **Delivered** → Job delivered
+15. **OnHold** → Paused
+16. **Cancelled** → Cancelled
+
+**Job Priorities**: Low, Normal, High, Urgent, Rush (color-coded in UI)
+
+### Customer Types
+
+- **Commercial**: B2B customers with pricing tiers, credit limits
+- **Non-Commercial**: Individual customers, typically simpler pricing
+
+### Inventory Management
+
+**Transaction Types**: Purchase, Sale, Adjustment, Transfer, Return, Waste, Initial
+- All transactions tracked in `InventoryTransaction` entity
+- Reorder points trigger low-stock alerts
+
+### Equipment & Maintenance
+
+**Equipment Status**: Operational, NeedsMaintenance, UnderMaintenance, OutOfService, Retired
+**Maintenance Priority**: Low, Normal, High, Critical
+**Maintenance Status**: Scheduled, InProgress, Completed, Cancelled, Overdue
+
+## Configuration Files
+
+### Web Application (src/PowderCoating.Web/appsettings.json)
+
+```json
+{
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=.\\SQLEXPRESS;Database=PowderCoatingDb;Trusted_Connection=true;MultipleActiveResultSets=true;TrustServerCertificate=true"
+  },
+  "AppSettings": {
+    "CompanyName": "Powder Coating Logix",
+    "DefaultQuoteValidityDays": 30,
+    "DefaultPaymentTerms": "Net 30",
+    "TaxRate": 0.0,
+    "Currency": "USD",
+    "TrialPeriodDays": 7,
+    "QuoteApprovalTokenDays": 30
+  },
+  "AI": {
+    "Anthropic": {
+      "ApiKey": "your-anthropic-api-key-here"
+    }
+  },
+  "SendGrid": { ... },
+  "Stripe": { ... },
+  "Storage": { ... }
+}
+```
+
+**AI uses Anthropic Codex Sonnet 4.6** (`Codex-sonnet-4-6`) — NOT OpenAI. The `AI:Anthropic:ApiKey` config key is what the AI photo quoting and AI scheduling services read.
+
+### API (src/PowderCoating.Api/appsettings.json)
+
+```json
+{
+  "JwtSettings": {
+    "SecretKey": "CHANGE-THIS-TO-YOUR-OWN-SECRET-KEY-AT-LEAST-32-CHARACTERS",
+    "Issuer": "PowderCoatingAPI",
+    "Audience": "PowderCoatingMobileApp",
+    "ExpirationMinutes": 1440
+  }
+}
+```
+
+### Launch Settings (src/PowderCoating.Web/Properties/launchSettings.json)
+
+Default ports:
+- HTTPS: 58461
+- HTTP: 58462
+
+## Authentication & Authorization
+
+### System Roles
+- **SuperAdmin**: Platform-wide access, sees all companies and deleted records
+- **Administrator**: Company admin
+- **Manager**: Operations management
+- **Employee**: Create/edit jobs and quotes
+- **ShopFloor**: Update job status
+- **ReadOnly**: View-only access
+
+### Custom Authorization Policies
+
+Defined in `PowderCoating.Shared/Constants/AppConstants.cs`:
+- `RequireAdministratorRole`
+- `CanManageJobs`
+- `CanManageInventory`
+- `CanManageUsers`
+- `CanViewData`
+
+Apply with `[Authorize(Policy = "PolicyName")]` on controllers/actions.
+
+### JWT Authentication (API Only)
+
+API uses JWT Bearer tokens. Web uses cookie-based Identity authentication.
+
+## AutoMapper Configuration
+
+AutoMapper is registered as singleton in `Program.cs`:
+```csharp
+builder.Services.AddSingleton(provider => new MapperConfiguration(cfg =>
+{
+    cfg.AddMaps(typeof(ApplicationAssemblyMarker).Assembly);
+}).CreateMapper());
+```
+
+All profiles in `Application/Mappings/` are auto-discovered. Profiles include reverse mappings for entity ↔ DTO conversion.
+
+## Logging
+
+Serilog configured to write:
+- Console (structured logs)
+- File: `logs/powdercoating-{Date}.txt` (rolling daily)
+
+Access via constructor injection:
+```csharp
+private readonly ILogger<ExampleController> _logger;
+```
+
+## Common Development Tasks
+
+### Adding a New Entity
+
+1. Create entity class in `Core/Entities/` inheriting from `BaseEntity`
+2. Add DbSet to `ApplicationDbContext`
+3. Register repository property in `IUnitOfWork` interface
+4. Add lazy-loaded property in `UnitOfWork` implementation
+5. Create migration: `dotnet ef migrations add AddEntityName --project ../PowderCoating.Infrastructure`
+6. Apply migration: `dotnet ef database update --project ../PowderCoating.Infrastructure`
+
+### Adding a New Controller
+
+1. Create DTOs in `Application/DTOs/`
+2. Create AutoMapper profile in `Application/Mappings/`
+3. Create controller in `Web/Controllers/`
+4. Create views in `Web/Views/[ControllerName]/`
+5. Add navigation link in `Views/Shared/_Layout.cshtml`
+
+### Working with Soft Deletes
+
+```csharp
+// Soft delete (sets IsDeleted = true)
+await _unitOfWork.Customers.SoftDeleteAsync(id);
+await _unitOfWork.CompleteAsync();
+
+// Physical delete (use sparingly)
+await _unitOfWork.Customers.DeleteAsync(entity);
+await _unitOfWork.CompleteAsync();
+
+// Include deleted records in query
+var allCustomers = await _unitOfWork.Customers.GetAllAsync(ignoreQueryFilters: true);
+```
+
+### Bypassing Multi-Tenancy Filters
+
+Only for SuperAdmin users:
+```csharp
+// See all companies' data
+var allJobs = await _unitOfWork.Jobs.GetAllAsync(ignoreQueryFilters: true);
+```
+
+## Implemented Modules
+
+All modules below are fully implemented with controllers, views, and migrations applied.
+
+### Operations
+- **Jobs** — full lifecycle (16 statuses), worker assignment, time entries, rework tracking, shop access codes, job templates
+- **Quotes** — multi-item pricing engine, AI Photo Quoting (Anthropic Codex Sonnet 4.6), quote-to-job conversion, customer approval portal, online payment
+- **Invoices** — create from job, partial payments, voids, PDF download, email send; 1:1 Job→Invoice enforced by unique index
+- **Deposits** — record against customer/job/quote; auto-applied to invoices on creation; receipt PDF via QuestPDF
+- **Customers** — commercial and non-commercial types, pricing tiers, tax exempt flag + certificate upload, credit limits
+- **Oven Scheduler** — batch jobs into named ovens, capacity planning, suggested batches
+
+### Inventory & Purchasing
+- **Inventory** — stock tracking, transactions, reorder alerts, powder coverage/efficiency fields
+- **Vendors** — supplier management, payment terms, linked to inventory items
+- **Purchase Orders** — create/submit/receive POs, convert to vendor bills
+- **Accounts Payable** — vendor bills, AP ledger, payment tracking
+
+### Shop Management
+- **Shop Workers** — roles (Coater, Sandblaster, etc.), assignment to jobs and maintenance tasks
+- **Equipment & Maintenance** — equipment status lifecycle, scheduled/completed maintenance records
+- **Catalog Items** — pre-priced service catalog with default prices
+- **Pricing Tiers** — customer discount tiers; use `CompanyAdminOnly` policy (not `RequireAdministratorRole`)
+
+### Billing & Payments
+- **Stripe** — subscription plans, checkout sessions, customer portal, webhooks (`/stripe/webhook`)
+- **Stripe Connect** — embedded payments, OAuth flow for tenant onboarding
+- **Twilio SMS** — `ISmsService` fully implemented; webhook at `POST /Webhooks/TwilioSms`
+
+### Platform (SuperAdmin only)
+- **Platform Users** — create/manage SuperAdmin accounts
+- **Companies** — view/manage all tenant companies
+- **Seed Data** — manual seeding via Platform Management UI (not automatic)
+- **Subscription Plans** — `SubscriptionPlanConfig` controls per-plan limits and pricing
+
+### Other
+- **Help Center** — 14 fully-written articles at `Views/Help/`
+- **Setup Wizard** — 10-step onboarding wizard at `SetupWizardController`
+- **Reports** — 24 report actions including P&L, AR Aging, Powder Usage, Job Cycle Time, PDF exports
+- **Gift Certificates** — issue, redeem, track balance
+- **Announcements** — platform-wide announcements to tenants
+
+### Key Pricing Rules
+- Custom powder (no inventory item + `PowderToOrder` > 0): charge for the **full ordered quantity**, not just calculated usage
+- In-stock inventory powder: charge for calculated usage only (surface area × lbs/sqft × unit cost)
+- Tax exempt customers (`Customer.IsTaxExempt`): `TaxPercent` defaults to 0 on quote and invoice create; customer dropdown marks exempt customers with ★
+
+### Pricing Routing Flags — Must Stay In Sync Across All Three Layers
+
+`PricingCalculationService.CalculateQuoteItemPriceAsync` routes each item to the correct pricing path using boolean flags. **These flags MUST exist identically on `QuoteItem`, `JobItem`, and `CreateQuoteItemDto`, AND be mapped in all three `JobItemAssemblyService.CreateJobItem` overloads.**
+
+| Flag | Effect if missing on JobItem |
+|------|------------------------------|
+| `IsAiItem` | Job repriced as calculated item; oven cost double-charged on every save |
+| `IsGenericItem` | ManualUnitPrice ignored; price recalculated from surface area |
+| `IsLaborItem` | Item repriced at surface-area rate instead of hours × labor rate |
+| `IsSalesItem` | ManualUnitPrice ignored; item repriced using coat/surface math |
+
+**Checklist when adding a new pricing routing flag:**
+1. Add the property to `QuoteItem` (Core/Entities)
+2. Add the property to `JobItem` (Core/Entities)
+3. Add it to `CreateQuoteItemDto` (Application/DTOs)
+4. Add it to `JobItemSeed` (private class in JobItemAssemblyService)
+5. Map it in all three `JobItemAssemblyService.CreateJobItem` overloads
+6. Include it in every `existingItemsData` JSON block in job views (`Edit.cshtml`, `EditItems.cshtml`) and in all job controller actions that build `CreateQuoteItemDto` from a `JobItem`
+7. Add a migration if the field is new on a persisted entity
+8. The structural test `PricingRoutingFlags_ExistOnBothQuoteItemAndJobItem` in `JobItemAssemblyServiceTests` will fail until steps 1–3 are done — this is intentional
+
+### Branding
+- Application name: **Powder Coating Logix**
+- PCL logo: `wwwroot/images/pcl-logo.png` — used in sidebar header (when no tenant logo), login/register pages, sidebar footer
+- Sidebar footer always shows PCL logo linking to `http://www.powdercoatinglogix.com`
+- Tenant companies can upload their own logo (stored in Azure Blob `companylogos` container); it replaces the PCL logo in the sidebar header
+
+## Known Issues
+
+- Entity Framework warnings about global query filters on related entities (non-critical, informational only)
+
+## File Upload Configuration
+
+Limits defined in `AppConstants.cs`:
+- Max file size: 10 MB
+- Allowed extensions: jpg, jpeg, png, gif, pdf, doc, docx, xls, xlsx
+
+## Testing Strategy
+
+- **Unit Tests**: Test business logic in isolation
+- **Integration Tests**: Test full request pipeline with test database
+- Use xUnit framework
+- Mock `IUnitOfWork` in unit tests
+
+## Extending the System
+
+### Adding AI Features
+
+AI uses Anthropic Codex Sonnet 4.6 via `IAiQuoteService`. Configure the key under `AI:Anthropic:ApiKey` in `appsettings.json`.
+1. Create service interface in `Application/Interfaces/`
+2. Implement in `Infrastructure/Services/` calling the Anthropic client
+3. Inject into controllers via DI
+
+### SignalR Hubs
+
+Two hubs are already implemented and mapped in `Program.cs`:
+- `NotificationHub` → `/hubs/notifications` (company-scoped push notifications)
+- `ShopHub` → `/hubs/shop` (real-time shop floor updates)
+
+To add a new hub:
+1. Create hub class in `Web/Hubs/`
+2. Map hub in `Program.cs`: `app.MapHub<YourHub>("/hubpath")`
+3. Use JavaScript client in views to connect
+
+### Adding API Endpoints
+
+1. Create controller in `Api/Controllers/` with `[ApiController]` attribute
+2. Return `ActionResult<T>` types
+3. Use `[Authorize]` for protected endpoints
+4. Document with XML comments for Swagger
+
+## Project Dependencies
+
+Key NuGet packages:
+- **AutoMapper 16.0.0**: Entity-to-DTO mapping
+- **Entity Framework Core 8.0.11**: ORM and database access
+- **Serilog.AspNetCore 8.0.3**: Structured logging
+- **Microsoft.AspNetCore.Identity.UI 8.0.11**: Authentication
+- **Swashbuckle.AspNetCore 7.2.0**: API documentation (API project)
+
+## Security Considerations
+
+- Password requirements: 8+ chars, uppercase, lowercase, digit
+- HTTPS enforced in production
+- SQL injection prevented by EF Core parameterization
+- XSS protection via Razor encoding
+- CSRF tokens on all forms (automatic with ASP.NET Core)
+- Sensitive settings (connection strings, API keys) should use User Secrets in development and Azure Key Vault in production
+
+## Active design work
+A visual redesign is in progress. If the user asks about UI changes, dashboard/jobs/board styling, or the new design tokens, read `design_handoff_pcl_redesign/README.md` and follow `design_handoff_pcl_redesign/AGENTS.md` for that work.
@@ -20,7 +20,7 @@ public class EquipmentDto
    public string StatusDisplay { get; set; } = string.Empty;
    public string? Location { get; set; }

-    public int RecommendedMaintenanceIntervalDays { get; set; }
+    public int? RecommendedMaintenanceIntervalDays { get; set; }
    public DateTime? LastMaintenanceDate { get; set; }
    public DateTime? NextScheduledMaintenance { get; set; }
    public int? DaysUntilMaintenance { get; set; }
@@ -101,7 +101,7 @@ public class CreateEquipmentDto

    [Range(1, 3650, ErrorMessage = "Maintenance interval must be between 1 and 3650 days")]
    [Display(Name = "Recommended Maintenance Interval (Days)")]
-    public int RecommendedMaintenanceIntervalDays { get; set; }
+    public int? RecommendedMaintenanceIntervalDays { get; set; }

    [Display(Name = "Last Maintenance Date")]
    public DateTime? LastMaintenanceDate { get; set; }
@@ -68,6 +68,7 @@ public class InventoryListDto
    public string? CategoryName { get; set; }
    public string Category { get; set; } = string.Empty; // Legacy field
    public string? ColorName { get; set; }
+    public string? Location { get; set; }
    public decimal QuantityOnHand { get; set; }
    public string UnitOfMeasure { get; set; } = "lbs";
    public decimal ReorderPoint { get; set; }
@@ -33,6 +33,10 @@ public class InvoiceDto
    public string? CustomerEmail { get; set; }
    public string? CustomerPhone { get; set; }
    public string? CustomerMobilePhone { get; set; }
+    public string? CustomerAddress { get; set; }
+    public string? CustomerCity { get; set; }
+    public string? CustomerState { get; set; }
+    public string? CustomerZipCode { get; set; }
    public bool CustomerNotifyByEmail { get; set; }
    public bool CustomerNotifyBySms { get; set; }
    public string? PreparedById { get; set; }
@@ -486,6 +486,7 @@ public class ReworkRecordDto
    public decimal ActualReworkCost { get; set; }
    public bool IsBillableToCustomer { get; set; }
    public string? BillingNotes { get; set; }
+    public PowderCoating.Core.Enums.ReworkPricingType? ReworkPricingType { get; set; }

    public PowderCoating.Core.Enums.ReworkStatus Status { get; set; }
    public string StatusDisplay { get; set; } = string.Empty;
@@ -511,6 +512,11 @@ public class CreateReworkRecordDto
    public decimal EstimatedReworkCost { get; set; }
    public bool IsBillableToCustomer { get; set; }
    public string? BillingNotes { get; set; }
+
+    // Rework job creation (opt-in)
+    public bool CreateReworkJob { get; set; }
+    public List<int>? ReworkJobItemIds { get; set; }  // null = not creating a job
+    public PowderCoating.Core.Enums.ReworkPricingType? ReworkPricingType { get; set; }
 }

 public class UpdateReworkRecordDto
@@ -125,6 +125,8 @@ public class CreateVendorDto

    [Display(Name = "Default Expense Account")]
    public int? DefaultExpenseAccountId { get; set; }
+
+    public List<int> CategoryIds { get; set; } = new();
 }

 // ============================================================================
@@ -209,4 +211,6 @@ public class UpdateVendorDto

    [Display(Name = "Default Expense Account")]
    public int? DefaultExpenseAccountId { get; set; }
+
+    public List<int> CategoryIds { get; set; } = new();
 }
@@ -25,6 +25,12 @@ public interface IPdfService
        CompanyInfoDto companyInfo,
        QuoteTemplateSettingsDto? template = null);

+    Task<byte[]> GeneratePackingSlipPdfAsync(
+        InvoiceDto invoiceDto,
+        byte[]? companyLogo,
+        string? companyLogoContentType,
+        CompanyInfoDto companyInfo);
+
    Task<byte[]> GeneratePurchaseOrderPdfAsync(
        PurchaseOrderDto po,
        byte[]? companyLogo,
@@ -20,7 +20,6 @@ public interface IStripeConnectService
        decimal invoiceTotal,
        decimal surchargeAmount,
        string currency,
-        string customerEmail,
        string invoiceNumber,
        int invoiceId);

@@ -33,7 +32,6 @@ public interface IStripeConnectService
        decimal depositAmount,
        decimal surchargeAmount,
        string currency,
-        string customerEmail,
        string quoteNumber,
        int quoteId);
 }
@@ -29,6 +29,10 @@ public class InvoiceProfile : Profile
                : null))
            .ForMember(d => d.CustomerPhone, o => o.MapFrom(s => s.Customer != null ? s.Customer.Phone : null))
            .ForMember(d => d.CustomerMobilePhone, o => o.MapFrom(s => s.Customer != null ? s.Customer.MobilePhone : null))
+            .ForMember(d => d.CustomerAddress, o => o.MapFrom(s => s.Customer != null ? s.Customer.Address : null))
+            .ForMember(d => d.CustomerCity, o => o.MapFrom(s => s.Customer != null ? s.Customer.City : null))
+            .ForMember(d => d.CustomerState, o => o.MapFrom(s => s.Customer != null ? s.Customer.State : null))
+            .ForMember(d => d.CustomerZipCode, o => o.MapFrom(s => s.Customer != null ? s.Customer.ZipCode : null))
            .ForMember(d => d.CustomerNotifyByEmail, o => o.MapFrom(s => s.Customer == null || s.Customer.NotifyByEmail))
            .ForMember(d => d.CustomerNotifyBySms, o => o.MapFrom(s => s.Customer != null && s.Customer.NotifyBySms))
            .ForMember(d => d.PreparedByName, o => o.MapFrom(s => s.PreparedBy != null
@@ -196,7 +196,9 @@ public class JobProfile : Profile
            .ForMember(dest => dest.JobItemDescription,
                      opt => opt.MapFrom(src => src.JobItem != null ? src.JobItem.Description : null))
            .ForMember(dest => dest.ReworkJobNumber,
-                      opt => opt.MapFrom(src => src.ReworkJob != null ? src.ReworkJob.JobNumber : null));
+                      opt => opt.MapFrom(src => src.ReworkJob != null ? src.ReworkJob.JobNumber : null))
+            .ForMember(dest => dest.ReworkPricingType,
+                      opt => opt.MapFrom(src => src.ReworkPricingType));

        // Job → JobDto (rework fields)
        // (IsReworkJob and OriginalJobId map by convention; OriginalJobNumber needs explicit map — handled in controller)
@@ -2753,4 +2753,187 @@ public class PdfService : IPdfService
                .FontColor(amount < 0 ? Colors.Red.Darken2 : Colors.Black);
        }
    }
+
+    // -----------------------------------------------------------------------
+    // Packing Slip
+    // -----------------------------------------------------------------------
+
+    /// <summary>
+    /// Generates a no-price packing slip PDF for the given invoice. Lists job items with
+    /// description, color, and quantity only — no unit prices or totals. Intended for
+    /// physical pickup/delivery paperwork where pricing should not be visible.
+    /// </summary>
+    public async Task<byte[]> GeneratePackingSlipPdfAsync(
+        InvoiceDto invoiceDto,
+        byte[]? companyLogo,
+        string? companyLogoContentType,
+        CompanyInfoDto companyInfo)
+    {
+        QuestPDF.Settings.License = LicenseType.Community;
+        const string accentColor = "#1e40af"; // blue
+
+        return await Task.Run(() =>
+        {
+            var document = Document.Create(container =>
+            {
+                container.Page(page =>
+                {
+                    page.Size(PageSizes.Letter);
+                    page.Margin(0.75f, Unit.Inch);
+                    page.PageColor(Colors.White);
+                    page.DefaultTextStyle(x => x.FontSize(10).FontFamily("Arial"));
+
+                    page.Header().Element(c => ComposePackingSlipHeader(c, companyLogo, companyInfo, accentColor, invoiceDto));
+                    page.Content().Element(c => ComposePackingSlipContent(c, invoiceDto, accentColor));
+                    page.Footer().AlignCenter().Text(text =>
+                    {
+                        text.Span("PACKING SLIP  |  ").FontSize(8).FontColor(Colors.Grey.Darken1);
+                        text.Span(companyInfo.CompanyName).FontSize(8).FontColor(Colors.Grey.Darken1);
+                        text.Span("  |  Page ").FontSize(8).FontColor(Colors.Grey.Darken1);
+                        text.CurrentPageNumber().FontSize(8).FontColor(Colors.Grey.Darken1);
+                        text.Span(" of ").FontSize(8).FontColor(Colors.Grey.Darken1);
+                        text.TotalPages().FontSize(8).FontColor(Colors.Grey.Darken1);
+                    });
+                });
+            });
+
+            return document.GeneratePdf();
+        });
+    }
+
+    /// <summary>
+    /// Header for the packing slip: company branding left, "PACKING SLIP" title + invoice/date info right.
+    /// </summary>
+    private void ComposePackingSlipHeader(IContainer container, byte[]? companyLogo, CompanyInfoDto companyInfo, string accentColor, InvoiceDto invoice)
+    {
+        container.Column(col =>
+        {
+            col.Item().Row(row =>
+            {
+                row.RelativeItem().Column(column =>
+                {
+                    if (companyLogo != null && companyLogo.Length > 0)
+                        column.Item().MaxHeight(60).Image(companyLogo);
+                    else
+                        column.Item().Text(companyInfo.CompanyName).FontSize(18).Bold().FontColor(accentColor);
+
+                    if (!string.IsNullOrWhiteSpace(companyInfo.Address))
+                        column.Item().Text(companyInfo.Address).FontSize(8).FontColor(Colors.Grey.Darken1);
+                    var cityLine = $"{companyInfo.City}{(!string.IsNullOrEmpty(companyInfo.City) && !string.IsNullOrEmpty(companyInfo.State) ? ", " : "")}{companyInfo.State} {companyInfo.ZipCode}".Trim();
+                    if (!string.IsNullOrWhiteSpace(cityLine))
+                        column.Item().Text(cityLine).FontSize(8).FontColor(Colors.Grey.Darken1);
+                    if (!string.IsNullOrWhiteSpace(companyInfo.Phone))
+                        column.Item().Text(FormatPhoneNumber(companyInfo.Phone)).FontSize(8).FontColor(Colors.Grey.Darken1);
+                    if (!string.IsNullOrWhiteSpace(companyInfo.PrimaryContactEmail))
+                        column.Item().Text(companyInfo.PrimaryContactEmail).FontSize(8).FontColor(Colors.Grey.Darken1);
+                });
+
+                row.RelativeItem().AlignRight().Column(column =>
+                {
+                    column.Item().Text("PACKING SLIP").FontSize(26).Bold().FontColor(accentColor);
+                    column.Item().Text($"Invoice #: {invoice.InvoiceNumber}").FontSize(9).Bold();
+                    column.Item().Text($"Date: {invoice.InvoiceDate:MMMM d, yyyy}").FontSize(9);
+                    if (!string.IsNullOrWhiteSpace(invoice.JobNumber))
+                        column.Item().Text($"Job #: {invoice.JobNumber}").FontSize(9);
+                });
+            });
+
+            col.Item().PaddingVertical(4).LineHorizontal(1).LineColor(accentColor);
+        });
+    }
+
+    /// <summary>
+    /// Body of the packing slip: customer info block, optional PO number, and an items table
+    /// showing description, color, and quantity — no prices.
+    /// </summary>
+    private void ComposePackingSlipContent(IContainer container, InvoiceDto invoice, string accentColor)
+    {
+        container.Column(col =>
+        {
+            // Customer info
+            col.Item().PaddingTop(12).Row(row =>
+            {
+                row.RelativeItem().Column(c =>
+                {
+                    c.Item().Text("PREPARED FOR").FontSize(8).Bold().FontColor(Colors.Grey.Darken1);
+                    c.Item().Text(invoice.CustomerName).Bold();
+                    if (!string.IsNullOrWhiteSpace(invoice.CustomerAddress))
+                        c.Item().Text(invoice.CustomerAddress).FontSize(9);
+                    var cityLine = $"{invoice.CustomerCity}{(!string.IsNullOrEmpty(invoice.CustomerCity) && !string.IsNullOrEmpty(invoice.CustomerState) ? ", " : "")}{invoice.CustomerState} {invoice.CustomerZipCode}".Trim();
+                    if (!string.IsNullOrWhiteSpace(cityLine))
+                        c.Item().Text(cityLine).FontSize(9);
+                    if (!string.IsNullOrWhiteSpace(invoice.CustomerPhone))
+                        c.Item().Text(FormatPhoneNumber(invoice.CustomerPhone)).FontSize(9);
+                });
+
+                if (!string.IsNullOrWhiteSpace(invoice.CustomerPO))
+                {
+                    row.ConstantItem(160).AlignRight().Column(c =>
+                    {
+                        c.Item().Text("PURCHASE ORDER").FontSize(8).Bold().FontColor(Colors.Grey.Darken1);
+                        c.Item().Text(invoice.CustomerPO).Bold();
+                    });
+                }
+            });
+
+            // Items table
+            col.Item().PaddingTop(16).Table(table =>
+            {
+                table.ColumnsDefinition(cols =>
+                {
+                    cols.RelativeColumn(5);
+                    cols.RelativeColumn(3);
+                    cols.RelativeColumn(1);
+                });
+
+                table.Header(h =>
+                {
+                    h.Cell().Background(accentColor).Padding(5).Text("Description").FontColor(Colors.White).Bold().FontSize(9);
+                    h.Cell().Background(accentColor).Padding(5).Text("Color / Finish").FontColor(Colors.White).Bold().FontSize(9);
+                    h.Cell().Background(accentColor).Padding(5).AlignCenter().Text("Qty").FontColor(Colors.White).Bold().FontSize(9);
+                });
+
+                var rowAlt = false;
+                foreach (var item in invoice.InvoiceItems.OrderBy(i => i.DisplayOrder))
+                {
+                    var bg = rowAlt ? Colors.Grey.Lighten4 : Colors.White;
+                    table.Cell().Background(bg).Padding(5).Column(c =>
+                    {
+                        c.Item().Text(item.Description).FontSize(9);
+                        if (!string.IsNullOrWhiteSpace(item.Notes))
+                            c.Item().Text(item.Notes).FontSize(8).FontColor(Colors.Grey.Darken1);
+                    });
+                    table.Cell().Background(bg).Padding(5).Text(item.ColorName ?? "—").FontSize(9);
+                    table.Cell().Background(bg).Padding(5).AlignCenter().Text(item.Quantity.ToString("G")).FontSize(9);
+                    rowAlt = !rowAlt;
+                }
+            });
+
+            // Notes (if any)
+            if (!string.IsNullOrWhiteSpace(invoice.Notes))
+            {
+                col.Item().PaddingTop(16).Column(c =>
+                {
+                    c.Item().Text("Notes").Bold().FontSize(9);
+                    c.Item().Text(invoice.Notes).FontSize(9).FontColor(Colors.Grey.Darken1);
+                });
+            }
+
+            // Received by signature line
+            col.Item().PaddingTop(32).Row(row =>
+            {
+                row.RelativeItem().Column(c =>
+                {
+                    c.Item().BorderBottom(1).BorderColor(Colors.Grey.Darken1).PaddingBottom(2).Text(string.Empty);
+                    c.Item().PaddingTop(2).Text("Received by / Date").FontSize(8).FontColor(Colors.Grey.Darken1);
+                });
+                row.ConstantItem(24);
+                row.RelativeItem().Column(c =>
+                {
+                    c.Item().BorderBottom(1).BorderColor(Colors.Grey.Darken1).PaddingBottom(2).Text(string.Empty);
+                    c.Item().PaddingTop(2).Text("Condition noted").FontSize(8).FontColor(Colors.Grey.Darken1);
+                });
+            });
+        });
+    }
 }
@@ -19,7 +19,7 @@ public class Equipment : BaseEntity
    public string? Location { get; set; }
    
    // Maintenance Information
-    public int RecommendedMaintenanceIntervalDays { get; set; }
+    public int? RecommendedMaintenanceIntervalDays { get; set; }
    public DateTime? LastMaintenanceDate { get; set; }
    public DateTime? NextScheduledMaintenance { get; set; }
    
@@ -12,4 +12,5 @@ public class InventoryCategoryLookup : BaseEntity

    // Relationships
    public virtual ICollection<InventoryItem> InventoryItems { get; set; } = new List<InventoryItem>();
+    public virtual ICollection<Vendor> Vendors { get; set; } = new List<Vendor>();
 }
@@ -31,6 +31,9 @@ public class ReworkRecord : BaseEntity
    public bool IsBillableToCustomer { get; set; }
    public string? BillingNotes { get; set; }

+    // Pricing attribution for the linked rework job (null on pre-existing records)
+    public ReworkPricingType? ReworkPricingType { get; set; }
+
    // ── Resolution ────────────────────────────────────────────────────────────
    public ReworkStatus Status { get; set; } = ReworkStatus.Open;
    public ReworkResolution? Resolution { get; set; }
@@ -45,6 +45,7 @@ public class Vendor : BaseEntity
    public virtual ICollection<BillPayment> BillPayments { get; set; } = new List<BillPayment>();
    public virtual ICollection<Expense> Expenses { get; set; } = new List<Expense>();
    public virtual Account? DefaultExpenseAccount { get; set; }
+    public virtual ICollection<InventoryCategoryLookup> Categories { get; set; } = new List<InventoryCategoryLookup>();
 }

 public class InventoryTransaction : BaseEntity
@@ -144,6 +144,14 @@ public enum ReworkResolution
    NoActionRequired = 4
 }

+/// <summary>Who bears the cost of the rework job, recorded at the time the rework is logged.</summary>
+public enum ReworkPricingType
+{
+    ShopFault = 0,        // Redo is on the shop — rework job items priced at $0
+    CustomerReduced = 1,  // Customer caused it; we're helping — prices copied, user edits
+    CustomerFull = 2      // Customer caused it; full original pricing applies
+}
+
 public enum BugReportStatus
 {
    New = 0,
@@ -92,4 +92,10 @@ public interface IJobRepository : IRepository<Job>
    /// were never completed and rolled past their scheduled day.
    /// </summary>
    Task<List<Job>> GetOverdueScheduledJobsAsync();
+
+    /// <summary>
+    /// Returns the count of rework jobs linked to <paramref name="originalJobId"/>
+    /// (including soft-deleted) so the next rework suffix (R1, R2, …) can be determined.
+    /// </summary>
+    Task<int> GetReworkJobCountAsync(int originalJobId);
 }
@@ -809,6 +809,15 @@ modelBuilder.Entity<ReworkRecord>().HasQueryFilter(e =>
            .HasForeignKey(s => s.DefaultExpenseAccountId)
            .OnDelete(DeleteBehavior.SetNull);

+        // Vendor ↔ InventoryCategoryLookup (many-to-many supply categories)
+        modelBuilder.Entity<Vendor>()
+            .HasMany(v => v.Categories)
+            .WithMany(c => c.Vendors)
+            .UsingEntity<Dictionary<string, object>>(
+                "VendorInventoryCategories",
+                j => j.HasOne<InventoryCategoryLookup>().WithMany().HasForeignKey("InventoryCategoryLookupId"),
+                j => j.HasOne<Vendor>().WithMany().HasForeignKey("VendorId"));
+
        // Bill → APAccount (no cascade to avoid cycles)
        modelBuilder.Entity<Bill>()
            .HasOne(b => b.APAccount)
@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddReworkPricingType : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ReworkPricingType",
+                table: "ReworkRecords",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 21, 14, 32, 24, 337, DateTimeKind.Utc).AddTicks(8533));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 21, 14, 32, 24, 337, DateTimeKind.Utc).AddTicks(8542));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 21, 14, 32, 24, 337, DateTimeKind.Utc).AddTicks(8543));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ReworkPricingType",
+                table: "ReworkRecords");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5186));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5190));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5191));
+        }
+    }
+}
@@ -0,0 +1,93 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddVendorCategories : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "VendorInventoryCategories",
+                columns: table => new
+                {
+                    InventoryCategoryLookupId = table.Column<int>(type: "int", nullable: false),
+                    VendorId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_VendorInventoryCategories", x => new { x.InventoryCategoryLookupId, x.VendorId });
+                    table.ForeignKey(
+                        name: "FK_VendorInventoryCategories_InventoryCategoryLookups_InventoryCategoryLookupId",
+                        column: x => x.InventoryCategoryLookupId,
+                        principalTable: "InventoryCategoryLookups",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_VendorInventoryCategories_Vendors_VendorId",
+                        column: x => x.VendorId,
+                        principalTable: "Vendors",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 23, 13, 51, 6, 293, DateTimeKind.Utc).AddTicks(4300));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 23, 13, 51, 6, 293, DateTimeKind.Utc).AddTicks(4313));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 23, 13, 51, 6, 293, DateTimeKind.Utc).AddTicks(4315));
+
+            migrationBuilder.CreateIndex(
+                name: "IX_VendorInventoryCategories_VendorId",
+                table: "VendorInventoryCategories",
+                column: "VendorId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "VendorInventoryCategories");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 21, 14, 32, 24, 337, DateTimeKind.Utc).AddTicks(8533));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 21, 14, 32, 24, 337, DateTimeKind.Utc).AddTicks(8542));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 21, 14, 32, 24, 337, DateTimeKind.Utc).AddTicks(8543));
+        }
+    }
+}
@@ -0,0 +1,79 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class MakeMaintenanceIntervalNullable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "RecommendedMaintenanceIntervalDays",
+                table: "Equipment",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 24, 14, 36, 3, 317, DateTimeKind.Utc).AddTicks(8197));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 24, 14, 36, 3, 317, DateTimeKind.Utc).AddTicks(8203));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 24, 14, 36, 3, 317, DateTimeKind.Utc).AddTicks(8204));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "RecommendedMaintenanceIntervalDays",
+                table: "Equipment",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 23, 13, 51, 6, 293, DateTimeKind.Utc).AddTicks(4300));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 23, 13, 51, 6, 293, DateTimeKind.Utc).AddTicks(4313));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 23, 13, 51, 6, 293, DateTimeKind.Utc).AddTicks(4315));
+        }
+    }
+}
@@ -3045,7 +3045,7 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Property<decimal>("PurchasePrice")
                        .HasColumnType("decimal(18,2)");

-                    b.Property<int>("RecommendedMaintenanceIntervalDays")
+                    b.Property<int?>("RecommendedMaintenanceIntervalDays")
                        .HasColumnType("int");

                    b.Property<string>("SerialNumber")
@@ -6711,7 +6711,7 @@ namespace PowderCoating.Infrastructure.Migrations
                        {
                            Id = 1,
                            CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5186),
+                            CreatedAt = new DateTime(2026, 5, 24, 14, 36, 3, 317, DateTimeKind.Utc).AddTicks(8197),
                            Description = "Standard pricing for regular customers",
                            DiscountPercent = 0m,
                            IsActive = true,
@@ -6722,7 +6722,7 @@ namespace PowderCoating.Infrastructure.Migrations
                        {
                            Id = 2,
                            CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5190),
+                            CreatedAt = new DateTime(2026, 5, 24, 14, 36, 3, 317, DateTimeKind.Utc).AddTicks(8203),
                            Description = "5% discount for preferred customers",
                            DiscountPercent = 5m,
                            IsActive = true,
@@ -6733,7 +6733,7 @@ namespace PowderCoating.Infrastructure.Migrations
                        {
                            Id = 3,
                            CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5191),
+                            CreatedAt = new DateTime(2026, 5, 24, 14, 36, 3, 317, DateTimeKind.Utc).AddTicks(8204),
                            Description = "10% discount for premium customers",
                            DiscountPercent = 10m,
                            IsActive = true,
@@ -7990,6 +7990,9 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Property<int?>("ReworkJobId")
                        .HasColumnType("int");

+                    b.Property<int?>("ReworkPricingType")
+                        .HasColumnType("int");
+
                    b.Property<int>("ReworkType")
                        .HasColumnType("int");

@@ -8631,6 +8634,21 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.ToTable("YearEndCloses");
                });

+            modelBuilder.Entity("VendorInventoryCategories", b =>
+                {
+                    b.Property<int>("InventoryCategoryLookupId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("VendorId")
+                        .HasColumnType("int");
+
+                    b.HasKey("InventoryCategoryLookupId", "VendorId");
+
+                    b.HasIndex("VendorId");
+
+                    b.ToTable("VendorInventoryCategories");
+                });
+
            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                {
                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
@@ -10369,6 +10387,21 @@ namespace PowderCoating.Infrastructure.Migrations
                    b.Navigation("JournalEntry");
                });

+            modelBuilder.Entity("VendorInventoryCategories", b =>
+                {
+                    b.HasOne("PowderCoating.Core.Entities.InventoryCategoryLookup", null)
+                        .WithMany()
+                        .HasForeignKey("InventoryCategoryLookupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PowderCoating.Core.Entities.Vendor", null)
+                        .WithMany()
+                        .HasForeignKey("VendorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
            modelBuilder.Entity("PowderCoating.Core.Entities.Account", b =>
                {
                    b.Navigation("BillLineItems");
@@ -187,6 +187,14 @@ public class JobRepository : Repository<Job>, IJobRepository
            .FirstOrDefaultAsync();
    }

+    /// <inheritdoc/>
+    public async Task<int> GetReworkJobCountAsync(int originalJobId)
+    {
+        return await _context.Jobs
+            .IgnoreQueryFilters()
+            .CountAsync(j => j.OriginalJobId == originalJobId);
+    }
+
    /// <inheritdoc/>
    public async Task<List<Job>> GetOverdueScheduledJobsAsync()
    {
@@ -1209,6 +1209,15 @@ Rules:
            sb.AppendLine("Page content:");
            sb.AppendLine(pageContent);
        }
+        else if (!string.IsNullOrWhiteSpace(fetchUrl))
+        {
+            // Page content unavailable (fetch failed or blocked) — still surface the URL so Claude
+            // can use its training knowledge of the manufacturer URL structure (e.g. Prismatic SKU
+            // in the path) to infer product identity rather than returning all-null fields.
+            sb.AppendLine();
+            sb.AppendLine($"Product URL (page content could not be fetched): {fetchUrl}");
+            sb.AppendLine("Use your training knowledge of this manufacturer and the URL to fill in as many fields as possible.");
+        }

        return sb.ToString();
    }
@@ -162,7 +162,6 @@ public class StripeConnectService : IStripeConnectService
        decimal invoiceTotal,
        decimal surchargeAmount,
        string currency,
-        string customerEmail,
        string invoiceNumber,
        int invoiceId)
    {
@@ -175,7 +174,6 @@ public class StripeConnectService : IStripeConnectService
            {
                Amount = amountInCents,
                Currency = currency.ToLower(),
-                ReceiptEmail = customerEmail,
                Description = $"Invoice {invoiceNumber}",
                Metadata = new Dictionary<string, string>
                {
@@ -215,7 +213,6 @@ public class StripeConnectService : IStripeConnectService
        decimal depositAmount,
        decimal surchargeAmount,
        string currency,
-        string customerEmail,
        string quoteNumber,
        int quoteId)
    {
@@ -228,7 +225,6 @@ public class StripeConnectService : IStripeConnectService
            {
                Amount = amountInCents,
                Currency = currency.ToLower(),
-                ReceiptEmail = customerEmail,
                Description = $"Deposit for quote {quoteNumber}",
                Metadata = new Dictionary<string, string>
                {
@@ -64,6 +64,7 @@ public class InventoryController : Controller
    public async Task<IActionResult> Index(
        string? searchTerm,
        string? category,
+        string? location,
        string? sortColumn,
        string sortDirection = "asc",
        bool lowStockOnly = false,
@@ -87,50 +88,64 @@ public class InventoryController : Controller
            };
            gridRequest.Validate();

-            // Build search and category filter
+            // Build filter — compose search, category, location, and low-stock predicates
            System.Linq.Expressions.Expression<Func<InventoryItem, bool>>? filter = null;

-            if (lowStockOnly && !string.IsNullOrWhiteSpace(searchTerm))
-            {
-                var search = searchTerm.ToLower();
+            var hasSearch   = !string.IsNullOrWhiteSpace(searchTerm);
+            var hasCategory = !string.IsNullOrWhiteSpace(category);
+            var hasLocation = !string.IsNullOrWhiteSpace(location);
+
+            var search = searchTerm?.ToLower() ?? "";
+            var cat    = category ?? "";
+            var loc    = location ?? "";
+
+            if (lowStockOnly && hasSearch && hasLocation)
                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint
-                    && (i.SKU.ToLower().Contains(search)
-                        || i.Name.ToLower().Contains(search)
+                    && (i.Location != null && i.Location.ToLower() == loc.ToLower())
+                    && (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)));
-            }
+            else if (lowStockOnly && hasSearch)
+                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint
+                    && (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
+                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
+                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)));
+            else if (lowStockOnly && hasLocation)
+                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint
+                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
            else if (lowStockOnly)
-            {
                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint;
-            }
-            else if (!string.IsNullOrWhiteSpace(searchTerm) && !string.IsNullOrWhiteSpace(category))
-            {
-                // Both search and category filter
-                var search = searchTerm.ToLower();
-                var cat = category;
-                filter = i => (i.SKU.ToLower().Contains(search)
-                    || i.Name.ToLower().Contains(search)
-                    || (i.Description != null && i.Description.ToLower().Contains(search))
-                    || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
-                    || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
+            else if (hasSearch && hasCategory && hasLocation)
+                filter = i => (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
+                        || (i.Description != null && i.Description.ToLower().Contains(search))
+                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
+                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
+                    && i.Category.ToLower() == cat.ToLower()
+                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
+            else if (hasSearch && hasCategory)
+                filter = i => (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
+                        || (i.Description != null && i.Description.ToLower().Contains(search))
+                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
+                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
                    && i.Category.ToLower() == cat.ToLower();
-            }
-            else if (!string.IsNullOrWhiteSpace(searchTerm))
-            {
-                // Search only
-                var search = searchTerm.ToLower();
-                filter = i => i.SKU.ToLower().Contains(search)
-                    || i.Name.ToLower().Contains(search)
+            else if (hasSearch && hasLocation)
+                filter = i => (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
+                        || (i.Description != null && i.Description.ToLower().Contains(search))
+                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
+                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
+                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
+            else if (hasSearch)
+                filter = i => i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
                    || (i.Description != null && i.Description.ToLower().Contains(search))
                    || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
                    || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search));
-            }
-            else if (!string.IsNullOrWhiteSpace(category))
-            {
-                // Category filter only
-                var cat = category;
+            else if (hasCategory && hasLocation)
+                filter = i => i.Category.ToLower() == cat.ToLower()
+                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
+            else if (hasCategory)
                filter = i => i.Category.ToLower() == cat.ToLower();
-            }
+            else if (hasLocation)
+                filter = i => i.Location != null && i.Location.ToLower() == loc.ToLower();

            // Build orderBy function
            Func<IQueryable<InventoryItem>, IOrderedQueryable<InventoryItem>> orderBy = gridRequest.SortColumn switch
@@ -159,19 +174,21 @@ public class InventoryController : Controller

            var pagedResult = PagedResult<InventoryListDto>.From(gridRequest, itemDtos, totalCount);

-            // Load all items once to compute sidebar stats and category list in memory
+            // Load all items once to compute sidebar stats and dropdown option lists in memory
            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
            var allItems = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId)).ToList();
            ViewBag.Categories         = allItems.Select(i => i.Category).Where(c => c != null).Distinct().OrderBy(c => c).ToList();
+            ViewBag.Locations          = allItems.Select(i => i.Location).Where(l => !string.IsNullOrWhiteSpace(l)).Distinct().OrderBy(l => l).ToList();
            ViewBag.StatsLowStockCount = allItems.Count(i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint);
            ViewBag.StatsActiveCount   = allItems.Count(i => i.IsActive);
            ViewBag.StatsTotalValue    = allItems.Sum(i => (decimal?)i.QuantityOnHand * i.UnitCost) ?? 0m;

            // Set ViewBag for sorting and filters
-            ViewBag.SearchTerm = searchTerm;
-            ViewBag.Category = category;
+            ViewBag.SearchTerm   = searchTerm;
+            ViewBag.Category     = category;
+            ViewBag.Location     = location;
            ViewBag.LowStockOnly = lowStockOnly;
-            ViewBag.SortColumn = gridRequest.SortColumn;
+            ViewBag.SortColumn   = gridRequest.SortColumn;
            ViewBag.SortDirection = gridRequest.SortDirection;

            return View(pagedResult);
@@ -184,6 +201,26 @@ public class InventoryController : Controller
        }
    }

+    /// <summary>
+    /// Returns a print-optimised list of all active inventory items in a given bin/location.
+    /// Renders without the site chrome (no layout) so the browser print dialog produces a
+    /// clean page. Items are sorted by name within the bin.
+    /// </summary>
+    public async Task<IActionResult> PrintBin(string location)
+    {
+        if (string.IsNullOrWhiteSpace(location))
+            return RedirectToAction(nameof(Index));
+
+        var loc = location.Trim();
+        var items = await _unitOfWork.InventoryItems.FindAsync(
+            i => i.Location != null && i.Location.ToLower() == loc.ToLower());
+
+        var dtos = _mapper.Map<List<InventoryListDto>>(items.OrderBy(i => i.Name).ToList());
+        ViewBag.Location = loc;
+        ViewBag.PrintedAt = DateTime.Now;
+        return View(dtos);
+    }
+
    /// <summary>
    /// Renders the inventory item detail page. The primary vendor name is looked up
    /// separately because the repository does not eager-load Vendor by default, avoiding
@@ -897,10 +934,31 @@ public class InventoryController : Controller

        if (!string.IsNullOrWhiteSpace(qrUrl))
        {
-            // QR path: fetch the product page; LookupByUrlAsync now maps all identity + spec fields
-            aiResult = await _aiLookupService.LookupByUrlAsync(qrUrl, null);
-            if (aiResult.Success && aiResult.SpecPageUrl == null)
-                aiResult.SpecPageUrl = qrUrl;
+            // QR path: try to extract product identity from the URL using manufacturer patterns.
+            // Prismatic Powders URLs embed both the SKU and color slug in the path
+            // (e.g. /shop/powder-coating-colors/PMB-6906/fire-red), so we can feed the full
+            // LookupAsync pipeline (Serper + direct URL + Claude) with real context instead of
+            // relying solely on a page fetch that may fail in production.
+            var activePatterns = (await _unitOfWork.ManufacturerLookupPatterns.GetAllAsync(ignoreQueryFilters: true))
+                .Where(p => p.IsActive).ToList();
+            var (urlMfr, urlColor, urlPart) = TryParseManufacturerUrl(qrUrl, activePatterns);
+
+            if (!string.IsNullOrWhiteSpace(urlMfr))
+            {
+                aiResult = await _aiLookupService.LookupAsync(urlMfr, urlColor, null, urlPart);
+                // The scanned QR URL is always the authoritative product page link — it came
+                // directly from the manufacturer's bag and is always fully-qualified. Overwrite
+                // whatever LookupAsync returned (which may be a scheme-less path from the template).
+                if (aiResult.Success)
+                    aiResult.SpecPageUrl = qrUrl;
+            }
+            else
+            {
+                // No pattern match — fall back to URL-based lookup
+                aiResult = await _aiLookupService.LookupByUrlAsync(qrUrl, null);
+                if (aiResult.Success && aiResult.SpecPageUrl == null)
+                    aiResult.SpecPageUrl = qrUrl;
+            }
        }
        else if (!string.IsNullOrWhiteSpace(imageBase64))
        {
@@ -1272,6 +1330,72 @@ public class InventoryController : Controller
        return transferEfficiency ?? DefaultTransferEfficiency;
    }

+    /// <summary>
+    /// Reverse-parses a scanned QR URL against known manufacturer URL templates to extract
+    /// product identity (manufacturer name, color name, part number). For example, a Prismatic
+    /// Powders URL like /shop/powder-coating-colors/PMB-6906/fire-red yields manufacturer
+    /// "Prismatic Powders", partNumber "PMB-6906", and colorName "Fire Red". Returns nulls
+    /// when no active pattern matches the URL domain.
+    /// </summary>
+    private static (string? manufacturer, string? colorName, string? partNumber) TryParseManufacturerUrl(
+        string url, IEnumerable<Core.Entities.ManufacturerLookupPattern> patterns)
+    {
+        Uri? parsed;
+        try { parsed = new Uri(url); } catch { return (null, null, null); }
+
+        var host = parsed.Host.Replace("www.", "", StringComparison.OrdinalIgnoreCase);
+
+        foreach (var pattern in patterns.Where(p => !string.IsNullOrEmpty(p.Domain) && !string.IsNullOrEmpty(p.ProductUrlTemplate)))
+        {
+            if (!host.Equals(pattern.Domain, StringComparison.OrdinalIgnoreCase)) continue;
+
+            var template = pattern.ProductUrlTemplate!;
+            var placeholderKeys = new[] { "{partNumber}", "{slug}", "{colorName}", "{colorCode}" };
+
+            // Find the first placeholder to split off the static prefix
+            var firstIdx = placeholderKeys
+                .Select(ph => template.IndexOf(ph, StringComparison.OrdinalIgnoreCase))
+                .Where(i => i >= 0)
+                .DefaultIfEmpty(-1)
+                .Min();
+
+            if (firstIdx < 0) continue;
+
+            var staticPrefix = template[..firstIdx].TrimEnd('/');
+            var fullUrl = url.TrimEnd('/');
+            if (!fullUrl.StartsWith(staticPrefix, StringComparison.OrdinalIgnoreCase)) continue;
+
+            var templateSegments = template[firstIdx..].Split('/', StringSplitOptions.RemoveEmptyEntries);
+            var urlSegments      = fullUrl[staticPrefix.Length..].Split('/', StringSplitOptions.RemoveEmptyEntries);
+
+            var extracted = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            bool matched = true;
+            for (int i = 0; i < templateSegments.Length && i < urlSegments.Length; i++)
+            {
+                var seg = templateSegments[i];
+                if (seg.StartsWith("{") && seg.EndsWith("}"))
+                    extracted[seg[1..^1]] = urlSegments[i];
+                else if (!seg.Equals(urlSegments[i], StringComparison.OrdinalIgnoreCase))
+                { matched = false; break; }
+            }
+            if (!matched) continue;
+
+            extracted.TryGetValue("partNumber", out var partNumber);
+            var slug = extracted.TryGetValue("slug", out var s) ? s
+                     : extracted.TryGetValue("colorName", out var cn) ? cn
+                     : extracted.TryGetValue("colorCode", out var cc) ? cc : null;
+
+            // Convert URL slug to display name: "fire-red" → "Fire Red"
+            string? colorName = slug == null ? null
+                : string.Join(" ", slug.Split(new[] { '-', '_' }, StringSplitOptions.RemoveEmptyEntries)
+                    .Select(w => w.Length > 0 ? char.ToUpperInvariant(w[0]) + w[1..].ToLowerInvariant() : w));
+
+            return (pattern.ManufacturerName, colorName, partNumber);
+        }
+
+        return (null, null, null);
+    }
+
    /// <summary>
    /// Normalizes a string to title-case using the current culture's TextInfo. Applied to
    /// inventory item names on create and edit so the list view is consistently formatted
@@ -1371,8 +1495,20 @@ public class InventoryController : Controller
        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
        ViewBag.AiInventoryAssistEnabled = await _subscriptionService.IsAiInventoryAssistEnabledAsync(companyId);

-        var vendors = await _unitOfWork.Vendors.FindAsync(v => v.CompanyId == companyId);
-        ViewBag.Vendors = new SelectList(vendors.Where(s => s.IsActive).OrderBy(s => s.CompanyName), "Id", "CompanyName");
+        var vendors = (await _unitOfWork.Vendors.FindAsync(v => v.IsActive, false, v => v.Categories))
+            .OrderBy(v => v.CompanyName).ToList();
+        ViewBag.Vendors = new SelectList(vendors, "Id", "CompanyName");
+
+        // Build {categoryId: [vendorId, ...]} so the inventory form can filter vendors by category
+        var categoryVendorMap = new Dictionary<string, List<int>>();
+        foreach (var v in vendors)
+            foreach (var cat in v.Categories)
+            {
+                var key = cat.Id.ToString();
+                if (!categoryVendorMap.ContainsKey(key)) categoryVendorMap[key] = new List<int>();
+                categoryVendorMap[key].Add(v.Id);
+            }
+        ViewBag.CategoryVendorMapJson = System.Text.Json.JsonSerializer.Serialize(categoryVendorMap);

        // Load categories from lookup table
        var allCategories = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId);
@@ -1499,11 +1635,12 @@ public class InventoryController : Controller
    /// Renders a print-optimised label for the inventory item containing the QR code,
    /// item name, SKU, and colour. Designed to be printed directly from the browser.
    /// </summary>
-    public async Task<IActionResult> Label(int? id)
+    public async Task<IActionResult> Label(int? id, bool embed = false)
    {
        if (id == null) return NotFound();
        var item = await _unitOfWork.InventoryItems.GetByIdAsync(id.Value);
        if (item == null) return NotFound();
+        ViewBag.IsEmbed = embed;
        return View(_mapper.Map<InventoryItemDto>(item));
    }

@@ -355,6 +355,15 @@ public class InvoicesController : Controller
                var job = await _unitOfWork.Jobs.GetByIdAsync(jobId.Value, false, j => j.Customer, j => j.JobItems);
                if (job == null) return NotFound();

+                // Pre-load coats so we can derive color names for invoice line items
+                var activeItemIds = job.JobItems.Where(ji => !ji.IsDeleted).Select(ji => ji.Id).ToList();
+                var allCoats = activeItemIds.Any()
+                    ? (await _unitOfWork.JobItemCoats.FindAsync(c => activeItemIds.Contains(c.JobItemId) && !c.IsDeleted)).ToList()
+                    : new List<JobItemCoat>();
+                var coatsByItem = allCoats
+                    .GroupBy(c => c.JobItemId)
+                    .ToDictionary(g => g.Key, g => g.OrderBy(c => c.Sequence).ToList());
+
                // Validate no existing active invoice for this job (voided ones are kept as history)
                var existing = await _unitOfWork.Invoices.GetForJobAsync(jobId.Value);
                if (existing != null && existing.Status != InvoiceStatus.Voided)
@@ -404,6 +413,16 @@ public class InvoicesController : Controller
                        revenueAccountId = ci.RevenueAccountId;
                    revenueAccountId ??= defaultRevenueAccount?.Id;

+                    // Derive color from coats when the item itself has no explicit color set
+                    var derivedColor = item.ColorName;
+                    if (string.IsNullOrEmpty(derivedColor) && coatsByItem.TryGetValue(item.Id, out var itemCoats))
+                    {
+                        var coatColors = itemCoats
+                            .Where(c => !string.IsNullOrEmpty(c.ColorName))
+                            .Select(c => c.ColorName!);
+                        derivedColor = string.Join(" / ", coatColors);
+                    }
+
                    dto.InvoiceItems.Add(new CreateInvoiceItemDto
                    {
                        SourceJobItemId  = item.Id,
@@ -412,7 +431,7 @@ public class InvoicesController : Controller
                        Quantity         = item.Quantity > 0 ? item.Quantity : 1,
                        UnitPrice        = item.UnitPrice,
                        TotalPrice       = item.TotalPrice,
-                        ColorName        = item.ColorName,
+                        ColorName        = derivedColor,
                        Notes            = item.Notes,
                        DisplayOrder     = order++,
                        RevenueAccountId = revenueAccountId
@@ -445,16 +464,22 @@ public class InvoicesController : Controller
                // If the job came from a quote, carry over the quote-level costs and agreed terms.
                // The quote SubTotal = sum(items) + oven batch cost + shop supplies.
                // Job items only capture per-item prices, so oven & shop supplies need a separate line.
-                // Read directly from the quote snapshot — never try to reverse-engineer from job.FinalPrice
-                // because FinalPrice is recalculated on every item edit and can drift from the original quote.
+                // For fee components, prefer the job's own breakdown snapshot (updated every time the job
+                // is saved) over the source quote — the quote's FacilityOverheadCost was only added in
+                // migration AddQuotePricingSnapshotFields (May 2026); older quotes have 0 there even though
+                // overhead was included in the quote total. Tax and discount still come from the quote
+                // because those represent the customer-approved agreed terms.
                if (sourceQuote != null)
                {
-                    // Bundle all quote-level charges so the invoice subtotal matches the quote total.
-                    // FacilityOverheadCost is included — it is a real cost baked into the quoted price.
-                    var processingFees = sourceQuote.OvenBatchCost
-                                       + sourceQuote.FacilityOverheadCost
-                                       + sourceQuote.ShopSuppliesAmount
-                                       + sourceQuote.RushFee;
+                    // Prefer job breakdown values for dynamic fee components; fall back to quote for
+                    // compatibility with jobs that were never re-saved after the May 2026 migration.
+                    var ovenCost     = jobBreakdown != null ? jobBreakdown.OvenBatchCost      : sourceQuote.OvenBatchCost;
+                    var overhead     = jobBreakdown != null ? jobBreakdown.FacilityOverheadCost : sourceQuote.FacilityOverheadCost;
+                    var shopSupplies = jobBreakdown != null ? jobBreakdown.ShopSuppliesAmount  : sourceQuote.ShopSuppliesAmount;
+                    var rushFee      = jobBreakdown != null ? jobBreakdown.RushFee             : sourceQuote.RushFee;
+
+                    // Bundle all quote-level charges so the invoice subtotal matches the job total.
+                    var processingFees = ovenCost + overhead + shopSupplies + rushFee;

                    if (processingFees > 0.01m)
                    {
@@ -1461,6 +1486,7 @@ public class InvoicesController : Controller
            }

            var currentUser = await _userManager.GetUserAsync(User);
+            var totalCreditCreated = 0m;  // populated inside transaction, used in success message

            await _unitOfWork.ExecuteInTransactionAsync(async () =>
            {
@@ -1480,6 +1506,75 @@ public class InvoicesController : Controller
                await _unitOfWork.Payments.SoftDeleteAsync(payment.Id);
            }

+            // Re-release any deposits that were applied to this invoice so they can be
+            // auto-applied to the replacement invoice. Without this, AppliedToInvoiceId
+            // stays set and the deposit lookup (AppliedToInvoiceId == null) skips them.
+            var appliedDeposits = await _unitOfWork.Deposits.FindAsync(
+                d => d.AppliedToInvoiceId == invoice.Id && !d.IsDeleted);
+            var totalDepositReleased = 0m;
+            foreach (var deposit in appliedDeposits)
+            {
+                deposit.AppliedToInvoiceId = null;
+                deposit.AppliedDate = null;
+                deposit.UpdatedAt = DateTime.UtcNow;
+                await _unitOfWork.Deposits.UpdateAsync(deposit);
+                totalDepositReleased += deposit.Amount;
+            }
+            // Restore the CustomerDeposits 2300 liability that was cleared when the deposits
+            // were applied. Mirrors the DR at apply time; follows the same simplified reversal
+            // pattern as the rest of the void (regular payment GL entries are also left as-is).
+            if (totalDepositReleased > 0)
+            {
+                var custDepositsAcctId = await GetCustomerDepositsAccountIdAsync(invoice.CompanyId);
+                await _accountBalanceService.CreditAsync(custDepositsAcctId, totalDepositReleased);
+            }
+
+            // Convert non-deposit payments (cash, card, check, online) to customer credits so
+            // the money isn't lost when the invoice is voided. Each payment becomes a CRED-
+            // Deposit record linked to the same job; it will auto-apply when the replacement
+            // invoice is created, exactly like a normal deposit.
+            var nonDepositPayments = invoice.Payments
+                .Where(p => !p.IsDeleted && !(p.Reference ?? "").StartsWith("Deposit "))
+                .ToList();
+            if (nonDepositPayments.Any())
+            {
+                var credPrefix = $"CRED-{DateTime.UtcNow:yy}{DateTime.UtcNow.Month:D2}-";
+                var existingNums = (await _unitOfWork.Deposits.FindAsync(
+                        d => d.CompanyId == invoice.CompanyId && d.ReceiptNumber.StartsWith(credPrefix),
+                        ignoreQueryFilters: true))
+                    .Select(d => d.ReceiptNumber).ToList();
+                var maxNum = 0;
+                foreach (var rn in existingNums)
+                {
+                    var suffix = rn.Length >= credPrefix.Length + 4 ? rn[credPrefix.Length..] : "";
+                    if (int.TryParse(suffix, out int parsed) && parsed > maxNum) maxNum = parsed;
+                }
+
+                var creditCustDepositsAcctId = await GetCustomerDepositsAccountIdAsync(invoice.CompanyId);
+                foreach (var payment in nonDepositPayments)
+                {
+                    maxNum++;
+                    await _unitOfWork.Deposits.AddAsync(new Core.Entities.Deposit
+                    {
+                        CompanyId     = invoice.CompanyId,
+                        CustomerId    = invoice.CustomerId,
+                        JobId         = invoice.JobId,
+                        Amount        = payment.Amount,
+                        PaymentMethod = payment.PaymentMethod,
+                        ReceivedDate  = payment.PaymentDate,
+                        Reference     = payment.Reference,
+                        Notes         = $"Credit from voided invoice {invoice.InvoiceNumber}" +
+                                        (string.IsNullOrWhiteSpace(payment.Notes) ? "." : $". Original: {payment.Notes}"),
+                        ReceiptNumber = $"{credPrefix}{maxNum:D4}",
+                        CreatedAt     = DateTime.UtcNow
+                    });
+                    totalCreditCreated += payment.Amount;
+                }
+
+                // CR CustomerDeposits to create the liability matching the cash already in Checking
+                await _accountBalanceService.CreditAsync(creditCustDepositsAcctId, totalCreditCreated);
+            }
+
            // Void any gift certificates that were generated from this invoice.
            // Capture each GC's remaining balance BEFORE voiding so the GL entries below can use it.
            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(invoice.CompanyId);
@@ -1531,7 +1626,10 @@ public class InvoicesController : Controller

            }); // end ExecuteInTransactionAsync

-            TempData["Success"] = $"Invoice {invoice.InvoiceNumber} has been voided.";
+            var creditMsg = totalCreditCreated > 0
+                ? $" {totalCreditCreated:C} converted to customer credit and will auto-apply to the next invoice."
+                : "";
+            TempData["Success"] = $"Invoice {invoice.InvoiceNumber} has been voided.{creditMsg}";
            return RedirectToAction(nameof(Details), new { id });
        }
        catch (Exception ex)
@@ -1690,6 +1788,59 @@ public class InvoicesController : Controller
        }
    }

+    // -----------------------------------------------------------------------
+    // GET: /Invoices/DownloadPackingSlip/5
+    // -----------------------------------------------------------------------
+    /// <summary>
+    /// Generates a no-price packing slip PDF for physical pickup/delivery paperwork.
+    /// Reuses the same company branding and invoice data pipeline as DownloadPdf but
+    /// delegates to GeneratePackingSlipPdfAsync which omits all pricing columns.
+    /// </summary>
+    public async Task<IActionResult> DownloadPackingSlip(int? id, bool inline = false)
+    {
+        if (id == null) return NotFound();
+
+        try
+        {
+            var invoice = await LoadInvoiceForViewAsync(id.Value);
+            if (invoice == null) return NotFound();
+
+            var currentUser = await _userManager.GetUserAsync(User);
+            if (currentUser == null) return Unauthorized();
+
+            var company = await _unitOfWork.Companies.GetByIdAsync(currentUser.CompanyId);
+            var companyInfo = new Application.DTOs.Company.CompanyInfoDto
+            {
+                CompanyName = company?.CompanyName ?? string.Empty,
+                Phone = company?.Phone,
+                Address = company?.Address,
+                City = company?.City,
+                State = company?.State,
+                ZipCode = company?.ZipCode,
+                PrimaryContactEmail = company?.PrimaryContactEmail
+            };
+
+            var (logoData, logoContentType) = await LoadCompanyLogoAsync(company);
+            var dto = await BuildInvoiceDtoAsync(invoice);
+            var pdfBytes = await _pdfService.GeneratePackingSlipPdfAsync(dto, logoData, logoContentType, companyInfo);
+            var fileName = $"PackingSlip-{invoice.InvoiceNumber}.pdf";
+
+            if (inline)
+            {
+                Response.Headers["Content-Disposition"] = $"inline; filename=\"{fileName}\"";
+                return File(pdfBytes, "application/pdf");
+            }
+
+            return File(pdfBytes, "application/pdf", fileName);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error generating packing slip for invoice {Id}", id);
+            TempData["ErrorPermanent"] = $"Packing slip generation failed: {ex.Message}";
+            return RedirectToAction(nameof(Details), new { id });
+        }
+    }
+
    // -----------------------------------------------------------------------
    // GET: /Invoices/ForJob/5  — redirect to existing or Create
    // -----------------------------------------------------------------------
@@ -3016,6 +3167,50 @@ public class InvoicesController : Controller
        return false;
    }

+    /// <summary>
+    /// Inline-edits description, quantity, and unit price on a single invoice line item.
+    /// Blocked on paid/voided invoices (same gate as the full Edit action).
+    /// Returns updated totals so the page can reflect the change without a reload.
+    /// </summary>
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> PatchItem([FromBody] PatchInvoiceItemRequest request)
+    {
+        var currentUser = await _userManager.GetUserAsync(User);
+        if (currentUser == null) return Unauthorized();
+
+        var item = await _unitOfWork.InvoiceItems.GetByIdAsync(request.ItemId);
+        if (item == null) return NotFound();
+
+        var invoice = await _unitOfWork.Invoices.GetByIdAsync(item.InvoiceId);
+        if (invoice == null || invoice.CompanyId != currentUser.CompanyId) return NotFound();
+
+        if (invoice.Status is not (InvoiceStatus.Draft or InvoiceStatus.Sent or InvoiceStatus.Overdue))
+            return BadRequest(new { error = "Cannot edit items on a paid or voided invoice." });
+
+        item.Description = request.Description.Trim();
+        item.Quantity    = request.Quantity;
+        item.UnitPrice   = request.UnitPrice;
+        item.TotalPrice  = Math.Round(request.Quantity * request.UnitPrice, 2);
+        await _unitOfWork.InvoiceItems.UpdateAsync(item);
+
+        var allItems    = await _unitOfWork.InvoiceItems.FindAsync(ii => ii.InvoiceId == invoice.Id);
+        var newSubTotal = allItems.Sum(i => i.TotalPrice);
+        invoice.SubTotal   = newSubTotal;
+        invoice.TaxAmount  = Math.Round(newSubTotal * invoice.TaxPercent / 100m, 2);
+        invoice.Total      = Math.Round(newSubTotal - invoice.DiscountAmount + invoice.TaxAmount, 2);
+        await _unitOfWork.Invoices.UpdateAsync(invoice);
+        await _unitOfWork.CompleteAsync();
+
+        return Json(new {
+            lineTotal  = item.TotalPrice,
+            subtotal   = invoice.SubTotal,
+            taxAmount  = invoice.TaxAmount,
+            total      = invoice.Total,
+            balanceDue = invoice.BalanceDue
+        });
+    }
+
    /// <summary>
    /// Returns logo bytes and content type for PDF generation.
    /// Prefers blob-stored logos (LogoFilePath) over the legacy DB column (LogoData).
@@ -3031,3 +3226,11 @@ public class InvoicesController : Controller
        return (company.LogoData, company.LogoContentType);
    }
 }
+
+public class PatchInvoiceItemRequest
+{
+    public int     ItemId      { get; set; }
+    public string  Description { get; set; } = string.Empty;
+    public decimal Quantity    { get; set; }
+    public decimal UnitPrice   { get; set; }
+}
@@ -110,6 +110,11 @@ public class JobsController : Controller
    {
        try
        {
+            // Default landing view: On Floor — redirect bare /Jobs to ?statusGroup=active
+            // so completed/cancelled jobs don't clutter the first screen.
+            if (string.IsNullOrEmpty(statusGroup) && string.IsNullOrEmpty(searchTerm) && string.IsNullOrEmpty(tagFilter))
+                return RedirectToAction("Index", new { statusGroup = "active" });
+
            // Create and validate grid request
            var gridRequest = new GridRequest
            {
@@ -141,6 +146,13 @@ public class JobsController : Controller
                        && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Delivered
                        && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Cancelled;
                }
+                else if (statusGroup == "completed")
+                {
+                    filter = j => j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.Completed
+                        || j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.ReadyForPickup
+                        || j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.Delivered;
+                }
+                // "all" or unknown group: no filter applied (show every status)
            }
            else if (!string.IsNullOrWhiteSpace(searchTerm))
            {
@@ -195,6 +207,27 @@ public class JobsController : Controller
                gridRequest, jobDtos,
                string.IsNullOrWhiteSpace(tagFilter) ? totalCount : jobDtos.Count);

+            // Pill badge counts — always global (not scoped to current filter/page)
+            var today = DateTime.Today;
+            ViewBag.AllJobCount       = await _unitOfWork.Jobs.CountAsync();
+            ViewBag.ActiveCount       = await _unitOfWork.Jobs.CountAsync(j =>
+                j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Completed
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.ReadyForPickup
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Delivered
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Cancelled);
+            ViewBag.OverdueCount      = await _unitOfWork.Jobs.CountAsync(j =>
+                j.DueDate < today
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Completed
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.ReadyForPickup
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Delivered
+                && j.JobStatus.StatusCode != AppConstants.StatusCodes.Job.Cancelled);
+            ViewBag.CompletedCount    = await _unitOfWork.Jobs.CountAsync(j =>
+                j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.Completed
+                || j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.ReadyForPickup
+                || j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.Delivered);
+            ViewBag.ReadyCount        = await _unitOfWork.Jobs.CountAsync(j =>
+                j.JobStatus.StatusCode == AppConstants.StatusCodes.Job.ReadyForPickup);
+
            // Set ViewBag for sorting
            ViewBag.SearchTerm = searchTerm;
            ViewBag.StatusGroup = statusGroup;
@@ -2374,6 +2407,28 @@ public class JobsController : Controller
                    });
            }

+            // When a rework job reaches a terminal status, close out the linked ReworkRecord
+            // on the original job so the shop doesn't have to do it manually.
+            // Cancelled → WrittenOff; any other terminal → Resolved.
+            if (newStatus?.IsTerminalStatus == true && job.IsReworkJob)
+            {
+                var linkedRecords = await _unitOfWork.ReworkRecords.FindAsync(
+                    r => r.ReworkJobId == job.Id && r.CompanyId == job.CompanyId, false);
+                foreach (var rr in linkedRecords)
+                {
+                    if (rr.Status == ReworkStatus.Resolved || rr.Status == ReworkStatus.WrittenOff)
+                        continue;
+                    rr.Status       = newStatus.StatusCode == AppConstants.StatusCodes.Job.Cancelled
+                        ? ReworkStatus.WrittenOff
+                        : ReworkStatus.Resolved;
+                    rr.ResolvedDate ??= DateTime.UtcNow;
+                    rr.UpdatedAt    = DateTime.UtcNow;
+                    await _unitOfWork.ReworkRecords.UpdateAsync(rr);
+                }
+                if (linkedRecords.Any())
+                    await _unitOfWork.SaveChangesAsync();
+            }
+
            // Notify customer on status change (only if user opted in)
            if (request.SendEmail && newStatus != null)
            {
@@ -3495,10 +3550,13 @@ public class JobsController : Controller
    }

    /// <summary>
-    /// Records a rework event against a job item (e.g. defect found during QC).
-    /// Automatically creates a new linked rework Job so the repair work can be tracked
-    /// through the same job lifecycle. The rework job inherits the original job's customer,
-    /// oven, and items so the shop has a complete specification to work from.
+    /// Records a rework event against a job. Optionally creates a linked rework job so the
+    /// repair can flow through the full shop lifecycle. When creating a rework job:
+    /// - Job number uses sub-number format: {parentNumber}-R{n} (e.g. JOB-2605-0007-R1)
+    /// - Only items selected by the user are copied (partial rework support)
+    /// - Pricing obeys the ReworkPricingType: ShopFault zeros all item prices;
+    ///   CustomerReduced/CustomerFull copy prices as-is (user edits after if needed)
+    /// - Job starts at the first non-Pending status in the company's workflow
    /// </summary>
    [HttpPost]
    public async Task<IActionResult> AddReworkRecord([FromBody] CreateReworkRecordDto dto)
@@ -3507,95 +3565,207 @@ public class JobsController : Controller
        if (job == null) return NotFound();

        var companyId = job.CompanyId;
+        Job? reworkJob = null;

-        // Generate rework job number
-        var statuses = await _lookupCache.GetJobStatusLookupsAsync(companyId);
-        var pendingStatus = statuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.Pending);
-        var priorities = await _lookupCache.GetJobPriorityLookupsAsync(companyId);
-        var normalPriority = priorities.FirstOrDefault(p => p.PriorityCode == "NORMAL") ?? priorities.First();
-
-        var allJobs = await _unitOfWork.Jobs.GetAllAsync(true);
-        var year = DateTime.Now.ToString("yy");
-        var month = DateTime.Now.ToString("MM");
-        var prefix = $"JOB-{year}{month}-";
-        var maxNum = allJobs
-            .Where(j => j.JobNumber.StartsWith(prefix))
-            .Select(j => { int.TryParse(j.JobNumber.Replace(prefix, ""), out int n); return n; })
-            .DefaultIfEmpty(0).Max();
-
-        var reworkJob = pendingStatus != null ? new Job
+        if (dto.CreateReworkJob && dto.ReworkJobItemIds != null && dto.ReworkJobItemIds.Count > 0 && dto.ReworkPricingType.HasValue)
        {
-            JobNumber = $"{prefix}{(maxNum + 1):D4}",
-            CustomerId = job.CustomerId,
-            Description = $"REWORK: {job.Description}",
-            JobStatusId = pendingStatus.Id,
-            JobPriorityId = normalPriority.Id,
-            IsReworkJob = true,
-            OriginalJobId = job.Id,
-            SpecialInstructions = $"Rework of {job.JobNumber}.",
-            CompanyId = companyId,
-            CreatedAt = DateTime.UtcNow
-        } : null;
-
-        if (reworkJob != null)
-        {
-            await _unitOfWork.Jobs.AddAsync(reworkJob);
-            await _unitOfWork.CompleteAsync();
-
-            // Copy items: specific item if flagged, otherwise all items
-            var itemsToCopy = dto.JobItemId.HasValue
-                ? job.JobItems.Where(i => i.Id == dto.JobItemId.Value).ToList()
-                : job.JobItems.ToList();
-
-            foreach (var item in itemsToCopy)
+            var typeLabel = dto.ReworkType switch
            {
-                var createdAtUtc = DateTime.UtcNow;
-                var newItem = _jobItemAssemblyService.CreateJobItem(item, reworkJob.Id, companyId, createdAtUtc);
+                ReworkType.InternalDefect    => "Internal Defect",
+                ReworkType.CustomerWarranty  => "Customer Warranty",
+                ReworkType.CustomerDamage    => "Customer Damage",
+                _                            => dto.ReworkType.ToString()
+            };
+            var reasonLabel = dto.Reason switch
+            {
+                ReworkReason.AdhesionFailure    => "Adhesion Failure",
+                ReworkReason.Contamination      => "Contamination",
+                ReworkReason.ColorMismatch      => "Color Mismatch",
+                ReworkReason.RunsSags           => "Runs / Sags",
+                ReworkReason.SurfacePrepFailure => "Surface Prep Failure",
+                ReworkReason.OvenIssue          => "Oven Issue",
+                ReworkReason.InsufficientCoverage => "Insufficient Coverage",
+                ReworkReason.HandlingDamage     => "Handling Damage",
+                _                               => "Other"
+            };
+            var pricingLabel = dto.ReworkPricingType.Value switch
+            {
+                ReworkPricingType.ShopFault       => "Shop Fault — no charge",
+                ReworkPricingType.CustomerReduced => "Customer responsible — reduced rate",
+                ReworkPricingType.CustomerFull    => "Customer responsible — full price",
+                _                                 => ""
+            };
+            var defect = string.IsNullOrWhiteSpace(dto.DefectDescription) ? "" : $": {dto.DefectDescription}";
+            var reworkDescription = $"REWORK ({typeLabel} / {reasonLabel}){defect}. Pricing: {pricingLabel}.";

-                await _unitOfWork.JobItems.AddAsync(newItem);
-                await _unitOfWork.CompleteAsync();
-
-                foreach (var coat in _jobItemAssemblyService.CreateJobItemCoats(item, newItem.Id, companyId, createdAtUtc))
-                {
-                    await _unitOfWork.JobItemCoats.AddAsync(coat);
-                }
-
-                foreach (var prepService in _jobItemAssemblyService.CreateJobItemPrepServices(item, newItem.Id, companyId, createdAtUtc))
-                {
-                    await _unitOfWork.JobItemPrepServices.AddAsync(prepService);
-                }
-            }
-
-            await _unitOfWork.CompleteAsync();
+            var currentUserId = _userManager.GetUserId(User);
+            reworkJob = await BuildReworkJobAsync(job, dto.ReworkJobItemIds, dto.ReworkPricingType.Value, companyId, reworkDescription, currentUserId);
        }

        var record = new ReworkRecord
        {
-            JobId = dto.JobId,
-            JobItemId = dto.JobItemId,
-            ReworkType = dto.ReworkType,
-            Reason = dto.Reason,
+            JobId           = dto.JobId,
+            JobItemId       = dto.JobItemId,
+            ReworkType      = dto.ReworkType,
+            Reason          = dto.Reason,
            DefectDescription = dto.DefectDescription,
-            DiscoveredBy = dto.DiscoveredBy,
-            DiscoveredDate = dto.DiscoveredDate,
-            ReportedByName = dto.ReportedByName,
+            DiscoveredBy    = dto.DiscoveredBy,
+            DiscoveredDate  = dto.DiscoveredDate,
+            ReportedByName  = dto.ReportedByName,
            EstimatedReworkCost = dto.EstimatedReworkCost,
            IsBillableToCustomer = dto.IsBillableToCustomer,
-            BillingNotes = dto.BillingNotes,
-            ReworkJobId = reworkJob?.Id,
-            Status = reworkJob != null ? ReworkStatus.InProgress : ReworkStatus.Open,
-            CompanyId = companyId,
-            CreatedAt = DateTime.UtcNow
+            BillingNotes    = dto.BillingNotes,
+            ReworkPricingType = dto.ReworkPricingType,
+            ReworkJobId     = reworkJob?.Id,
+            Status          = reworkJob != null ? ReworkStatus.InProgress : ReworkStatus.Open,
+            CompanyId       = companyId,
+            CreatedAt       = DateTime.UtcNow
        };

        await _unitOfWork.ReworkRecords.AddAsync(record);
        await _unitOfWork.CompleteAsync();

-        // Reload with navigation for response
        var saved = await _unitOfWork.ReworkRecords.FindAsync(r => r.Id == record.Id, false, r => r.JobItem, r => r.ReworkJob);
        return Json(_mapper.Map<ReworkRecordDto>(saved.First()));
    }

+    /// <summary>
+    /// Creates a linked rework Job from an existing rework record that was saved without one.
+    /// Uses sub-number format and applies the specified pricing attribution.
+    /// </summary>
+    [HttpPost]
+    public async Task<IActionResult> CreateReworkJob([FromBody] CreateReworkJobRequest req)
+    {
+        var reworkRecord = await _unitOfWork.ReworkRecords.GetByIdAsync(req.ReworkRecordId, false, r => r.Job);
+        if (reworkRecord == null) return NotFound();
+
+        var originalJob = await _unitOfWork.Jobs.LoadForDetailsAsync(reworkRecord.JobId);
+        if (originalJob == null) return NotFound();
+
+        var companyId = originalJob.CompanyId;
+        var itemIds = req.ItemIds ?? originalJob.JobItems.Select(i => i.Id).ToList();
+        var pricingType = req.ReworkPricingType ?? ReworkPricingType.ShopFault;
+
+        var pricingLabel = pricingType switch
+        {
+            ReworkPricingType.ShopFault       => "Shop Fault — no charge",
+            ReworkPricingType.CustomerReduced => "Customer responsible — reduced rate",
+            ReworkPricingType.CustomerFull    => "Customer responsible — full price",
+            _                                 => ""
+        };
+        var notes = string.IsNullOrWhiteSpace(req.Notes) ? "" : $" Notes: {req.Notes}";
+        var reworkDescription = $"REWORK: {pricingLabel}.{notes}";
+        var currentUserId = _userManager.GetUserId(User);
+        var reworkJob = await BuildReworkJobAsync(originalJob, itemIds, pricingType, companyId, reworkDescription, currentUserId);
+
+        reworkRecord.ReworkJobId      = reworkJob.Id;
+        reworkRecord.ReworkPricingType = pricingType;
+        reworkRecord.Status           = ReworkStatus.InProgress;
+        reworkRecord.UpdatedAt        = DateTime.UtcNow;
+        await _unitOfWork.ReworkRecords.UpdateAsync(reworkRecord);
+        await _unitOfWork.CompleteAsync();
+
+        return Json(new { success = true, reworkJobId = reworkJob.Id, reworkJobNumber = reworkJob.JobNumber });
+    }
+
+    /// <summary>
+    /// Shared helper that creates and persists a rework Job with sub-numbered job number,
+    /// copies the specified items (with coats and prep services), applies pricing attribution,
+    /// sets descriptive job description from the rework record data, and auto-records intake
+    /// (parts are already on hand when rework is logged).
+    /// Called by both AddReworkRecord and CreateReworkJob.
+    /// </summary>
+    private async Task<Job> BuildReworkJobAsync(
+        Job originalJob,
+        List<int> itemIds,
+        ReworkPricingType pricingType,
+        int companyId,
+        string reworkDescription,
+        string? checkedByUserId)
+    {
+        var statuses   = await _lookupCache.GetJobStatusLookupsAsync(companyId);
+        var priorities = await _lookupCache.GetJobPriorityLookupsAsync(companyId);
+
+        // First non-Pending status by workflow order
+        var firstActiveStatus = statuses
+            .Where(s => s.StatusCode != AppConstants.StatusCodes.Job.Pending)
+            .OrderBy(s => s.DisplayOrder)
+            .First();
+
+        var normalPriority = priorities.FirstOrDefault(p => p.PriorityCode == "NORMAL") ?? priorities.First();
+
+        // Sub-number: {parentJobNumber}-R{n+1}
+        var reworkCount = await _unitOfWork.Jobs.GetReworkJobCountAsync(originalJob.Id);
+        var reworkNumber = $"{originalJob.JobNumber}-R{reworkCount + 1}";
+
+        var reworkJob = new Job
+        {
+            JobNumber           = reworkNumber,
+            CustomerId          = originalJob.CustomerId,
+            Description         = reworkDescription,
+            JobStatusId         = firstActiveStatus.Id,
+            JobPriorityId       = normalPriority.Id,
+            IsReworkJob         = true,
+            OriginalJobId       = originalJob.Id,
+            SpecialInstructions = $"Rework of {originalJob.JobNumber}.",
+            // Auto-intake: parts are already on hand when rework is logged
+            IntakeDate              = DateTime.UtcNow,
+            IntakeConditionNotes    = $"Parts auto-checked in as rework from {originalJob.JobNumber}.",
+            IntakeCheckedByUserId   = checkedByUserId,
+            CompanyId           = companyId,
+            CreatedAt           = DateTime.UtcNow
+        };
+
+        await _unitOfWork.Jobs.AddAsync(reworkJob);
+        await _unitOfWork.CompleteAsync();
+
+        var itemsToCopy = originalJob.JobItems.Where(i => itemIds.Contains(i.Id)).ToList();
+        var createdAtUtc = DateTime.UtcNow;
+
+        foreach (var item in itemsToCopy)
+        {
+            var newItem = _jobItemAssemblyService.CreateJobItem(item, reworkJob.Id, companyId, createdAtUtc);
+
+            // Shop-fault rework jobs are done at no charge
+            if (pricingType == ReworkPricingType.ShopFault)
+            {
+                newItem.UnitPrice        = 0;
+                newItem.ManualUnitPrice  = 0;
+                newItem.TotalPrice       = 0;
+            }
+
+            await _unitOfWork.JobItems.AddAsync(newItem);
+            await _unitOfWork.CompleteAsync();
+
+            foreach (var coat in _jobItemAssemblyService.CreateJobItemCoats(item, newItem.Id, companyId, createdAtUtc))
+                await _unitOfWork.JobItemCoats.AddAsync(coat);
+
+            foreach (var prep in _jobItemAssemblyService.CreateJobItemPrepServices(item, newItem.Id, companyId, createdAtUtc))
+                await _unitOfWork.JobItemPrepServices.AddAsync(prep);
+        }
+
+        // Set intake part count now that items are known
+        reworkJob.IntakePartCount = (int)Math.Ceiling(itemsToCopy.Sum(i => i.Quantity));
+
+        // Write a pricing snapshot so the Details page and inline edit both work correctly
+        var itemsSubtotal = pricingType == ReworkPricingType.ShopFault
+            ? 0m
+            : itemsToCopy.Sum(i => i.TotalPrice);
+        reworkJob.FinalPrice = itemsSubtotal;
+        reworkJob.PricingBreakdownJson = System.Text.Json.JsonSerializer.Serialize(new QuotePricingBreakdownDto
+        {
+            ItemsSubtotal          = itemsSubtotal,
+            SubtotalBeforeDiscount = itemsSubtotal,
+            SubtotalAfterDiscount  = itemsSubtotal,
+            Total                  = itemsSubtotal
+        });
+
+        await _unitOfWork.Jobs.UpdateAsync(reworkJob);
+        await _unitOfWork.CompleteAsync();
+
+        return reworkJob;
+    }
+
    /// <summary>
    /// Updates a rework record's status, resolution notes, cost, and billability.
    /// Auto-sets ResolvedDate when status transitions to Resolved or WrittenOff (if not already set).
@@ -3647,66 +3817,6 @@ public class JobsController : Controller
        return Json(new { success = true });
    }

-    /// <summary>
-    /// Creates a new rework Job from an existing rework record and links them.
-    /// The rework job is a lightweight clone of the original job — same customer, description, and
-    /// oven — but starts fresh with Pending status so it goes through the full workflow again.
-    /// The ReworkJob FK on the rework record is updated so the Detail view can link to it.
-    /// </summary>
-    [HttpPost]
-    public async Task<IActionResult> CreateReworkJob([FromBody] CreateReworkJobRequest req)
-    {
-        var reworkRecord = await _unitOfWork.ReworkRecords.GetByIdAsync(req.ReworkRecordId, false, r => r.Job);
-        if (reworkRecord == null) return NotFound();
-
-        var originalJob = reworkRecord.Job;
-        var companyId = originalJob.CompanyId;
-
-        // Load status lookups to find Pending status
-        var statuses = await _lookupCache.GetJobStatusLookupsAsync(companyId);
-        var pendingStatus = statuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.Pending);
-        if (pendingStatus == null) return Json(new { success = false, message = "Could not find Pending status." });
-
-        var priorities = await _lookupCache.GetJobPriorityLookupsAsync(companyId);
-        var normalPriority = priorities.FirstOrDefault(p => p.PriorityCode == "NORMAL") ?? priorities.First();
-
-        // Generate job number
-        var allJobs = await _unitOfWork.Jobs.GetAllAsync(true);
-        var year = DateTime.Now.ToString("yy");
-        var month = DateTime.Now.ToString("MM");
-        var prefix = $"JOB-{year}{month}-";
-        var maxNum = allJobs
-            .Where(j => j.JobNumber.StartsWith(prefix))
-            .Select(j => { int.TryParse(j.JobNumber.Replace(prefix, ""), out int n); return n; })
-            .DefaultIfEmpty(0).Max();
-
-        var reworkJob = new Job
-        {
-            JobNumber = $"{prefix}{(maxNum + 1):D4}",
-            CustomerId = originalJob.CustomerId,
-            Description = $"REWORK: {originalJob.Description}",
-            JobStatusId = pendingStatus.Id,
-            JobPriorityId = normalPriority.Id,
-            IsReworkJob = true,
-            OriginalJobId = originalJob.Id,
-            SpecialInstructions = $"Rework of {originalJob.JobNumber}. {req.Notes}".Trim().TrimEnd('.') + ".",
-            CompanyId = companyId,
-            CreatedAt = DateTime.UtcNow
-        };
-
-        await _unitOfWork.Jobs.AddAsync(reworkJob);
-        await _unitOfWork.CompleteAsync();
-
-        // Link rework record to new job
-        reworkRecord.ReworkJobId = reworkJob.Id;
-        reworkRecord.Status = ReworkStatus.InProgress;
-        reworkRecord.UpdatedAt = DateTime.UtcNow;
-        await _unitOfWork.ReworkRecords.UpdateAsync(reworkRecord);
-        await _unitOfWork.CompleteAsync();
-
-        return Json(new { success = true, reworkJobId = reworkJob.Id, reworkJobNumber = reworkJob.JobNumber });
-    }
-
    // ── Quote-Changed Banner Actions ──────────────────────────────────────────

    /// <summary>
@@ -3950,10 +4060,11 @@ public class JobsController : Controller
                ovenCost = opCosts.OvenOperatingCostPerHour * defaultOvenCycleHours;
            }

-            // 4. Revenue
-            decimal revenue = job.Invoice != null
-                ? job.Invoice.Total
-                : (job.FinalPrice > 0 ? job.FinalPrice : job.QuotedPrice);
+            // 4. Revenue — prefer FinalPrice (reflects inline edits and job-level changes);
+            //    fall back to Invoice.Total only when FinalPrice is zero (voided/zeroed job).
+            decimal revenue = job.FinalPrice > 0
+                ? job.FinalPrice
+                : (job.Invoice?.Total ?? job.QuotedPrice);

            // 5. Rework costs from linked rework jobs
            var reworkRecords = await _unitOfWork.ReworkRecords.FindAsync(
@@ -3989,7 +4100,7 @@ public class JobsController : Controller

            return Json(new {
                revenue = Math.Round(revenue, 2),
-                revenueSource = job.Invoice != null ? "Invoice" : (job.FinalPrice > 0 ? "Final Price" : "Quoted Price"),
+                revenueSource = job.FinalPrice > 0 ? "Final Price" : (job.Invoice != null ? "Invoice" : "Quoted Price"),
                powderCost = Math.Round(powderCost, 2),
                laborCost = Math.Round(laborCost, 2),
                ovenCost = Math.Round(ovenCost, 2),
@@ -4183,9 +4294,92 @@ public class JobsController : Controller
            return Json(new { success = false, message = "An error occurred. Please try again." });
        }
    }
+
+    /// <summary>
+    /// Inline-edits description, quantity, and unit price on a single job line item.
+    /// Adjusts FinalPrice and the stored PricingBreakdownJson snapshot by the price delta.
+    /// Returns updated totals so the page can reflect the change without a reload.
+    /// </summary>
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> PatchItem([FromBody] PatchJobItemRequest request)
+    {
+        var currentUser = await _userManager.GetUserAsync(User);
+        if (currentUser == null) return Unauthorized();
+
+        var item = await _unitOfWork.JobItems.GetByIdAsync(request.ItemId);
+        if (item == null) return NotFound();
+
+        var job = await _unitOfWork.Jobs.GetByIdAsync(item.JobId);
+        if (job == null || job.CompanyId != currentUser.CompanyId) return NotFound();
+
+        var oldTotal     = item.TotalPrice;
+        item.Description = request.Description.Trim();
+        item.Quantity    = request.Quantity;
+        item.UnitPrice   = request.UnitPrice;
+        item.TotalPrice  = Math.Round(request.Quantity * request.UnitPrice, 2);
+        await _unitOfWork.JobItems.UpdateAsync(item);
+
+        var delta     = item.TotalPrice - oldTotal;
+        job.FinalPrice = Math.Round(job.FinalPrice + delta, 2);
+
+        // Keep the stored pricing snapshot in sync so the breakdown panel stays consistent.
+        // Case-insensitive options handle JSON stored before PascalCase serialization was enforced.
+        QuotePricingBreakdownDto? pbFinal = null;
+        var jsonOpts = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+        if (!string.IsNullOrEmpty(job.PricingBreakdownJson))
+        {
+            var pb = JsonSerializer.Deserialize<QuotePricingBreakdownDto>(job.PricingBreakdownJson, jsonOpts);
+            if (pb != null)
+            {
+                pb.ItemsSubtotal          += delta;
+                pb.SubtotalBeforeDiscount += delta;
+                pb.SubtotalAfterDiscount   = pb.SubtotalBeforeDiscount - pb.DiscountAmount;
+                pb.TaxAmount               = Math.Round(pb.SubtotalAfterDiscount * pb.TaxPercent / 100m, 2);
+                pb.Total                   = Math.Round(pb.SubtotalAfterDiscount + pb.RushFee + pb.TaxAmount, 2);
+                job.FinalPrice             = pb.Total;
+                job.PricingBreakdownJson   = JsonSerializer.Serialize(pb);
+                pbFinal = pb;
+            }
+        }
+
+        await _unitOfWork.Jobs.UpdateAsync(job);
+        await _unitOfWork.CompleteAsync();
+
+        // For legacy jobs without a stored snapshot, derive breakdown from live item totals.
+        if (pbFinal == null)
+        {
+            var allItems      = await _unitOfWork.JobItems.FindAsync(ji => ji.JobId == job.Id && !ji.IsDeleted);
+            var itemsSubtotal = allItems.Sum(ji => ji.TotalPrice);
+            var subtotal      = itemsSubtotal + job.OvenBatchCost + job.ShopSuppliesAmount;
+            pbFinal = new QuotePricingBreakdownDto
+            {
+                ItemsSubtotal          = itemsSubtotal,
+                SubtotalBeforeDiscount = subtotal,
+                SubtotalAfterDiscount  = subtotal,
+                Total                  = job.FinalPrice
+            };
+        }
+
+        return Json(new {
+            lineTotal               = item.TotalPrice,
+            finalPrice              = job.FinalPrice,
+            itemsSubtotal           = pbFinal.ItemsSubtotal,
+            subtotalBeforeDiscount  = pbFinal.SubtotalBeforeDiscount,
+            subtotalAfterDiscount   = pbFinal.SubtotalAfterDiscount,
+            taxAmount               = pbFinal.TaxAmount
+        });
+    }
 }

 public class DeleteTimeEntryRequest { public int Id { get; set; } }
+public class PatchJobItemRequest
+{
+    public int     ItemId      { get; set; }
+    public string  Description { get; set; } = string.Empty;
+    public decimal Quantity    { get; set; }
+    public decimal UnitPrice   { get; set; }
+}
 public class LogMaterialRequest
 {
    public int     JobId           { get; set; }
@@ -4194,7 +4388,13 @@ public class LogMaterialRequest
    public string  TransactionType { get; set; } = "JobUsage";
    public string? Notes           { get; set; }
 }
-public class CreateReworkJobRequest { public int ReworkRecordId { get; set; } public string? Notes { get; set; } }
+public class CreateReworkJobRequest
+{
+    public int ReworkRecordId { get; set; }
+    public List<int>? ItemIds { get; set; }
+    public PowderCoating.Core.Enums.ReworkPricingType? ReworkPricingType { get; set; }
+    public string? Notes { get; set; }
+}

 public class UpdateWorkerAssignmentRequest
 {
@@ -580,7 +580,7 @@ public class MaintenanceController : Controller
                // Calculate next scheduled maintenance
                if (equipment.RecommendedMaintenanceIntervalDays > 0)
                {
-                    equipment.NextScheduledMaintenance = DateTime.UtcNow.AddDays(equipment.RecommendedMaintenanceIntervalDays);
+                    equipment.NextScheduledMaintenance = DateTime.UtcNow.AddDays(equipment.RecommendedMaintenanceIntervalDays.Value);
                }

                equipment.UpdatedAt = DateTime.UtcNow;
@@ -75,7 +75,6 @@ public class PaymentController : Controller
            CustomerName     = customer != null
                ? $"{customer.ContactFirstName} {customer.ContactLastName}".Trim()
                : "Valued Customer",
-            CustomerEmail    = customer?.Email ?? string.Empty,
            CompanyName      = company!.CompanyName,
            BalanceDue       = invoice.BalanceDue,
            InvoiceTotal     = invoice.Total,
@@ -127,8 +126,6 @@ public class PaymentController : Controller
            return BadRequest(new { error = "Invalid payment amount." });

        var surcharge = CalculateSurcharge(request.Amount, company!);
-        var customer = await _context.Customers.AsNoTracking()
-            .FirstOrDefaultAsync(c => c.Id == invoice.CustomerId);

        var (success, clientSecret, paymentIntentId, stripeError) =
            await _stripeConnect.CreatePaymentIntentAsync(
@@ -136,7 +133,6 @@ public class PaymentController : Controller
                invoiceTotal: request.Amount,
                surchargeAmount: surcharge,
                currency: "usd",
-                customerEmail: customer?.Email ?? string.Empty,
                invoiceNumber: invoice.InvoiceNumber,
                invoiceId: invoice.Id);

@@ -261,7 +257,6 @@ public class PaymentController : Controller
            CustomerName         = customer != null
                ? $"{customer.ContactFirstName} {customer.ContactLastName}".Trim()
                : quote.ProspectContactName ?? "Valued Customer",
-            CustomerEmail        = customer?.Email ?? quote.ProspectEmail ?? string.Empty,
            CompanyName          = company!.CompanyName,
            DepositAmount        = depositAmount,
            QuoteTotal           = quote.Total,
@@ -296,7 +291,6 @@ public class PaymentController : Controller

        var depositAmount = Math.Round(quote!.Total * (quote.DepositPercent / 100m), 2);
        var surcharge = CalculateSurcharge(depositAmount, company!);
-        var customerEmail = quote.Customer?.Email ?? quote.ProspectEmail ?? string.Empty;

        var (success, clientSecret, paymentIntentId, stripeError) =
            await _stripeConnect.CreateDepositPaymentIntentAsync(
@@ -304,7 +298,6 @@ public class PaymentController : Controller
                depositAmount: depositAmount,
                surchargeAmount: surcharge,
                currency: "usd",
-                customerEmail: customerEmail,
                quoteNumber: quote.QuoteNumber,
                quoteId: quote.Id);

@@ -942,7 +935,6 @@ public class PaymentPageViewModel
    public int InvoiceId { get; set; }
    public string Token { get; set; } = string.Empty;
    public string CustomerName { get; set; } = string.Empty;
-    public string CustomerEmail { get; set; } = string.Empty;
    public string CompanyName { get; set; } = string.Empty;
    public decimal BalanceDue { get; set; }
    public decimal InvoiceTotal { get; set; }
@@ -963,7 +955,6 @@ public class DepositPaymentPageViewModel
    public int    QuoteId              { get; set; }
    public string Token                { get; set; } = string.Empty;
    public string CustomerName         { get; set; } = string.Empty;
-    public string CustomerEmail        { get; set; } = string.Empty;
    public string CompanyName          { get; set; } = string.Empty;
    public decimal DepositAmount       { get; set; }
    public decimal QuoteTotal          { get; set; }
@@ -3824,6 +3824,49 @@ public class QuotesController : Controller
        }
        return (company.LogoData, company.LogoContentType);
    }
+
+    /// <summary>
+    /// Inline-edits description, quantity, and unit price on a single quote line item.
+    /// Adjusts stored quote totals by the price delta so the sidebar stays accurate.
+    /// Returns updated totals so the page can reflect the change without a reload.
+    /// </summary>
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> PatchItem([FromBody] PatchQuoteItemRequest request)
+    {
+        var currentUser = await _userManager.GetUserAsync(User);
+        if (currentUser == null) return Unauthorized();
+
+        var item = await _unitOfWork.QuoteItems.GetByIdAsync(request.ItemId);
+        if (item == null) return NotFound();
+
+        var quote = await _unitOfWork.Quotes.GetByIdAsync(item.QuoteId);
+        if (quote == null || quote.CompanyId != currentUser.CompanyId) return NotFound();
+
+        var oldTotal        = item.TotalPrice;
+        item.Description    = request.Description.Trim();
+        item.Quantity       = request.Quantity;
+        item.UnitPrice      = request.UnitPrice;
+        item.TotalPrice     = Math.Round(request.Quantity * request.UnitPrice, 2);
+        await _unitOfWork.QuoteItems.UpdateAsync(item);
+
+        // Cascade delta through stored totals without re-running the pricing engine
+        var delta                    = item.TotalPrice - oldTotal;
+        quote.ItemsSubtotal         += delta;
+        quote.SubTotal              += delta;
+        quote.SubtotalAfterDiscount  = quote.SubTotal - quote.DiscountAmount;
+        quote.TaxAmount              = Math.Round(quote.SubtotalAfterDiscount * quote.TaxPercent / 100m, 2);
+        quote.Total                  = Math.Round(quote.SubtotalAfterDiscount + quote.RushFee + quote.TaxAmount, 2);
+        await _unitOfWork.Quotes.UpdateAsync(quote);
+        await _unitOfWork.CompleteAsync();
+
+        return Json(new {
+            lineTotal = item.TotalPrice,
+            subtotal  = quote.SubTotal,
+            taxAmount = quote.TaxAmount,
+            total     = quote.Total
+        });
+    }
 }

 // Request model for AJAX pricing calculation
@@ -3834,3 +3877,11 @@ public class UpdateQuoteStatusRequest
    public int QuoteId { get; set; }
    public int StatusId { get; set; }
 }
+
+public class PatchQuoteItemRequest
+{
+    public int     ItemId      { get; set; }
+    public string  Description { get; set; } = string.Empty;
+    public decimal Quantity    { get; set; }
+    public decimal UnitPrice   { get; set; }
+}
@@ -181,6 +181,7 @@ public class VendorsController : Controller
    public async Task<IActionResult> Create(bool inline = false)
    {
        await PopulateExpenseAccountsAsync();
+        await PopulateVendorCategoriesAsync();
        if (inline)
            return PartialView(new CreateVendorDto());
        return View(new CreateVendorDto());
@@ -207,6 +208,7 @@ public class VendorsController : Controller
                return Json(new { success = false, errors });
            }
            await PopulateExpenseAccountsAsync();
+            await PopulateVendorCategoriesAsync(dto.CategoryIds);
            return View(dto);
        }

@@ -216,6 +218,12 @@ public class VendorsController : Controller
            var vendor = _mapper.Map<Vendor>(dto);
            vendor.CompanyId = currentUser!.CompanyId;

+            if (dto.CategoryIds.Any())
+            {
+                var cats = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => dto.CategoryIds.Contains(c.Id));
+                vendor.Categories = cats.ToList();
+            }
+
            await _unitOfWork.Vendors.AddAsync(vendor);
            await _unitOfWork.CompleteAsync();

@@ -247,14 +255,16 @@ public class VendorsController : Controller

        try
        {
-            var vendor = await _unitOfWork.Vendors.GetByIdAsync(id.Value);
+            var vendor = await _unitOfWork.Vendors.GetByIdAsync(id.Value, false, v => v.Categories);
            if (vendor == null)
            {
                return NotFound();
            }

            var dto = _mapper.Map<UpdateVendorDto>(vendor);
+            dto.CategoryIds = vendor.Categories.Select(c => c.Id).ToList();
            await PopulateExpenseAccountsAsync();
+            await PopulateVendorCategoriesAsync(dto.CategoryIds);
            return View(dto);
        }
        catch (Exception ex)
@@ -282,18 +292,27 @@ public class VendorsController : Controller
        if (!ModelState.IsValid)
        {
            await PopulateExpenseAccountsAsync();
+            await PopulateVendorCategoriesAsync(dto.CategoryIds);
            return View(dto);
        }

        try
        {
-            var vendor = await _unitOfWork.Vendors.GetByIdAsync(id);
+            var vendor = await _unitOfWork.Vendors.GetByIdAsync(id, false, v => v.Categories);
            if (vendor == null)
            {
                return NotFound();
            }

            _mapper.Map(dto, vendor);
+
+            vendor.Categories.Clear();
+            if (dto.CategoryIds.Any())
+            {
+                var cats = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => dto.CategoryIds.Contains(c.Id));
+                foreach (var cat in cats) vendor.Categories.Add(cat);
+            }
+
            await _unitOfWork.Vendors.UpdateAsync(vendor);
            await _unitOfWork.CompleteAsync();

@@ -413,6 +432,20 @@ public class VendorsController : Controller
    /// purchases) in addition to regular operating expenses. A "— None —" placeholder is prepended so
    /// the field is optional — not every vendor needs a default account pre-set.
    /// </summary>
+    /// <summary>
+    /// Populates ViewBag.VendorCategories with active inventory categories for the checkbox list,
+    /// and ViewBag.SelectedCategoryIds with the IDs already assigned to the vendor being edited.
+    /// </summary>
+    private async Task PopulateVendorCategoriesAsync(IEnumerable<int>? selectedIds = null)
+    {
+        var companyId = (await _userManager.GetUserAsync(User))!.CompanyId;
+        var cats = (await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId && c.IsActive))
+            .OrderBy(c => c.DisplayOrder)
+            .ToList();
+        ViewBag.VendorCategories = cats;
+        ViewBag.SelectedCategoryIds = (selectedIds ?? Enumerable.Empty<int>()).ToHashSet();
+    }
+
    private async Task PopulateExpenseAccountsAsync()
    {
        var accounts = (await _unitOfWork.Accounts.FindAsync(
@@ -215,6 +215,8 @@ public static class HelpKnowledgeBase

        **Per-item cost breakdown:** On the Quote Details page, each line item shows a collapsible cost breakdown — click the row to expand it and see how material, labor, equipment, complexity, and markup were calculated for that specific item. This is useful for spotting which items are underpriced or where costs are concentrated.

+        **Inline item editing on quotes:** On the Quote Details page, any unit price, quantity, or item description can be edited in-place by clicking the value directly. Press Enter or click away to save; press Escape to cancel. The pricing summary (subtotal, discount, tax, and total) updates immediately without reloading the page.
+
        **Pricing Mode (Markup vs Margin):** In Company Settings → Operating Costs you can choose between two pricing modes:
        - *Markup on Materials* (default) — the General Markup % is applied as a markup on top of calculated costs: `price = cost × (1 + markup%)`. A 25% markup on a $100 cost = $125.
        - *Target Margin on Total Cost* — the markup % is treated as a target gross margin: `price = cost ÷ (1 − margin%)`. A 25% margin on a $100 cost = $133.33. The difference grows at higher percentages.
@@ -265,12 +267,15 @@ public static class HelpKnowledgeBase
        **Job Priorities (color-coded):**
        - Low (grey), Normal (blue), High (orange), Urgent (red), Rush (purple)

+        **Jobs list default view:** The Jobs list opens on the **On Floor** filter by default — showing only active jobs (excludes Completed, Ready for Pickup, Delivered, Cancelled). Use the filter pills at the top to switch views: **All** shows every job regardless of status; **On Floor** shows active work; **Overdue** shows past-due active jobs; **Ready** shows jobs awaiting customer pickup; **Completed** shows all finished jobs (Completed + Ready for Pickup + Delivered). Each pill shows a live global count.
+
        **How to create a job:**
        1. Go to [Jobs](/Jobs) → "New Job"
        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. Save
+        5. Optionally set Oven & Batch Settings — select a named oven, number of batches, and cycle time. These affect the oven cost in pricing.
+        6. Save

        **Job Priority Board:** [/JobsPriority](/JobsPriority) — Kanban-style view of all active jobs sorted by priority and status.

@@ -296,13 +301,30 @@ public static class HelpKnowledgeBase

        **Time Entries:** Track labor time on a job from the Details page.

-        **Rework:** If a job needs to be redone, a rework record can be created from the Details page. Tracks rework type, reason, and resolution.
+        **Rework / Redo:** Rework and redo mean the same thing in this system. If a finished part fails QA or a customer brings it back damaged, open the original job's Details page and use the **Rework Log** section to record it.
+
+        Each rework entry captures: the type (internal defect, customer damage, warranty), the reason (adhesion failure, color mismatch, runs/sags, insufficient coverage, etc.), a defect description, who discovered it, and pricing responsibility.
+
+        **Pricing responsibility options:**
+        - **Shop Fault — no charge:** All rework job item prices are set to $0. Use this when the defect is the shop's fault.
+        - **Customer responsible — reduced rate:** Item prices are copied from the original job. Edit them down after the rework job is created.
+        - **Customer responsible — full price:** Item prices are copied from the original job as-is.
+
+        **Creating a rework job:** Toggle "Parts are back — create a Rework Job" in the log form. Select which items need to be redone and choose the pricing responsibility. The system creates a new job with a sub-number (e.g., JOB-2605-0001-R1), copies the selected items with their coats and prep services, and auto-records intake (parts are already on hand). The rework job description shows the defect type, reason, and pricing at the top of the job where it is easy to see.
+
+        **Rework job completion:** When the rework job reaches a terminal status (Completed, Delivered, etc.), the linked rework record on the original job is automatically marked as **Resolved**. If the rework job is Cancelled instead, the record is marked **Written Off**. No manual follow-up on the original job is needed.

        **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.

        **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.

-        **Creating an invoice from a job:** On the Job Details page, look for the Invoice section and click "Create Invoice." The system pre-fills all line items, pricing, discount, tax rate, payment terms, and due date from the job and customer automatically. Review the Totals panel on the right — if a discount was applied to the job it will show as a red "Discount Applied" line. Adjust anything you need, then save.
+        **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.
+
+        **Job Costing revenue:** The Job Costing card uses the job's Final Price as the revenue figure — not the linked invoice total. This means inline price edits are reflected in the profit margin estimate immediately, even before an invoice exists.
+
+        **Completing a job:** When a job is ready to mark complete, click the **Complete Job** button on the Job Details page. A modal appears asking you to confirm the completion date, actual hours spent, and final price. If the job used powder from inventory, you will be asked to enter the actual lbs used — the modal groups all coats by unique powder color (not per coat or per item) so you fill in one quantity per powder. The system deducts the entered amounts from inventory, crediting any quantities already logged via QR scan. Once confirmed, the job advances to Completed status, and you are prompted to create the invoice if one does not exist.
+
+        **Creating an invoice from a job:** On the Job Details page, look for the Invoice section and click "Create Invoice." The system pre-fills all line items, pricing, discount, tax rate, payment terms, and due date from the job and customer automatically. Line item descriptions include the coat color(s) for each item (e.g., "Color1 / Color2" if multiple coats), helping customers distinguish repeated items on the invoice. Review the Totals panel on the right — if a discount was applied to the job it will show as a red "Discount Applied" line. Adjust anything you need, then save.

        **Work Order QR Codes:** Every printed job work order includes two tiers of QR codes — one for viewing the job, and a separate set for taking action on it. All QR codes require the worker to be logged in.

@@ -352,6 +374,8 @@ public static class HelpKnowledgeBase

        **Payment methods:** Cash, Check, Credit/Debit Card, Bank Transfer (ACH), Digital Payment, Store Credit

+        **Inline item editing on invoices:** On the Invoice Details page, unit prices, quantities, and item descriptions can be edited in-place while the invoice is in Draft status. Click the value — it becomes an input field. Press Enter or click away to save; press Escape to cancel. The invoice total updates immediately. Line items are locked once the invoice is Sent.
+
        **Sending an invoice:** Invoice Details → "Send" — emails PDF to customer.

        **Online Payments:** [/Invoices/OnlinePayments](/Invoices/OnlinePayments) — Lists invoices with a shareable payment link the customer can pay without logging in. Requires Stripe Connect to be set up first (see below).
@@ -442,13 +466,21 @@ public static class HelpKnowledgeBase
        Filter by item, date range, and transaction type. Summary pills show total lbs received, used, and net adjustments. Access from the sidebar ("Inventory Activity") or via "View Activity History" on any item's Details page (pre-filtered to that item).

        **QR Code Labels & Mobile Usage Logging:**
-        - Print a QR label from any item's Details page → click "Print QR Label" → opens a standalone print page with the item name, SKU, colour, and QR code. Print and stick on the bag/bin.
+        - Print a QR label from any item's Details page OR from the QR icon in the Actions column on the Inventory list page → click "Print QR Label" → a preview modal opens with the label (item name, SKU, colour, finish, and QR code). Click "Print Label" inside the modal to send to your printer without opening a new tab.
+        - You can also print from the list page without opening the item: click the QR icon (first button in the action column) next to any row.
        - Scan the QR code with a phone camera → opens the mobile-friendly Log Usage page at /Inventory/Scan/[item-id]
        - On the scan page: select a job (My Jobs shows jobs assigned to the logged-in user; Other Jobs shows all open jobs; No Job logs without a reference), enter quantity used (live balance preview shown), choose reason (Job Usage / Waste / Correction / Transfer Out), add optional notes, tap Save
        - After saving: success screen with "Log Another Item for This Job" (returns to scan with same job pre-selected) or "Back to Inventory" / "View Item Details"
        - Every scan log is recorded as a JobUsage or Adjustment InventoryTransaction and immediately reduces QuantityOnHand; visible in Inventory Activity ledger
        - First-time scan on a new device requires login; browser caches the session after that

+        **Location / Bin filtering and printing:**
+        - Every inventory item has an optional **Location** field (e.g. "Shelf A", "Bin 3") set on the Create/Edit form.
+        - Once any item has a location, a **Location dropdown** appears in the Inventory list filter bar (next to Category). Selecting a location filters the list to only items stored there. Can be combined with keyword search and category filter simultaneously.
+        - Each location badge in the table is a clickable link that instantly filters to that bin.
+        - With a location filter active, a **Print Bin** button appears in the filter banner. Clicking it opens a printer-ready page (new tab) at /Inventory/PrintBin?location=... listing all items in that bin with line number, name, color, and SKU. No site chrome — prints cleanly on a standard sheet.
+        - The Location dropdown only appears when at least one item has a location value set. If a user doesn't see it, they need to fill in the Location field on at least one inventory item.
+
        **Catalog Lookup & Label Scanner (when adding/editing inventory items):**
        - When creating or editing an inventory item, click the **Lookup** button next to the SKU/Part Number field to search a built-in platform catalog of thousands of Prismatic Powders and other manufacturer SKUs. Select a match to auto-fill name, manufacturer, color code, finish, coverage rate, SDS/TDS links, and cure specs.
        - The catalog only shows products not already in the company's inventory (prevents duplicates). When editing, the item's own catalog entry is always shown.
@@ -180,6 +180,18 @@ builder.Services.AddIdentity<ApplicationUser, IdentityRole>(options =>
 .AddDefaultUI()
 .AddClaimsPrincipalFactory<ApplicationUserClaimsPrincipalFactory>();

+// Configure the auth cookie to survive mobile browser suspensions (iOS Safari clears session
+// cookies when it suspends a tab). Max-Age on the cookie itself makes it persistent regardless
+// of whether the user checked "Remember me". SlidingExpiration renews the window on each request.
+builder.Services.ConfigureApplicationCookie(options =>
+{
+    options.ExpireTimeSpan    = TimeSpan.FromDays(30);
+    options.SlidingExpiration = true;
+    options.Cookie.MaxAge     = TimeSpan.FromDays(30);
+    options.Cookie.IsEssential = true;
+    options.Cookie.SameSite   = SameSiteMode.Lax;
+});
+
 // Register HttpContextAccessor for multi-tenancy
 builder.Services.AddHttpContextAccessor();

@@ -530,6 +542,49 @@ builder.Services.AddRateLimiter(options =>
 {
    options.RejectionStatusCode = StatusCodes.Status429TooManyRequests;

+    // Return a proper HTML body on 429 so mobile browsers (especially iOS Safari) don't try to
+    // download the empty response as a file. Without this, Safari shows "Login / data Zero KB".
+    options.OnRejected = async (context, ct) =>
+    {
+        context.HttpContext.Response.StatusCode = StatusCodes.Status429TooManyRequests;
+
+        var isAjax = context.HttpContext.Request.Headers.XRequestedWith == "XMLHttpRequest"
+                  || (context.HttpContext.Request.Headers.Accept.ToString().Contains("application/json"));
+
+        if (isAjax)
+        {
+            context.HttpContext.Response.ContentType = "application/json; charset=utf-8";
+            await context.HttpContext.Response.WriteAsync(
+                """{"success":false,"error":"Too many requests. Please wait a moment and try again."}""", ct);
+        }
+        else
+        {
+            context.HttpContext.Response.ContentType = "text/html; charset=utf-8";
+            await context.HttpContext.Response.WriteAsync("""
+                <!DOCTYPE html>
+                <html lang="en">
+                <head>
+                  <meta charset="utf-8">
+                  <meta name="viewport" content="width=device-width, initial-scale=1">
+                  <title>Too Many Requests &mdash; Powder Coating Logix</title>
+                  <style>
+                    body{font-family:system-ui,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#f5f5f5}
+                    .card{background:#fff;border-radius:8px;padding:2rem;max-width:420px;text-align:center;box-shadow:0 2px 8px rgba(0,0,0,.1)}
+                    h2{margin-top:0;color:#333}p{color:#666}a{color:#0d6efd}
+                  </style>
+                </head>
+                <body>
+                  <div class="card">
+                    <h2>Too Many Requests</h2>
+                    <p>You've made too many login attempts in a short period. Please wait a minute and try again.</p>
+                    <a href="/Identity/Account/Login">Back to Login</a>
+                  </div>
+                </body>
+                </html>
+                """, ct);
+        }
+    };
+
    // login / password-reset — 10 per minute per IP
    options.AddPolicy(AppConstants.RateLimitPolicies.Auth, ctx =>
        RateLimitPartition.GetSlidingWindowLimiter(
@@ -616,8 +671,8 @@ System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
 // SECURITY: Add security headers middleware
 app.Use(async (context, next) =>
 {
-    // Prevent clickjacking
-    context.Response.Headers.Append("X-Frame-Options", "DENY");
+    // Prevent clickjacking — SAMEORIGIN so our own iframe embeds (QR labels, etc.) still work
+    context.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN");

    // Prevent MIME type sniffing
    context.Response.Headers.Append("X-Content-Type-Options", "nosniff");
@@ -634,7 +689,7 @@ app.Use(async (context, next) =>
        : "'self' 'unsafe-inline' https://cdn.jsdelivr.net https://code.jquery.com https://js.stripe.com";

    var cspConnectSrc = app.Environment.IsDevelopment()
-        ? "'self' wss://localhost:* https://cdn.jsdelivr.net https://api.stripe.com"  // Allow hot reload WebSocket in dev
+        ? "'self' ws://localhost:* wss://localhost:* https://cdn.jsdelivr.net https://api.stripe.com"  // Allow hot reload WebSocket in dev (ws:// for browser-refresh, wss:// for SignalR)
        : "'self' https://cdn.jsdelivr.net https://api.stripe.com";

    context.Response.Headers.Append("Content-Security-Policy",
@@ -644,7 +699,8 @@ app.Use(async (context, next) =>
        "font-src 'self' https://fonts.gstatic.com https://cdn.jsdelivr.net; " +
        "img-src 'self' data: https:; " +
        $"connect-src {cspConnectSrc}; " +
-        "frame-src https://js.stripe.com https://hooks.stripe.com");
+        "frame-src 'self' https://js.stripe.com https://hooks.stripe.com; " +
+        "frame-ancestors 'self'");

    // Referrer Policy - control referrer information
    context.Response.Headers.Append("Referrer-Policy", "strict-origin-when-cross-origin");
@@ -653,6 +709,11 @@ app.Use(async (context, next) =>
    context.Response.Headers.Append("Permissions-Policy",
        "geolocation=(), microphone=(), camera=()");

+    // Prevent browsers from caching authenticated pages — avoids stale data and
+    // browser-specific cache corruption bugs (e.g. Firefox caching a partial load).
+    if (context.User.Identity?.IsAuthenticated == true)
+        context.Response.Headers.Append("Cache-Control", "no-store");
+
    await next();
 });

@@ -72,14 +72,14 @@
                        <input class="form-check-input" type="radio" name="format" value="xlsx" id="fmt_xlsx" checked />
                        <label class="form-check-label" for="fmt_xlsx">
                            <i class="bi bi-file-earmark-spreadsheet me-1 text-success"></i>
-                            Excel (.xlsx) — all sheets in one file
+                            Excel (.xlsx) &mdash; all sheets in one file
                        </label>
                    </div>
                    <div class="form-check">
                        <input class="form-check-input" type="radio" name="format" value="csv" id="fmt_csv" />
                        <label class="form-check-label" for="fmt_csv">
                            <i class="bi bi-file-zip me-1 text-warning"></i>
-                            CSV (.zip) — one file per sheet
+                            CSV (.zip) &mdash; one file per sheet
                        </label>
                    </div>
                </div>
@@ -111,7 +111,7 @@
        document.getElementById('exportForm').addEventListener('submit', function () {
            var btn = document.getElementById('exportBtn');
            btn.disabled = true;
-            btn.innerHTML = '<span class="spinner-border spinner-border-sm me-2"></span>Generating…';
+            btn.innerHTML = '<span class="spinner-border spinner-border-sm me-2"></span>Generating&hellip;';
            // Re-enable after 10s in case browser blocks the download dialog
            setTimeout(function () {
                btn.disabled = false;
@@ -49,7 +49,7 @@
                                    <div class="mt-1 text-success" style="font-size:1.6rem;"><i class="bi bi-building"></i></div>
                                    <div>
                                        <div class="fw-semibold">QuickBooks Desktop</div>
-                                        <div class="text-muted small">IIF files — import directly via File &gt; Utilities &gt; Import</div>
+                                        <div class="text-muted small">IIF files &mdash; import directly via File &gt; Utilities &gt; Import</div>
                                        <div class="mt-2">
                                            <span class="badge bg-light text-dark border me-1">customers.iif</span>
                                            <span class="badge bg-light text-dark border me-1">invoices_payments.iif</span>
@@ -146,7 +146,7 @@
        });
    }

-    // Init — mark CSV as selected by default
+    // Init &mdash; mark CSV as selected by default
    document.getElementById('fmt-csv').checked = true;
    updateFormatCards();

@@ -154,7 +154,7 @@
    document.getElementById('exportForm').addEventListener('submit', function() {
        const btn = document.getElementById('exportBtn');
        btn.disabled = true;
-        btn.innerHTML = '<span class="spinner-border spinner-border-sm me-2"></span>Generating…';
+        btn.innerHTML = '<span class="spinner-border spinner-border-sm me-2"></span>Generating&hellip;';
        setTimeout(function() { btn.disabled = false; btn.innerHTML = '<i class="bi bi-download me-2"></i>Download Export Package'; }, 8000);
    });

@@ -1,11 +1,11 @@
-@model PowderCoating.Application.DTOs.Accounting.CreateAccountDto
+@model PowderCoating.Application.DTOs.Accounting.CreateAccountDto
@using PowderCoating.Core.Enums

@{
    ViewData["Title"] = "New Account";
    ViewData["PageIcon"] = "bi-journal-plus";
    ViewData["PageHelpTitle"] = "New Account";
-    ViewData["PageHelpContent"] = "Add a custom account to the Chart of Accounts. Select a Sub-Type first â€” it auto-sets the Account Type. Use conventional numbering: 1000s = Assets, 2000s = Liabilities, 3000s = Equity, 4000s = Revenue, 5000s = Cost of Goods, 6000s+ = Expenses.";
+    ViewData["PageHelpContent"] = "Add a custom account to the Chart of Accounts. Select a Sub-Type first &mdash; it auto-sets the Account Type. Use conventional numbering: 1000s = Assets, 2000s = Liabilities, 3000s = Equity, 4000s = Revenue, 5000s = Cost of Goods, 6000s+ = Expenses.";
    bool isInline = ViewBag.Inline == true;
 }

@@ -31,7 +31,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Account Number"
-                                   data-bs-content="A numeric code for sorting and organizing accounts. Convention: 1000â€“1999 Assets, 2000â€“2999 Liabilities, 3000â€“3999 Equity, 4000â€“4999 Revenue, 5000â€“5999 Cost of Goods, 6000â€“9999 Expenses. Must be unique. Sub-accounts can use decimals (e.g. 6100.1).">
+                                   data-bs-content="A numeric code for sorting and organizing accounts. Convention: 1000&ndash;1999 Assets, 2000&ndash;2999 Liabilities, 3000&ndash;3999 Equity, 4000&ndash;4999 Revenue, 5000&ndash;5999 Cost of Goods, 6000&ndash;9999 Expenses. Must be unique. Sub-accounts can use decimals (e.g. 6100.1).">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -55,7 +55,7 @@
                                </a>
                            </div>
                            <select asp-for="AccountType" asp-items="ViewBag.AccountTypes" class="form-select" id="accountTypeSelect">
-                                <option value="">â€” Select Type â€”</option>
+                                <option value="">&mdash; Select Type &mdash;</option>
                            </select>
                            <span asp-validation-for="AccountType" class="text-danger small"></span>
                        </div>
@@ -70,7 +70,7 @@
                                </a>
                            </div>
                            <select asp-for="AccountSubType" asp-items="ViewBag.AccountSubTypes" class="form-select" id="accountSubTypeSelect">
-                                <option value="">â€” Select Sub-Type â€”</option>
+                                <option value="">&mdash; Select Sub-Type &mdash;</option>
                            </select>
                            <span asp-validation-for="AccountSubType" class="text-danger small"></span>
                            <div class="form-text text-primary" id="typeAutoSetHint" style="display:none">
@@ -89,12 +89,12 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Parent Account"
-                                   data-bs-content="Nest this account under a parent to create a hierarchy â€” e.g. 'Powder Costs' under 'Cost of Goods Sold'. Sub-accounts roll up into their parent on financial reports. Most accounts work fine without a parent.">
+                                   data-bs-content="Nest this account under a parent to create a hierarchy &mdash; e.g. 'Powder Costs' under 'Cost of Goods Sold'. Sub-accounts roll up into their parent on financial reports. Most accounts work fine without a parent.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
                            <select asp-for="ParentAccountId" asp-items="ViewBag.ParentAccounts" class="form-select">
-                                <option value="">â€” None (top-level account) â€”</option>
+                                <option value="">&mdash; None (top-level account) &mdash;</option>
                            </select>
                        </div>

@@ -152,7 +152,7 @@

 <script>
    (function () {
-        // SubType enum values â†’ AccountType enum values (mirrors server-side mapping)
+        // SubType enum values â†' AccountType enum values (mirrors server-side mapping)
        const subTypeToAccountType = {
            8: 1, 1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1,   // Assets
            10: 2, 11: 2, 12: 2, 13: 2,                    // Liabilities
@@ -1,10 +1,10 @@
-@model PowderCoating.Application.DTOs.Accounting.EditAccountDto
+@model PowderCoating.Application.DTOs.Accounting.EditAccountDto

@{
    ViewData["Title"] = "Edit Account";
    ViewData["PageIcon"] = "bi-pencil-square";
    ViewData["PageHelpTitle"] = "Edit Account";
-    ViewData["PageHelpContent"] = "You can change number, name, type, sub-type, parent, and opening balance. Changing the account type or sub-type on an account that already has transactions is allowed but use caution â€” it changes how balances are reported going forward. Inactive accounts are hidden from pickers but preserved in history.";
+    ViewData["PageHelpContent"] = "You can change number, name, type, sub-type, parent, and opening balance. Changing the account type or sub-type on an account that already has transactions is allowed but use caution &mdash; it changes how balances are reported going forward. Inactive accounts are hidden from pickers but preserved in history.";
 }

 <div class="d-flex justify-content-start mb-4">
@@ -27,7 +27,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Account Number"
-                                   data-bs-content="A numeric code for sorting and organizing accounts. Convention: 1000â€“1999 Assets, 2000â€“2999 Liabilities, 3000â€“3999 Equity, 4000â€“4999 Revenue, 5000â€“5999 Cost of Goods, 6000â€“9999 Expenses. Must be unique.">
+                                   data-bs-content="A numeric code for sorting and organizing accounts. Convention: 1000&ndash;1999 Assets, 2000&ndash;2999 Liabilities, 3000&ndash;3999 Equity, 4000&ndash;4999 Revenue, 5000&ndash;5999 Cost of Goods, 6000&ndash;9999 Expenses. Must be unique.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -81,12 +81,12 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Parent Account"
-                                   data-bs-content="Nest this account under a parent to create a hierarchy â€” e.g. 'Powder Costs' under 'Cost of Goods Sold'. Sub-accounts roll up into their parent on financial reports. Most accounts work fine without a parent.">
+                                   data-bs-content="Nest this account under a parent to create a hierarchy &mdash; e.g. 'Powder Costs' under 'Cost of Goods Sold'. Sub-accounts roll up into their parent on financial reports. Most accounts work fine without a parent.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
                            <select asp-for="ParentAccountId" asp-items="ViewBag.ParentAccounts" class="form-select">
-                                <option value="">â€” None â€”</option>
+                                <option value="">&mdash; None &mdash;</option>
                            </select>
                        </div>

@@ -59,7 +59,7 @@
    </div>
 </div>

-@* Bootstrap toast — confirmation before recalculating balances *@
+@* Bootstrap toast &mdash; confirmation before recalculating balances *@
 <div class="toast-container position-fixed top-50 start-50 translate-middle p-3" style="z-index:1100">
    <div id="recalcConfirmToast" class="toast align-items-center border-0 bg-dark text-white" role="alert" aria-atomic="true" data-bs-autohide="false">
        <div class="toast-body d-flex flex-column gap-2 py-3 px-3">
@@ -153,7 +153,7 @@
                                <span class="fw-medium">@acct.Name</span>
                                @if (acct.IsSystem)
                                {
-                                    <span class="badge bg-secondary ms-1" title="System account — cannot be deleted">sys</span>
+                                    <span class="badge bg-secondary ms-1" title="System account &mdash; cannot be deleted">sys</span>
                                }
                            </td>
                            <td><span class="text-muted small">@acct.AccountSubType.ToDisplayName()</span></td>
@@ -186,7 +186,7 @@
                                @if (!acct.IsSystem)
                                {
                                    <form asp-action="Delete" asp-route-id="@acct.Id" method="post" class="d-inline"
-                                          onsubmit="return confirm('Delete account @acct.AccountNumber – @acct.Name?')">
+                                          onsubmit="return confirm('Delete account @acct.AccountNumber &ndash; @acct.Name?')">
                                        @Html.AntiForgeryToken()
                                        <button type="submit" class="btn btn-sm btn-outline-danger" title="Delete">
                                            <i class="bi bi-trash"></i>
@@ -219,7 +219,7 @@
            });
        });

-        // Recalculate Balances — show confirmation toast instead of native confirm()
+        // Recalculate Balances &mdash; show confirmation toast instead of native confirm()
        const recalcToast = new bootstrap.Toast(document.getElementById('recalcConfirmToast'));

        document.getElementById('btnRecalcBalances').addEventListener('click', () => {
@@ -2,7 +2,7 @@
@using PowderCoating.Core.Enums

@{
-    ViewData["Title"] = $"Ledger — {Model.AccountNumber} {Model.Name}";
+    ViewData["Title"] = $"Ledger &mdash; {Model.AccountNumber} {Model.Name}";
    ViewData["PageIcon"] = "bi-journal-text";
    ViewData["PageHelpTitle"] = "Account Ledger";
    ViewData["PageHelpContent"] = "A chronological list of every transaction posted to this account. Click any Reference to open the source record. Debit increases asset and expense accounts; credit increases liability, equity, and revenue accounts. Use the date range or quick buttons (This Month, YTD, etc.) to narrow the view.";
@@ -60,7 +60,7 @@
 <nav aria-label="breadcrumb" class="mb-3">
    <ol class="breadcrumb">
        <li class="breadcrumb-item"><a asp-action="Index">Chart of Accounts</a></li>
-        <li class="breadcrumb-item active">@Model.AccountNumber – @Model.Name</li>
+        <li class="breadcrumb-item active">@Model.AccountNumber &ndash; @Model.Name</li>
    </ol>
 </nav>

@@ -166,7 +166,7 @@
                <i class="bi bi-journal-text me-1"></i>
                Transactions
                <span class="text-muted fw-normal small ms-1">
-                    @Model.From.ToString("MMM d") – @Model.To.ToString("MMM d, yyyy")
+                    @Model.From.ToString("MMM d") &ndash; @Model.To.ToString("MMM d, yyyy")
                </span>
            </span>
            <a tabindex="0" class="help-icon" role="button"
@@ -205,7 +205,7 @@
                    <!-- Opening balance row -->
                    <tr class="table-light">
                        <td class="text-muted small">@Model.From.ToString("MM/dd/yyyy")</td>
-                        <td><span class="fw-medium text-muted">—</span></td>
+                        <td><span class="fw-medium text-muted">&mdash;</span></td>
                        <td><span class="badge bg-dark-subtle text-dark">Opening Balance</span></td>
                        <td class="text-muted small">Balance brought forward as of @Model.From.ToString("MMM d, yyyy")</td>
                        <td></td>
@@ -1,4 +1,4 @@
-@using PowderCoating.Core.Entities
+@using PowderCoating.Core.Entities
@{
    ViewData["Title"] = "Year-End Close";
    ViewData["PageIcon"] = "bi-calendar-check";
@@ -33,7 +33,7 @@
                <div class="alert alert-warning alert-permanent py-2 mb-4">
                    <i class="bi bi-exclamation-triangle me-2"></i>
                    <strong>What this does:</strong> Posts a Journal Entry dated December 31 that zeroes all Revenue
-                    and Expense account balances into Retained Earnings â€” the standard accounting close.
+                    and Expense account balances into Retained Earnings &mdash; the standard accounting close.
                    Run this <strong>after</strong> all entries for the year are posted and the period is locked.
                    A year can only be closed once.
                </div>
@@ -99,7 +99,7 @@
                                <tr>
                                    <td class="fw-bold">@c.ClosedYear</td>
                                    <td>@c.ClosedAt.ToLocalTime().ToString("MM/dd/yyyy h:mm tt")</td>
-                                    <td>@(c.ClosedBy ?? "â€”")</td>
+                                    <td>@Html.Raw(c.ClosedBy ?? "&mdash;")</td>
                                    <td>
                                        @if (c.JournalEntry != null)
                                        {
@@ -40,7 +40,7 @@
                        </div>
                        <div>
                            <div class="fs-3 fw-bold">@Model.TotalCallsLast30Days.ToString("N0")</div>
-                            <div class="text-muted small">AI Calls — Last 30 Days</div>
+                            <div class="text-muted small">AI Calls &mdash; Last 30 Days</div>
                        </div>
                    </div>
                </div>
@@ -96,11 +96,11 @@
    <!-- Tier Legend -->
    <div class="d-flex flex-wrap gap-2 mb-3 align-items-center">
        <span class="text-muted small fw-semibold me-1">Usage Tier (last 30 days):</span>
-        <span class="badge bg-secondary">Inactive — 0 calls</span>
-        <span class="badge bg-success">Light — 1–10</span>
-        <span class="badge bg-primary">Regular — 11–50</span>
-        <span class="badge bg-warning text-dark">Heavy — 51–200</span>
-        <span class="badge bg-danger">Power User — 200+</span>
+        <span class="badge bg-secondary">Inactive &mdash; 0 calls</span>
+        <span class="badge bg-success">Light &mdash; 1&ndash;10</span>
+        <span class="badge bg-primary">Regular &mdash; 11&ndash;50</span>
+        <span class="badge bg-warning text-dark">Heavy &mdash; 51&ndash;200</span>
+        <span class="badge bg-danger">Power User &mdash; 200+</span>
    </div>

    <!-- Main Table -->
@@ -207,16 +207,16 @@
                                </span>
                            </td>
                            <td class="text-center @(row.Today > 0 ? "fw-semibold" : "text-muted")">
-                                @(row.Today > 0 ? row.Today.ToString("N0") : "—")
+                                @Html.Raw(row.Today > 0 ? row.Today.ToString("N0") : "&mdash;")
                            </td>
                            <td class="text-center @(row.Last7Days > 0 ? "fw-semibold" : "text-muted")">
-                                @(row.Last7Days > 0 ? row.Last7Days.ToString("N0") : "—")
+                                @Html.Raw(row.Last7Days > 0 ? row.Last7Days.ToString("N0") : "&mdash;")
                            </td>
                            <td class="text-center @(row.Last30Days > 0 ? "fw-semibold" : "text-muted")">
-                                @(row.Last30Days > 0 ? row.Last30Days.ToString("N0") : "—")
+                                @Html.Raw(row.Last30Days > 0 ? row.Last30Days.ToString("N0") : "&mdash;")
                            </td>
                            <td class="text-center @(row.AllTime > 0 ? "" : "text-muted")">
-                                @(row.AllTime > 0 ? row.AllTime.ToString("N0") : "—")
+                                @Html.Raw(row.AllTime > 0 ? row.AllTime.ToString("N0") : "&mdash;")
                            </td>
                            <td class="text-center @(row.PhotoCount > 0 ? "" : "text-muted")">
                                @if (row.PhotoCount > 0)
@@ -225,7 +225,7 @@
                                }
                                else
                                {
-                                    <span>—</span>
+                                    <span>&mdash;</span>
                                }
                            </td>
                            <td>
@@ -244,7 +244,7 @@
                                }
                                else
                                {
-                                    <span class="text-muted">—</span>
+                                    <span class="text-muted">&mdash;</span>
                                }
                            </td>
                            <td class="text-center">
@@ -60,7 +60,7 @@
                            onclick="window.location='@Url.Action("Edit", new { id = a.Id })'">
                            <td>
                                <div class="fw-medium">@a.Title</div>
-                                <small class="text-muted">@a.Message.Substring(0, Math.Min(60, a.Message.Length))@(a.Message.Length > 60 ? "…" : "")</small>
+                                <small class="text-muted">@a.Message.Substring(0, Math.Min(60, a.Message.Length))@(a.Message.Length > 60 ? "&hellip;" : "")</small>
                            </td>
                            <td><span class="badge @TypeBadge(a.Type)">@a.Type</span></td>
                            <td>
@@ -110,7 +110,7 @@
                </tbody>
            </table>
        </div>
-        <!-- Mobile card view — shown on screens < 992px -->
+        <!-- Mobile card view &mdash; shown on screens < 992px -->
        <div class="mobile-card-view">
            <div class="mobile-card-list">
                @if (!Model.Any())
@@ -15,7 +15,7 @@
    <div class="col-12">
        <label class="form-label fw-medium">Message <span class="text-danger">*</span></label>
        <textarea asp-for="Message" class="form-control" rows="3"
-                  placeholder="The platform will be offline for maintenance on Saturday from 2–4 AM ET." required></textarea>
+                  placeholder="The platform will be offline for maintenance on Saturday from 2&ndash;4 AM ET." required></textarea>
        <span asp-validation-for="Message" class="text-danger small"></span>
    </div>

@@ -42,7 +42,7 @@
        <div id="planTargetGroup" style="display:none">
            <label class="form-label fw-medium">Plan</label>
            <select asp-for="TargetPlan" class="form-select">
-                <option value="">— select —</option>
+                <option value="">&mdash; select &mdash;</option>
                @foreach (var p in planConfigs)
                {
                    <option value="@p.Plan">@p.DisplayName</option>
@@ -52,7 +52,7 @@
        <div id="companyTargetGroup" style="display:none">
            <label class="form-label fw-medium">Company</label>
            <select asp-for="TargetCompanyId" class="form-select">
-                <option value="">— select —</option>
+                <option value="">&mdash; select &mdash;</option>
                @foreach (var c in companies)
                {
                    <option value="@c.Id">@c.CompanyName</option>
@@ -93,7 +93,7 @@
        <label class="form-label fw-medium text-muted">Preview</label>
        <div id="announcementPreview" class="alert mb-0" role="alert">
            <strong id="previewTitle">@Model.Title</strong>
-            <span id="previewMessage"> — @Model.Message</span>
+            <span id="previewMessage"> &mdash; @Model.Message</span>
        </div>
    </div>
 </div>
@@ -113,7 +113,7 @@
        const preview = document.getElementById('announcementPreview');
        preview.className = 'alert mb-0 ' + (typeMap[type] || 'alert-info');
        document.getElementById('previewTitle').textContent = document.getElementById('Title').value || 'Title';
-        document.getElementById('previewMessage').textContent = ' — ' + (document.getElementById('Message').value || 'Message');
+        document.getElementById('previewMessage').textContent = ' &mdash; ' + (document.getElementById('Message').value || 'Message');
    }
    document.getElementById('Type')?.addEventListener('change', updatePreview);
    document.getElementById('Title')?.addEventListener('input', updatePreview);
@@ -1,10 +1,10 @@
-@model PowderCoating.Application.DTOs.Appointment.CreateAppointmentDto
+@model PowderCoating.Application.DTOs.Appointment.CreateAppointmentDto

@{
    ViewData["Title"] = "New Appointment";
    ViewData["PageIcon"] = "bi-calendar-plus";
    ViewData["PageHelpTitle"] = "New Appointment";
-    ViewData["PageHelpContent"] = "Create an appointment to schedule a customer visit, drop-off, pick-up, or consultation. Select the Type first â€” the Linked Job field appears once a type is chosen. Reminder notifications fire before the scheduled start time.";
+    ViewData["PageHelpContent"] = "Create an appointment to schedule a customer visit, drop-off, pick-up, or consultation. Select the Type first &mdash; the Linked Job field appears once a type is chosen. Reminder notifications fire before the scheduled start time.";
 }

 <div class="d-flex justify-content-end align-items-center mb-4">
@@ -143,7 +143,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Reminder Settings"
-                                   data-bs-content="Enable a reminder to receive an in-app notification before the appointment. Set how many minutes in advance â€” e.g., 30 for a brief heads-up, 1440 for a full day before. Reminders are per-appointment and do not send external emails or SMS.">
+                                   data-bs-content="Enable a reminder to receive an in-app notification before the appointment. Set how many minutes in advance &mdash; e.g., 30 for a brief heads-up, 1440 for a full day before. Reminders are per-appointment and do not send external emails or SMS.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -1,10 +1,10 @@
-@model PowderCoating.Application.DTOs.Appointment.AppointmentDto
+@model PowderCoating.Application.DTOs.Appointment.AppointmentDto

@{
    ViewData["Title"] = $"Appointment {Model.AppointmentNumber}";
    ViewData["PageIcon"] = "bi-calendar-event";
    ViewData["PageHelpTitle"] = "Appointment Details";
-    ViewData["PageHelpContent"] = "View all details for this appointment. Edit to update status or record actual times. Deleting permanently removes the record â€” consider setting status to Cancelled instead to preserve history.";
+    ViewData["PageHelpContent"] = "View all details for this appointment. Edit to update status or record actual times. Deleting permanently removes the record &mdash; consider setting status to Cancelled instead to preserve history.";
 }

 <div class="d-flex justify-content-end gap-2 mb-4">
@@ -115,7 +115,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Actual Times"
-                                   data-bs-content="Record when the customer actually arrived and when the appointment finished. These are optional and separate from the scheduled times — useful for tracking punctuality and measuring how accurately appointments are estimated.">
+                                   data-bs-content="Record when the customer actually arrived and when the appointment finished. These are optional and separate from the scheduled times &mdash; useful for tracking punctuality and measuring how accurately appointments are estimated.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -169,7 +169,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Reminder Settings"
-                                   data-bs-content="Enable a reminder to receive an in-app notification before the appointment. Set how many minutes in advance — e.g., 30 for a brief heads-up, 1440 for a full day before. Reminders are per-appointment and do not send external emails or SMS.">
+                                   data-bs-content="Enable a reminder to receive an in-app notification before the appointment. Set how many minutes in advance &mdash; e.g., 30 for a brief heads-up, 1440 for a full day before. Reminders are per-appointment and do not send external emails or SMS.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -46,19 +46,19 @@
                        <dd class="col-7">@Model.EntityType</dd>

                        <dt class="col-5 text-muted">Entity ID</dt>
-                        <dd class="col-7">@(Model.EntityId ?? "—")</dd>
+                        <dd class="col-7">@Html.Raw(Model.EntityId ?? "&mdash;")</dd>

                        <dt class="col-5 text-muted">Description</dt>
-                        <dd class="col-7">@(Model.EntityDescription ?? "—")</dd>
+                        <dd class="col-7">@Html.Raw(Model.EntityDescription ?? "&mdash;")</dd>

                        <dt class="col-5 text-muted">User</dt>
                        <dd class="col-7">@Model.UserName</dd>

                        <dt class="col-5 text-muted">Company</dt>
-                        <dd class="col-7">@(Model.CompanyName ?? (Model.CompanyId?.ToString() ?? "—"))</dd>
+                        <dd class="col-7">@Html.Raw(Model.CompanyName ?? (Model.CompanyId?.ToString() ?? "&mdash;"))</dd>

                        <dt class="col-5 text-muted">IP Address</dt>
-                        <dd class="col-7">@(Model.IpAddress ?? "—")</dd>
+                        <dd class="col-7">@Html.Raw(Model.IpAddress ?? "&mdash;")</dd>
                    </dl>
                </div>
            </div>
@@ -95,8 +95,8 @@
                                        var newVal = newData.ValueKind == JsonValueKind.Object && newData.TryGetProperty(key, out var nv) ? nv.ToString() : null;
                                        <tr>
                                            <td class="fw-medium">@key</td>
-                                            <td class="text-danger font-monospace">@(oldVal ?? "—")</td>
-                                            <td class="text-success font-monospace">@(newVal ?? "—")</td>
+                                            <td class="text-danger font-monospace">@Html.Raw(oldVal ?? "&mdash;")</td>
+                                            <td class="text-success font-monospace">@Html.Raw(newVal ?? "&mdash;")</td>
                                        </tr>
                                    }
                                }
@@ -55,7 +55,7 @@
            <form method="get" class="row g-2 align-items-end">
                <div class="col-md-3">
                    <input name="search" value="@ViewBag.Search" class="form-control form-control-sm"
-                           placeholder="User, entity name, ID…" />
+                           placeholder="User, entity name, ID&hellip;" />
                </div>
                <div class="col-md-2">
                    <select name="entityType" class="form-select form-select-sm">
@@ -145,7 +145,7 @@
            </table>
        </div>

-        <!-- Mobile card view — shown on screens < 992px (table-responsive hidden by mobile-cards.css) -->
+        <!-- Mobile card view &mdash; shown on screens < 992px (table-responsive hidden by mobile-cards.css) -->
        <div class="mobile-card-view">
            <div class="mobile-card-list">
                @if (!Model.Any())
@@ -196,7 +196,7 @@
        {
            <div class="card-footer d-flex align-items-center justify-content-between py-2">
                <small class="text-muted">
-                    Showing @((page - 1) * pageSize + 1)–@Math.Min(page * pageSize, totalCount) of @totalCount.ToString("N0")
+                    Showing @((page - 1) * pageSize + 1)&ndash;@Math.Min(page * pageSize, totalCount) of @totalCount.ToString("N0")
                </small>
                <nav>
                    <ul class="pagination pagination-sm mb-0">
@@ -18,7 +18,7 @@
            <div class="mb-3">
                <label class="form-label fw-semibold">Bank Account <span class="text-danger">*</span></label>
                <select asp-for="AccountId" asp-items="accounts" class="form-select" required>
-                    <option value="">— select account —</option>
+                    <option value="">&mdash; select account &mdash;</option>
                </select>
                <div class="form-text">Only Checking, Savings, and Cash accounts are listed.</div>
            </div>
@@ -43,7 +43,7 @@
    </div>
    <div class="col-md-3 text-center">
        <div class="card shadow-sm py-3">
-            <div class="fw-bold fs-5" id="difference">—</div>
+            <div class="fw-bold fs-5" id="difference">&mdash;</div>
            <div class="text-muted small">Difference</div>
        </div>
    </div>
@@ -212,7 +212,7 @@
    document.getElementById('aiMatchBtn')?.addEventListener('click', async function() {
        const btn = this;
        btn.disabled = true;
-        btn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Analyzing…';
+        btn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Analyzing&hellip;';

        try {
            const resp = await fetch('/BankReconciliations/AiSuggestMatches', {
@@ -244,7 +244,7 @@
                    const td = row.querySelector('td:last-child');
                    if (td) {
                        const pct = Math.round(s.confidence * 100);
-                        td.insertAdjacentHTML('afterend', `<td class="small text-info" style="white-space:nowrap">${pct}% — ${s.reason}</td>`);
+                        td.insertAdjacentHTML('afterend', `<td class="small text-info" style="white-space:nowrap">${pct}% &mdash; ${s.reason}</td>`);
                    }
                }
            });
@@ -256,7 +256,7 @@
            if (aiSuggestions.length > 0) {
                document.getElementById('aiMatchAccept').classList.remove('d-none');
            } else {
-                insightsEl.innerHTML += '<br><span class="text-muted">No high-confidence suggestions found — review items manually.</span>';
+                insightsEl.innerHTML += '<br><span class="text-muted">No high-confidence suggestions found &mdash; review items manually.</span>';
            }
        } catch (err) {
            document.getElementById('aiMatchInsights').innerHTML = '<span class="text-danger">Error contacting AI service.</span>';
@@ -1,7 +1,7 @@
@model PowderCoating.Core.Entities.BankReconciliation
@using PowderCoating.Web.Controllers
@{
-    ViewData["Title"] = $"Reconciliation Report – {Model.Account?.Name}";
+    ViewData["Title"] = $"Reconciliation Report &ndash; {Model.Account?.Name}";
    var clearedDeposits = ViewBag.ClearedDeposits as IEnumerable<PowderCoating.Core.Entities.Payment> ?? Enumerable.Empty<PowderCoating.Core.Entities.Payment>();
    var clearedPayments = ViewBag.ClearedPayments as List<ReconciliationItem> ?? new();
 }
@@ -38,7 +38,7 @@
                        <td class="fw-semibold text-end text-success">@clearedDeposits.Sum(p => p.Amount).ToString("C")</td>
                    </tr>
                    <tr>
-                        <td class="text-muted">– Cleared Payments:</td>
+                        <td class="text-muted">&ndash; Cleared Payments:</td>
                        <td class="fw-semibold text-end text-danger">@clearedPayments.Sum(p => p.Amount).ToString("C")</td>
                    </tr>
                    <tr class="border-top">
@@ -248,7 +248,7 @@
                            {
                                <tr class="text-muted">
                                    <td><code>@ban.IpAddress</code></td>
-                                    <td><small>@(ban.Reason ?? "—")</small></td>
+                                    <td><small>@Html.Raw(ban.Reason ?? "&mdash;")</small></td>
                                    <td><small>@ban.BannedAt.ToString("MMM dd, yyyy")</small></td>
                                    <td>
                                        @if (!ban.IsActive)
@@ -1,4 +1,4 @@
-@using PowderCoating.Application.DTOs.Subscription
+@using PowderCoating.Application.DTOs.Subscription
@using PowderCoating.Core.Enums
@{
    ViewData["Title"] = "Billing & Subscription";
@@ -136,7 +136,7 @@ else if (status.IsExpired)
                        }
                        else if (status.IsGracePeriod)
                        {
-                            <span class="text-warning">Grace period â€” expired @status.EndDate.Value.ToString("MMM d, yyyy")</span>
+                            <span class="text-warning">Grace period &mdash; expired @status.EndDate.Value.ToString("MMM d, yyyy")</span>
                        }
                        else
                        {
@@ -266,7 +266,7 @@ else if (status.IsExpired)
        <strong>Cancellation &amp; Refund Policy:</strong>
        You may cancel your subscription at any time from this page or by contacting
        <a href="mailto:support@powdercoatinglogix.com">support@powdercoatinglogix.com</a>.
-        Cancellation takes effect at the end of your current billing period â€” you retain full access until then.
+        Cancellation takes effect at the end of your current billing period &mdash; you retain full access until then.
        All fees are <strong>non-refundable</strong>; unused time is not credited back.
        See our <a asp-controller="Home" asp-action="TermsOfService" asp-fragment="section-5" target="_blank">full billing terms</a> for details.
    </div>
@@ -4,7 +4,7 @@
    ViewData["Title"] = "New Bill";
    ViewData["PageIcon"] = "bi-receipt-cutoff";
    ViewData["PageHelpTitle"] = "New Bill";
-    ViewData["PageHelpContent"] = "Record a vendor invoice to track what you owe. Bills start as Draft (editable) and become Open once confirmed. Partial payments are supported — each payment reduces the balance. Link line items to expense accounts and optionally to specific jobs for cost tracking.";
+    ViewData["PageHelpContent"] = "Record a vendor invoice to track what you owe. Bills start as Draft (editable) and become Open once confirmed. Partial payments are supported &mdash; each payment reduces the balance. Link line items to expense accounts and optionally to specific jobs for cost tracking.";
    string? fromPoNumber = ViewBag.FromPoNumber as string;
    int? fromPoId = ViewBag.FromPoId as int?;
 }
@@ -13,7 +13,7 @@
    <div>
        @if (!string.IsNullOrEmpty(fromPoNumber))
        {
-            <p class="text-muted mb-0 small"><i class="bi bi-box-arrow-in-down text-success me-1"></i> Pre-filled from <strong>@fromPoNumber</strong> — review and save</p>
+            <p class="text-muted mb-0 small"><i class="bi bi-box-arrow-in-down text-success me-1"></i> Pre-filled from <strong>@fromPoNumber</strong> &mdash; review and save</p>
        }
    </div>
    @if (fromPoId.HasValue)
@@ -44,7 +44,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                           data-bs-title="Bill Details"
-                           data-bs-content="Vendor: who you're paying. AP Account: the liability account this bill posts to (e.g. Accounts Payable). Bill Date: date on the vendor's invoice. Due Date: when payment is due — drives overdue status. Vendor Invoice #: the vendor's own reference number for reconciliation. Payment Terms auto-fill from the vendor record.">
+                           data-bs-content="Vendor: who you're paying. AP Account: the liability account this bill posts to (e.g. Accounts Payable). Bill Date: date on the vendor's invoice. Due Date: when payment is due &mdash; drives overdue status. Vendor Invoice #: the vendor's own reference number for reconciliation. Payment Terms auto-fill from the vendor record.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </div>
@@ -66,8 +66,8 @@
                            <label asp-for="VendorId" class="form-label fw-medium">Vendor <span class="text-danger">*</span></label>
                            <select asp-for="VendorId" asp-items="ViewBag.Vendors" class="form-select" id="vendorSelect"
                                    data-quick-add-url="/Vendors/Create" data-quick-add-title="Add New Vendor">
-                                <option value="">— Select Vendor —</option>
-                                <option value="__new__">+ Add New Vendor…</option>
+                                <option value="">&mdash; Select Vendor &mdash;</option>
+                                <option value="__new__">+ Add New Vendor&hellip;</option>
                            </select>
                            <span asp-validation-for="VendorId" class="text-danger small"></span>
                        </div>
@@ -100,7 +100,7 @@
                            <label for="receiptFile" class="form-label fw-medium">Attach Receipt / Document</label>
                            <input type="file" name="receiptFile" id="receiptFile" class="form-control"
                                   accept=".jpg,.jpeg,.png,.gif,.webp,.pdf" />
-                            <div class="form-text">JPG, PNG, GIF, WebP, or PDF — up to 10 MB.</div>
+                            <div class="form-text">JPG, PNG, GIF, WebP, or PDF &mdash; up to 10 MB.</div>
                        </div>
                    </div>
                </div>
@@ -150,7 +150,7 @@
                    <a tabindex="0" class="help-icon" role="button"
                       data-bs-toggle="popover" data-bs-placement="left" data-bs-trigger="focus"
                       data-bs-title="Bill Summary"
-                       data-bs-content="Tax % is applied to the line-item subtotal. The resulting Total is the full amount owed to the vendor. Partial payments are allowed — each payment recorded reduces the balance due until the bill is fully paid.">
+                       data-bs-content="Tax % is applied to the line-item subtotal. The resulting Total is the full amount owed to the vendor. Partial payments are allowed &mdash; each payment recorded reduces the balance due until the bill is fully paid.">
                        <i class="bi bi-question-circle"></i>
                    </a>
                </div>
@@ -198,7 +198,7 @@
                        <div class="mb-2">
                            <label class="form-label small fw-medium">Bank / Cash Account <span class="text-danger">*</span></label>
                            <select name="bankAccountId" class="form-select form-select-sm" id="payNowBankAccount">
-                                <option value="">— Select Account —</option>
+                                <option value="">&mdash; Select Account &mdash;</option>
                                @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.BankAccounts)
                                {
                                    <option value="@item.Value">@item.Text</option>
@@ -232,7 +232,7 @@
    <tr class="line-item-row">
        <td>
            <select class="form-select form-select-sm account-select" name="LineItems[INDEX].AccountId" required>
-                <option value="">— Account —</option>
+                <option value="">&mdash; Account &mdash;</option>
                @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.ExpenseAccounts)
                {
                    <option value="@item.Value">@item.Text</option>
@@ -242,7 +242,7 @@
        <td><input type="text" class="form-control form-control-sm" name="LineItems[INDEX].Description" placeholder="Description" /></td>
        <td>
            <select class="form-select form-select-sm" name="LineItems[INDEX].JobId">
-                <option value="">—</option>
+                <option value="">&mdash;</option>
                @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.Jobs)
                {
                    <option value="@item.Value">@item.Text</option>
@@ -273,7 +273,7 @@
                <div class="mb-3">
                    <label for="scanReceiptFile" class="form-label fw-medium">Receipt / Invoice Document</label>
                    <input type="file" id="scanReceiptFile" class="form-control" accept=".jpg,.jpeg,.png,.gif,.webp,.pdf" />
-                    <div class="form-text">JPG, PNG, GIF, WebP, or PDF — up to 10 MB.</div>
+                    <div class="form-text">JPG, PNG, GIF, WebP, or PDF &mdash; up to 10 MB.</div>
                </div>
                <div id="scanReceiptStatus" class="text-muted small mt-2"></div>
            </div>
@@ -394,7 +394,7 @@
        if (lineCount === 0) addLineItem();

        // ── AI Auto-suggest Account on description blur ───────────────────────
-        // Keyword shortcuts — handle common cases with zero API cost
+        // Keyword shortcuts &mdash; handle common cases with zero API cost
        const _keywordMap = [
            { words: ['electric','power','utility','gas','water','internet','phone','telecom'], hint: 'utilities' },
            { words: ['powder','paint','coat','material','supply','supplies','chemical','resin'], hint: 'materials' },
@@ -480,7 +480,7 @@
                hint2.className = 'ai-account-hint text-muted small mt-1';
                accountSel.parentNode.appendChild(hint2);
            }
-            hint2.innerHTML = '<span class="spinner-border spinner-border-sm" style="width:.75rem;height:.75rem"></span> Thinking…';
+            hint2.innerHTML = '<span class="spinner-border spinner-border-sm" style="width:.75rem;height:.75rem"></span> Thinking&hellip;';

            try {
                const token = document.querySelector('input[name="__RequestVerificationToken"]')?.value;
@@ -501,7 +501,7 @@
            }
        }

-        // Event delegation — works for dynamically added rows
+        // Event delegation &mdash; works for dynamically added rows
        document.getElementById('lineItemsBody').addEventListener('blur', function (e) {
            if (e.target.matches('[name$=".Description"]')) {
                _suggestAccountForRow(e.target.closest('tr'));
@@ -535,7 +535,7 @@
                    return;
                }

-                // Auto-fill bill header — try to match vendor name to dropdown
+                // Auto-fill bill header &mdash; try to match vendor name to dropdown
                if (data.vendorName) {
                    const vendorSel = document.getElementById('vendorSelect');
                    if (vendorSel && !vendorSel.value) {
@@ -553,7 +553,7 @@
                            vendorSel.value = bestOption.value;
                            vendorSel.dispatchEvent(new Event('change'));
                        } else {
-                            // No match — put the name in Memo so user knows what the AI saw
+                            // No match &mdash; put the name in Memo so user knows what the AI saw
                            const memo = document.querySelector('[name="Memo"]');
                            if (memo && !memo.value) memo.value = data.vendorName;
                        }
@@ -598,7 +598,7 @@
                const modal = bootstrap.Modal.getInstance(document.getElementById('scanReceiptModal'));
                if (modal) modal.hide();

-                statusEl.textContent = 'Scan complete — review and adjust as needed.';
+                statusEl.textContent = 'Scan complete &mdash; review and adjust as needed.';
            } catch (e) {
                statusEl.textContent = 'Error connecting to AI service.';
            } finally {
@@ -5,7 +5,7 @@
    ViewData["Title"] = $"Bill {Model.BillNumber}";
    ViewData["PageIcon"] = "bi-receipt-cutoff";
    ViewData["PageHelpTitle"] = "Bill Status";
-    ViewData["PageHelpContent"] = "Draft: editable, not yet confirmed. Open: awaiting payment. Partially Paid: some payments recorded. Paid: fully settled. Voided: cancelled — preserves history. Edit is only available in Draft status. Use Void instead of deleting to keep a complete audit trail.";
+    ViewData["PageHelpContent"] = "Draft: editable, not yet confirmed. Open: awaiting payment. Partially Paid: some payments recorded. Paid: fully settled. Voided: cancelled &mdash; preserves history. Edit is only available in Draft status. Use Void instead of deleting to keep a complete audit trail.";

    string StatusBadge(BillStatus s) => s switch
    {
@@ -266,7 +266,7 @@
                <a tabindex="0" class="help-icon" role="button"
                   data-bs-toggle="popover" data-bs-placement="left" data-bs-trigger="focus"
                   data-bs-title="Balance Summary"
-                   data-bs-content="Balance Due = Bill Total minus all payments recorded. Multiple partial payments are supported — each reduces the balance until fully paid. Deleting a payment reverses it and restores the balance due.">
+                   data-bs-content="Balance Due = Bill Total minus all payments recorded. Multiple partial payments are supported &mdash; each reduces the balance until fully paid. Deleting a payment reverses it and restores the balance due.">
                    <i class="bi bi-question-circle"></i>
                </a>
            </div>
@@ -322,7 +322,7 @@
        <div class="modal-dialog">
            <div class="modal-content">
                <div class="modal-header">
-                    <h5 class="modal-title">Record Payment — @Model.BillNumber</h5>
+                    <h5 class="modal-title">Record Payment &mdash; @Model.BillNumber</h5>
                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                </div>
                <form asp-action="RecordPayment" method="post">
@@ -358,12 +358,12 @@
                                    <a tabindex="0" class="help-icon" role="button"
                                       data-bs-toggle="popover" data-bs-placement="left" data-bs-trigger="focus"
                                       data-bs-title="Bank Account"
-                                       data-bs-content="The bank or cash account this payment is drawn from. Used for bank reconciliation — helps match this payment to the corresponding debit on your bank statement.">
+                                       data-bs-content="The bank or cash account this payment is drawn from. Used for bank reconciliation &mdash; helps match this payment to the corresponding debit on your bank statement.">
                                        <i class="bi bi-question-circle"></i>
                                    </a>
                                </div>
                                <select name="BankAccountId" class="form-select" required>
-                                    <option value="">— Select Account —</option>
+                                    <option value="">&mdash; Select Account &mdash;</option>
                                    @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.BankAccounts)
                                    {
                                        <option value="@item.Value">@item.Text</option>
@@ -423,7 +423,7 @@
                        <div class="col-12">
                            <label class="form-label fw-medium">Bank Account <span class="text-danger">*</span></label>
                            <select name="BankAccountId" id="editBillBankAccountId" class="form-select" required>
-                                <option value="">— Select Account —</option>
+                                <option value="">&mdash; Select Account &mdash;</option>
                                @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.BankAccounts)
                                {
                                    <option value="@item.Value">@item.Text</option>
@@ -1,10 +1,10 @@
-@model PowderCoating.Application.DTOs.Accounting.EditBillDto
+@model PowderCoating.Application.DTOs.Accounting.EditBillDto

@{
    ViewData["Title"] = "Edit Bill";
    ViewData["PageIcon"] = "bi-pencil-square";
    ViewData["PageHelpTitle"] = "Edit Bill";
-    ViewData["PageHelpContent"] = "Bills can only be edited while in Draft status. Once marked Open, they are locked — Void the bill and recreate it if corrections are needed after confirmation.";
+    ViewData["PageHelpContent"] = "Bills can only be edited while in Draft status. Once marked Open, they are locked &mdash; Void the bill and recreate it if corrections are needed after confirmation.";
 }

 <div class="d-flex justify-content-start mb-4">
@@ -24,7 +24,7 @@
                    <a tabindex="0" class="help-icon" role="button"
                       data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                       data-bs-title="Bill Details"
-                       data-bs-content="Vendor: who you're paying. AP Account: the liability account this bill posts to (e.g. Accounts Payable). Bill Date: date on the vendor's invoice. Due Date: when payment is due — drives overdue status. Vendor Invoice #: the vendor's own reference number for reconciliation.">
+                       data-bs-content="Vendor: who you're paying. AP Account: the liability account this bill posts to (e.g. Accounts Payable). Bill Date: date on the vendor's invoice. Due Date: when payment is due &mdash; drives overdue status. Vendor Invoice #: the vendor's own reference number for reconciliation.">
                        <i class="bi bi-question-circle"></i>
                    </a>
                </div>
@@ -34,8 +34,8 @@
                            <label asp-for="VendorId" class="form-label fw-medium">Vendor <span class="text-danger">*</span></label>
                            <select asp-for="VendorId" asp-items="ViewBag.Vendors" class="form-select"
                                    data-quick-add-url="/Vendors/Create" data-quick-add-title="Add New Vendor">
-                                <option value="">— Select Vendor —</option>
-                                <option value="__new__">+ Add New Vendor…</option>
+                                <option value="">&mdash; Select Vendor &mdash;</option>
+                                <option value="__new__">+ Add New Vendor&hellip;</option>
                            </select>
                        </div>
                        <div class="col-md-6">
@@ -87,7 +87,7 @@
                            }
                            <input type="file" name="receiptFile" id="receiptFile" class="form-control"
                                   accept=".jpg,.jpeg,.png,.gif,.webp,.pdf" />
-                            <div class="form-text">JPG, PNG, GIF, WebP, or PDF — up to 10 MB.</div>
+                            <div class="form-text">JPG, PNG, GIF, WebP, or PDF &mdash; up to 10 MB.</div>
                        </div>
                    </div>
                </div>
@@ -134,7 +134,7 @@
                    <a tabindex="0" class="help-icon" role="button"
                       data-bs-toggle="popover" data-bs-placement="left" data-bs-trigger="focus"
                       data-bs-title="Bill Summary"
-                       data-bs-content="Tax % is applied to the line-item subtotal. The resulting Total is the full amount owed to the vendor. Partial payments are allowed — each payment recorded reduces the balance due until the bill is fully paid.">
+                       data-bs-content="Tax % is applied to the line-item subtotal. The resulting Total is the full amount owed to the vendor. Partial payments are allowed &mdash; each payment recorded reduces the balance due until the bill is fully paid.">
                        <i class="bi bi-question-circle"></i>
                    </a>
                </div>
@@ -171,7 +171,7 @@
    <tr class="line-item-row">
        <td>
            <select class="form-select form-select-sm account-select" name="LineItems[INDEX].AccountId" required>
-                <option value="">— Account —</option>
+                <option value="">&mdash; Account &mdash;</option>
                @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.ExpenseAccounts)
                {
                    <option value="@item.Value">@item.Text</option>
@@ -181,7 +181,7 @@
        <td><input type="text" class="form-control form-control-sm" name="LineItems[INDEX].Description" placeholder="Description" /></td>
        <td>
            <select class="form-select form-select-sm" name="LineItems[INDEX].JobId">
-                <option value="">—</option>
+                <option value="">&mdash;</option>
                @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.Jobs)
                {
                    <option value="@item.Value">@item.Text</option>
@@ -1,4 +1,4 @@
-@model List<PowderCoating.Application.DTOs.Accounting.BillExpenseListDto>
+@model List<PowderCoating.Application.DTOs.Accounting.BillExpenseListDto>

@{
    ViewData["Title"] = "Bills / Expenses";
@@ -62,7 +62,7 @@
        <form method="get" class="row g-2 align-items-end">
            <div class="col-md-4">
                <input type="search" name="search" value="@ViewBag.Search" class="form-control"
-                       placeholder="Search by #, vendor, memo, amountâ€¦" />
+                       placeholder="Search by #, vendor, memo, amount&hellip;" />
            </div>
            <div class="col-md-2">
                <select name="type" class="form-select">
@@ -156,13 +156,13 @@
                                }
                                else if (entry.EntryType == "Expense")
                                {
-                                    <span class="text-muted">â€”</span>
+                                    <span class="text-muted">&mdash;</span>
                                }
                            </td>
                            <td><span class="badge bg-@entry.StatusColor">@entry.StatusLabel</span></td>
                            <td class="text-end">@entry.Total.ToString("C")</td>
                            <td class="text-end fw-medium @(entry.BalanceDue > 0 ? "text-danger" : "text-muted")">
-                                @(entry.EntryType == "Bill" ? entry.BalanceDue.ToString("C") : "â€”")
+                                @Html.Raw(entry.EntryType == "Bill" ? entry.BalanceDue.ToString("C") : "&mdash;")
                            </td>
                            <td>
                                @if (entry.EntryType == "Bill")
@@ -209,7 +209,7 @@ else
                   asp-route-status="@ViewBag.StatusFilter"
                   asp-route-search="@ViewBag.Search"
                   asp-route-page="@((int)ViewBag.Page - 1)"
-                   asp-route-pageSize="@ViewBag.PageSize">â€¹ Prev</a>
+                   asp-route-pageSize="@ViewBag.PageSize">&lsaquo; Prev</a>
            </li>
            @for (var p = 1; p <= (int)ViewBag.TotalPages; p++)
            {
@@ -228,11 +228,11 @@ else
                   asp-route-status="@ViewBag.StatusFilter"
                   asp-route-search="@ViewBag.Search"
                   asp-route-page="@((int)ViewBag.Page + 1)"
-                   asp-route-pageSize="@ViewBag.PageSize">Next â€º</a>
+                   asp-route-pageSize="@ViewBag.PageSize">Next &rsaquo;</a>
            </li>
        </ul>
        <p class="text-center text-muted small">
-            Showing @(((int)ViewBag.Page - 1) * (int)ViewBag.PageSize + 1)â€“@(Math.Min((int)ViewBag.Page * (int)ViewBag.PageSize, (int)ViewBag.TotalCount))
+            Showing @(((int)ViewBag.Page - 1) * (int)ViewBag.PageSize + 1)&ndash;@(Math.Min((int)ViewBag.Page * (int)ViewBag.PageSize, (int)ViewBag.TotalCount))
            of @ViewBag.TotalCount entries
        </p>
    </nav>
@@ -31,7 +31,7 @@
 <div id="resultArea" class="d-none">
    <div id="spinnerArea" class="text-center py-5 d-none">
        <div class="spinner-border text-primary" style="width:2.5rem;height:2.5rem;" role="status"></div>
-        <p class="text-muted mt-3">Claude is reviewing your bill history…</p>
+        <p class="text-muted mt-3">Claude is reviewing your bill history&hellip;</p>
    </div>

    <div id="errorArea" class="alert alert-danger alert-permanent d-none"></div>
@@ -2,7 +2,7 @@
@model BudgetCreateVm

@{
-    ViewData["Title"] = $"Edit Budget — {Model.Name}";
+    ViewData["Title"] = $"Edit Budget &mdash; {Model.Name}";
    ViewData["PageIcon"] = "bi-pencil";
    var months = new[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 }
@@ -24,7 +24,7 @@
    <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-pie-chart me-2 text-primary"></i>@Model.Name — @Model.FiscalYear
+                <i class="bi bi-pie-chart me-2 text-primary"></i>@Model.Name &mdash; @Model.FiscalYear
            </h5>
        </div>
        <div class="card-body">
@@ -78,7 +78,7 @@ else
                                </td>
                                <td class="text-center">@b.Lines.Count</td>
                                <td class="text-end text-success">@b.Lines.Sum(l => l.Annual).ToString("C")</td>
-                                <td class="text-end text-danger">—</td>
+                                <td class="text-end text-danger">&mdash;</td>
                                <td class="text-center">
                                    @if (b.IsDefault)
                                    {
@@ -246,7 +246,7 @@
                    </table>
                </div>

-                <!-- Mobile card view — shown on screens < 992px -->
+                <!-- Mobile card view &mdash; shown on screens < 992px -->
                <div class="mobile-card-view">
                    <div class="mobile-card-list">
                        @foreach (var report in Model)
@@ -313,7 +313,7 @@
                {
                    <div class="d-flex justify-content-between align-items-center px-3 py-2 border-top">
                        <small class="text-muted">
-                            Showing @((pageNumber - 1) * pageSize + 1)–@(Math.Min(pageNumber * pageSize, totalCount)) of @totalCount
+                            Showing @((pageNumber - 1) * pageSize + 1)&ndash;@(Math.Min(pageNumber * pageSize, totalCount)) of @totalCount
                        </small>
                        <nav>
                            <ul class="pagination pagination-sm mb-0">
@@ -1,4 +1,4 @@
-@model PowderCoating.Application.DTOs.BugReport.CreateBugReportDto
+@model PowderCoating.Application.DTOs.BugReport.CreateBugReportDto
@using PowderCoating.Core.Enums
@{
    ViewData["Title"] = "Report a Bug";
@@ -59,10 +59,10 @@
                        <div class="mb-4">
                            <label asp-for="Priority" class="form-label fw-semibold">Priority</label>
                            <select asp-for="Priority" class="form-select">
-                                <option value="@((int)BugReportPriority.Low)">Low â€“ Minor inconvenience, workaround exists</option>
-                                <option value="@((int)BugReportPriority.Normal)" selected>Normal â€“ Affects workflow but not critical</option>
-                                <option value="@((int)BugReportPriority.High)">High â€“ Significantly impacts operations</option>
-                                <option value="@((int)BugReportPriority.Critical)">Critical â€“ System unusable or data loss risk</option>
+                                <option value="@((int)BugReportPriority.Low)">Low &ndash; Minor inconvenience, workaround exists</option>
+                                <option value="@((int)BugReportPriority.Normal)" selected>Normal &ndash; Affects workflow but not critical</option>
+                                <option value="@((int)BugReportPriority.High)">High &ndash; Significantly impacts operations</option>
+                                <option value="@((int)BugReportPriority.Critical)">Critical &ndash; System unusable or data loss risk</option>
                            </select>
                            <span asp-validation-for="Priority" class="text-danger small"></span>
                        </div>
@@ -104,7 +104,7 @@
                const li = document.createElement('li');
                const sizeMb = (f.size / 1024 / 1024).toFixed(1);
                if (f.size > maxBytes) {
-                    li.innerHTML = `<i class="bi bi-exclamation-triangle text-danger"></i> ${f.name} (${sizeMb} MB) â€” exceeds 100 MB limit`;
+                    li.innerHTML = `<i class="bi bi-exclamation-triangle text-danger"></i> ${f.name} (${sizeMb} MB) &mdash; exceeds 100 MB limit`;
                } else {
                    li.innerHTML = `<i class="bi bi-file-earmark text-secondary"></i> ${f.name} (${sizeMb} MB)`;
                }
@@ -34,7 +34,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Parent Category"
-                                   data-bs-content="Leave as '(None)' to create a top-level category. Choose a parent to nest this under it — e.g., place 'Aluminum Wheels' under a parent 'Wheels' category. This creates a browsable hierarchy in the catalog and quote wizard.">
+                                   data-bs-content="Leave as '(None)' to create a top-level category. Choose a parent to nest this under it &mdash; e.g., place 'Aluminum Wheels' under a parent 'Wheels' category. This creates a browsable hierarchy in the catalog and quote wizard.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -35,7 +35,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Parent Category"
-                                   data-bs-content="Leave as '(None)' to keep this as a top-level category. Choose a parent to nest it — e.g., 'Aluminum Wheels' under 'Wheels'. The system prevents circular references (you cannot make a category its own ancestor).">
+                                   data-bs-content="Leave as '(None)' to keep this as a top-level category. Choose a parent to nest it &mdash; e.g., 'Aluminum Wheels' under 'Wheels'. The system prevents circular references (you cannot make a category its own ancestor).">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -3,7 +3,7 @@
    ViewData["Title"] = "AI Catalog Price Check";
    ViewData["PageIcon"] = "bi-robot";
    ViewData["PageHelpTitle"] = "AI Catalog Price Check";
-    ViewData["PageHelpContent"] = "The AI Price Check reviews every item in your catalog against your actual operating costs and flags items that may be priced below cost, have thin margins, or appear unusually high. Results are estimates based on industry knowledge and your shop's rates — always apply your own judgment before changing prices.";
+    ViewData["PageHelpContent"] = "The AI Price Check reviews every item in your catalog against your actual operating costs and flags items that may be priced below cost, have thin margins, or appear unusually high. Results are estimates based on industry knowledge and your shop's rates &mdash; always apply your own judgment before changing prices.";

    var sortedResults = Model?.Results
        .OrderBy(r => r.Verdict switch
@@ -82,7 +82,7 @@
    <div class="progress-card">
        <div class="icon"><i class="bi bi-robot"></i></div>
        <h5>Analyzing your catalog</h5>
-        <p class="status-msg" id="overlay-status">Preparing items…</p>
+        <p class="status-msg" id="overlay-status">Preparing items&hellip;</p>
        <div class="progress-bar-track">
            <div class="progress-bar-fill" id="overlay-bar"></div>
        </div>
@@ -151,22 +151,22 @@
            <div>
                <h6 class="fw-semibold mb-1">What this analysis does</h6>
                <p class="small text-muted mb-2">
-                    Our AI system reviews every active, priced item in your catalog against your shop's actual operating costs —
+                    Our AI system reviews every active, priced item in your catalog against your shop's actual operating costs &mdash;
                    labor, oven time, sandblasting, coating booth, and powder material. For each item it estimates a
                    realistic surface area and processing time, calculates a cost floor, then compares that to your
                    current price and returns one of four verdicts:
                </p>
                <div class="d-flex flex-wrap gap-2 mb-2">
-                    <span class="verdict-badge verdict-below-cost">Below Cost</span><span class="small text-muted align-self-center">— you're losing money on this item</span>
+                    <span class="verdict-badge verdict-below-cost">Below Cost</span><span class="small text-muted align-self-center">&mdash; you're losing money on this item</span>
                </div>
                <div class="d-flex flex-wrap gap-2 mb-2">
-                    <span class="verdict-badge verdict-low">Thin Margin</span><span class="small text-muted align-self-center">— above cost floor but below your target margin</span>
+                    <span class="verdict-badge verdict-low">Thin Margin</span><span class="small text-muted align-self-center">&mdash; above cost floor but below your target margin</span>
                </div>
                <div class="d-flex flex-wrap gap-2 mb-2">
-                    <span class="verdict-badge verdict-high">High</span><span class="small text-muted align-self-center">— significantly above typical market rates</span>
+                    <span class="verdict-badge verdict-high">High</span><span class="small text-muted align-self-center">&mdash; significantly above typical market rates</span>
                </div>
                <div class="d-flex flex-wrap gap-2 mb-3">
-                    <span class="verdict-badge verdict-ok">OK</span><span class="small text-muted align-self-center">— price is within a reasonable range</span>
+                    <span class="verdict-badge verdict-ok">OK</span><span class="small text-muted align-self-center">&mdash; price is within a reasonable range</span>
                </div>
                <p class="small text-muted mb-0">
                    <i class="bi bi-exclamation-triangle me-1 text-warning"></i>
@@ -301,15 +301,15 @@ else
                            <div class="col-4 text-center">
                                <div class="small text-muted">Suggested</div>
                                <div class="fw-semibold text-primary">
-                                    @item.SuggestedPriceMin.ToString("C") – @item.SuggestedPriceMax.ToString("C")
+                                    @item.SuggestedPriceMin.ToString("C") &ndash; @item.SuggestedPriceMax.ToString("C")
                                </div>
                            </div>
                        </div>

                        <div class="small text-muted mb-1">
                            <i class="bi bi-rulers me-1"></i>
-                            Est. @item.EstimatedSqFtMin–@item.EstimatedSqFtMax sqft &bull;
-                            @item.EstimatedMinutesMin–@item.EstimatedMinutesMax min
+                            Est. @item.EstimatedSqFtMin&ndash;@item.EstimatedSqFtMax sqft &bull;
+                            @item.EstimatedMinutesMin&ndash;@item.EstimatedMinutesMax min
                        </div>

                        <p class="small mb-1">@item.Reasoning</p>
@@ -20,7 +20,7 @@
                        <div class="alert alert-permanent alert-warning d-flex gap-2 mb-4" role="alert">
                            <i class="bi bi-exclamation-triangle-fill flex-shrink-0 mt-1"></i>
                            <div>
-                                <strong>Catalog item prices are fixed.</strong> The price you enter here is exactly what gets charged when this item is added to a quote or job — no markup, no prep service charges, and no complexity adjustments are added on top. Make sure your price already includes labor, materials, and margin.
+                                <strong>Catalog item prices are fixed.</strong> The price you enter here is exactly what gets charged when this item is added to a quote or job &mdash; no markup, no prep service charges, and no complexity adjustments are added on top. Make sure your price already includes labor, materials, and margin.
                            </div>
                        </div>

@@ -41,7 +41,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Item Name"
-                                   data-bs-content="Use a specific, recognizable name. The name appears on quotes, invoices, and in the picker dropdown. Good names include material and size where relevant — e.g., 'Steel Bracket (6in)', '18in Alloy Wheel'.">
+                                   data-bs-content="Use a specific, recognizable name. The name appears on quotes, invoices, and in the picker dropdown. Good names include material and size where relevant &mdash; e.g., 'Steel Bracket (6in)', '18in Alloy Wheel'.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -75,7 +75,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Pricing"
-                               data-bs-content="The Default Price is the exact amount charged when this item is added to a quote — no markup, prep services, or complexity adjustments are applied on top. Set the all-in price you want to bill. Approximate Area is optional — if set, it helps estimate powder needed for reporting purposes.">
+                               data-bs-content="The Default Price is the exact amount charged when this item is added to a quote &mdash; no markup, prep services, or complexity adjustments are applied on top. Set the all-in price you want to bill. Approximate Area is optional &mdash; if set, it helps estimate powder needed for reporting purposes.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -87,7 +87,7 @@
                                    <a tabindex="0" class="help-icon" role="button"
                                       data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                       data-bs-title="Default Price"
-                                       data-bs-content="This is the final price charged to the customer — no markup, prep services, or complexity charges are added on top. Enter the all-in amount you want to bill for this item. Staff can still override it on individual quotes if needed.">
+                                       data-bs-content="This is the final price charged to the customer &mdash; no markup, prep services, or complexity charges are added on top. Enter the all-in amount you want to bill for this item. Staff can still override it on individual quotes if needed.">
                                        <i class="bi bi-question-circle"></i>
                                    </a>
                                </div>
@@ -122,7 +122,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Financial Accounts"
-                               data-bs-content="Links this item to your chart of accounts for accounting exports. Revenue Account is credited when invoiced; COGS Account is debited when materials are consumed. Leave both blank to use the company default accounts — most shops only need to set these for items with special accounting treatment.">
+                               data-bs-content="Links this item to your chart of accounts for accounting exports. Revenue Account is credited when invoiced; COGS Account is debited when materials are consumed. Leave both blank to use the company default accounts &mdash; most shops only need to set these for items with special accounting treatment.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -140,7 +140,7 @@
                                <select asp-for="CogsAccountId" class="form-select" asp-items="ViewBag.CogsAccounts"
                                        data-quick-add-url="/Accounts/Create?preSubType=40" data-quick-add-title="Add COGS Account">
                                    <option value="">(Default COGS account)</option>
-                                    <option value="__new__">+ Add New Account…</option>
+                                    <option value="__new__">+ Add New Account&hellip;</option>
                                </select>
                                <small class="form-text text-muted">Account debited when materials are consumed.</small>
                            </div>
@@ -164,7 +164,7 @@
                        <div class="mb-3">
                            <label for="image" class="form-label fw-semibold">Upload Image</label>
                            <input type="file" class="form-control" id="image" name="image" accept="image/jpeg,image/png,image/gif,image/webp" onchange="previewCatalogImage(this)" />
-                            <div class="form-text">Accepted formats: jpg, jpeg, png, gif, webp — max 10 MB. A 200×200 thumbnail is generated automatically.</div>
+                            <div class="form-text">Accepted formats: jpg, jpeg, png, gif, webp &mdash; max 10 MB. A 200×200 thumbnail is generated automatically.</div>
                            <div id="imagePreview" class="mt-2 d-none">
                                <img id="imagePreviewImg" src="" alt="Preview" style="max-width:200px;max-height:200px;object-fit:contain;border:1px solid #dee2e6;border-radius:6px;" />
                            </div>
@@ -35,7 +35,7 @@
                                <a tabindex="0" class="help-icon" role="button"
                                   data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                   data-bs-title="Item Name"
-                                   data-bs-content="Use a specific, recognizable name. The name appears on quotes, invoices, and in the picker dropdown. Good names include material and size where relevant — e.g., 'Steel Bracket (6in)', '18in Alloy Wheel'.">
+                                   data-bs-content="Use a specific, recognizable name. The name appears on quotes, invoices, and in the picker dropdown. Good names include material and size where relevant &mdash; e.g., 'Steel Bracket (6in)', '18in Alloy Wheel'.">
                                    <i class="bi bi-question-circle"></i>
                                </a>
                            </div>
@@ -69,7 +69,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Pricing &amp; Status"
-                               data-bs-content="The Default Price is the exact amount charged when this item is added to a quote — no markup, prep services, or complexity adjustments are applied on top. Staff can override it on individual quotes. Set Status to Inactive to hide the item from the picker without deleting it.">
+                               data-bs-content="The Default Price is the exact amount charged when this item is added to a quote &mdash; no markup, prep services, or complexity adjustments are applied on top. Staff can override it on individual quotes. Set Status to Inactive to hide the item from the picker without deleting it.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -81,7 +81,7 @@
                                    <a tabindex="0" class="help-icon" role="button"
                                       data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                       data-bs-title="Default Price"
-                                       data-bs-content="This is the final price charged to the customer — no markup, prep services, or complexity charges are added on top. Enter the all-in amount you want to bill for this item. Staff can still override it on individual quotes if needed.">
+                                       data-bs-content="This is the final price charged to the customer &mdash; no markup, prep services, or complexity charges are added on top. Enter the all-in amount you want to bill for this item. Staff can still override it on individual quotes if needed.">
                                        <i class="bi bi-question-circle"></i>
                                    </a>
                                </div>
@@ -125,7 +125,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Financial Accounts"
-                               data-bs-content="Links this item to your chart of accounts for accounting exports. Revenue Account is credited when invoiced; COGS Account is debited when materials are consumed. Leave both blank to use the company default accounts — most shops only need to set these for items with special accounting treatment.">
+                               data-bs-content="Links this item to your chart of accounts for accounting exports. Revenue Account is credited when invoiced; COGS Account is debited when materials are consumed. Leave both blank to use the company default accounts &mdash; most shops only need to set these for items with special accounting treatment.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -143,7 +143,7 @@
                                <select asp-for="CogsAccountId" class="form-select" asp-items="ViewBag.CogsAccounts"
                                        data-quick-add-url="/Accounts/Create?preSubType=40" data-quick-add-title="Add COGS Account">
                                    <option value="">(Default COGS account)</option>
-                                    <option value="__new__">+ Add New Account…</option>
+                                    <option value="__new__">+ Add New Account&hellip;</option>
                                </select>
                                <small class="form-text text-muted">Account debited when materials are consumed.</small>
                            </div>
@@ -186,7 +186,7 @@
                            <div class="mb-3">
                                <label for="image" class="form-label fw-semibold">Upload Image</label>
                                <input type="file" class="form-control" id="image" name="image" accept="image/jpeg,image/png,image/gif,image/webp" onchange="previewCatalogImage(this)" />
-                                <div class="form-text">Accepted formats: jpg, jpeg, png, gif, webp — max 10 MB. A 200×200 thumbnail is generated automatically.</div>
+                                <div class="form-text">Accepted formats: jpg, jpeg, png, gif, webp &mdash; max 10 MB. A 200×200 thumbnail is generated automatically.</div>
                                <div id="imagePreview" class="mt-2 d-none">
                                    <img id="imagePreviewImg" src="" alt="Preview" style="max-width:200px;max-height:200px;object-fit:contain;border:1px solid #dee2e6;border-radius:6px;" />
                                </div>
@@ -3,7 +3,7 @@
    ViewData["Title"] = "Product Catalog";
    ViewData["PageIcon"] = "bi-book";
    ViewData["PageHelpTitle"] = "Product Catalog";
-    ViewData["PageHelpContent"] = "The Product Catalog is a library of standard items (wheels, brackets, panels, etc.) that your shop regularly quotes and invoices. Each item has a fixed price — when a catalog item is added to a quote or job, that price is used exactly as entered. No markup, no prep services, and no complexity charges are added on top. Organize items into categories to keep the catalog easy to browse.";
+    ViewData["PageHelpContent"] = "The Product Catalog is a library of standard items (wheels, brackets, panels, etc.) that your shop regularly quotes and invoices. Each item has a fixed price &mdash; when a catalog item is added to a quote or job, that price is used exactly as entered. No markup, no prep services, and no complexity charges are added on top. Organize items into categories to keep the catalog easy to browse.";
    var totalItemsCount = ViewBag.TotalItemsCount ?? 0;
    var activeItemsCount = ViewBag.ActiveItemsCount ?? 0;
    var averagePrice = ViewBag.AveragePrice ?? 0m;
@@ -148,7 +148,7 @@
                        <div class="card-body">
                            <table class="table table-sm table-borderless mb-0">
                                <tr><th style="width:40%">Company Name</th><td>@Model.CompanyName</td></tr>
-                                <tr><th>Code</th><td>@(Model.CompanyCode ?? "—")</td></tr>
+                                <tr><th>Code</th><td>@Html.Raw(Model.CompanyCode ?? "&mdash;")</td></tr>
                                <tr><th>Status</th><td><span class="badge @(Model.IsActive ? "bg-success" : "bg-danger")">@(Model.IsActive ? "Active" : "Inactive")</span></td></tr>
                                <tr><th>Time Zone</th><td>@(Model.TimeZone ?? "America/New_York")</td></tr>
                                <tr><th>Created</th><td>@Model.CreatedAt.ToString("MMM d, yyyy h:mm tt")</td></tr>
@@ -174,7 +174,7 @@
                            <table class="table table-sm table-borderless mb-0">
                                <tr><th style="width:40%">Contact Name</th><td>@Model.PrimaryContactName</td></tr>
                                <tr><th>Email</th><td><a href="mailto:@Model.PrimaryContactEmail">@Model.PrimaryContactEmail</a></td></tr>
-                                <tr><th>Phone</th><td>@(Model.Phone ?? "—")</td></tr>
+                                <tr><th>Phone</th><td>@Html.Raw(Model.Phone ?? "&mdash;")</td></tr>
                            </table>
                        </div>
                    </div>
@@ -283,7 +283,7 @@
                                                }
                                                else { <span class="text-muted">N/A</span> }
                                            </td>
-                                            <td>@(user.Department ?? "—")</td>
+                                            <td>@Html.Raw(user.Department ?? "&mdash;")</td>
                                            <td>
                                                <span class="badge @(user.IsActive ? "bg-success" : "bg-danger")">
                                                    @(user.IsActive ? "Active" : "Inactive")
@@ -527,20 +527,20 @@
                                            @{
                                                var firstActivity = onboarding.FirstJobCreatedAt ?? onboarding.FirstQuoteCreatedAt;
                                            }
-                                            @(firstActivity.HasValue ? firstActivity.Value.ToString("MMM d, yyyy") : "—")
+                                            @Html.Raw(firstActivity.HasValue ? firstActivity.Value.ToString("MMM d, yyyy") : "&mdash;")
                                        </td>
                                    </tr>
                                    <tr>
                                        <th>First Invoice</th>
-                                        <td>@(onboarding.FirstInvoiceCreatedAt.HasValue ? onboarding.FirstInvoiceCreatedAt.Value.ToString("MMM d, yyyy") : "—")</td>
+                                        <td>@Html.Raw(onboarding.FirstInvoiceCreatedAt.HasValue ? onboarding.FirstInvoiceCreatedAt.Value.ToString("MMM d, yyyy") : "&mdash;")</td>
                                    </tr>
                                    <tr>
                                        <th>Workflow Completed</th>
-                                        <td>@(onboarding.FirstWorkflowCompletedAt.HasValue ? onboarding.FirstWorkflowCompletedAt.Value.ToString("MMM d, yyyy") : "—")</td>
+                                        <td>@Html.Raw(onboarding.FirstWorkflowCompletedAt.HasValue ? onboarding.FirstWorkflowCompletedAt.Value.ToString("MMM d, yyyy") : "&mdash;")</td>
                                    </tr>
                                    <tr>
                                        <th>Widget Dismissed</th>
-                                        <td>@(onboarding.GuidedActivationDismissedAt.HasValue ? onboarding.GuidedActivationDismissedAt.Value.ToString("MMM d, yyyy") : "—")</td>
+                                        <td>@Html.Raw(onboarding.GuidedActivationDismissedAt.HasValue ? onboarding.GuidedActivationDismissedAt.Value.ToString("MMM d, yyyy") : "&mdash;")</td>
                                    </tr>
                                </table>
                            </div>
@@ -618,7 +618,7 @@

    </div><!-- /tab-content -->

-    <!-- Danger Zone (outside tabs — always present) -->
+    <!-- Danger Zone (outside tabs &mdash; always present) -->
    <div class="card shadow-sm border-danger mt-4">
        <div class="card-header bg-light">
            <h6 class="card-title mb-0 text-danger">
@@ -630,7 +630,7 @@
                <div>
                    <h6 class="mb-1 text-warning-emphasis"><i class="bi bi-fire me-1"></i>Reset All Company Data</h6>
                    <p class="text-muted small mb-0">
-                        Permanently deletes all business data — customers, jobs, quotes, invoices, inventory, and more.
+                        Permanently deletes all business data &mdash; customers, jobs, quotes, invoices, inventory, and more.
                        The company record, users, and settings are preserved. Use this to wipe a migration and start fresh.
                    </p>
                </div>
@@ -646,7 +646,7 @@
                        Permanently deletes the company and everything in it. There is no going back.
                        @if (Model.UserCount > 0)
                        {
-                            <br /><strong class="text-danger">This company has @Model.UserCount user(s) — remove them first.</strong>
+                            <br /><strong class="text-danger">This company has @Model.UserCount user(s) &mdash; remove them first.</strong>
                        }
                    </p>
                </div>
@@ -672,7 +672,7 @@
            </div>
            <div class="modal-body p-0">
                <div id="oc-loading" class="d-flex justify-content-center align-items-center py-5">
-                    <div class="spinner-border text-primary" role="status"><span class="visually-hidden">Loading…</span></div>
+                    <div class="spinner-border text-primary" role="status"><span class="visually-hidden">Loading&hellip;</span></div>
                </div>
                <div id="oc-content" style="display:none;">
                    <div class="px-3 pt-3 pb-2">
@@ -688,14 +688,14 @@
                            <span id="oc-status-badge" class="badge ms-auto"></span>
                        </div>
                        <table class="table table-sm table-borderless mb-0 small">
-                            <tr><th style="width:38%;" class="text-muted fw-normal">Role</th><td id="oc-role">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Department</th><td id="oc-dept">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Position</th><td id="oc-position">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Phone</th><td id="oc-phone">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Hired</th><td id="oc-hire">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Account created</th><td id="oc-created">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Last login</th><td id="oc-lastlogin">—</td></tr>
-                            <tr><th class="text-muted fw-normal">Email confirmed</th><td id="oc-emailconf">—</td></tr>
+                            <tr><th style="width:38%;" class="text-muted fw-normal">Role</th><td id="oc-role">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Department</th><td id="oc-dept">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Position</th><td id="oc-position">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Phone</th><td id="oc-phone">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Hired</th><td id="oc-hire">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Account created</th><td id="oc-created">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Last login</th><td id="oc-lastlogin">&mdash;</td></tr>
+                            <tr><th class="text-muted fw-normal">Email confirmed</th><td id="oc-emailconf">&mdash;</td></tr>
                        </table>
                    </div>
                    <hr class="my-0" />
@@ -127,12 +127,12 @@
                        </div>

                        <h5 class="card-title mb-3 pb-2 border-bottom">Feature Overrides</h5>
-                        <p class="text-muted small mb-3">Override plan-level feature access for this company. Leave blank (—) to inherit from the subscription plan.</p>
+                        <p class="text-muted small mb-3">Override plan-level feature access for this company. Leave blank (&mdash;) to inherit from the subscription plan.</p>
                        <div class="row g-3 mb-4">
                            <div class="col-md-6">
                                <label class="form-label fw-medium">Online Payments</label>
                                <select asp-for="OnlinePaymentsOverride" class="form-select">
-                                    <option value="">— Use plan default —</option>
+                                    <option value="">&mdash; Use plan default &mdash;</option>
                                    <option value="true">Force Enable</option>
                                    <option value="false">Force Disable</option>
                                </select>
@@ -141,7 +141,7 @@
                            <div class="col-md-6">
                                <label class="form-label fw-medium">Accounting Module</label>
                                <select asp-for="AccountingOverride" class="form-select">
-                                    <option value="">— Use plan default —</option>
+                                    <option value="">&mdash; Use plan default &mdash;</option>
                                    <option value="true">Force Enable</option>
                                    <option value="false">Force Disable</option>
                                </select>
@@ -150,7 +150,7 @@
                        </div>

                        <h5 class="card-title mb-3 pb-2 border-bottom">SMS Override</h5>
-                        <p class="text-muted small mb-3">Use this to immediately cut off SMS for a company — for example if they are sending abusive messages or have a billing dispute. This overrides the plan entitlement and the company's own opt-in setting.</p>
+                        <p class="text-muted small mb-3">Use this to immediately cut off SMS for a company &mdash; for example if they are sending abusive messages or have a billing dispute. This overrides the plan entitlement and the company's own opt-in setting.</p>
                        <div class="mb-4">
                            <div class="form-check form-switch">
                                <input asp-for="SmsDisabledByAdmin" class="form-check-input" type="checkbox" role="switch" id="SmsDisabledByAdmin" />
@@ -61,7 +61,7 @@
                    <div class="input-group">
                        <span class="input-group-text"><i class="bi bi-search"></i></span>
                        <input type="text" name="searchTerm" class="form-control"
-                               placeholder="Search by name, code, email, phone…"
+                               placeholder="Search by name, code, email, phone&hellip;"
                               value="@searchTerm" />
                    </div>
                </div>
@@ -265,7 +265,7 @@
                    </table>
                </div>

-                <!-- Mobile card view — shown on screens < 992px (table-responsive hidden by mobile-cards.css) -->
+                <!-- Mobile card view &mdash; shown on screens < 992px (table-responsive hidden by mobile-cards.css) -->
                <div class="mobile-card-view">
                    <div class="mobile-card-list">
                        @foreach (var company in Model)
@@ -321,7 +321,7 @@
                {
                    <div class="card-footer d-flex justify-content-between align-items-center">
                        <div class="text-muted small">
-                            Showing @((pageNumber - 1) * pageSize + 1)–@(Math.Min(pageNumber * pageSize, totalCount)) of @totalCount companies
+                            Showing @((pageNumber - 1) * pageSize + 1)&ndash;@(Math.Min(pageNumber * pageSize, totalCount)) of @totalCount companies
                        </div>
                        <div class="d-flex align-items-center gap-3">
                            <div>
@@ -448,7 +448,7 @@
                    <h6 class="fw-bold text-danger"><i class="bi bi-fire me-2"></i>Hard Delete (Permanent)</h6>
                    <p class="text-muted small mb-2">
                        <strong class="text-danger">This cannot be undone.</strong>
-                        All company data — users, jobs, quotes, customers, invoices, and everything else — will be
+                        All company data &mdash; users, jobs, quotes, customers, invoices, and everything else &mdash; will be
                        <strong>permanently and irreversibly deleted</strong> from the database.
                    </p>
                    <div class="alert alert-danger alert-permanent py-2 mb-3">
@@ -198,7 +198,7 @@
            <form method="get" class="row g-2 align-items-end">
                <div class="col-md-4">
                    <input name="search" value="@ViewBag.Search" class="form-control form-control-sm"
-                           placeholder="Company name or email…" />
+                           placeholder="Company name or email&hellip;" />
                </div>
                <div class="col-md-3">
                    <select name="risk" class="form-select form-select-sm">
@@ -274,7 +274,7 @@
                            <td>
                                @if (h.RiskLevel == ChurnRisk.NeverActivated)
                                {
-                                    <span class="text-muted">—</span>
+                                    <span class="text-muted">&mdash;</span>
                                }
                                else
                                {
@@ -338,7 +338,7 @@
            </table>
        </div>

-        <!-- Mobile card view — shown on screens < 992px -->
+        <!-- Mobile card view &mdash; shown on screens < 992px -->
        <div class="mobile-card-view">
            <div class="mobile-card-list">
                @foreach (var h in Model)
@@ -394,7 +394,7 @@
        @if (!Model.Any(h => h.RiskLevel != ChurnRisk.Healthy) && Model.Any())
        {
            <div class="card-footer text-center py-3 text-success">
-                <i class="bi bi-check-circle-fill me-2"></i>All tenants are healthy — no churn signals detected.
+                <i class="bi bi-check-circle-fill me-2"></i>All tenants are healthy &mdash; no churn signals detected.
            </div>
        }
    </div>
@@ -53,7 +53,7 @@
            <ul class="list-unstyled mb-3">
                <li class="mb-2">
                    <i class="bi bi-person-x-fill text-danger me-2"></i>
-                    <strong>@userCount user account@(userCount != 1 ? "s" : "")</strong> will be deactivated — no one will be able to log in.
+                    <strong>@userCount user account@(userCount != 1 ? "s" : "")</strong> will be deactivated &mdash; no one will be able to log in.
                </li>
                <li class="mb-2">
                    <i class="bi bi-briefcase-fill text-danger me-2"></i>
@@ -90,13 +90,13 @@
        <div class="card-body">
            <ul class="mb-0">
                <li class="mb-1">
-                    <strong>Pause instead of delete</strong> — Contact support to temporarily suspend your account.
+                    <strong>Pause instead of delete</strong> &mdash; Contact support to temporarily suspend your account.
                </li>
                <li class="mb-1">
-                    <strong>Cancel your subscription</strong> — Stop future billing without deleting your data.
+                    <strong>Cancel your subscription</strong> &mdash; Stop future billing without deleting your data.
                </li>
                <li>
-                    <strong>Export your data first</strong> — Go to
+                    <strong>Export your data first</strong> &mdash; Go to
                    <a asp-controller="Reports" asp-action="Index">Reports</a>
                    to export jobs, customers, invoices, and more before proceeding.
                </li>
@@ -146,7 +146,7 @@
                        <i class="bi bi-trash3 me-1"></i>Delete My Account Permanently
                    </button>
                    <a asp-controller="CompanySettings" asp-action="Index" class="btn btn-outline-secondary px-4">
-                        Cancel — Keep My Account
+                        Cancel &mdash; Keep My Account
                    </a>
                </div>
            </form>
@@ -176,7 +176,7 @@
            // Extra guard: prevent accidental double-submit after the form is submitted.
            document.getElementById('deleteAccountForm').addEventListener('submit', function () {
                deleteBtn.disabled = true;
-                deleteBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Deleting…';
+                deleteBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Deleting&hellip;';
            });
        })();
    </script>
@@ -1,6 +1,6 @@
@model PowderCoating.Application.DTOs.Notification.NotificationTemplateDto
@{
-    ViewData["Title"] = $"Edit Template — {Model.DisplayName}";
+    ViewData["Title"] = $"Edit Template &mdash; {Model.DisplayName}";
    ViewData["PageIcon"] = "bi-envelope-gear";
    var placeholders = ViewBag.Placeholders as List<(string Placeholder, string Description)>
        ?? new List<(string, string)>();
@@ -70,7 +70,7 @@

                            @if (isEmail)
                            {
-                                <!-- Raw HTML textarea for email — supports {{placeholders}} and full HTML -->
+                                <!-- Raw HTML textarea for email &mdash; supports {{placeholders}} and full HTML -->
                                <textarea asp-for="Body" class="form-control font-monospace" rows="16"
                                          placeholder="Enter HTML email body..."></textarea>
                                <div class="form-text text-muted mt-1">
@@ -131,7 +131,7 @@
                            <div>
                                <span class="badge bg-light text-dark border placeholder-pill px-2 py-1"
                                      onclick="copyPlaceholder('@placeholder', this)"
-                                      title="@description — click to copy">
+                                      title="@description &mdash; click to copy">
                                    @placeholder
                                </span>
                                <span class="copy-feedback ms-1">Copied!</span>
@@ -1,4 +1,4 @@
-@model PowderCoating.Application.DTOs.Company.CompanySettingsDto
+@model PowderCoating.Application.DTOs.Company.CompanySettingsDto
@{
    ViewData["Title"] = "Company Settings";
    ViewData["PageIcon"] = "bi-building";
@@ -118,7 +118,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Company Information"
-                           data-bs-content="This information appears on every customer-facing document — quotes, invoices, and PDFs. Keep the company name, address, and email accurate so customers see the right details. The &lt;strong&gt;Primary Contact Email&lt;/strong&gt; is used as the reply-to address on all outgoing notifications.&lt;br&gt;&lt;br&gt;&lt;a href='/Help/Settings#company-information' target='_blank'&gt;Learn more →&lt;/a&gt;">
+                           data-bs-content="This information appears on every customer-facing document &mdash; quotes, invoices, and PDFs. Keep the company name, address, and email accurate so customers see the right details. The &lt;strong&gt;Primary Contact Email&lt;/strong&gt; is used as the reply-to address on all outgoing notifications.&lt;br&gt;&lt;br&gt;&lt;a href='/Help/Settings#company-information' target='_blank'&gt;Learn more →&lt;/a&gt;">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -165,39 +165,39 @@
                                    <label for="timeZone" class="form-label">Time Zone</label>
                                    <select class="form-select" id="timeZone" name="TimeZone">
                                        <optgroup label="United States">
-                                            <option value="America/New_York"    selected="@(Model.TimeZone == "America/New_York"    ? "selected" : null)">Eastern (ET) — New York</option>
-                                            <option value="America/Chicago"     selected="@(Model.TimeZone == "America/Chicago"     ? "selected" : null)">Central (CT) — Chicago</option>
-                                            <option value="America/Denver"      selected="@(Model.TimeZone == "America/Denver"      ? "selected" : null)">Mountain (MT) — Denver</option>
-                                            <option value="America/Phoenix"     selected="@(Model.TimeZone == "America/Phoenix"     ? "selected" : null)">Mountain no-DST — Phoenix</option>
-                                            <option value="America/Los_Angeles" selected="@(Model.TimeZone == "America/Los_Angeles" ? "selected" : null)">Pacific (PT) — Los Angeles</option>
-                                            <option value="America/Anchorage"   selected="@(Model.TimeZone == "America/Anchorage"   ? "selected" : null)">Alaska (AKT) — Anchorage</option>
-                                            <option value="Pacific/Honolulu"    selected="@(Model.TimeZone == "Pacific/Honolulu"    ? "selected" : null)">Hawaii (HT) — Honolulu</option>
+                                            <option value="America/New_York"    selected="@(Model.TimeZone == "America/New_York"    ? "selected" : null)">Eastern (ET) &mdash; New York</option>
+                                            <option value="America/Chicago"     selected="@(Model.TimeZone == "America/Chicago"     ? "selected" : null)">Central (CT) &mdash; Chicago</option>
+                                            <option value="America/Denver"      selected="@(Model.TimeZone == "America/Denver"      ? "selected" : null)">Mountain (MT) &mdash; Denver</option>
+                                            <option value="America/Phoenix"     selected="@(Model.TimeZone == "America/Phoenix"     ? "selected" : null)">Mountain no-DST &mdash; Phoenix</option>
+                                            <option value="America/Los_Angeles" selected="@(Model.TimeZone == "America/Los_Angeles" ? "selected" : null)">Pacific (PT) &mdash; Los Angeles</option>
+                                            <option value="America/Anchorage"   selected="@(Model.TimeZone == "America/Anchorage"   ? "selected" : null)">Alaska (AKT) &mdash; Anchorage</option>
+                                            <option value="Pacific/Honolulu"    selected="@(Model.TimeZone == "Pacific/Honolulu"    ? "selected" : null)">Hawaii (HT) &mdash; Honolulu</option>
                                        </optgroup>
                                        <optgroup label="Canada">
-                                            <option value="America/Halifax"   selected="@(Model.TimeZone == "America/Halifax"   ? "selected" : null)">Atlantic (AT) — Halifax</option>
-                                            <option value="America/Toronto"   selected="@(Model.TimeZone == "America/Toronto"   ? "selected" : null)">Eastern — Toronto</option>
-                                            <option value="America/Winnipeg"  selected="@(Model.TimeZone == "America/Winnipeg"  ? "selected" : null)">Central — Winnipeg</option>
-                                            <option value="America/Edmonton"  selected="@(Model.TimeZone == "America/Edmonton"  ? "selected" : null)">Mountain — Edmonton</option>
-                                            <option value="America/Vancouver" selected="@(Model.TimeZone == "America/Vancouver" ? "selected" : null)">Pacific — Vancouver</option>
+                                            <option value="America/Halifax"   selected="@(Model.TimeZone == "America/Halifax"   ? "selected" : null)">Atlantic (AT) &mdash; Halifax</option>
+                                            <option value="America/Toronto"   selected="@(Model.TimeZone == "America/Toronto"   ? "selected" : null)">Eastern &mdash; Toronto</option>
+                                            <option value="America/Winnipeg"  selected="@(Model.TimeZone == "America/Winnipeg"  ? "selected" : null)">Central &mdash; Winnipeg</option>
+                                            <option value="America/Edmonton"  selected="@(Model.TimeZone == "America/Edmonton"  ? "selected" : null)">Mountain &mdash; Edmonton</option>
+                                            <option value="America/Vancouver" selected="@(Model.TimeZone == "America/Vancouver" ? "selected" : null)">Pacific &mdash; Vancouver</option>
                                        </optgroup>
                                        <optgroup label="Europe">
-                                            <option value="Europe/London"   selected="@(Model.TimeZone == "Europe/London"   ? "selected" : null)">GMT/BST — London</option>
-                                            <option value="Europe/Paris"    selected="@(Model.TimeZone == "Europe/Paris"    ? "selected" : null)">CET — Paris / Berlin</option>
-                                            <option value="Europe/Helsinki" selected="@(Model.TimeZone == "Europe/Helsinki" ? "selected" : null)">EET — Helsinki</option>
-                                            <option value="Europe/Moscow"   selected="@(Model.TimeZone == "Europe/Moscow"   ? "selected" : null)">MSK — Moscow</option>
+                                            <option value="Europe/London"   selected="@(Model.TimeZone == "Europe/London"   ? "selected" : null)">GMT/BST &mdash; London</option>
+                                            <option value="Europe/Paris"    selected="@(Model.TimeZone == "Europe/Paris"    ? "selected" : null)">CET &mdash; Paris / Berlin</option>
+                                            <option value="Europe/Helsinki" selected="@(Model.TimeZone == "Europe/Helsinki" ? "selected" : null)">EET &mdash; Helsinki</option>
+                                            <option value="Europe/Moscow"   selected="@(Model.TimeZone == "Europe/Moscow"   ? "selected" : null)">MSK &mdash; Moscow</option>
                                        </optgroup>
                                        <optgroup label="Asia / Pacific">
-                                            <option value="Asia/Dubai"       selected="@(Model.TimeZone == "Asia/Dubai"       ? "selected" : null)">GST — Dubai</option>
-                                            <option value="Asia/Kolkata"     selected="@(Model.TimeZone == "Asia/Kolkata"     ? "selected" : null)">IST — India</option>
-                                            <option value="Asia/Bangkok"     selected="@(Model.TimeZone == "Asia/Bangkok"     ? "selected" : null)">ICT — Bangkok</option>
-                                            <option value="Asia/Shanghai"    selected="@(Model.TimeZone == "Asia/Shanghai"    ? "selected" : null)">CST — Beijing / Shanghai</option>
-                                            <option value="Asia/Tokyo"       selected="@(Model.TimeZone == "Asia/Tokyo"       ? "selected" : null)">JST — Tokyo</option>
-                                            <option value="Australia/Sydney" selected="@(Model.TimeZone == "Australia/Sydney" ? "selected" : null)">AEST — Sydney</option>
-                                            <option value="Pacific/Auckland" selected="@(Model.TimeZone == "Pacific/Auckland" ? "selected" : null)">NZST — Auckland</option>
+                                            <option value="Asia/Dubai"       selected="@(Model.TimeZone == "Asia/Dubai"       ? "selected" : null)">GST &mdash; Dubai</option>
+                                            <option value="Asia/Kolkata"     selected="@(Model.TimeZone == "Asia/Kolkata"     ? "selected" : null)">IST &mdash; India</option>
+                                            <option value="Asia/Bangkok"     selected="@(Model.TimeZone == "Asia/Bangkok"     ? "selected" : null)">ICT &mdash; Bangkok</option>
+                                            <option value="Asia/Shanghai"    selected="@(Model.TimeZone == "Asia/Shanghai"    ? "selected" : null)">CST &mdash; Beijing / Shanghai</option>
+                                            <option value="Asia/Tokyo"       selected="@(Model.TimeZone == "Asia/Tokyo"       ? "selected" : null)">JST &mdash; Tokyo</option>
+                                            <option value="Australia/Sydney" selected="@(Model.TimeZone == "Australia/Sydney" ? "selected" : null)">AEST &mdash; Sydney</option>
+                                            <option value="Pacific/Auckland" selected="@(Model.TimeZone == "Pacific/Auckland" ? "selected" : null)">NZST &mdash; Auckland</option>
                                        </optgroup>
                                        <optgroup label="South America">
-                                            <option value="America/Sao_Paulo"    selected="@(Model.TimeZone == "America/Sao_Paulo"    ? "selected" : null)">BRT — São Paulo</option>
-                                            <option value="America/Buenos_Aires" selected="@(Model.TimeZone == "America/Buenos_Aires" ? "selected" : null)">ART — Buenos Aires</option>
+                                            <option value="America/Sao_Paulo"    selected="@(Model.TimeZone == "America/Sao_Paulo"    ? "selected" : null)">BRT &mdash; São Paulo</option>
+                                            <option value="America/Buenos_Aires" selected="@(Model.TimeZone == "America/Buenos_Aires" ? "selected" : null)">ART &mdash; Buenos Aires</option>
                                        </optgroup>
                                        <optgroup label="UTC">
                                            <option value="UTC" selected="@(Model.TimeZone == "UTC" ? "selected" : null)">UTC</option>
@@ -243,7 +243,7 @@
                                }
                                else
                                {
-                                    <div class="text-muted small mb-2">No period lock set — all dates are open.</div>
+                                    <div class="text-muted small mb-2">No period lock set &mdash; all dates are open.</div>
                                }
                            </div>
                            <div class="col-md-4">
@@ -353,7 +353,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right"
                               data-bs-title="Operating Costs"
-                               data-bs-content="These are the rates the quoting engine uses to price every job automatically. Set them to your real shop costs and the system will produce accurate quotes without manual calculation. &lt;strong&gt;New quotes use the current rates&lt;/strong&gt; — changing a rate here does not retroactively reprice existing quotes.&lt;br&gt;&lt;br&gt;&lt;a href='/Help/Settings#pricing-configuration' target='_blank'&gt;Learn more →&lt;/a&gt;">
+                               data-bs-content="These are the rates the quoting engine uses to price every job automatically. Set them to your real shop costs and the system will produce accurate quotes without manual calculation. &lt;strong&gt;New quotes use the current rates&lt;/strong&gt; &mdash; changing a rate here does not retroactively reprice existing quotes.&lt;br&gt;&lt;br&gt;&lt;a href='/Help/Settings#pricing-configuration' target='_blank'&gt;Learn more →&lt;/a&gt;">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </h5>
@@ -368,7 +368,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Rates &amp; Costs"
-                           data-bs-content="&lt;strong&gt;Standard Labor Rate&lt;/strong&gt; is the baseline $/hr for all coating work — sandblasting and masking are multiplied from this. &lt;strong&gt;Powder Coating Cost/sq ft&lt;/strong&gt; is the fallback material rate used when you don't select a specific powder inventory item on a quote item. &lt;strong&gt;Additional Coat Labor&lt;/strong&gt; is the percentage of the base labor cost charged for each coat after the first (e.g. 30% means a 2nd coat adds 30% more labor).">
+                           data-bs-content="&lt;strong&gt;Standard Labor Rate&lt;/strong&gt; is the baseline $/hr for all coating work &mdash; sandblasting and masking are multiplied from this. &lt;strong&gt;Powder Coating Cost/sq ft&lt;/strong&gt; is the fallback material rate used when you don't select a specific powder inventory item on a quote item. &lt;strong&gt;Additional Coat Labor&lt;/strong&gt; is the percentage of the base labor cost charged for each coat after the first (e.g. 30% means a 2nd coat adds 30% more labor).">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </div>
@@ -506,7 +506,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Equipment Operating Costs"
-                           data-bs-content="The hourly cost of running each piece of equipment, including energy and depreciation. These are added to quote items based on the prep services selected. The &lt;strong&gt;Default Oven Rate&lt;/strong&gt; is used on quotes where no named oven is chosen — add individual shop ovens below if you have multiple ovens with different capacities and costs.">
+                           data-bs-content="The hourly cost of running each piece of equipment, including energy and depreciation. These are added to quote items based on the prep services selected. The &lt;strong&gt;Default Oven Rate&lt;/strong&gt; is used on quotes where no named oven is chosen &mdash; add individual shop ovens below if you have multiple ovens with different capacities and costs.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </div>
@@ -554,7 +554,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Pricing &amp; Profit"
-                           data-bs-content="&lt;strong&gt;Markup mode&lt;/strong&gt; adds a % on top of material costs only (labor and equipment pass through at cost). &lt;strong&gt;Margin mode&lt;/strong&gt; targets a gross margin % of the total selling price — e.g. 30% margin on a $100 cost base gives a $142.86 price. Note: margin % and markup % are not the same number. &lt;strong&gt;Shop Minimum&lt;/strong&gt; sets a floor price for any job.">
+                           data-bs-content="&lt;strong&gt;Markup mode&lt;/strong&gt; adds a % on top of material costs only (labor and equipment pass through at cost). &lt;strong&gt;Margin mode&lt;/strong&gt; targets a gross margin % of the total selling price &mdash; e.g. 30% margin on a $100 cost base gives a $142.86 price. Note: margin % and markup % are not the same number. &lt;strong&gt;Shop Minimum&lt;/strong&gt; sets a floor price for any job.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </div>
@@ -678,7 +678,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Part Complexity Multipliers"
-                           data-bs-content="A percentage added to the price of &lt;strong&gt;calculated items&lt;/strong&gt; based on how intricate the part is. When adding an item in a quote, staff select a complexity level — the system then applies this multiplier to account for the extra time and care needed. &lt;em&gt;Simple&lt;/em&gt; = 0% (flat panels, basic shapes). &lt;em&gt;Extreme&lt;/em&gt; = highly detailed, tight recesses, masking-intensive parts.">
+                           data-bs-content="A percentage added to the price of &lt;strong&gt;calculated items&lt;/strong&gt; based on how intricate the part is. When adding an item in a quote, staff select a complexity level &mdash; the system then applies this multiplier to account for the extra time and care needed. &lt;em&gt;Simple&lt;/em&gt; = 0% (flat panels, basic shapes). &lt;em&gt;Extreme&lt;/em&gt; = highly detailed, tight recesses, masking-intensive parts.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </div>
@@ -775,11 +775,11 @@
                                </div>
                                <div class="d-flex align-items-center gap-1 ms-auto">
                                    <span class="text-muted">=</span>
-                                    <span id="ovenDimResult" class="fw-semibold small text-primary" style="min-width:65px;">—</span>
+                                    <span id="ovenDimResult" class="fw-semibold small text-primary" style="min-width:65px;">&mdash;</span>
                                    <button type="button" class="btn btn-sm btn-outline-primary" id="ovenDimApply" disabled>Use</button>
                                </div>
                            </div>
-                            <div class="text-muted mt-1" style="font-size:.72rem;">W × D × H of oven interior — 20% deducted for rack &amp; wall depth</div>
+                            <div class="text-muted mt-1" style="font-size:.72rem;">W × D × H of oven interior &mdash; 20% deducted for rack &amp; wall depth</div>
                        </div>
                        <div class="mb-3">
                            <label for="ovenOrderInput" class="form-label">Display Order</label>
@@ -810,7 +810,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="AI Photo Quote Profile"
-                           data-bs-content="Describe your shop's specialties, typical items, and pricing style in plain language. This text is injected into the AI's system prompt every time a photo quote is analysed — the more specific you are, the better calibrated the estimates will be for your business. You can also describe anything the AI tends to get wrong. &lt;br&gt;&lt;br&gt;&lt;strong&gt;Additionally&lt;/strong&gt;, the AI automatically learns from quotes your team accepted without overriding — those become calibration examples that improve accuracy over time.">
+                           data-bs-content="Describe your shop's specialties, typical items, and pricing style in plain language. This text is injected into the AI's system prompt every time a photo quote is analysed &mdash; the more specific you are, the better calibrated the estimates will be for your business. You can also describe anything the AI tends to get wrong. &lt;br&gt;&lt;br&gt;&lt;strong&gt;Additionally&lt;/strong&gt;, the AI automatically learns from quotes your team accepted without overriding &mdash; those become calibration examples that improve accuracy over time.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -821,9 +821,9 @@
                            <div class="mb-3">
                                <label for="aiContextProfile" class="form-label fw-semibold">Shop Description</label>
                                <textarea id="aiContextProfile" class="form-control" rows="8" maxlength="2000"
-                                          placeholder="Examples:&#10;• We specialise in automotive restoration — wheels, frames, suspension brackets, and roll cages are our bread and butter.&#10;• Our customers expect premium pricing. We rarely work on items over 20 sqft.&#10;• Most items come to us already stripped; sandblasting adds roughly 15 min per item on average.&#10;• We use a 2-stage cure cycle — pre-heat 10 min, coat, cure 20 min at 400°F.">@(Model.OperatingCosts?.AiContextProfile)</textarea>
+                                          placeholder="Examples:&#10;• We specialise in automotive restoration &mdash; wheels, frames, suspension brackets, and roll cages are our bread and butter.&#10;• Our customers expect premium pricing. We rarely work on items over 20 sqft.&#10;• Most items come to us already stripped; sandblasting adds roughly 15 min per item on average.&#10;• We use a 2-stage cure cycle &mdash; pre-heat 10 min, coat, cure 20 min at 400°F.">@(Model.OperatingCosts?.AiContextProfile)</textarea>
                                <div class="d-flex justify-content-between mt-1">
-                                    <small class="text-muted">Plain language — write it as if briefing a new estimator on your shop.</small>
+                                    <small class="text-muted">Plain language &mdash; write it as if briefing a new estimator on your shop.</small>
                                    <small class="text-muted"><span id="aiProfileCharCount">@(Model.OperatingCosts?.AiContextProfile?.Length ?? 0)</span>/2000</small>
                                </div>
                            </div>
@@ -832,7 +832,7 @@
                                    <i class="bi bi-floppy me-1"></i> Save AI Profile
                                </button>
                                <button type="button" class="btn btn-outline-secondary" id="btnGenerateAiDraft"
-                                        title="Build a suggested profile from your existing settings — ovens, workers, inventory categories, and rates">
+                                        title="Build a suggested profile from your existing settings &mdash; ovens, workers, inventory categories, and rates">
                                    <i class="bi bi-stars me-1"></i> Generate from my settings
                                </button>
                                <span id="aiProfileStatus" class="small"></span>
@@ -843,9 +843,9 @@
                            <div class="card bg-light border-0">
                                <div class="card-body">
                                    <h6 class="card-title"><i class="bi bi-lightbulb text-warning me-1"></i> How AI Learning Works</h6>
-                                    <p class="small mb-2"><strong>Layer 1 — Pricing config:</strong> Your operating costs (labor, equipment, markup) are always injected automatically.</p>
-                                    <p class="small mb-2"><strong>Layer 2 — Your shop profile:</strong> The description you write here is added to every AI analysis, guiding estimates toward your typical work.</p>
-                                    <p class="small mb-0"><strong>Layer 3 — Automatic learning:</strong> Each time your team accepts an AI estimate without changing it, that item is silently added as a calibration example. The AI improves on its own the more you use it.</p>
+                                    <p class="small mb-2"><strong>Layer 1 &mdash; Pricing config:</strong> Your operating costs (labor, equipment, markup) are always injected automatically.</p>
+                                    <p class="small mb-2"><strong>Layer 2 &mdash; Your shop profile:</strong> The description you write here is added to every AI analysis, guiding estimates toward your typical work.</p>
+                                    <p class="small mb-0"><strong>Layer 3 &mdash; Automatic learning:</strong> Each time your team accepts an AI estimate without changing it, that item is silently added as a calibration example. The AI improves on its own the more you use it.</p>
                                </div>
                            </div>
                        </div>
@@ -874,10 +874,10 @@
                    <div class="mb-3">
                        <label class="form-label fw-medium">Shop Size</label>
                        <select class="form-select" id="shopCapabilityTier" style="max-width:320px">
-                            <option value="0" selected="@(tierVal == 0 ? "selected" : null)">Garage — Home setup, part-time</option>
-                            <option value="1" selected="@(tierVal == 1 ? "selected" : null)">Small — 1–5 person shop</option>
-                            <option value="2" selected="@(tierVal == 2 ? "selected" : null)">Medium — Established shop, 5–10 people</option>
-                            <option value="3" selected="@(tierVal == 3 ? "selected" : null)">Large — High-volume, 10+ people</option>
+                            <option value="0" selected="@(tierVal == 0 ? "selected" : null)">Garage &mdash; Home setup, part-time</option>
+                            <option value="1" selected="@(tierVal == 1 ? "selected" : null)">Small &mdash; 1&ndash;5 person shop</option>
+                            <option value="2" selected="@(tierVal == 2 ? "selected" : null)">Medium &mdash; Established shop, 5&ndash;10 people</option>
+                            <option value="3" selected="@(tierVal == 3 ? "selected" : null)">Large &mdash; High-volume, 10+ people</option>
                        </select>
                        <div class="form-text">Used by the AI when estimating job complexity and throughput.</div>
                    </div>
@@ -978,11 +978,11 @@
                                <div class="mb-3">
                                    <label class="form-label">Default Currency</label>
                                    <select class="form-select" id="defaultCurrency" name="DefaultCurrency">
-                                        <option value="USD" selected="@(Model.Preferences?.DefaultCurrency == "USD" ? "selected" : null)">USD — US Dollar</option>
-                                        <option value="CAD" selected="@(Model.Preferences?.DefaultCurrency == "CAD" ? "selected" : null)">CAD — Canadian Dollar</option>
-                                        <option value="EUR" selected="@(Model.Preferences?.DefaultCurrency == "EUR" ? "selected" : null)">EUR — Euro</option>
-                                        <option value="GBP" selected="@(Model.Preferences?.DefaultCurrency == "GBP" ? "selected" : null)">GBP — British Pound</option>
-                                        <option value="AUD" selected="@(Model.Preferences?.DefaultCurrency == "AUD" ? "selected" : null)">AUD — Australian Dollar</option>
+                                        <option value="USD" selected="@(Model.Preferences?.DefaultCurrency == "USD" ? "selected" : null)">USD &mdash; US Dollar</option>
+                                        <option value="CAD" selected="@(Model.Preferences?.DefaultCurrency == "CAD" ? "selected" : null)">CAD &mdash; Canadian Dollar</option>
+                                        <option value="EUR" selected="@(Model.Preferences?.DefaultCurrency == "EUR" ? "selected" : null)">EUR &mdash; Euro</option>
+                                        <option value="GBP" selected="@(Model.Preferences?.DefaultCurrency == "GBP" ? "selected" : null)">GBP &mdash; British Pound</option>
+                                        <option value="AUD" selected="@(Model.Preferences?.DefaultCurrency == "AUD" ? "selected" : null)">AUD &mdash; Australian Dollar</option>
                                    </select>
                                </div>
                            </div>
@@ -1046,7 +1046,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right"
                               data-bs-title="Number Prefixes"
-                               data-bs-content="The prefix is combined with a date stamp and sequence number to form record IDs — for example prefix &lt;strong&gt;QT&lt;/strong&gt; produces &lt;em&gt;QT-2603-0042&lt;/em&gt;. Change the prefix to match your preferred numbering convention. Changing it only affects &lt;strong&gt;new&lt;/strong&gt; records; existing numbers are not renamed.">
+                               data-bs-content="The prefix is combined with a date stamp and sequence number to form record IDs &mdash; for example prefix &lt;strong&gt;QT&lt;/strong&gt; produces &lt;em&gt;QT-2603-0042&lt;/em&gt;. Change the prefix to match your preferred numbering convention. Changing it only affects &lt;strong&gt;new&lt;/strong&gt; records; existing numbers are not renamed.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </h6>
@@ -1082,7 +1082,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Job &amp; Workflow Defaults"
-                           data-bs-content="Controls how jobs are created and flow through your shop. &lt;strong&gt;Require Customer PO&lt;/strong&gt; enforces that a PO number is entered before a job can be saved — useful for commercial accounts. &lt;strong&gt;Allow Customer Approval&lt;/strong&gt; enables the approval step in the job workflow — when a quote is approved, the job moves to an Approved status before work begins.">
+                           data-bs-content="Controls how jobs are created and flow through your shop. &lt;strong&gt;Require Customer PO&lt;/strong&gt; enforces that a PO number is entered before a job can be saved &mdash; useful for commercial accounts. &lt;strong&gt;Allow Customer Approval&lt;/strong&gt; enables the approval step in the job workflow &mdash; when a quote is approved, the job moves to an Approved status before work begins.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -1141,7 +1141,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Notifications &amp; Alerts"
-                           data-bs-content="Controls which events send emails to your team and customers. Set the &lt;strong&gt;From Email Address&lt;/strong&gt; to a domain you control — using a domain-verified address prevents emails landing in spam. If left blank, the system default address is used. Turn off notification types you don't need to avoid inbox noise.">
+                           data-bs-content="Controls which events send emails to your team and customers. Set the &lt;strong&gt;From Email Address&lt;/strong&gt; to a domain you control &mdash; using a domain-verified address prevents emails landing in spam. If left blank, the system default address is used. Turn off notification types you don't need to avoid inbox noise.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -1311,7 +1311,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Notification Templates"
-                           data-bs-content="Customise the subject and body of every automated email sent by the system — job status updates, quote approvals, invoice reminders, and more. Templates use &lt;strong&gt;&#123;&#123;placeholder&#125;&#125;&lt;/strong&gt; tokens that are replaced with live data when the email is sent. Click &lt;strong&gt;Edit&lt;/strong&gt; on any row to modify it; use &lt;strong&gt;Reset to Default&lt;/strong&gt; to restore the original wording at any time.&lt;br&gt;&lt;br&gt;Changes take effect immediately — the next triggered notification will use the updated template.">
+                           data-bs-content="Customise the subject and body of every automated email sent by the system &mdash; job status updates, quote approvals, invoice reminders, and more. Templates use &lt;strong&gt;&#123;&#123;placeholder&#125;&#125;&lt;/strong&gt; tokens that are replaced with live data when the email is sent. Click &lt;strong&gt;Edit&lt;/strong&gt; on any row to modify it; use &lt;strong&gt;Reset to Default&lt;/strong&gt; to restore the original wording at any time.&lt;br&gt;&lt;br&gt;Changes take effect immediately &mdash; the next triggered notification will use the updated template.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -1371,7 +1371,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Data Retention"
-                           data-bs-content="Controls how long records are kept. Most businesses set quote and job retention to &lt;strong&gt;7 years&lt;/strong&gt; to satisfy tax and audit requirements. &lt;strong&gt;Deleted record retention&lt;/strong&gt; is the grace period after a soft-delete before the record is permanently purged — useful if someone accidentally deletes something.">
+                           data-bs-content="Controls how long records are kept. Most businesses set quote and job retention to &lt;strong&gt;7 years&lt;/strong&gt; to satisfy tax and audit requirements. &lt;strong&gt;Deleted record retention&lt;/strong&gt; is the grace period after a soft-delete before the record is permanently purged &mdash; useful if someone accidentally deletes something.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -1433,7 +1433,7 @@
                        <a tabindex="0" class="help-icon" role="button"
                           data-bs-toggle="popover" data-bs-placement="right"
                           data-bs-title="Data Lookups"
-                           data-bs-content="Lookups are the dropdown options that appear throughout the app — job statuses, priorities, quote statuses, and more. You can rename labels, change colours, and reorder them to match your shop's terminology. &lt;strong&gt;Status codes&lt;/strong&gt; drive workflow logic and should not be changed unless you understand the impact.">
+                           data-bs-content="Lookups are the dropdown options that appear throughout the app &mdash; job statuses, priorities, quote statuses, and more. You can rename labels, change colours, and reorder them to match your shop's terminology. &lt;strong&gt;Status codes&lt;/strong&gt; drive workflow logic and should not be changed unless you understand the impact.">
                            <i class="bi bi-question-circle"></i>
                        </a>
                    </h5>
@@ -1869,7 +1869,7 @@
                                <textarea id="woTerms" class="form-control" rows="5" maxlength="2000"
                                          placeholder="e.g. *Products must be picked up within 5 days of notification of completion or a storage fee may apply."
                                >@(Model.Preferences?.WoTerms ?? "")</textarea>
-                                <div class="form-text">Printed in italic at the bottom of every blank work order. Supports plain text — use * or ** for visual emphasis.</div>
+                                <div class="form-text">Printed in italic at the bottom of every blank work order. Supports plain text &mdash; use * or ** for visual emphasis.</div>
                            </div>

                            <div class="d-flex gap-2 align-items-center">
@@ -2168,7 +2168,7 @@
        <div class="modal-content">
            <div class="modal-header bg-primary text-white">
                <h5 class="modal-title" id="smsTermsModalLabel">
-                    <i class="bi bi-phone me-2"></i>SMS Notifications — Terms of Service
+                    <i class="bi bi-phone me-2"></i>SMS Notifications &mdash; Terms of Service
                </h5>
            </div>
            <div class="modal-body">
@@ -2178,9 +2178,9 @@
                </div>

                <h6 class="fw-bold">1. Prior Express Written Consent Required</h6>
-                <p class="text-muted small">You <strong>must obtain clear, documented consent</strong> from each customer before sending them any SMS message. This means each customer must have explicitly agreed — in writing or through a recorded digital interaction — that they wish to receive text messages from your business. Enabling this feature is not consent on their behalf. You must collect and record their authorization individually, before enabling SMS for their account in this system.</p>
+                <p class="text-muted small">You <strong>must obtain clear, documented consent</strong> from each customer before sending them any SMS message. This means each customer must have explicitly agreed &mdash; in writing or through a recorded digital interaction &mdash; that they wish to receive text messages from your business. Enabling this feature is not consent on their behalf. You must collect and record their authorization individually, before enabling SMS for their account in this system.</p>

-                <h6 class="fw-bold">2. Federal Law Governs SMS — Fines Are Real</h6>
+                <h6 class="fw-bold">2. Federal Law Governs SMS &mdash; Fines Are Real</h6>
                <p class="text-muted small">The <strong>Telephone Consumer Protection Act (TCPA)</strong>, enforced by the Federal Communications Commission (FCC), imposes fines of <strong>$500 to $1,500 per individual message</strong> sent without proper authorization. These fines apply per text, not per customer. A single campaign to 100 unconsented recipients could result in exposure of $50,000 to $150,000. The FCC and private plaintiffs both actively pursue TCPA violations.</p>

                <h6 class="fw-bold">3. Opt-Out Requests Must Be Honored Immediately</h6>
@@ -2189,7 +2189,7 @@
                <h6 class="fw-bold">4. Message Rates &amp; Content Restrictions</h6>
                <p class="text-muted small">Every message sent must include your business name and an opt-out reminder (e.g., "Reply STOP to opt out"). Messages must be directly relevant to the service the customer consented to receive and must not contain solicitations, promotions, or third-party offers unless the customer has separately consented to those.</p>

-                <h6 class="fw-bold">5. Your Responsibility — Not Ours</h6>
+                <h6 class="fw-bold">5. Your Responsibility &mdash; Not Ours</h6>
                <p class="text-muted small">Powder Coating Logix provides this feature as a communication tool only. <strong>We are not responsible for how you use it.</strong> You agree that your company is solely responsible for obtaining proper consent, maintaining records of that consent, honoring opt-outs, and ensuring all outbound messages comply with the TCPA, FCC regulations, and any applicable state laws. You agree to indemnify and hold Powder Coating Logix harmless from any claims, fines, or damages arising from your company's use of SMS.</p>

                <hr />
@@ -2201,7 +2201,7 @@
                </div>
            </div>
            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" id="smsTermsDeclineBtn">Cancel — Keep SMS Disabled</button>
+                <button type="button" class="btn btn-secondary" id="smsTermsDeclineBtn">Cancel &mdash; Keep SMS Disabled</button>
                <button type="button" class="btn btn-primary" id="smsTermsAcceptBtn" disabled>
                    <i class="bi bi-check-circle me-1"></i>I Agree &amp; Enable SMS
                </button>
@@ -2469,7 +2469,7 @@
                });
            });

-            // AI Profile — char counter and save (elements only exist when AiPhotoQuotesEnabled)
+            // AI Profile &mdash; char counter and save (elements only exist when AiPhotoQuotesEnabled)
            $('#aiContextProfile').on('input', function () {
                $('#aiProfileCharCount').text($(this).val().length);
            });
@@ -2511,7 +2511,7 @@
                        if (response.success) {
                            $('#aiContextProfile').val(response.draft);
                            $('#aiProfileCharCount').text(response.draft.length);
-                            showToast('info', 'Draft generated — review and edit it, then click Save AI Profile.');
+                            showToast('info', 'Draft generated &mdash; review and edit it, then click Save AI Profile.');
                        } else {
                            showToast('error', response.message);
                        }
@@ -2525,7 +2525,7 @@
                });
            });

-            // Quoting Calibration — save
+            // Quoting Calibration &mdash; save
            $('#saveBlastProfile').on('click', function () {
                var btn = $(this);
                btn.prop('disabled', true).html('<span class="spinner-border spinner-border-sm"></span> Saving...');
@@ -2631,7 +2631,7 @@
                };
            }, 'Save Retention Policy');

-            // SMS toggle — shows terms modal on first enable (or after terms version change)
+            // SMS toggle &mdash; shows terms modal on first enable (or after terms version change)
            (function () {
                const toggle = document.getElementById('smsEnabledToggle');
                if (!toggle) return;
@@ -2737,7 +2737,7 @@
    <script src="~/js/company-settings-lookups-modals.js" asp-append-version="true"></script>
    <script>
        // ── Oven Costs Management ──────────────────────────────────────────────
-        // Cache element references once — modal is now outside all forms
+        // Cache element references once &mdash; modal is now outside all forms

        const _ovenModal    = new bootstrap.Modal(document.getElementById('ovenModal'));
        const _ovenTitle    = document.getElementById('ovenModalTitle');
@@ -2765,7 +2765,7 @@
                if (!data.success) throw new Error(data.message);
                renderOvenTable(data.data);
                _ovenCount.textContent = data.data.length === 0
-                    ? 'No shop ovens — default rate will be used on all quotes.'
+                    ? 'No shop ovens &mdash; default rate will be used on all quotes.'
                    : `${data.data.length} oven(s) configured`;
            } catch (e) {
                _ovenBody.innerHTML = `<tr><td colspan="6" class="text-center text-danger">Failed to load ovens: ${escHtml(e.message)}</td></tr>`;
@@ -2783,7 +2783,7 @@
                <tr>
                    <td><strong>${escHtml(o.label)}</strong></td>
                    <td>$${parseFloat(o.costPerHour).toFixed(2)}/hr</td>
-                    <td class="text-muted small">${o.maxLoadSqFt != null ? parseFloat(o.maxLoadSqFt).toFixed(0) + ' sqft' : '—'}</td>
+                    <td class="text-muted small">${o.maxLoadSqFt != null ? parseFloat(o.maxLoadSqFt).toFixed(0) + ' sqft' : '&mdash;'}</td>
                    <td>${o.displayOrder}</td>
                    <td>${o.isActive
                        ? '<span class="badge bg-success">Active</span>'
@@ -2887,7 +2887,7 @@
        document.getElementById('ovenCalcToggle').addEventListener('click', function (e) {
            e.preventDefault();
            const hidden = _calcPanel.classList.toggle('d-none');
-            if (!hidden) { _calcW.value = ''; _calcD.value = ''; _calcH.value = ''; _calcResult.textContent = '—'; _calcApply.disabled = true; _calcW.focus(); }
+            if (!hidden) { _calcW.value = ''; _calcD.value = ''; _calcH.value = ''; _calcResult.textContent = '&mdash;'; _calcApply.disabled = true; _calcW.focus(); }
        });

        function _updateCalc() {
@@ -2907,7 +2907,7 @@
                _calcApply.disabled = false;
                _calcApply.dataset.val = val;
            } else {
-                _calcResult.textContent = '—';
+                _calcResult.textContent = '&mdash;';
                _calcApply.disabled = true;
            }
        }
@@ -2925,7 +2925,7 @@
        document.getElementById('ovenModal').addEventListener('hidden.bs.modal', function () {
            _calcPanel.classList.add('d-none');
            _calcW.value = ''; _calcD.value = ''; _calcH.value = '';
-            _calcResult.textContent = '—'; _calcApply.disabled = true;
+            _calcResult.textContent = '&mdash;'; _calcApply.disabled = true;
        });
        // ─────────────────────────────────────────────────────────────────────

@@ -3108,7 +3108,7 @@
                              onmouseenter="this.classList.replace('bg-light','bg-primary');this.classList.replace('text-dark','text-white')"
                              onmouseleave="this.classList.replace('bg-primary','bg-light');this.classList.replace('text-white','text-dark')"
                              onclick="ntplCopyPlaceholder('${p.placeholder}', this)"
-                              title="${p.description} — click to copy">
+                              title="${p.description} &mdash; click to copy">
                            ${p.placeholder}
                        </span>
                        <span class="ms-1 text-success small" style="display:none;">Copied!</span>
@@ -435,13 +435,13 @@
                        <div class="col-sm-6">
                            <label for="blastSetupNozzleSize" class="form-label">Nozzle Size</label>
                            <select class="form-select blast-modal-input" id="blastSetupNozzleSize">
-                                <option value="2">#2 (1/8") — Very small / entry level</option>
-                                <option value="3">#3 (3/16") — Small / hobby</option>
-                                <option value="4">#4 (1/4") — Light duty</option>
-                                <option value="5" selected>#5 (5/16") — Medium (most common)</option>
-                                <option value="6">#6 (3/8") — Heavy duty</option>
-                                <option value="7">#7 (7/16") — High volume</option>
-                                <option value="8">#8 (1/2") — Industrial</option>
+                                <option value="2">#2 (1/8") &mdash; Very small / entry level</option>
+                                <option value="3">#3 (3/16") &mdash; Small / hobby</option>
+                                <option value="4">#4 (1/4") &mdash; Light duty</option>
+                                <option value="5" selected>#5 (5/16") &mdash; Medium (most common)</option>
+                                <option value="6">#6 (3/8") &mdash; Heavy duty</option>
+                                <option value="7">#7 (7/16") &mdash; High volume</option>
+                                <option value="8">#8 (1/2") &mdash; Industrial</option>
                            </select>
                        </div>
                        <div class="col-sm-6">
@@ -465,7 +465,7 @@
                        <div class="col-sm-6 d-flex align-items-end">
                            <div class="w-100 p-3 bg-light rounded text-center">
                                <div class="text-muted small">Derived Rate</div>
-                                <div class="fw-bold fs-5" id="blastSetupDerivedRate">—</div>
+                                <div class="fw-bold fs-5" id="blastSetupDerivedRate">&mdash;</div>
                                <div class="text-muted small">sqft/hr</div>
                            </div>
                        </div>
@@ -1,10 +1,10 @@
-@model PowderCoating.Application.DTOs.User.CreateCompanyUserDto
+@model PowderCoating.Application.DTOs.User.CreateCompanyUserDto

@{
    ViewData["Title"] = "Add New User";
    ViewData["PageIcon"] = "bi-person-plus";
    ViewData["PageHelpTitle"] = "Add New User";
-    ViewData["PageHelpContent"] = "Creates a new login account for a member of your company. The email address doubles as the login username. Set a temporary password â€” the user can change it from their Profile page after their first login. Assign a Role, then fine-tune individual permissions below.";
+    ViewData["PageHelpContent"] = "Creates a new login account for a member of your company. The email address doubles as the login username. Set a temporary password &mdash; the user can change it from their Profile page after their first login. Assign a Role, then fine-tune individual permissions below.";
 }

 <div class="container">
@@ -26,7 +26,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Basic Information"
-                               data-bs-content="First Name, Last Name, and Email are required. The email is used as the login username â€” it must be unique across the system. Employee Number is an optional internal reference. The user can update their name and phone from their own Profile page after logging in.">
+                               data-bs-content="First Name, Last Name, and Email are required. The email is used as the login username &mdash; it must be unique across the system. Employee Number is an optional internal reference. The user can update their name and phone from their own Profile page after logging in.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -1,10 +1,10 @@
-@model PowderCoating.Application.DTOs.User.UpdateCompanyUserDto
+@model PowderCoating.Application.DTOs.User.UpdateCompanyUserDto

@{
    ViewData["Title"] = "Edit User";
    ViewData["PageIcon"] = "bi-person-gear";
    ViewData["PageHelpTitle"] = "Edit User";
-    ViewData["PageHelpContent"] = "Update this user&apos;s account details, role, and permissions. Unchecking User Active prevents the user from logging in without deleting their account or history. Changing the email here also changes their login username â€” notify them so they can log in with the new address.";
+    ViewData["PageHelpContent"] = "Update this user&apos;s account details, role, and permissions. Unchecking User Active prevents the user from logging in without deleting their account or history. Changing the email here also changes their login username &mdash; notify them so they can log in with the new address.";
 }

 <div class="container">
@@ -36,7 +36,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Basic Information"
-                               data-bs-content="Email is this user's login username â€” changing it here means they must use the new address to log in. User Active controls whether the account can sign in; deactivating preserves all data without deleting the account. To reset a password, the user can use Forgot Password on the login page, or a SuperAdmin can set one directly.">
+                               data-bs-content="Email is this user's login username &mdash; changing it here means they must use the new address to log in. User Active controls whether the account can sign in; deactivating preserves all data without deleting the account. To reset a password, the user can use Forgot Password on the login page, or a SuperAdmin can set one directly.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -80,7 +80,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Role &amp; Department"
-                               data-bs-content="Changing the Role updates the user's base access level immediately on save. Termination Date is informational â€” to actually prevent login, also uncheck User Active above. Department and Position appear on the user's profile card and in the Manage Users list.">
+                               data-bs-content="Changing the Role updates the user's base access level immediately on save. Termination Date is informational &mdash; to actually prevent login, also uncheck User Active above. Department and Position appear on the user's profile card and in the Manage Users list.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -55,7 +55,7 @@
                </div>
                <div class="flex-grow-1">
                    <div class="fw-semibold">AI Assistant</div>
-                    <div class="text-muted small">Ask anything — available 24/7 in the bottom-right corner.</div>
+                    <div class="text-muted small">Ask anything &mdash; available 24/7 in the bottom-right corner.</div>
                </div>
                <button type="button" class="btn btn-sm btn-outline-success flex-shrink-0"
                        onclick="document.getElementById('aiHelpTrigger')?.click()">
@@ -122,7 +122,7 @@
                        <div class="col-md-6">
                            <label asp-for="Form.Category" class="form-label fw-semibold"></label>
                            <select asp-for="Form.Category" class="form-select">
-                                <option value="">— Select a Category —</option>
+                                <option value="">&mdash; Select a Category &mdash;</option>
                                @foreach (var cat in ContactFormModel.Categories)
                                {
                                    <option value="@cat" selected="@(Model.Form.Category == cat)">@cat</option>
@@ -105,7 +105,7 @@ else
                                    <div class="mb-0">
                                        <label class="form-label fw-semibold">Admin Note <span class="text-muted fw-normal">(optional)</span></label>
                                        <textarea name="adminNotes" class="form-control" rows="3"
-                                                  placeholder="e.g. Replied via email, escalated to billing, resolved…"></textarea>
+                                                  placeholder="e.g. Replied via email, escalated to billing, resolved&hellip;"></textarea>
                                    </div>
                                </div>
                                <div class="modal-footer">
@@ -33,7 +33,7 @@
                    <div class="mb-3">
                        <label asp-for="CustomerId" class="form-label">Customer <span class="text-danger">*</span></label>
                        <select asp-for="CustomerId" asp-items="customers" class="form-select">
-                            <option value="0">— select customer —</option>
+                            <option value="0">&mdash; select customer &mdash;</option>
                        </select>
                        <span asp-validation-for="CustomerId" class="text-danger small"></span>
                    </div>
@@ -51,7 +51,7 @@
                    <div class="mb-3">
                        <label asp-for="Reason" class="form-label">Reason <span class="text-danger">*</span></label>
                        <input asp-for="Reason" class="form-control"
-                               placeholder="e.g. Price adjustment, billing error, goodwill credit…" />
+                               placeholder="e.g. Price adjustment, billing error, goodwill credit&hellip;" />
                        <span asp-validation-for="Reason" class="text-danger small"></span>
                    </div>

@@ -65,7 +65,7 @@
                    <div class="mb-4">
                        <label asp-for="ExpiryDate" class="form-label">
                            Expiry Date
-                            <span class="text-muted small ms-1">(optional — leave blank for no expiry)</span>
+                            <span class="text-muted small ms-1">(optional &mdash; leave blank for no expiry)</span>
                        </label>
                        <input asp-for="ExpiryDate" type="date" class="form-control" />
                        <span asp-validation-for="ExpiryDate" class="text-danger small"></span>
@@ -181,7 +181,7 @@
                                        </td>
                                        <td>@a.AppliedDate.ToLocalTime().ToString("MM/dd/yyyy")</td>
                                        <td class="text-end fw-semibold text-success">@a.AmountApplied.ToString("C")</td>
-                                        <td class="small text-muted">@(a.AppliedBy?.FullName ?? "—")</td>
+                                        <td class="small text-muted">@Html.Raw(a.AppliedBy?.FullName ?? "&mdash;")</td>
                                    </tr>
                                }
                            </tbody>
@@ -220,12 +220,12 @@
                            <div class="mb-3">
                                <label class="form-label">Select Invoice</label>
                                <select name="invoiceId" id="applyInvoiceId" class="form-select" required>
-                                    <option value="">— choose invoice —</option>
+                                    <option value="">&mdash; choose invoice &mdash;</option>
                                    @foreach (var inv in openInvoices)
                                    {
                                        <option value="@inv.Id"
                                                data-balance="@inv.BalanceDue.ToString("F2")">
-                                            @inv.InvoiceNumber — Due @inv.BalanceDue.ToString("C")
+                                            @inv.InvoiceNumber &mdash; Due @inv.BalanceDue.ToString("C")
                                            @if (inv.DueDate.HasValue && inv.DueDate.Value < DateTime.UtcNow)
                                            { <text>(Overdue)</text> }
                                        </option>
@@ -73,7 +73,7 @@
            <div class="col-md-4">
                <label class="form-label small mb-1">Search</label>
                <input name="search" value="@search" class="form-control form-control-sm"
-                       placeholder="Customer, memo #, or reason…" />
+                       placeholder="Customer, memo #, or reason&hellip;" />
            </div>
            <div class="col-md-3">
                <label class="form-label small mb-1">Status</label>
@@ -204,7 +204,7 @@ else
                            </td>
                            <td>@m.IssueDate.ToLocalTime().ToString("MM/dd/yyyy")</td>
                            <td class="@(expired ? "text-danger fw-semibold" : "")">
-                                @(m.ExpiryDate.HasValue ? m.ExpiryDate.Value.ToLocalTime().ToString("MM/dd/yyyy") : "—")
+                                @Html.Raw(m.ExpiryDate.HasValue ? m.ExpiryDate.Value.ToLocalTime().ToString("MM/dd/yyyy") : "&mdash;")
                                @if (expired) { <small>(Expired)</small> }
                            </td>
                            <td>
@@ -239,7 +239,7 @@
                                            }
                                            else
                                            {
-                                                <span class="text-muted">—</span>
+                                                <span class="text-muted">&mdash;</span>
                                            }
                                        </td>
                                        <td class="fw-semibold">@job.FinalPrice.ToString("C")</td>
@@ -267,7 +267,7 @@
                    {
                        <div class="card-footer bg-transparent d-flex justify-content-between align-items-center py-3 px-4">
                            <div class="text-muted small">
-                                Showing @jobs.StartIndex–@jobs.EndIndex of @jobs.TotalCount jobs
+                                Showing @jobs.StartIndex&ndash;@jobs.EndIndex of @jobs.TotalCount jobs
                            </div>
                            <div class="d-flex align-items-center gap-3">
                                <div class="d-flex align-items-center gap-1">
@@ -399,7 +399,7 @@
                                            }
                                            else
                                            {
-                                                <span class="text-muted">—</span>
+                                                <span class="text-muted">&mdash;</span>
                                            }
                                        </td>
                                        <td class="fw-semibold">@quote.Total.ToString("C")</td>
@@ -426,7 +426,7 @@
                    {
                        <div class="card-footer bg-transparent d-flex justify-content-between align-items-center py-3 px-4">
                            <div class="text-muted small">
-                                Showing @quotes.StartIndex–@quotes.EndIndex of @quotes.TotalCount quotes
+                                Showing @quotes.StartIndex&ndash;@quotes.EndIndex of @quotes.TotalCount quotes
                            </div>
                            <div class="d-flex align-items-center gap-3">
                                <div class="d-flex align-items-center gap-1">
@@ -25,7 +25,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Company Information"
-                               data-bs-content="Company Name is used on quotes, invoices, and correspondence. Leave it blank for individual (non-business) customers. Customer Type controls which features are available — Commercial customers get payment terms, credit limits, and pricing tier discounts; Individual customers are for simpler one-off work.">
+                               data-bs-content="Company Name is used on quotes, invoices, and correspondence. Leave it blank for individual (non-business) customers. Customer Type controls which features are available &mdash; Commercial customers get payment terms, credit limits, and pricing tier discounts; Individual customers are for simpler one-off work.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -59,7 +59,7 @@
                        </h5>
                        <div class="alert alert-info alert-permanent py-2 px-3 mb-3" style="font-size:.875rem;">
                            <i class="bi bi-info-circle me-1"></i>
-                            <strong>Required:</strong> At least one of Company Name, First Name, or Last Name — and at least one of Email, Phone, or Mobile Phone.
+                            <strong>Required:</strong> At least one of Company Name, First Name, or Last Name &mdash; and at least one of Email, Phone, or Mobile Phone.
                        </div>
                        <div class="row g-3">
                            <div class="col-md-6">
@@ -216,7 +216,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Business Information"
-                               data-bs-content="These fields govern billing and compliance. Payment Terms sets the default for invoices (e.g., Net 30 = payment due within 30 days). Credit Limit is a soft cap on outstanding balance — the system will warn when exceeded. Tax Exempt removes tax from all invoices for this customer (upload the exemption certificate on the Edit page).">
+                               data-bs-content="These fields govern billing and compliance. Payment Terms sets the default for invoices (e.g., Net 30 = payment due within 30 days). Credit Limit is a soft cap on outstanding balance &mdash; the system will warn when exceeded. Tax Exempt removes tax from all invoices for this customer (upload the exemption certificate on the Edit page).">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -232,7 +232,7 @@
                                    <a tabindex="0" class="help-icon" role="button"
                                       data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                                       data-bs-title="Payment Terms"
-                                       data-bs-content="Sets the default due date on invoices for this customer. 'Net 30' means payment is due 30 days after the invoice date. This is a default — you can override it on individual invoices.">
+                                       data-bs-content="Sets the default due date on invoices for this customer. 'Net 30' means payment is due 30 days after the invoice date. This is a default &mdash; you can override it on individual invoices.">
                                        <i class="bi bi-question-circle"></i>
                                    </a>
                                </div>
@@ -250,7 +250,7 @@
                            <div class="col-md-3">
                                <label asp-for="PricingTierId" class="form-label">Pricing Tier</label>
                                <select asp-for="PricingTierId" asp-items="ViewBag.PricingTiers" class="form-select">
-                                    <option value="">— No tier —</option>
+                                    <option value="">&mdash; No tier &mdash;</option>
                                </select>
                                <small class="text-muted">Applies a discount to all quotes for this customer.</small>
                            </div>
@@ -1,4 +1,4 @@
-@model PowderCoating.Application.DTOs.Customer.CustomerDto
+@model PowderCoating.Application.DTOs.Customer.CustomerDto

@{
    ViewData["Title"] = !string.IsNullOrWhiteSpace(Model.CompanyName)
@@ -123,7 +123,7 @@
                                    }
                                    else
                                    {
-                                        <span class="text-muted">Not set â€” invoices go to contact email</span>
+                                        <span class="text-muted">Not set &mdash; invoices go to contact email</span>
                                    }
                                </p>
                            </div>
@@ -531,7 +531,7 @@
                        <div class="mb-3">
                            <label class="form-label fw-semibold">Reason <span class="text-danger">*</span></label>
                            <select name="Reason" class="form-select" required id="creditReasonSelect">
-                                <option value="">â€” Select reason â€”</option>
+                                <option value="">&mdash; Select reason &mdash;</option>
                                <option value="Pre-payment / Deposit">Pre-payment / Deposit</option>
                                <option value="Gift / Gift Card">Gift / Gift Card</option>
                                <option value="Overpayment credit">Overpayment credit</option>
@@ -1,4 +1,4 @@
-@model PowderCoating.Application.DTOs.Customer.UpdateCustomerDto
+@model PowderCoating.Application.DTOs.Customer.UpdateCustomerDto

@{
    ViewData["Title"] = "Edit Customer";
@@ -26,7 +26,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Company Information"
-                               data-bs-content="Company Name is used on quotes, invoices, and correspondence. Customer Type controls which features are available â€” Commercial customers get payment terms, credit limits, and pricing tier discounts. Status Inactive hides the customer from new quote/job dropdowns but preserves all history.">
+                               data-bs-content="Company Name is used on quotes, invoices, and correspondence. Customer Type controls which features are available &mdash; Commercial customers get payment terms, credit limits, and pricing tier discounts. Status Inactive hides the customer from new quote/job dropdowns but preserves all history.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -220,7 +220,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Business Information"
-                               data-bs-content="Payment Terms sets the default due date on invoices (e.g., Net 30 = 30 days from invoice date). Credit Limit is a soft warning cap â€” the system alerts when exceeded. Tax Exempt removes tax from all invoices; upload the exemption certificate in the Tax Exempt Certificate section below.">
+                               data-bs-content="Payment Terms sets the default due date on invoices (e.g., Net 30 = 30 days from invoice date). Credit Limit is a soft warning cap &mdash; the system alerts when exceeded. Tax Exempt removes tax from all invoices; upload the exemption certificate in the Tax Exempt Certificate section below.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -246,7 +246,7 @@
                            <div class="col-md-3">
                                <label asp-for="PricingTierId" class="form-label">Pricing Tier</label>
                                <select asp-for="PricingTierId" asp-items="ViewBag.PricingTiers" class="form-select">
-                                    <option value="">â€” No tier â€”</option>
+                                    <option value="">&mdash; No tier &mdash;</option>
                                </select>
                                <small class="text-muted">Applies a discount to all quotes for this customer.</small>
                            </div>
@@ -291,7 +291,7 @@
                            <a tabindex="0" class="help-icon" role="button"
                               data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                               data-bs-title="Notification Preferences"
-                               data-bs-content="Controls when the customer receives automatic updates. Email notifications send status change alerts (e.g., job ready for pickup) to the customer's email address. SMS requires separate TCPA consent â€” uncheck 'SMS Notifications Active' to temporarily pause without revoking consent.">
+                               data-bs-content="Controls when the customer receives automatic updates. Email notifications send status change alerts (e.g., job ready for pickup) to the customer's email address. SMS requires separate TCPA consent &mdash; uncheck 'SMS Notifications Active' to temporarily pause without revoking consent.">
                                <i class="bi bi-question-circle"></i>
                            </a>
                        </div>
@@ -314,7 +314,7 @@
                        <div class="mt-3">
                            @if (Model.SmsConsentedAt.HasValue)
                            {
-                                <!-- Consent already recorded â€” show status and allow pause/resume -->
+                                <!-- Consent already recorded &mdash; show status and allow pause/resume -->
                                <div class="card border-success bg-success-subtle p-3 mb-2">
                                    <div class="d-flex align-items-start gap-3">
                                        <i class="bi bi-shield-fill-check text-success fs-4 mt-1"></i>
@@ -339,7 +339,7 @@
                            }
                            else
                            {
-                                <!-- No consent on file â€” show the compliance notice and consent checkbox -->
+                                <!-- No consent on file &mdash; show the compliance notice and consent checkbox -->
                                <div class="alert alert-warning border-warning alert-permanent" role="alert">
                                    <h6 class="alert-heading fw-bold mb-2">
                                        <i class="bi bi-exclamation-triangle-fill me-2"></i>SMS Consent Requirement (TCPA)
@@ -116,7 +116,7 @@
                                    }
                                    else
                                    {
-                                        <span class="text-muted">—</span>
+                                        <span class="text-muted">&mdash;</span>
                                    }
                                </td>
                                <td>
@@ -128,7 +128,7 @@
                                    }
                                    else
                                    {
-                                        <span class="text-muted">—</span>
+                                        <span class="text-muted">&mdash;</span>
                                    }
                                </td>
                                <td>
@@ -140,7 +140,7 @@
                                    }
                                    else
                                    {
-                                        <span class="text-muted">—</span>
+                                        <span class="text-muted">&mdash;</span>
                                    }
                                </td>
                                <td>
@@ -224,7 +224,7 @@
                                    }
                                    <div class="mobile-card-row">
                                        <span class="mobile-card-label">Phone</span>
-                                        <span class="mobile-card-value">@(customer.Phone ?? "—")</span>
+                                        <span class="mobile-card-value">@Html.Raw(customer.Phone ?? "&mdash;")</span>
                                    </div>
                                    <div class="mobile-card-row">
                                        <span class="mobile-card-label">Type</span>
@@ -102,7 +102,7 @@
                                    }
                                    else
                                    {
-                                        <span class="text-muted">—</span>
+                                        <span class="text-muted">&mdash;</span>
                                    }
                                </td>
                                <td class="align-middle text-end fw-semibold">@inv.Total.ToString("C")</td>
@@ -1,12 +1,12 @@
@model PowderCoating.Application.DTOs.Accounting.CustomerStatementDto
@{
-    ViewData["Title"] = $"Statement – {Model.CustomerName}";
+    ViewData["Title"] = $"Statement &ndash; {Model.CustomerName}";
 }

 <div class="d-flex justify-content-between align-items-start mb-4 flex-wrap gap-2">
    <div>
        <h4 class="mb-0">Customer Statement</h4>
-        <p class="text-muted mb-0">@Model.CustomerName &nbsp;·&nbsp; @Model.From.ToString("MMM d, yyyy") – @Model.To.ToString("MMM d, yyyy")</p>
+        <p class="text-muted mb-0">@Model.CustomerName &nbsp;·&nbsp; @Model.From.ToString("MMM d, yyyy") &ndash; @Model.To.ToString("MMM d, yyyy")</p>
    </div>
    <div class="d-flex gap-2 flex-wrap">
        <form method="get" class="d-flex gap-2 align-items-center">
@@ -24,7 +24,7 @@
                <p class="mb-3" style="font-family:var(--font-display);font-size:1.35rem;font-weight:500;line-height:1.4;color:var(--pcl-ink);">
                    @if (_attnCount > 0)
                    {
-                        <span>Shop is </span><span style="color:var(--pcl-bad);">running hot</span><span> — @_attnCount item@(_attnCount == 1 ? "" : "s") need attention.</span>
+                        <span>Shop is </span><span style="color:var(--pcl-bad);">running hot</span><span> &mdash; @_attnCount item@(_attnCount == 1 ? "" : "s") need attention.</span>
                    }
                    else
                    {
@@ -70,7 +70,7 @@
    </div>
 </div>

-@* PWA install banner — rendered by JS only on mobile, hidden once dismissed or already installed *@
+@* PWA install banner &mdash; rendered by JS only on mobile, hidden once dismissed or already installed *@
 <div id="pwa-install-banner" class="row mb-4" style="display:none!important;">
    <div class="col-12">
        <div class="alert alert-permanent mb-0 d-flex align-items-start gap-3 py-3"
@@ -115,7 +115,7 @@
    @await Html.PartialAsync("_ShopProgressWidget", shopProgressWidget)
 }

-@* Config health alert — only shown when there are setup gaps *@
+@* Config health alert &mdash; only shown when there are setup gaps *@
@if (configHealth != null && !configHealth.IsHealthy)
 {
    <div class="row mb-4">
@@ -417,15 +417,15 @@
                            }
                            @if (Model.AgingDays1To30 > 0)
                            {
-                                <span><span class="me-1" style="display:inline-block;width:8px;height:8px;border-radius:2px;background:var(--pcl-warn);"></span>1–30d @Model.AgingDays1To30.ToString("C0")</span>
+                                <span><span class="me-1" style="display:inline-block;width:8px;height:8px;border-radius:2px;background:var(--pcl-warn);"></span>1&ndash;30d @Model.AgingDays1To30.ToString("C0")</span>
                            }
                            @if (Model.AgingDays31To60 > 0)
                            {
-                                <span><span class="me-1" style="display:inline-block;width:8px;height:8px;border-radius:2px;background:var(--pcl-bad);"></span>31–60d @Model.AgingDays31To60.ToString("C0")</span>
+                                <span><span class="me-1" style="display:inline-block;width:8px;height:8px;border-radius:2px;background:var(--pcl-bad);"></span>31&ndash;60d @Model.AgingDays31To60.ToString("C0")</span>
                            }
                            @if (Model.AgingDays61To90 > 0)
                            {
-                                <span><span class="me-1" style="display:inline-block;width:8px;height:8px;border-radius:2px;background:var(--pcl-bad);"></span>61–90d @Model.AgingDays61To90.ToString("C0")</span>
+                                <span><span class="me-1" style="display:inline-block;width:8px;height:8px;border-radius:2px;background:var(--pcl-bad);"></span>61&ndash;90d @Model.AgingDays61To90.ToString("C0")</span>
                            }
                            @if (Model.AgingDaysOver90 > 0)
                            {
@@ -547,7 +547,7 @@
                                                @if (line.EstCost.HasValue)
                                                {<span>@line.EstCost.Value.ToString("C")</span>}
                                                else
-                                                {<span class="text-muted">—</span>}
+                                                {<span class="text-muted">&mdash;</span>}
                                            </td>
                                            <td class="text-center">
                                                <button class="btn btn-sm btn-outline-danger mark-ordered-btn text-nowrap"
@@ -563,7 +563,7 @@
                                    <tr>
                                        <td colspan="2">Vendor Total</td>
                                        <td class="text-end">@vendorGroup.TotalLbsNeeded.ToString("N2") lbs</td>
-                                        <td class="text-end">@(vendorGroup.TotalEstCost > 0 ? vendorGroup.TotalEstCost.ToString("C") : "—")</td>
+                                        <td class="text-end">@Html.Raw(vendorGroup.TotalEstCost > 0 ? vendorGroup.TotalEstCost.ToString("C") : "&mdash;")</td>
                                        <td></td>
                                    </tr>
                                </tfoot>
@@ -582,7 +582,7 @@
        <div class="card border-0 shadow-sm dashboard-card" style="border-left: 4px solid #0d6efd !important;">
            <div class="card-header bg-body border-0 d-flex justify-content-between align-items-center pt-4 pb-3">
                <h5 class="mb-0 fw-bold">
-                    <i class="bi bi-box-arrow-in-down me-2 text-muted"></i>Powder Ordered — Awaiting Receipt
+                    <i class="bi bi-box-arrow-in-down me-2 text-muted"></i>Powder Ordered &mdash; Awaiting Receipt
                    <span class="ms-2 text-muted fw-normal small" id="placed-count-label">@Model.PowderOrdersPlacedCount item@(Model.PowderOrdersPlacedCount == 1 ? "" : "s")</span>
                </h5>
                <small class="text-muted">Grouped by vendor &middot; Enter lbs received to update inventory</small>
@@ -641,13 +641,13 @@
                                                @if (line.EstCost.HasValue)
                                                {<span>@line.EstCost.Value.ToString("C")</span>}
                                                else
-                                                {<span class="text-muted">—</span>}
+                                                {<span class="text-muted">&mdash;</span>}
                                            </td>
                                            <td class="text-muted small">
                                                @if (line.OrderedAt.HasValue)
                                                {<span title="@line.OrderedAt.Value.Tz(ViewBag.CompanyTimeZone as string).ToString("g")">@line.OrderedAt.Value.Tz(ViewBag.CompanyTimeZone as string).ToString("MMM d")</span>}
                                                else
-                                                {<span>—</span>}
+                                                {<span>&mdash;</span>}
                                            </td>
                                            <td class="text-center">
                                                <div class="d-flex align-items-center gap-1 justify-content-center receive-form-@line.CoatId">
@@ -680,7 +680,7 @@
                                    <tr>
                                        <td colspan="2">Vendor Total</td>
                                        <td class="text-end">@vendorGroup.TotalLbsNeeded.ToString("N2") lbs</td>
-                                        <td class="text-end">@(vendorGroup.TotalEstCost > 0 ? vendorGroup.TotalEstCost.ToString("C") : "—")</td>
+                                        <td class="text-end">@Html.Raw(vendorGroup.TotalEstCost > 0 ? vendorGroup.TotalEstCost.ToString("C") : "&mdash;")</td>
                                        <td colspan="2"></td>
                                    </tr>
                                </tfoot>
@@ -750,7 +750,7 @@
                        <div class="col-md-6">
                            <label class="form-label fw-medium">Category</label>
                            <select class="form-select" id="apm-categoryId" name="inventoryCategoryId">
-                                <option value="">— Select category —</option>
+                                <option value="">&mdash; Select category &mdash;</option>
                                @if (ViewBag.InventoryCategories != null)
                                {
                                    foreach (var cat in (IEnumerable<dynamic>)ViewBag.InventoryCategories)
@@ -764,7 +764,7 @@
                        <div class="col-md-6">
                            <label class="form-label fw-medium">Primary Vendor</label>
                            <select class="form-select" id="apm-vendorId" name="primaryVendorId">
-                                <option value="">— Select vendor —</option>
+                                <option value="">&mdash; Select vendor &mdash;</option>
                                @if (ViewBag.VendorList != null)
                                {
                                    foreach (var v in (IEnumerable<dynamic>)ViewBag.VendorList)
@@ -838,12 +838,12 @@
@section Scripts {
 <script src="~/js/shop-progress-widget.js" asp-append-version="true"></script>
 <script>
-    // Start Intake — pushes SignalR event to front-desk tablet
+    // Start Intake &mdash; pushes SignalR event to front-desk tablet
    document.getElementById('btnStartIntake')?.addEventListener('click', async function () {
        const btn   = this;
        const token = document.querySelector('input[name="__RequestVerificationToken"]')?.value;
        btn.disabled = true;
-        btn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Sending…';
+        btn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Sending&hellip;';
        try {
            const res = await fetch('/Kiosk/StartSession', {
                method: 'POST',
@@ -928,7 +928,7 @@

        const esc = s => s ? s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;') : '';
        const estCost = (c.lbsToOrder && c.costPerLb) ? (c.lbsToOrder * c.costPerLb) : null;
-        const orderedDate = c.orderedAt ? new Date(c.orderedAt).toLocaleDateString('en-US',{month:'short',day:'numeric'}) : '—';
+        const orderedDate = c.orderedAt ? new Date(c.orderedAt).toLocaleDateString('en-US',{month:'short',day:'numeric'}) : '&mdash;';
        const lbsFmt = c.lbsToOrder ? parseFloat(c.lbsToOrder).toFixed(2) : '0.00';

        // Find or create vendor group
@@ -973,7 +973,7 @@
                ${c.finish    ? `<span class="badge bg-light text-dark border ms-1">${esc(c.finish)}</span>` : ''}
            </td>
            <td class="text-end fw-medium">${lbsFmt} lbs</td>
-            <td class="text-end">${estCost ? '$' + estCost.toFixed(2) : '<span class="text-muted">—</span>'}</td>
+            <td class="text-end">${estCost ? '$' + estCost.toFixed(2) : '<span class="text-muted">&mdash;</span>'}</td>
            <td class="text-muted small">${orderedDate}</td>
            <td class="text-center">
                <div class="d-flex align-items-center gap-1 justify-content-center receive-form-${c.coatId}">
@@ -1024,7 +1024,7 @@
            }
            qtyInput.classList.remove('is-invalid');

-            // Custom powder (no inventory item) â†’ open modal to add to inventory
+            // Custom powder (no inventory item) â†' open modal to add to inventory
            if (!hasInv) {
                const modal = document.getElementById('addPowderModal');
                // Pre-fill hidden + text fields
@@ -1069,7 +1069,7 @@
                return;
            }

-            // Inventory item exists â†’ receive directly
+            // Inventory item exists â†' receive directly
            const token = document.querySelector('input[name="__RequestVerificationToken"]')?.value
                       ?? document.querySelector('meta[name="__RequestVerificationToken"]')?.content;

@@ -1110,7 +1110,7 @@
                     ?? document.querySelector('meta[name="__RequestVerificationToken"]')?.content;

        saveBtn.disabled = true;
-        saveBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Saving…';
+        saveBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Saving&hellip;';

        try {
            const resp = await fetch('@Url.Action("AddCustomPowderToInventory", "Dashboard")', {
@@ -1139,7 +1139,7 @@
        }
    });

-    // â”€â”€ AI Lookup for Add Powder modal â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€â”€
+    // -- AI Lookup for Add Powder modal ---------------------------------------
    (function () {
        const apmBtn      = document.getElementById('apm-ai-btn');
        const apmStatusEl = document.getElementById('apm-ai-status');
@@ -1189,7 +1189,7 @@

            const hasInput = manufacturer || colorName || colorCode || partNumber || itemName;
            if (!hasInput) {
-                apmShowStatus('warning', '<i class="bi bi-exclamation-triangle me-1"></i>Fill in at least one field — Manufacturer, Color Name, Color Code, or Item Name — then try again.');
+                apmShowStatus('warning', '<i class="bi bi-exclamation-triangle me-1"></i>Fill in at least one field &mdash; Manufacturer, Color Name, Color Code, or Item Name &mdash; then try again.');
                return;
            }

@@ -1198,7 +1198,7 @@
            document.getElementById('apm-bad-match-btn')?.remove();
            apmBtn.disabled = true;
            apmBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Looking up...';
-            apmShowStatus('info', '<i class="bi bi-hourglass-split me-1"></i>Searching for product specifications…');
+            apmShowStatus('info', '<i class="bi bi-hourglass-split me-1"></i>Searching for product specifications&hellip;');

            try {
                const formData = new FormData();
@@ -1265,7 +1265,7 @@
                        : '';
                    apmShowStatus('success', `<i class="bi bi-check-circle me-1"></i>Auto-filled: ${filled.join(', ')}.${reasoning}`);
                } else {
-                    apmShowStatus('warning', '<i class="bi bi-info-circle me-1"></i>No new fields to fill — they may already be populated, or the product wasn\'t found.');
+                    apmShowStatus('warning', '<i class="bi bi-info-circle me-1"></i>No new fields to fill &mdash; they may already be populated, or the product wasn\'t found.');
                }

            } catch (err) {
@@ -1319,7 +1319,7 @@
 (function () {
    var DISMISSED_KEY = 'pcl_pwa_banner_dismissed';

-    // Already installed as standalone — never show
+    // Already installed as standalone &mdash; never show
    var isStandalone = window.navigator.standalone === true ||
                       window.matchMedia('(display-mode: standalone)').matches;
    if (isStandalone) return;
@@ -1343,7 +1343,7 @@
        var isSafari = /webkit/i.test(ua) && !/crios|chrome|fxios|opios/i.test(ua);
        if (isSafari) {
            titleEl.textContent = 'Add to Home Screen';
-            msgEl.innerHTML = 'For the best experience — and so the camera only asks once — open the ' +
+            msgEl.innerHTML = 'For the best experience &mdash; and so the camera only asks once &mdash; open the ' +
                '<strong>Share menu</strong> <span style="font-size:1.1em">&#9650;</span> at the bottom of Safari ' +
                'and tap <strong>Add to Home Screen</strong>.';
        } else {
@@ -173,7 +173,7 @@
                </tbody>
            </table>
        </div>
-        <!-- Mobile card view — shown on screens < 992px -->
+        <!-- Mobile card view &mdash; shown on screens < 992px -->
        <div class="mobile-card-view">
            <div class="mobile-card-list">
                @if (!Model.Any())
@@ -188,7 +188,7 @@
                }
                @foreach (var tip in Model)
                {
-                    var tipPreview = tip.TipText.Length > 60 ? tip.TipText.Substring(0, 60) + "…" : tip.TipText;
+                    var tipPreview = tip.TipText.Length > 60 ? tip.TipText.Substring(0, 60) + "&hellip;" : tip.TipText;
                    <div class="mobile-data-card">
                        <div class="mobile-card-header">
                            <div class="mobile-card-icon bg-warning"><i class="bi bi-lightbulb"></i></div>
@@ -54,7 +54,7 @@
                    <div class="d-flex align-items-center justify-content-between">
                        <h6 class="mb-0">Select a Company</h6>
                        <input type="text" id="companySearch" class="form-control form-control-sm w-auto"
-                               placeholder="Search…" style="min-width:180px" />
+                               placeholder="Search&hellip;" style="min-width:180px" />
                    </div>
                </div>
                <div class="table-responsive" style="max-height:520px;overflow-y:auto">
@@ -101,7 +101,7 @@
                    </table>
                </div>

-                <!-- Mobile card view — shown on screens < 992px -->
+                <!-- Mobile card view &mdash; shown on screens < 992px -->
                <div class="mobile-card-view">
                    <div class="mobile-card-list">
                        @foreach (var c in Model)
@@ -148,7 +148,7 @@
            </div>
        </div>

-        @* Right: export options — always visible *@
+        @* Right: export options &mdash; always visible *@
        <div class="col-lg-5">
            <div class="card border-0 shadow-sm" style="position:sticky;top:1rem">
                <div class="card-header bg-primary text-white py-2">
@@ -156,14 +156,14 @@
                </div>
                <div class="card-body">

-                    <!-- Company selection banner — shown/hidden by JS -->
+                    <!-- Company selection banner &mdash; shown/hidden by JS -->
                    <div id="noCompanyBanner" class="alert alert-light alert-permanent border d-flex align-items-center gap-2 mb-3 small">
                        <i class="bi bi-arrow-left-circle fs-5 text-muted"></i>
                        <span>Select a company from the list to begin.</span>
                    </div>
                    <div id="selectedBanner" class="alert alert-info alert-permanent py-2 mb-3 small" style="display:none">
                        <i class="bi bi-building me-1"></i>
-                        Exporting: <strong id="selectedCompanyName">—</strong>
+                        Exporting: <strong id="selectedCompanyName">&mdash;</strong>
                    </div>

                    <form method="post" asp-action="Export" id="exportForm">
@@ -266,7 +266,7 @@
                                    <input class="form-check-input" type="radio" name="format" id="fmtCsv" value="csv" />
                                    <label class="form-check-label" for="fmtCsv">
                                        <i class="bi bi-filetype-csv me-1 text-secondary"></i>CSV (.zip)
-                                        <span class="text-muted small">— one file per sheet</span>
+                                        <span class="text-muted small">&mdash; one file per sheet</span>
                                    </label>
                                </div>
                            </div>
@@ -333,7 +333,7 @@
        });
    });

-    // ── Format toggle — update button label ──────────────────────────────────
+    // ── Format toggle &mdash; update button label ──────────────────────────────────
    document.querySelectorAll('input[name="format"]').forEach(function (radio) {
        radio.addEventListener('change', function () {
            var isCsv = this.value === 'csv';
--- a/Show More
+++ b/Show More