Merge dev into master for release v2026.05.19b

After deleting a job item, the remaining-items DTO projection was missing
NoExtraLayerCharge, causing PricingCalculationService to treat all coats as
extra-charge when recalculating the job total post-delete.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitignore

@@ -129,3 +129,7 @@ DataProtection-Keys/
 # Secrets
 appsettings.secrets.json
 *.pfx
+
+# Local task tracking
+TODO.txt
+TODO.txt.bak

CLAUDE.md

@@ -478,6 +478,27 @@ All modules below are fully implemented with controllers, views, and migrations
 - 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

TODO.txt

@@ -1,226 +0,0 @@
-Shop Management App TO DO List
-==============================
--Add feature to prep for events where we can generate coupons or gift certificates in bulk
-
-Duplication refactor memory
-C:/Users/spoul/.codex/memories/powdercoatingapp-refactor-plan-2026-05-07.md.
-
-Current memory
-C:/Users/spoul/.codex/memories/powdercoatingapp-quote-sync-extracted-2026-05-07.md
-
-
-
--Google review request email after a job
--Check my ChatGPT chat about surface area for a few solid ideas for the system
--Fix up approve/decline messages between customer and user on quote approval feature
-
-Done and need testing
-=====================
--Add sorting to all grids
--Add searching to all grids
--Add Workers to the system
--Allow jobs to be assigned to workers
--Add Shop Job Board display to show in the shop
--Added quick edits on a few pages
--Fix job page customer drop down.  It's only showing business names and not individuals
--Add country drop down on customer edit and add pages
--Conver customer once quote accepted not complete
--Add Dashboard page
-	-Low Inventory Warnings display
-	-Overdue jobs
-	-Todays Jobs
--new quote button on customer page doesnt pre-select customer
--Add customer job history page
--Profiles can now change from a light theme to a dark theme as well as other appearance changes
--Date format can be customized per profile
--Timezone can now be changed per profile
--Have company logos stored in the database with the other company information
--Add Company Name under Logo in navbar
--Make logo bigger
--Update create quote page to show names of individual customers or company name depending on which type it is
--Validate that the company has entered operating costs before allowing the quote page to be loaded
--Make phone number and contact required on quotes for new prospects
--Move the create quote button to the right side of the screen to be consistent with other pages
--Add setting for tax exempt on customer
--Added tax certificate upload as well
--Add shop minimum to quoting system and company settings
--Add Rush Job Fee (customizable in company settings)
--Add ability to quick change the status on the job listing and record who changed the status.
--Deactivating company should NOT allow any users to login at all.
--Allow superadmins to create company users/managers
--Add a print quote button
--Add a download PDF button for quotes
--When adding users, also create worker records
--Add quick update to all view pages
--Add Mobile layouts
--Fix a few text pieces on the dashboard page that did not invert properly when dark mode was selected
--Add ability to upload job photos
--Allow photo uploads for jobs before and after photos
--Added Log Viewer
--Added Seed Data option for super admins that will assist during testing
--Add an item list with prices for repeat parts and such
--Add manual data seeding that super admins can use to seed a company one at a time if needed
--Add Log Viewer for Super Admins
--Quotes cleaned up quite a bit and calculations and style changed
--Approving a Quote will now auto-create a Job and link back to the quote it came from.
--Job Items now appear on the Job Screen with the line items from the quote
--Job items can be edited
--Add a way to convert a quote into a job
--Add multiple item types to add to a quote
-	1. Pre-Defined item that we can choose from our product list
-	2. Batch items where we enter the square footage manually as well as the quantity
--Add Quickbooks import for customers and price lists (Desktop and Online)
--Custom Order Powder not saving or displaying properly on quuote page
--Added ability for Companies to define their own Job Status, Job Priority, and Quote Status' via Company Settings > Data Lookups
--Add Randomizer Wheel
--Add Quickbooks format export for
-	-Customers
-	-Product Catalog
-	-Invoices
--Quote for Product Catalog Item is only selecting items from Powder Coating, need all items
--Add a Shop Supplies operating cost that will be used on quote calculations
--Fix Quote screen, only Powder showing in item dropdown.  Need to get all items in an IsCoating category showing up.
--Update everywhere that uses tax rate to read and use this setting
--Add ability to export a full price list for known items
--Add tracking for all changes and show change history on view page. Possibly in a hidden grid or modal
--Update the inventory screen to not duplicate color name fields and the like
--Add option for metric system
--Add Bulk Upload for
-	-Powder
-	-Product Catalog
-	-Customer Data
--Add an Appointment engine and Calendar. Also show Maintenence tasks that are scheduled on it
--Allow shops to put employee days off on the calendar as well
--Fix and Verify user permissions are honored
--Run a full security check on the application
--Add support for multi stage coatings on an item
--Fix Seed Data routines to track errors better and continue past error imports
--Add ability to complete a job and enter actual time and materials used
--Add export for all data to CSV format
--Check calendar resizing with the browser.  It's off a bit
--Add ability to apply discounts
--Remove powder from inventory when completeing a job
--Add color change ability for appointment types
--Add code to honor the rush charge on a quote
--Add options to quote for Sandblasting, Masking, Chemical Strip, Outgas, Phosphate Wash, Degrease
--Add ability to add sq ft to product catalog item for powder estimation
--Add better UX design for validation errors and such
-	 Option 1: Change "ModelOnly" to "All" (1 line change)                                                                                                                                                                                                                                                                                                                  - Shows all validation errors at top of form in red alert box
-			- User would have seen: "The field Estimated Minutes must be between 0 and 10,000"                                                                                                                                                                                                                                                                                     
-	Option 2: Add inline validation (more complex)
-			- Show error messages right next to the problematic field
-				- Better UX but requires adding validation spans to dynamic fields
-
-	Option 3: Toast notifications (requires new library/code)
-			- Modern popup notifications for success/error messages
-			- Would need to add a toast library (like Toastr) and wire it up
--Add Import/Export for Company Settings
--Allow Super Admin to modify permissions for company admins in case we add any in the future, or if anything gets messed up we can fix it!
--Allow recurring scheduled maintenance
--Let's show scheduled maintenence on the job schedule as well.  At the top of the screen
--Make sure maintenence shows on the calendar list view.
--Add viewing quotes on the customer details page so we can see all quotes/jobs for a given customer to make things easier to find.
--Add support for multiple ovens in operating costs
--Display oven selected on quote and job detail pages
--Allow user to choose an oven on a quote, and have it follow through to a job
--Check for any old and outdated code and DB fields!
--Add ability to email a quote
--Add email capabilities
--Add search on super admin companies screen
--Set limits on job photos per app tier
--Check subscription signup page to make sure the selected subscription is actually saved.
--Don't seed the product catalog on a new user
--Check to make sure subscription page has quotes and all fields on it
--Allow customizing of the quote sheets and invoices (If we do them)
--Add feature to allow username changes
--Fix quickbooks imports based on files Colton sent
--Add thicker border around input fields to signify they are text boxes
--Check to make sure emails get sent when a quote is created
--Add buttons to send emails manually if needed
--Modify price calculations to prompt for service times (ie... sandblasting, oven cure times, outgas times etc)
--Add ability to modify items on jobs
--Swap quoting page to use modals to add items to segregate it a bit better.
--Build account ledger/transaction summary view
--Add security for financial pages
--Allow opening balances for accounts
--Create P&L and other reports
--Allow receipet upload on expenses and bills
--Download PDF for invoices throws and error
--Emailing invoice doesn't seem to trigger
--When a customer record has email notifications turned off, disable any email buttons that may send one and alert the user that this customer is set to have notifications turned off.
--When doing anything that sends mail, prompt the user to alert them a message will be sent
--Create a setup wizard for new users that will walk through system setup.  Allow re-running later.
-	-Check Workflow steps in wizard, might need adjusting
-	-Account Summary, use permanent alert for info message at bottom
-	-Add steps so that the new user can customize the data lookups and re-order them
--Reorder menu to work better
--Add ability to print a job invoice once completed
--Add ability to email a job invoice
--Integrate invoicing/billing/reports
--Add customer portal to approve quotes from a link for now.  We can do a full login later.
--Need a complexity score for quoting parts (Simple, moderate, complex, extreme)
--Add tagging options for quotes and jobs (user driven)
--Can we also add this tag system to quotes and jobs to allow users to tag themselves and we can use that data later as well?  We'd have to add a good
-  description of WHY the user should add some tags though.
--Inventory forecasting might be worth looking into
--Build some AI powder usage predictions into the system
--AI Production Scheduling - Batching enough parts together to fill the oven automagically
--Update dashboard to show some $$$ fields
--Update Setup Wizard
--Update the Setup Checklist
--Modify system to keep running balances of all accounts
-- Make sure ALL job updates refresh the Shop Display
--Add multiple item types to add to a quote
-AI Agent item where we upload a picture and it will calculate the approximate sq ft and quote from that
--Integration with stripe or square to accept online paymens from our users customers.
--AI Assistant for help
--Allow customer filtering on quotes and jobs
--New job page blanks when validation fails
--Can we keep track of which users have completed the setup wizard?
--Make sure we're tracking logins.  I see a user logged on, but the company health page states they have never logged in.
--Allow printing blank work orders (model after the SCP Powder Coating blank work order)
--IDEA:  Print powders to use on work order with their QR code so they can be scanned right from there and usage recorded.
--Add ability to save a quoted item to the product catalog either from an AI Photo Quote or from the calculated item
--Add images to product catalog items for easily identification of parts
--Look into possibly having AI scan a product catalog and suggest prices for items.
--Add Oven and Add Blasting Setup don't work in Setup Wizard
--When scanning inventory QR Code, there is no cancel button
--Bug: When scanning Inventory QR Code, if not logged in...it takes you to the dashboard after login, not our inventory scanning screen
--Add SMS capabilities
--Lookup not working 100% correct.  If I type columbia as the manufacturer and a color name....it's finding blackmamba from prismatic incorrectly.
--Lookup Modal not showing ALL matches.  Maybe make scrollable
--Pickup cure information from TDS Sheet if not found by AI Search
--ON AI Photo Quote page, when the AI info comes back we should scroll the modal window down so it's visible.  It's not clear that new info has been added to the modal for all customers
--Inventory Lookup not always finding price for Columbia Coatings
--Logging powder usage and choosing a job doesn't record properly in the activity section of the powder itself
--Need to allow deleting of powder usage entries, or at least editing in case of a goof up
--Still random weird characters on a bunch of pages.  Intake button for example on the jobs screen shows: Intake ✓
-
-5/7/2026
--When editing a job/quote item from catalog, pre-select the item chosen please
--Move buttons to right side of job details page
--When completing a job, pull in powder usage already entered
--Fix invoice due date to match terms selected
--Invoice Status should not show on PDF unless PAID
--If we start with a job, shop supplies is not being added to the items
--If you delete an invoice attached to a job, the create invoice button keeps trying to go back to it
--Customer approval page doesn't show all charges (Oven time missing?)
--Time Logging default user to logged in user
--Add Print Invoice button or allow viewing the PDF
--If an invoice is voided, I cant create a new one from a job.  Show voided invoice as history, but allow creating a new one.
--If a completed job is changed after an invoice is created, we need to update the invoice.  Also need to be able to modify an invoice to add a discount or similar after it's created
--Add multiple email address for commercial customers (Accounting for invoices and contact for quotes)
--Support entering multiple email addresses (comma seperated) in each field
--If no email on file, then prompt for address to send to.
--When choosing a powder NOT in stock, can we incorporate our inventory lookup function to find a powder, link it to the quote, add it to the inventory with a 0lb balance and still put it on the "powder to order" list?
--When choosing a prospect for a quote, we need  way to consent and enable SMS for them
-
-Ideas Removed
-=======================
--Add Deactivate Customer button on Customer Detail page
-
-
-Logins:
-rich@r2r.com/Ragz2Richs123!
-
-rich@cannon.com/Cannon123!

TODO.txt.bak

@@ -1,226 +0,0 @@
-Shop Management App TO DO List
-==============================
--When editing a job/quote item from catalog, pre-select the item chosen please
--Move buttons to right side of job details page
--When completing a job, pull in powder usage already entered
--Fix invoice due date to match terms selected
--Invoice Status should not show on PDF unless PAID
--If we start with a job, shop supplies is not being added to the items
--If you delete an invoice attached to a job, the create invoice button keeps trying to go back to it
--Customer approval page doesn't show all charges (Oven time missing?)
--Time Logging default user to logged in user
--Add Print Invoice button or allow viewing the PDF
--If an invoice is voided, I cant create a new one from a job.  Show voided invoice as history, but allow creating a new one.
--If a completed job is changed after an invoice is created, we need to update the invoice.  Also need to be able to modify an invoice to add a discount or similar after it's created
--Add multiple email address for commercial customers (Accounting for invoices and contact for quotes)
--Support entering multiple email addresses (comma seperated) in each field
--If no email on file, then prompt for address to send to.
--When choosing a powder NOT in stock, can we incorporate our inventory lookup function to find a powder, link it to the quote, add it to the inventory with a 0lb balance and still put it on the "powder to order" list?
--When choosing a prospect for a quote, we need  way to consent and enable SMS for them
-
-
-
-
-Duplication refactor memory
-C:/Users/spoul/.codex/memories/powdercoatingapp-refactor-plan-2026-05-07.md.
-
-Current memory
-C:/Users/spoul/.codex/memories/powdercoatingapp-quote-sync-extracted-2026-05-07.md
-
-
-
--Google review request email after a job
--Check my ChatGPT chat about surface area for a few solid ideas for the system
--Fix up approve/decline messages between customer and user on quote approval feature
-
-Done and need testing
-=====================
--Add sorting to all grids
--Add searching to all grids
--Add Workers to the system
--Allow jobs to be assigned to workers
--Add Shop Job Board display to show in the shop
--Added quick edits on a few pages
--Fix job page customer drop down.  It's only showing business names and not individuals
--Add country drop down on customer edit and add pages
--Conver customer once quote accepted not complete
--Add Dashboard page
-	-Low Inventory Warnings display
-	-Overdue jobs
-	-Todays Jobs
--new quote button on customer page doesnt pre-select customer
--Add customer job history page
--Profiles can now change from a light theme to a dark theme as well as other appearance changes
--Date format can be customized per profile
--Timezone can now be changed per profile
--Have company logos stored in the database with the other company information
--Add Company Name under Logo in navbar
--Make logo bigger
--Update create quote page to show names of individual customers or company name depending on which type it is
--Validate that the company has entered operating costs before allowing the quote page to be loaded
--Make phone number and contact required on quotes for new prospects
--Move the create quote button to the right side of the screen to be consistent with other pages
--Add setting for tax exempt on customer
--Added tax certificate upload as well
--Add shop minimum to quoting system and company settings
--Add Rush Job Fee (customizable in company settings)
--Add ability to quick change the status on the job listing and record who changed the status.
--Deactivating company should NOT allow any users to login at all.
--Allow superadmins to create company users/managers
--Add a print quote button
--Add a download PDF button for quotes
--When adding users, also create worker records
--Add quick update to all view pages
--Add Mobile layouts
--Fix a few text pieces on the dashboard page that did not invert properly when dark mode was selected
--Add ability to upload job photos
--Allow photo uploads for jobs before and after photos
--Added Log Viewer
--Added Seed Data option for super admins that will assist during testing
--Add an item list with prices for repeat parts and such
--Add manual data seeding that super admins can use to seed a company one at a time if needed
--Add Log Viewer for Super Admins
--Quotes cleaned up quite a bit and calculations and style changed
--Approving a Quote will now auto-create a Job and link back to the quote it came from.
--Job Items now appear on the Job Screen with the line items from the quote
--Job items can be edited
--Add a way to convert a quote into a job
--Add multiple item types to add to a quote
-	1. Pre-Defined item that we can choose from our product list
-	2. Batch items where we enter the square footage manually as well as the quantity
--Add Quickbooks import for customers and price lists (Desktop and Online)
--Custom Order Powder not saving or displaying properly on quuote page
--Added ability for Companies to define their own Job Status, Job Priority, and Quote Status' via Company Settings > Data Lookups
--Add Randomizer Wheel
--Add Quickbooks format export for
-	-Customers
-	-Product Catalog
-	-Invoices
--Quote for Product Catalog Item is only selecting items from Powder Coating, need all items
--Add a Shop Supplies operating cost that will be used on quote calculations
--Fix Quote screen, only Powder showing in item dropdown.  Need to get all items in an IsCoating category showing up.
--Update everywhere that uses tax rate to read and use this setting
--Add ability to export a full price list for known items
--Add tracking for all changes and show change history on view page. Possibly in a hidden grid or modal
--Update the inventory screen to not duplicate color name fields and the like
--Add option for metric system
--Add Bulk Upload for
-	-Powder
-	-Product Catalog
-	-Customer Data
--Add an Appointment engine and Calendar. Also show Maintenence tasks that are scheduled on it
--Allow shops to put employee days off on the calendar as well
--Fix and Verify user permissions are honored
--Run a full security check on the application
--Add support for multi stage coatings on an item
--Fix Seed Data routines to track errors better and continue past error imports
--Add ability to complete a job and enter actual time and materials used
--Add export for all data to CSV format
--Check calendar resizing with the browser.  It's off a bit
--Add ability to apply discounts
--Remove powder from inventory when completeing a job
--Add color change ability for appointment types
--Add code to honor the rush charge on a quote
--Add options to quote for Sandblasting, Masking, Chemical Strip, Outgas, Phosphate Wash, Degrease
--Add ability to add sq ft to product catalog item for powder estimation
--Add better UX design for validation errors and such
-	 Option 1: Change "ModelOnly" to "All" (1 line change)                                                                                                                                                                                                                                                                                                                  - Shows all validation errors at top of form in red alert box
-			- User would have seen: "The field Estimated Minutes must be between 0 and 10,000"                                                                                                                                                                                                                                                                                     
-	Option 2: Add inline validation (more complex)
-			- Show error messages right next to the problematic field
-				- Better UX but requires adding validation spans to dynamic fields
-
-	Option 3: Toast notifications (requires new library/code)
-			- Modern popup notifications for success/error messages
-			- Would need to add a toast library (like Toastr) and wire it up
--Add Import/Export for Company Settings
--Allow Super Admin to modify permissions for company admins in case we add any in the future, or if anything gets messed up we can fix it!
--Allow recurring scheduled maintenance
--Let's show scheduled maintenence on the job schedule as well.  At the top of the screen
--Make sure maintenence shows on the calendar list view.
--Add viewing quotes on the customer details page so we can see all quotes/jobs for a given customer to make things easier to find.
--Add support for multiple ovens in operating costs
--Display oven selected on quote and job detail pages
--Allow user to choose an oven on a quote, and have it follow through to a job
--Check for any old and outdated code and DB fields!
--Add ability to email a quote
--Add email capabilities
--Add search on super admin companies screen
--Set limits on job photos per app tier
--Check subscription signup page to make sure the selected subscription is actually saved.
--Don't seed the product catalog on a new user
--Check to make sure subscription page has quotes and all fields on it
--Allow customizing of the quote sheets and invoices (If we do them)
--Add feature to allow username changes
--Fix quickbooks imports based on files Colton sent
--Add thicker border around input fields to signify they are text boxes
--Check to make sure emails get sent when a quote is created
--Add buttons to send emails manually if needed
--Modify price calculations to prompt for service times (ie... sandblasting, oven cure times, outgas times etc)
--Add ability to modify items on jobs
--Swap quoting page to use modals to add items to segregate it a bit better.
--Build account ledger/transaction summary view
--Add security for financial pages
--Allow opening balances for accounts
--Create P&L and other reports
--Allow receipet upload on expenses and bills
--Download PDF for invoices throws and error
--Emailing invoice doesn't seem to trigger
--When a customer record has email notifications turned off, disable any email buttons that may send one and alert the user that this customer is set to have notifications turned off.
--When doing anything that sends mail, prompt the user to alert them a message will be sent
--Create a setup wizard for new users that will walk through system setup.  Allow re-running later.
-	-Check Workflow steps in wizard, might need adjusting
-	-Account Summary, use permanent alert for info message at bottom
-	-Add steps so that the new user can customize the data lookups and re-order them
--Reorder menu to work better
--Add ability to print a job invoice once completed
--Add ability to email a job invoice
--Integrate invoicing/billing/reports
--Add customer portal to approve quotes from a link for now.  We can do a full login later.
--Need a complexity score for quoting parts (Simple, moderate, complex, extreme)
--Add tagging options for quotes and jobs (user driven)
--Can we also add this tag system to quotes and jobs to allow users to tag themselves and we can use that data later as well?  We'd have to add a good
-  description of WHY the user should add some tags though.
--Inventory forecasting might be worth looking into
--Build some AI powder usage predictions into the system
--AI Production Scheduling - Batching enough parts together to fill the oven automagically
--Update dashboard to show some $$$ fields
--Update Setup Wizard
--Update the Setup Checklist
--Modify system to keep running balances of all accounts
-- Make sure ALL job updates refresh the Shop Display
--Add multiple item types to add to a quote
-AI Agent item where we upload a picture and it will calculate the approximate sq ft and quote from that
--Integration with stripe or square to accept online paymens from our users customers.
--AI Assistant for help
--Allow customer filtering on quotes and jobs
--New job page blanks when validation fails
--Can we keep track of which users have completed the setup wizard?
--Make sure we're tracking logins.  I see a user logged on, but the company health page states they have never logged in.
--Allow printing blank work orders (model after the SCP Powder Coating blank work order)
--IDEA:  Print powders to use on work order with their QR code so they can be scanned right from there and usage recorded.
--Add ability to save a quoted item to the product catalog either from an AI Photo Quote or from the calculated item
--Add images to product catalog items for easily identification of parts
--Look into possibly having AI scan a product catalog and suggest prices for items.
--Add Oven and Add Blasting Setup don't work in Setup Wizard
--When scanning inventory QR Code, there is no cancel button
--Bug: When scanning Inventory QR Code, if not logged in...it takes you to the dashboard after login, not our inventory scanning screen
--Add SMS capabilities
--Lookup not working 100% correct.  If I type columbia as the manufacturer and a color name....it's finding blackmamba from prismatic incorrectly.
--Lookup Modal not showing ALL matches.  Maybe make scrollable
--Pickup cure information from TDS Sheet if not found by AI Search
--ON AI Photo Quote page, when the AI info comes back we should scroll the modal window down so it's visible.  It's not clear that new info has been added to the modal for all customers
--Inventory Lookup not always finding price for Columbia Coatings
--Logging powder usage and choosing a job doesn't record properly in the activity section of the powder itself
--Need to allow deleting of powder usage entries, or at least editing in case of a goof up
--Still random weird characters on a bunch of pages.  Intake button for example on the jobs screen shows: Intake ✓
-
-Ideas Removed
-=======================
--Add Deactivate Customer button on Customer Detail page
-
-
-Logins:
-rich@r2r.com/Ragz2Richs123!
-
-rich@cannon.com/Cannon123!

src/PowderCoating.Application/DTOs/Company/CompanySettingsDtos.cs

@@ -112,6 +112,7 @@ namespace PowderCoating.Application.DTOs.Company
 
         // Labor Rates
         public decimal StandardLaborRate { get; set; }
+        public decimal? LaborCostPerHour { get; set; }
         public decimal AdditionalCoatLaborPercent { get; set; }
 
         // Equipment Operating Costs
@@ -185,6 +186,10 @@ namespace PowderCoating.Application.DTOs.Company
         [Display(Name = "Standard Labor Rate ($/hr)")]
         public decimal StandardLaborRate { get; set; }
 
+        [Range(0, 10000, ErrorMessage = "Labor cost rate must be between 0 and 10,000")]
+        [Display(Name = "Shop Labor Cost Rate ($/hr)")]
+        public decimal? LaborCostPerHour { get; set; }
+
         [Range(0, 100, ErrorMessage = "Additional coat labor percent must be between 0 and 100")]
         [Display(Name = "Additional Coat Labor (%)")]
         public decimal AdditionalCoatLaborPercent { get; set; } = 30m;

src/PowderCoating.Application/DTOs/GiftCertificate/GiftCertificateDtos.cs

@@ -16,6 +16,7 @@ public class GiftCertificateListDto
     public GiftCertificateStatus Status { get; set; }
     public DateTime IssueDate { get; set; }
     public DateTime? ExpiryDate { get; set; }
+    public Guid? BatchId { get; set; }
 }
 
 public class GiftCertificateDto : GiftCertificateListDto
@@ -87,3 +88,27 @@ public class RedeemGiftCertificateDto
     [Range(0.01, 9999.99)]
     public decimal Amount { get; set; }
 }
+
+public class BulkCreateGiftCertificateDto
+{
+    [Required]
+    [Range(1, 500, ErrorMessage = "Quantity must be between 1 and 500.")]
+    [Display(Name = "Number of Certificates")]
+    public int Quantity { get; set; } = 25;
+
+    [Required]
+    [Range(1.00, 9999.99, ErrorMessage = "Amount must be between $1.00 and $9,999.99.")]
+    [Display(Name = "Face Value (each)")]
+    public decimal Amount { get; set; }
+
+    [Required]
+    [Display(Name = "Issued Reason")]
+    public GiftCertificateIssuedReason IssuedReason { get; set; } = GiftCertificateIssuedReason.Promotional;
+
+    [Display(Name = "Expiry Date (optional)")]
+    public DateTime? ExpiryDate { get; set; }
+
+    [StringLength(1000)]
+    [Display(Name = "Event / Notes (applied to all certificates)")]
+    public string? Notes { get; set; }
+}

src/PowderCoating.Application/DTOs/Import/ShopWorkerImportDto.cs

@@ -1,28 +0,0 @@
-using CsvHelper.Configuration.Attributes;
-
-namespace PowderCoating.Application.DTOs.Import;
-
-/// <summary>
-/// DTO for importing shop workers from CSV files.
-/// Valid Role values: GeneralLabor, Sandblaster, Coater, Masker, QualityControl, OvenOperator, Supervisor, Maintenance
-/// </summary>
-public class ShopWorkerImportDto
-{
-    [Name("Name")]
-    public string Name { get; set; } = string.Empty;
-
-    [Name("Role")]
-    public string Role { get; set; } = "GeneralLabor";
-
-    [Name("Phone")]
-    public string? Phone { get; set; }
-
-    [Name("Email")]
-    public string? Email { get; set; }
-
-    [Name("IsActive")]
-    public bool? IsActive { get; set; }
-
-    [Name("Notes")]
-    public string? Notes { get; set; }
-}

src/PowderCoating.Application/DTOs/Job/JobDtos.cs

@@ -137,6 +137,13 @@ public class CreateJobDto
     [Display(Name = "Oven")]
     public int? OvenCostId { get; set; }
 
+    [Display(Name = "Batches")]
+    [Range(1, 999)]
+    public int OvenBatches { get; set; } = 1;
+
+    [Display(Name = "Cycle Time (min)")]
+    public int? OvenCycleMinutes { get; set; }
+
     [Required(ErrorMessage = "Description is required")]
     [StringLength(2000, ErrorMessage = "Description cannot exceed 2000 characters")]
     [Display(Name = "Description")]
@@ -208,6 +215,16 @@ public class UpdateJobDto
     [Display(Name = "Assigned Worker")]
     public string? AssignedUserId { get; set; }
 
+    [Display(Name = "Oven")]
+    public int? OvenCostId { get; set; }
+
+    [Display(Name = "Batches")]
+    [Range(1, 999)]
+    public int OvenBatches { get; set; } = 1;
+
+    [Display(Name = "Cycle Time (min)")]
+    public int? OvenCycleMinutes { get; set; }
+
     [Required(ErrorMessage = "Description is required")]
     [StringLength(2000, ErrorMessage = "Description cannot exceed 2000 characters")]
     [Display(Name = "Description")]
@@ -381,6 +398,7 @@ public class JobItemCoatDto
     public decimal? PowderCostPerLb { get; set; }
     public decimal? PowderToOrder { get; set; }
     public decimal? ActualPowderUsedLbs { get; set; }  // Filled during job completion
+    public bool NoExtraLayerCharge { get; set; }
     public string? Notes { get; set; }
 }
 
@@ -389,7 +407,7 @@ public class CompleteJobDto
 {
     public int JobId { get; set; }
     public decimal? ActualTimeSpentHours { get; set; }
-    public List<JobItemCoatUsageDto> CoatUsages { get; set; } = new();
+    public List<JobPowderUsageDto> PowderUsages { get; set; } = new();
     public bool SendEmailToCustomer { get; set; } = false;
 }
 
@@ -400,10 +418,10 @@ public class SendJobSmsRequest
     public string Message { get; set; } = string.Empty;
 }
 
-// DTO for tracking actual powder usage per coat
-public class JobItemCoatUsageDto
+// DTO for tracking actual powder usage per inventory item (color) for the whole job
+public class JobPowderUsageDto
 {
-    public int JobItemCoatId { get; set; }
+    public int InventoryItemId { get; set; }
     public decimal? ActualPowderUsedLbs { get; set; }
 }
 
@@ -515,6 +533,9 @@ public class JobEditItemsViewModel
     public string JobNumber { get; set; } = string.Empty;
     public int? CustomerId { get; set; }
     public decimal TaxPercent { get; set; }
+    public int? OvenCostId { get; set; }
+    public int OvenBatches { get; set; } = 1;
+    public int? OvenCycleMinutes { get; set; }
     public List<CreateQuoteItemDto> JobItems { get; set; } = new();
 }
 

src/PowderCoating.Application/DTOs/Quote/QuoteDtos.cs

@@ -604,6 +604,11 @@ public class QuotePricingBreakdownDto
 
     public decimal SubtotalBeforeDiscount { get; set; }
 
+    public decimal PricingTierDiscountAmount { get; set; }
+    public decimal PricingTierDiscountPercent { get; set; }
+    public decimal QuoteDiscountAmount { get; set; }
+    public decimal QuoteDiscountPercent { get; set; }
+
     public decimal DiscountAmount { get; set; }
     public decimal DiscountPercent { get; set; }
 
@@ -796,6 +801,7 @@ public class QuoteItemCoatDto
     public decimal CoatMaterialCost { get; set; }
     public decimal CoatLaborCost { get; set; }
     public decimal CoatTotalCost { get; set; }
+    public bool NoExtraLayerCharge { get; set; }
     public string? Notes { get; set; }
 }
 

src/PowderCoating.Application/DTOs/ShopWorker/CreateShopWorkerDto.cs

@@ -1,27 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using PowderCoating.Core.Enums;
-
-namespace PowderCoating.Application.DTOs.ShopWorker;
-
-public class CreateShopWorkerDto
-{
-    [Required(ErrorMessage = "Worker name is required")]
-    [StringLength(100, ErrorMessage = "Name cannot exceed 100 characters")]
-    public string Name { get; set; } = string.Empty;
-
-    [Required(ErrorMessage = "Role is required")]
-    public ShopWorkerRole Role { get; set; } = ShopWorkerRole.GeneralLabor;
-
-    [Phone(ErrorMessage = "Invalid phone number format")]
-    [StringLength(20, ErrorMessage = "Phone cannot exceed 20 characters")]
-    public string? Phone { get; set; }
-
-    [EmailAddress(ErrorMessage = "Invalid email address format")]
-    [StringLength(100, ErrorMessage = "Email cannot exceed 100 characters")]
-    public string? Email { get; set; }
-
-    public bool IsActive { get; set; } = true;
-
-    [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-    public string? Notes { get; set; }
-}

src/PowderCoating.Application/DTOs/ShopWorker/ShopWorkerDto.cs

@@ -1,16 +0,0 @@
-using PowderCoating.Core.Enums;
-
-namespace PowderCoating.Application.DTOs.ShopWorker;
-
-public class ShopWorkerDto
-{
-    public int Id { get; set; }
-    public string Name { get; set; } = string.Empty;
-    public ShopWorkerRole Role { get; set; }
-    public string? Phone { get; set; }
-    public string? Email { get; set; }
-    public bool IsActive { get; set; }
-    public string? Notes { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public DateTime? UpdatedAt { get; set; }
-}

src/PowderCoating.Application/DTOs/ShopWorker/UpdateShopWorkerDto.cs

@@ -1,29 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using PowderCoating.Core.Enums;
-
-namespace PowderCoating.Application.DTOs.ShopWorker;
-
-public class UpdateShopWorkerDto
-{
-    public int Id { get; set; }
-
-    [Required(ErrorMessage = "Worker name is required")]
-    [StringLength(100, ErrorMessage = "Name cannot exceed 100 characters")]
-    public string Name { get; set; } = string.Empty;
-
-    [Required(ErrorMessage = "Role is required")]
-    public ShopWorkerRole Role { get; set; }
-
-    [Phone(ErrorMessage = "Invalid phone number format")]
-    [StringLength(20, ErrorMessage = "Phone cannot exceed 20 characters")]
-    public string? Phone { get; set; }
-
-    [EmailAddress(ErrorMessage = "Invalid email address format")]
-    [StringLength(100, ErrorMessage = "Email cannot exceed 100 characters")]
-    public string? Email { get; set; }
-
-    public bool IsActive { get; set; }
-
-    [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-    public string? Notes { get; set; }
-}

src/PowderCoating.Application/DTOs/User/UserManagementDtos.cs

@@ -217,6 +217,10 @@ public class UpdateCompanyUserDto
     [Display(Name = "Active")]
     public bool IsActive { get; set; }
 
+    [Range(0, 10000, ErrorMessage = "Labor cost rate must be between 0 and 10,000")]
+    [Display(Name = "Labor Cost Rate ($/hr)")]
+    public decimal? LaborCostPerHour { get; set; }
+
     [Required(ErrorMessage = "Hire date is required")]
     [Display(Name = "Hire Date")]
     public DateTime HireDate { get; set; }

src/PowderCoating.Application/Interfaces/ICsvImportService.cs

@@ -136,18 +136,7 @@ public interface ICsvImportService
     /// </summary>
     Task<CsvImportResultDto> ImportVendorsAsync(Stream csvStream, int companyId);
 
-    /// <summary>
-    /// Generate a CSV template file for shop worker imports.
-    /// </summary>
-    byte[] GenerateShopWorkerTemplate();
-
-    /// <summary>
-    /// Import shop workers from a CSV stream.
-    /// Updates existing workers matched by Name; creates new ones otherwise.
-    /// </summary>
-    Task<CsvImportResultDto> ImportShopWorkersAsync(Stream csvStream, int companyId);
-
-    /// <summary>
+/// <summary>
     /// Generate a CSV template file for prep service imports.
     /// </summary>
     byte[] GeneratePrepServiceTemplate();

src/PowderCoating.Application/Interfaces/INotificationService.cs

@@ -91,4 +91,11 @@ public interface INotificationService
     /// Alert company staff when a Stripe chargeback (dispute) is opened on an invoice payment.
     /// </summary>
     Task NotifyChargebackAlertAsync(Invoice invoice, string disputeId, decimal amount, string reason);
+
+    /// <summary>
+    /// Sends an appointment reminder email to the linked customer (if opted in) and writes a
+    /// notification log row. Called by <see cref="PowderCoating.Web.BackgroundServices.AppointmentReminderBackgroundService"/>
+    /// when the reminder window opens. In-app bell notification is handled by the caller.
+    /// </summary>
+    Task NotifyAppointmentReminderAsync(Appointment appointment);
 }

src/PowderCoating.Application/Interfaces/IPdfService.cs

@@ -51,4 +51,10 @@ public interface IPdfService
         byte[]? companyLogo,
         string? companyLogoContentType,
         CompanyInfoDto companyInfo);
+
+    Task<byte[]> GenerateBulkGiftCertificatePdfAsync(
+        IList<GiftCertificateDto> certs,
+        byte[]? companyLogo,
+        string? companyLogoContentType,
+        CompanyInfoDto companyInfo);
 }

src/PowderCoating.Application/Mappings/JobProfile.cs

@@ -73,7 +73,7 @@ public class JobProfile : Profile
         // JobTimeEntry → JobTimeEntryDto
         CreateMap<JobTimeEntry, JobTimeEntryDto>()
             .ForMember(dest => dest.WorkerName, opt => opt.MapFrom(src =>
-                src.UserDisplayName ?? (src.Worker != null ? src.Worker.Name : string.Empty)));
+                src.UserDisplayName ?? string.Empty));
 
         // CreateJobDto to Job
         CreateMap<CreateJobDto, Job>()

src/PowderCoating.Application/Mappings/ShopWorkerProfile.cs

@@ -1,23 +0,0 @@
-using AutoMapper;
-using PowderCoating.Application.DTOs.ShopWorker;
-using PowderCoating.Core.Entities;
-
-namespace PowderCoating.Application.Mappings;
-
-public class ShopWorkerProfile : Profile
-{
-    public ShopWorkerProfile()
-    {
-        // Entity to DTO
-        CreateMap<ShopWorker, ShopWorkerDto>();
-
-        // DTO to Entity
-        CreateMap<CreateShopWorkerDto, ShopWorker>();
-        CreateMap<UpdateShopWorkerDto, ShopWorker>();
-
-        // Reverse mappings
-        CreateMap<ShopWorkerDto, ShopWorker>();
-        CreateMap<ShopWorker, CreateShopWorkerDto>();
-        CreateMap<ShopWorker, UpdateShopWorkerDto>();
-    }
-}

src/PowderCoating.Application/Services/JobItemAssemblyService.cs

@@ -4,8 +4,26 @@ using PowderCoating.Core.Entities;
 
 namespace PowderCoating.Application.Services;
 
+/// <summary>
+/// Converts quote/job data into persisted <see cref="JobItem"/>, <see cref="JobItemCoat"/>,
+/// and <see cref="JobItemPrepService"/> entities.
+///
+/// Three source types are supported, each with a matching overload:
+///   1. <see cref="CreateQuoteItemDto"/>  — quote wizard (new job from form data + fresh pricing result)
+///   2. <see cref="QuoteItem"/>           — quote-to-job conversion (copies a saved quote line)
+///   3. <see cref="JobItem"/>             — job duplication / template instantiation (copies an existing job line)
+///
+/// The private <see cref="JobItemSeed"/> / <see cref="JobItemCoatSeed"/> / <see cref="JobItemPrepServiceSeed"/>
+/// intermediary classes exist solely to give all three overload paths a single <see cref="BuildJobItem"/>
+/// construction site — avoiding subtle copy-paste drift where one overload forgets to copy a new field.
+/// </summary>
 public class JobItemAssemblyService : IJobItemAssemblyService
 {
+    /// <summary>
+    /// Creates a <see cref="JobItem"/> from a quote wizard DTO and a pre-calculated pricing result.
+    /// Used when creating a job directly from the job form or from an approved quote via the wizard.
+    /// Pricing is passed in separately because it was already computed upstream (CalculateQuoteItemPriceAsync).
+    /// </summary>
     public JobItem CreateJobItem(CreateQuoteItemDto source, int jobId, int companyId, QuoteItemPricingResult pricing, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -21,12 +39,13 @@ public class JobItemAssemblyService : IJobItemAssemblyService
                 IsGenericItem = source.IsGenericItem,
                 IsLaborItem = source.IsLaborItem,
                 IsSalesItem = source.IsSalesItem,
+                IsAiItem = source.IsAiItem,
                 Sku = source.Sku,
                 ManualUnitPrice = source.ManualUnitPrice,
                 PowderCostOverride = source.PowderCostOverride,
                 UnitPrice = pricing.UnitPrice,
                 TotalPrice = pricing.TotalPrice,
-                LaborCost = pricing.TotalPrice * 0.4m,
+                LaborCost = pricing.LaborCost,
                 RequiresSandblasting = source.RequiresSandblasting,
                 RequiresMasking = source.RequiresMasking,
                 EstimatedMinutes = source.EstimatedMinutes,
@@ -41,6 +60,11 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             createdAtUtc);
     }
 
+    /// <summary>
+    /// Builds <see cref="JobItemCoat"/> records from the coat DTOs in the quote wizard form.
+    /// PowderToOrder is recalculated server-side here (not trusted from the form) using surface area,
+    /// quantity, coverage, and transfer efficiency — the wizard's displayed value is for UI only.
+    /// </summary>
     public IReadOnlyList<JobItemCoat> CreateJobItemCoats(CreateQuoteItemDto source, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -61,7 +85,8 @@ public class JobItemAssemblyService : IJobItemAssemblyService
                     TransferEfficiency = c.TransferEfficiency,
                     PowderCostPerLb = c.PowderCostPerLb,
                     PowderToOrder = CalculatePowderToOrder(c.PowderToOrder, source.SurfaceAreaSqFt, source.Quantity, c.CoverageSqFtPerLb, c.TransferEfficiency),
-                    Notes = c.Notes
+                    Notes = c.Notes,
+                    NoExtraLayerCharge = c.NoExtraLayerCharge
                 },
                 jobItemId,
                 companyId,
@@ -69,6 +94,11 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             .ToList() ?? [];
     }
 
+    /// <summary>
+    /// Builds <see cref="JobItemPrepService"/> records (sandblasting, masking, etc.) from the
+    /// quote wizard DTO. These are per-item prep steps with individual time estimates that feed
+    /// labor cost calculations and shop floor instructions.
+    /// </summary>
     public IReadOnlyList<JobItemPrepService> CreateJobItemPrepServices(CreateQuoteItemDto source, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -84,6 +114,13 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             createdAtUtc);
     }
 
+    /// <summary>
+    /// Creates a <see cref="JobItem"/> by copying a saved <see cref="QuoteItem"/> during quote-to-job conversion.
+    /// Prices are taken directly from the quote snapshot — no repricing occurs — so the job starts with
+    /// exactly the amounts that were approved by the customer.
+    /// The first coat's color/finish is promoted to the job item's top-level fields for quick display
+    /// (details remain in the coat records).
+    /// </summary>
     public JobItem CreateJobItem(QuoteItem source, int jobId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -106,12 +143,13 @@ public class JobItemAssemblyService : IJobItemAssemblyService
                 IsGenericItem = source.IsGenericItem,
                 IsLaborItem = source.IsLaborItem,
                 IsSalesItem = source.IsSalesItem,
+                IsAiItem = source.IsAiItem,
                 Sku = source.Sku,
                 ManualUnitPrice = source.ManualUnitPrice,
                 PowderCostOverride = source.PowderCostOverride,
                 UnitPrice = source.UnitPrice,
                 TotalPrice = source.TotalPrice,
-                LaborCost = source.TotalPrice * 0.4m,
+                LaborCost = source.ItemLaborCost,
                 RequiresSandblasting = source.RequiresSandblasting,
                 RequiresMasking = source.RequiresMasking,
                 EstimatedMinutes = source.EstimatedMinutes,
@@ -126,6 +164,12 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             createdAtUtc);
     }
 
+    /// <summary>
+    /// Builds <see cref="JobItemCoat"/> records from a saved <see cref="QuoteItem"/> during quote-to-job conversion.
+    /// Coat appearance (color name, code, finish) is resolved from the linked <see cref="InventoryItem"/> if available,
+    /// because the inventory record is the canonical source of truth for a product's appearance —
+    /// the values typed into the quote form may be incomplete or informal.
+    /// </summary>
     public IReadOnlyList<JobItemCoat> CreateJobItemCoats(QuoteItem source, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -149,7 +193,8 @@ public class JobItemAssemblyService : IJobItemAssemblyService
                         TransferEfficiency = c.TransferEfficiency,
                         PowderCostPerLb = c.PowderCostPerLb,
                         PowderToOrder = CalculatePowderToOrder(c.PowderToOrder, source.SurfaceAreaSqFt, source.Quantity, c.CoverageSqFtPerLb, c.TransferEfficiency),
-                        Notes = c.Notes
+                        Notes = c.Notes,
+                        NoExtraLayerCharge = c.NoExtraLayerCharge
                     },
                     jobItemId,
                     companyId,
@@ -158,6 +203,9 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             .ToList() ?? [];
     }
 
+    /// <summary>
+    /// Copies prep service records from a <see cref="QuoteItem"/> to a new job item during quote-to-job conversion.
+    /// </summary>
     public IReadOnlyList<JobItemPrepService> CreateJobItemPrepServices(QuoteItem source, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -173,6 +221,12 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             createdAtUtc);
     }
 
+    /// <summary>
+    /// Creates a new <see cref="JobItem"/> by cloning an existing one — used for job templates
+    /// and rework duplication where an existing job line is reused on a new job.
+    /// Prices are copied as-is from the source; the job controller is responsible for repricing
+    /// if operating costs have changed since the original job was created.
+    /// </summary>
     public JobItem CreateJobItem(JobItem source, int jobId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -191,6 +245,7 @@ public class JobItemAssemblyService : IJobItemAssemblyService
                 IsGenericItem = source.IsGenericItem,
                 IsLaborItem = source.IsLaborItem,
                 IsSalesItem = source.IsSalesItem,
+                IsAiItem = source.IsAiItem,
                 Sku = source.Sku,
                 ManualUnitPrice = source.ManualUnitPrice,
                 PowderCostOverride = source.PowderCostOverride,
@@ -211,6 +266,11 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             createdAtUtc);
     }
 
+    /// <summary>
+    /// Clones coat records from an existing <see cref="JobItem"/> onto a new job item.
+    /// PowderToOrder is copied verbatim (not recalculated) because the original job's powder
+    /// quantities may have been manually adjusted after initial calculation.
+    /// </summary>
     public IReadOnlyList<JobItemCoat> CreateJobItemCoats(JobItem source, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -231,7 +291,8 @@ public class JobItemAssemblyService : IJobItemAssemblyService
                     TransferEfficiency = c.TransferEfficiency,
                     PowderCostPerLb = c.PowderCostPerLb,
                     PowderToOrder = c.PowderToOrder,
-                    Notes = c.Notes
+                    Notes = c.Notes,
+                    NoExtraLayerCharge = c.NoExtraLayerCharge
                 },
                 jobItemId,
                 companyId,
@@ -239,6 +300,9 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             .ToList() ?? [];
     }
 
+    /// <summary>
+    /// Clones prep service records from an existing <see cref="JobItem"/> onto a new job item.
+    /// </summary>
     public IReadOnlyList<JobItemPrepService> CreateJobItemPrepServices(JobItem source, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         ArgumentNullException.ThrowIfNull(source);
@@ -254,6 +318,10 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             createdAtUtc);
     }
 
+    /// <summary>
+    /// Single construction point for all <see cref="JobItem"/> creation paths.
+    /// Centralised here so that adding a new field only requires one code change, not three.
+    /// </summary>
     private static JobItem BuildJobItem(JobItemSeed seed, int jobId, int companyId, DateTime createdAtUtc)
     {
         return new JobItem
@@ -270,6 +338,7 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             IsGenericItem = seed.IsGenericItem,
             IsLaborItem = seed.IsLaborItem,
             IsSalesItem = seed.IsSalesItem,
+            IsAiItem = seed.IsAiItem,
             Sku = seed.Sku,
             ManualUnitPrice = seed.ManualUnitPrice,
             PowderCostOverride = seed.PowderCostOverride,
@@ -289,6 +358,9 @@ public class JobItemAssemblyService : IJobItemAssemblyService
         };
     }
 
+    /// <summary>
+    /// Single construction point for all <see cref="JobItemCoat"/> creation paths.
+    /// </summary>
     private static JobItemCoat BuildJobItemCoat(JobItemCoatSeed seed, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         return new JobItemCoat
@@ -306,11 +378,17 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             PowderCostPerLb = seed.PowderCostPerLb,
             PowderToOrder = seed.PowderToOrder,
             Notes = seed.Notes,
+            NoExtraLayerCharge = seed.NoExtraLayerCharge,
             CompanyId = companyId,
             CreatedAt = createdAtUtc
         };
     }
 
+    /// <summary>
+    /// Single construction point for all <see cref="JobItemPrepService"/> creation paths.
+    /// Returns an empty list (not null) when <paramref name="seeds"/> is null so callers
+    /// can safely iterate without a null check.
+    /// </summary>
     private static IReadOnlyList<JobItemPrepService> BuildJobItemPrepServices(IEnumerable<JobItemPrepServiceSeed>? seeds, int jobItemId, int companyId, DateTime createdAtUtc)
     {
         return seeds?
@@ -326,6 +404,18 @@ public class JobItemAssemblyService : IJobItemAssemblyService
             .ToList() ?? [];
     }
 
+    /// <summary>
+    /// Returns the pounds of powder needed to coat a batch, preferring the pre-stored value
+    /// (which the user may have manually adjusted in the wizard) over a fresh recalculation.
+    ///
+    /// Formula: (surfaceAreaSqFt × quantity) ÷ (coverageSqFtPerLb × transferEfficiency)
+    ///
+    /// Industry defaults are applied when catalog data is missing:
+    ///   - Coverage: 30 sqft/lb  (typical for standard powder at 2–3 mil DFT)
+    ///   - Transfer efficiency: 65% (industry average for electrostatic spray)
+    /// These are conservative defaults that slightly overestimate powder needed — intentional,
+    /// so the shop doesn't run short on a job.
+    /// </summary>
     private static decimal? CalculatePowderToOrder(decimal? storedPowderToOrder, decimal surfaceAreaSqFt, decimal quantity, decimal coverageSqFtPerLb, decimal transferEfficiency)
     {
         if (storedPowderToOrder.HasValue && storedPowderToOrder.Value > 0)
@@ -339,6 +429,12 @@ public class JobItemAssemblyService : IJobItemAssemblyService
         return Math.Round((surfaceAreaSqFt * quantity) / (coverage * efficiency), 2);
     }
 
+    /// <summary>
+    /// Resolves the display appearance (color name, code, finish) for a coat, preferring the linked
+    /// <see cref="InventoryItem"/>'s values over whatever was typed into the quote form.
+    /// The inventory record is the canonical source of truth — the form values are used as a fallback
+    /// only when no inventory item is linked (e.g. custom/one-off powder).
+    /// </summary>
     private static (string? ColorName, string? ColorCode, string? Finish) ResolveCoatAppearance(
         string? colorName,
         string? colorCode,
@@ -351,6 +447,11 @@ public class JobItemAssemblyService : IJobItemAssemblyService
         return (inventoryItem.Name, inventoryItem.ColorCode, inventoryItem.Finish);
     }
 
+    /// <summary>
+    /// Intermediate value object that normalises the three different source types
+    /// (DTO, QuoteItem, JobItem) into a single shape before the shared BuildJobItem factory method.
+    /// Using a seed class prevents subtle bugs where an overload forgets to map a new field.
+    /// </summary>
     private sealed class JobItemSeed
     {
         public string Description { get; init; } = string.Empty;
@@ -364,6 +465,7 @@ public class JobItemAssemblyService : IJobItemAssemblyService
         public bool IsGenericItem { get; init; }
         public bool IsLaborItem { get; init; }
         public bool IsSalesItem { get; init; }
+        public bool IsAiItem { get; init; }
         public string? Sku { get; init; }
         public decimal? ManualUnitPrice { get; init; }
         public decimal? PowderCostOverride { get; init; }
@@ -380,6 +482,7 @@ public class JobItemAssemblyService : IJobItemAssemblyService
         public int? AiPredictionId { get; init; }
     }
 
+    /// <summary>Intermediate value object for coat creation — see <see cref="JobItemSeed"/> for rationale.</summary>
     private sealed class JobItemCoatSeed
     {
         public string CoatName { get; init; } = string.Empty;
@@ -394,8 +497,10 @@ public class JobItemAssemblyService : IJobItemAssemblyService
         public decimal? PowderCostPerLb { get; init; }
         public decimal? PowderToOrder { get; init; }
         public string? Notes { get; init; }
+        public bool NoExtraLayerCharge { get; init; }
     }
 
+    /// <summary>Intermediate value object for prep service creation — see <see cref="JobItemSeed"/> for rationale.</summary>
     private sealed class JobItemPrepServiceSeed
     {
         public int PrepServiceId { get; init; }

src/PowderCoating.Application/Services/PdfService.cs

@@ -1858,6 +1858,50 @@ public class PdfService : IPdfService
         });
     }
 
+    /// <summary>
+    /// Generates a multi-page PDF containing one gift certificate per page, all using the same
+    /// branded layout as the single-certificate download. Used for bulk print runs (car shows,
+    /// promotions) so staff can hand-cut and distribute a full batch from one print job.
+    /// </summary>
+    public async Task<byte[]> GenerateBulkGiftCertificatePdfAsync(
+        IList<GiftCertificateDto> certs,
+        byte[]? companyLogo,
+        string? companyLogoContentType,
+        CompanyInfoDto companyInfo)
+    {
+        QuestPDF.Settings.License = LicenseType.Community;
+        const string accent = "#7c3aed";
+        const string gold = "#b45309";
+
+        return await Task.Run(() =>
+        {
+            var doc = Document.Create(container =>
+            {
+                foreach (var cert in certs)
+                {
+                    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.Content().Element(c => ComposeGiftCertificateContent(c, cert, companyInfo, companyLogo, accent, gold));
+
+                        page.Footer().AlignCenter().Text(text =>
+                        {
+                            text.Span(companyInfo.CompanyName).FontSize(8).FontColor(Colors.Grey.Darken1);
+                            if (!string.IsNullOrWhiteSpace(companyInfo.Phone))
+                                text.Span($"  ·  {FormatPhoneNumber(companyInfo.Phone)}").FontSize(8).FontColor(Colors.Grey.Darken1);
+                        });
+                    });
+                }
+            });
+
+            return doc.GeneratePdf();
+        });
+    }
+
     /// <summary>
     /// Composes the gift certificate body with a decorative double-border frame (outer purple 3pt,
     /// inner gold 1pt) that gives the document a premium printed-certificate appearance. Inside the

src/PowderCoating.Application/Services/QuotePricingAssemblyService.cs

@@ -6,6 +6,20 @@ using Microsoft.Extensions.Logging;
 
 namespace PowderCoating.Application.Services;
 
+/// <summary>
+/// Orchestrates the full quote item assembly pipeline: pricing calculation, entity construction,
+/// AI prediction tracking, and automatic inventory record creation for incoming powder orders.
+///
+/// This service sits above <see cref="PricingCalculationService"/> — it knows HOW to build and
+/// persist quote entities, while PricingCalculationService knows HOW to compute dollar amounts.
+/// Keeping them separate means pricing logic can be unit-tested without any entity construction concerns.
+///
+/// Key responsibilities:
+///   - <see cref="ApplyPricingSnapshot"/>  — stamps calculated totals onto the Quote entity so the
+///     displayed price is frozen at quote time and won't change if operating costs are updated later.
+///   - <see cref="CreateQuoteItemsAsync"/> — builds QuoteItem + coats + prep services for each DTO,
+///     records AI prediction overrides, and auto-creates incoming inventory records when needed.
+/// </summary>
 public class QuotePricingAssemblyService : IQuotePricingAssemblyService
 {
     private readonly IUnitOfWork _unitOfWork;
@@ -25,30 +39,48 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         _logger = logger;
     }
 
+    /// <summary>
+    /// Writes the calculated pricing breakdown onto the <see cref="Quote"/> entity as a snapshot.
+    /// Snapshots are critical: once a quote is sent to a customer, operating cost changes must NOT
+    /// silently alter the quoted amounts — the snapshot preserves what was presented at the time.
+    /// </summary>
     public void ApplyPricingSnapshot(Quote quote, QuotePricingResult pricingResult)
     {
         ArgumentNullException.ThrowIfNull(quote);
         ArgumentNullException.ThrowIfNull(pricingResult);
 
-        quote.MaterialCosts = pricingResult.MaterialCosts;
-        quote.LaborCosts = pricingResult.LaborCosts;
-        quote.EquipmentCosts = pricingResult.EquipmentCosts;
-        quote.ItemsSubtotal = pricingResult.ItemsSubtotal;
-        quote.OvenBatchCost = pricingResult.OvenBatchCost;
-        quote.ShopSuppliesAmount = pricingResult.ShopSuppliesAmount;
-        quote.ShopSuppliesPercent = pricingResult.ShopSuppliesPercent;
-        quote.OverheadAmount = pricingResult.OverheadCosts;
-        quote.OverheadPercent = pricingResult.OverheadPercent;
-        quote.ProfitMargin = pricingResult.ProfitMargin;
-        quote.ProfitPercent = pricingResult.ProfitPercent;
-        quote.SubTotal = pricingResult.SubtotalBeforeDiscount;
-        quote.DiscountPercent = pricingResult.DiscountPercent;
-        quote.DiscountAmount = pricingResult.DiscountAmount;
-        quote.RushFee = pricingResult.RushFee;
-        quote.TaxAmount = pricingResult.TaxAmount;
-        quote.Total = pricingResult.Total;
+        quote.MaterialCosts                = pricingResult.MaterialCosts;
+        quote.LaborCosts                   = pricingResult.LaborCosts;
+        quote.EquipmentCosts               = pricingResult.EquipmentCosts;
+        quote.ItemsSubtotal                = pricingResult.ItemsSubtotal;
+        quote.OvenBatchCost                = pricingResult.OvenBatchCost;
+        quote.FacilityOverheadCost         = pricingResult.FacilityOverheadCost;
+        quote.FacilityOverheadRatePerHour  = pricingResult.FacilityOverheadRatePerHour;
+        quote.ShopSuppliesAmount           = pricingResult.ShopSuppliesAmount;
+        quote.ShopSuppliesPercent          = pricingResult.ShopSuppliesPercent;
+        quote.OverheadAmount               = pricingResult.OverheadCosts;
+        quote.OverheadPercent              = pricingResult.OverheadPercent;
+        quote.ProfitMargin                 = pricingResult.ProfitMargin;
+        quote.ProfitPercent                = pricingResult.ProfitPercent;
+        quote.SubTotal                     = pricingResult.SubtotalBeforeDiscount;
+        quote.PricingTierDiscountAmount    = pricingResult.PricingTierDiscountAmount;
+        quote.PricingTierDiscountPercent   = pricingResult.PricingTierDiscountPercent;
+        quote.QuoteDiscountAmount          = pricingResult.QuoteDiscountAmount;
+        quote.QuoteDiscountPercent         = pricingResult.QuoteDiscountPercent;
+        quote.DiscountPercent              = pricingResult.DiscountPercent;
+        quote.DiscountAmount               = pricingResult.DiscountAmount;
+        quote.SubtotalAfterDiscount        = pricingResult.SubtotalAfterDiscount;
+        quote.RushFee                      = pricingResult.RushFee;
+        quote.TaxAmount                    = pricingResult.TaxAmount;
+        quote.Total                        = pricingResult.Total;
     }
 
+    /// <summary>
+    /// Builds and prices all <see cref="QuoteItem"/> entities from the incoming DTOs.
+    /// For each item: constructs the entity, calculates pricing, records whether the user overrode
+    /// an AI estimate, then attaches coats (including auto-creating incoming inventory entries when
+    /// the user selects a catalog powder not yet in their inventory) and prep services.
+    /// </summary>
     public async Task<IReadOnlyList<QuoteItem>> CreateQuoteItemsAsync(
         IEnumerable<CreateQuoteItemDto> itemDtos,
         int quoteId,
@@ -73,6 +105,13 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         return items;
     }
 
+    /// <summary>
+    /// Routes a single item to the correct pricing path and stamps the result onto the entity.
+    /// Priority order matches the routing table in <see cref="PricingCalculationService.CalculateQuoteItemPriceAsync"/>:
+    /// AI items → Sales items → Catalog (no coats) → full calculation engine.
+    /// Keeping pricing logic in PricingCalculationService means this method only decides WHICH
+    /// path to take, never HOW to compute the price.
+    /// </summary>
     private async Task ApplyPricingAsync(QuoteItem item, CreateQuoteItemDto itemDto, int companyId, decimal? ovenRateOverride)
     {
         if (itemDto.IsAiItem && itemDto.ManualUnitPrice.HasValue && itemDto.ManualUnitPrice.Value > 0)
@@ -120,6 +159,12 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         ApplyCalculatedPricing(item, pricing);
     }
 
+    /// <summary>
+    /// Builds <see cref="QuoteItemCoat"/> entities for a single item, including per-coat pricing.
+    /// If a coat has <c>AddAsIncoming = true</c> and references a catalog item but not an inventory
+    /// item, an incoming <see cref="InventoryItem"/> is auto-created so the shop can track the powder
+    /// order and receive it later — see <see cref="CreateIncomingInventoryItemAsync"/> for details.
+    /// </summary>
     private async Task<List<QuoteItemCoat>> BuildQuoteItemCoatsAsync(CreateQuoteItemDto itemDto, int companyId, DateTime createdAtUtc)
     {
         if (itemDto.Coats == null || itemDto.Coats.Count == 0)
@@ -151,6 +196,7 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         return coats;
     }
 
+    /// <summary>Constructs <see cref="QuoteItemPrepService"/> entities from the item DTO's prep service list.</summary>
     private static List<QuoteItemPrepService> BuildQuoteItemPrepServices(CreateQuoteItemDto itemDto, int companyId, DateTime createdAtUtc)
     {
         if (itemDto.PrepServices == null || itemDto.PrepServices.Count == 0)
@@ -168,6 +214,11 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
             .ToList();
     }
 
+    /// <summary>
+    /// Constructs a bare <see cref="QuoteItem"/> entity from the DTO — no pricing or coats yet.
+    /// Pricing is applied separately by <see cref="ApplyPricingAsync"/> to keep the construction
+    /// and calculation steps distinct and individually testable.
+    /// </summary>
     private static QuoteItem BuildQuoteItem(CreateQuoteItemDto itemDto, int quoteId, int companyId, DateTime createdAtUtc)
     {
         return new QuoteItem
@@ -197,6 +248,7 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         };
     }
 
+    /// <summary>Constructs a <see cref="QuoteItemCoat"/> entity from the coat DTO. Per-coat pricing is applied by the caller.</summary>
     private static QuoteItemCoat BuildQuoteItemCoat(CreateQuoteItemCoatDto coatDto, int companyId, DateTime createdAtUtc)
     {
         return new QuoteItemCoat
@@ -212,12 +264,17 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
             TransferEfficiency = coatDto.TransferEfficiency,
             PowderCostPerLb = coatDto.PowderCostPerLb,
             PowderToOrder = coatDto.PowderToOrder,
+            NoExtraLayerCharge = coatDto.NoExtraLayerCharge,
             Notes = coatDto.Notes,
             CompanyId = companyId,
             CreatedAt = createdAtUtc
         };
     }
 
+    /// <summary>
+    /// Stamps the pricing result onto the quote item entity.
+    /// Broken out as a separate method because it's called from multiple branches of ApplyPricingAsync.
+    /// </summary>
     private static void ApplyCalculatedPricing(QuoteItem item, QuoteItemPricingResult pricing)
     {
         item.UnitPrice = pricing.UnitPrice;
@@ -227,6 +284,13 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         item.ItemEquipmentCost = pricing.EquipmentCost;
     }
 
+    /// <summary>
+    /// Checks whether the user changed the AI's surface area or price estimates before saving,
+    /// and sets <c>UserOverrodeEstimate = true</c> on the prediction record if they did.
+    /// This flag feeds the AI analytics reports — over time it reveals how accurate the AI is
+    /// and whether certain item types consistently need manual correction.
+    /// A tolerance of $0.01 / 0.01 sqft is used to ignore floating-point rounding noise.
+    /// </summary>
     private async Task UpdateAiPredictionOverrideAsync(CreateQuoteItemDto itemDto, decimal finalUnitPrice)
     {
         if (!itemDto.AiPredictionId.HasValue) return;
@@ -240,6 +304,23 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         prediction.UpdatedAt = DateTime.UtcNow;
     }
 
+    /// <summary>
+    /// Auto-creates an "incoming" <see cref="InventoryItem"/> when a user selects a powder from the
+    /// platform catalog that doesn't yet exist in their company's inventory.
+    ///
+    /// WHY this exists: shops often quote jobs using powders they haven't ordered yet. Rather than
+    /// forcing the user to manually add the powder to inventory before quoting, we create an
+    /// IsIncoming=true record on their behalf. The shop can then receive the actual order against
+    /// this record later (updating quantity + receive date) without losing the link to the original quote.
+    ///
+    /// The AI augmentation step (LookupByUrlAsync) fills in technical specs (cure temp/time, coverage,
+    /// color families, etc.) that may be missing from the scraped catalog JSON. It is best-effort —
+    /// if it fails, the item is still created with whatever data the catalog has.
+    ///
+    /// After creation, <c>coatDto.PowderCostPerLb</c> is cleared so the pricing engine treats this
+    /// as an inventory-linked coat (not a custom powder), ensuring future repricings use the
+    /// inventory unit cost rather than the now-stale manual price from the quote form.
+    /// </summary>
     private async Task<int?> CreateIncomingInventoryItemAsync(CreateQuoteItemCoatDto coatDto, int companyId)
     {
         try

src/PowderCoating.Core/Entities/ApplicationUser.cs

@@ -58,7 +58,14 @@ public class ApplicationUser : IdentityUser
 
     public string? SidebarColor { get; set; } = "ocean";
     public string? Notes { get; set; }
-    
+
+    /// <summary>
+    /// Per-worker labor cost per hour used for job costing profit/margin calculations.
+    /// Overrides the company-level LaborCostPerHour when set.
+    /// Leave null to use the company default.
+    /// </summary>
+    public decimal? LaborCostPerHour { get; set; }
+
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
     public DateTime? UpdatedAt { get; set; }
     public DateTime? LastLoginDate { get; set; }

src/PowderCoating.Core/Entities/Appointment.cs

@@ -95,6 +95,12 @@ public class Appointment : BaseEntity
     /// </summary>
     public int ReminderMinutesBefore { get; set; } = 30;
 
+    /// <summary>
+    /// UTC timestamp when the reminder was dispatched. Null means it hasn't fired yet.
+    /// The background service uses this as a deduplication guard to prevent double-sending.
+    /// </summary>
+    public DateTime? ReminderSentAt { get; set; }
+
     // Navigation Properties
     public virtual Customer? Customer { get; set; }
     public virtual Job? Job { get; set; }

src/PowderCoating.Core/Entities/Company.cs

@@ -141,8 +141,7 @@ public class Company : BaseEntity
     public virtual ICollection<Quote> Quotes { get; set; } = new List<Quote>();
     public virtual ICollection<InventoryItem> InventoryItems { get; set; } = new List<InventoryItem>();
     public virtual ICollection<Vendor> Vendors { get; set; } = new List<Vendor>();
-    public virtual ICollection<ShopWorker> ShopWorkers { get; set; } = new List<ShopWorker>();
-    public virtual ICollection<PricingTier> PricingTiers { get; set; } = new List<PricingTier>();
+public virtual ICollection<PricingTier> PricingTiers { get; set; } = new List<PricingTier>();
     public virtual CompanyOperatingCosts? OperatingCosts { get; set; }
     public virtual CompanyPreferences? Preferences { get; set; }
 }

src/PowderCoating.Core/Entities/CompanyOperatingCosts.cs

@@ -13,6 +13,14 @@ namespace PowderCoating.Core.Entities
         [Range(0, 10000)]
         public decimal StandardLaborRate { get; set; }
 
+        /// <summary>
+        /// Actual labor cost per hour (wages + burden) used exclusively for internal job costing and profit/margin display.
+        /// This is NOT the billing rate — it should reflect what you actually pay workers.
+        /// When null, the costing engine defaults to 20% of StandardLaborRate.
+        /// </summary>
+        [Range(0, 10000)]
+        public decimal? LaborCostPerHour { get; set; }
+
         // Additional Coat Labor Percentage (percentage of base labor for each additional coat beyond the first)
         [Range(0, 100)]
         public decimal AdditionalCoatLaborPercent { get; set; } = 30m;

src/PowderCoating.Core/Entities/GiftCertificate.cs

@@ -32,6 +32,9 @@ public class GiftCertificate : BaseEntity
     /// <summary>Set when this GC was sold via an invoice line item.</summary>
     public int? SourceInvoiceItemId { get; set; }
 
+    /// <summary>Groups all certificates created in a single bulk run. Null for individually issued certs.</summary>
+    public Guid? BatchId { get; set; }
+
     // Navigation
     public virtual Customer? RecipientCustomer { get; set; }
     public virtual Customer? PurchasingCustomer { get; set; }

src/PowderCoating.Core/Entities/Job.cs

@@ -25,6 +25,10 @@ public class Job : BaseEntity
     // Selected oven (carried over from quote; null = company default rate)
     public int? OvenCostId { get; set; }
 
+    // Oven scheduling (carried over from quote)
+    public int OvenBatches { get; set; } = 1;
+    public int? OvenCycleMinutes { get; set; }
+
     // Pricing
     public decimal QuotedPrice { get; set; }
     public decimal FinalPrice { get; set; }
@@ -62,6 +66,10 @@ public class Job : BaseEntity
     // Used to detect when the quote was subsequently edited so the job details page can warn the user.
     public DateTime? QuoteSnapshotUpdatedAt { get; set; }
 
+    // Pricing snapshot — serialized QuotePricingBreakdownDto stored at save time so Details displays
+    // the breakdown that was actually calculated, not a re-run against current operating costs.
+    public string? PricingBreakdownJson { get; set; }
+
     // Rework tracking
     public bool IsReworkJob { get; set; }
     public int? OriginalJobId { get; set; }       // Set when this job was created as a rework

src/PowderCoating.Core/Entities/JobItem.cs

@@ -41,6 +41,10 @@ public class JobItem : BaseEntity
     // Values: "Simple" | "Moderate" | "Complex" | "Extreme"
     public string? Complexity { get; set; }
 
+    // True when this item originated from an AI Photo Quote — ManualUnitPrice is used as-is
+    // and oven cost is not double-charged (it was excluded from the AI estimate at quote level).
+    public bool IsAiItem { get; set; }
+
     // AI-generated standardized tags (comma-separated, e.g. "automotive,tubular")
     public string? AiTags { get; set; }
 

src/PowderCoating.Core/Entities/JobItemCoat.cs

@@ -42,6 +42,13 @@ public class JobItemCoat : BaseEntity
     public string? PowderReceivedByUserId { get; set; }
     public decimal? PowderReceivedLbs { get; set; }
 
+    // Pricing flags
+    /// <summary>
+    /// When true, the additional layer labor charge is not applied for this coat even if it is
+    /// not the first coat in the sequence. Used for clear coats, sealers, etc.
+    /// </summary>
+    public bool NoExtraLayerCharge { get; set; }
+
     // Notes
     public string? Notes { get; set; }
 

src/PowderCoating.Core/Entities/JobTimeEntry.cs

@@ -3,7 +3,6 @@ namespace PowderCoating.Core.Entities;
 public class JobTimeEntry : BaseEntity
 {
     public int JobId { get; set; }
-    public int? ShopWorkerId { get; set; }       // legacy — kept for entries created before user migration
     public string? UserId { get; set; }           // FK to AspNetUsers
     public string? UserDisplayName { get; set; }  // snapshot of worker name at entry creation time
     public DateTime WorkDate { get; set; }
@@ -13,5 +12,4 @@ public class JobTimeEntry : BaseEntity
 
     // Navigation
     public virtual Job Job { get; set; } = null!;
-    public virtual ShopWorker? Worker { get; set; }  // nullable — only populated for legacy entries
 }

src/PowderCoating.Core/Entities/Quote.cs

@@ -40,26 +40,33 @@ public class Quote : BaseEntity
     public DateTime? ApprovedDate { get; set; }
     
     // Pricing — all values are snapshots captured at save time and must not be recalculated on load
-    public decimal MaterialCosts { get; set; }       // Sum of powder/material costs across all items
-    public decimal LaborCosts { get; set; }          // Sum of labor costs across all items
-    public decimal EquipmentCosts { get; set; }      // Sum of equipment costs across all items
-    public decimal ItemsSubtotal { get; set; }       // Sum of item prices before any quote-level costs
-    public decimal OvenBatchCost { get; set; }       // Oven batch charge applied at quote level
-    public decimal ShopSuppliesAmount { get; set; }  // Shop supplies dollar amount
-    public decimal ShopSuppliesPercent { get; set; } // Shop supplies percentage used
-    public decimal OverheadAmount { get; set; }      // Overhead dollar amount
-    public decimal OverheadPercent { get; set; }     // Overhead percentage used
-    public decimal ProfitMargin { get; set; }        // Profit margin dollar amount
-    public decimal ProfitPercent { get; set; }       // Profit margin percentage used
-    public decimal SubTotal { get; set; }            // SubtotalBeforeDiscount (items + oven + overhead + profit + shop supplies)
+    public decimal MaterialCosts { get; set; }              // Sum of powder/material costs across all items
+    public decimal LaborCosts { get; set; }                 // Sum of labor costs across all items
+    public decimal EquipmentCosts { get; set; }             // Sum of equipment costs across all items
+    public decimal ItemsSubtotal { get; set; }              // Sum of item prices before any quote-level costs
+    public decimal OvenBatchCost { get; set; }              // Oven batch charge applied at quote level
+    public decimal FacilityOverheadCost { get; set; }       // Rent + utilities apportioned by estimated job hours
+    public decimal FacilityOverheadRatePerHour { get; set; }// Rate used for facility overhead ($/hr)
+    public decimal ShopSuppliesAmount { get; set; }         // Shop supplies dollar amount
+    public decimal ShopSuppliesPercent { get; set; }        // Shop supplies percentage used
+    public decimal OverheadAmount { get; set; }             // Legacy overhead (now always 0; kept for migration safety)
+    public decimal OverheadPercent { get; set; }            // Legacy overhead percent
+    public decimal ProfitMargin { get; set; }               // Profit margin dollar amount (0 — baked into item prices)
+    public decimal ProfitPercent { get; set; }              // Markup % used (for display reference)
+    public decimal SubTotal { get; set; }                   // SubtotalBeforeDiscount (items + oven + facility overhead + shop supplies)
 
     // Discount Information
     public DiscountType DiscountType { get; set; } = DiscountType.None;
-    public decimal DiscountValue { get; set; } = 0; // Value entered by user (percentage or fixed amount)
-    public decimal DiscountPercent { get; set; } // Calculated: actual percentage applied
-    public decimal DiscountAmount { get; set; } // Calculated: actual dollar amount deducted
-    public string? DiscountReason { get; set; } // Why discount was applied
+    public decimal DiscountValue { get; set; } = 0;          // Value entered by user (percentage or fixed amount)
+    public decimal PricingTierDiscountAmount { get; set; }   // Discount from customer's pricing tier
+    public decimal PricingTierDiscountPercent { get; set; }  // Tier discount percentage
+    public decimal QuoteDiscountAmount { get; set; }         // Manual quote-level discount amount
+    public decimal QuoteDiscountPercent { get; set; }        // Manual quote-level discount percentage
+    public decimal DiscountPercent { get; set; }             // Combined: actual percentage applied
+    public decimal DiscountAmount { get; set; }              // Combined: actual dollar amount deducted
+    public string? DiscountReason { get; set; }              // Why discount was applied
     public bool HideDiscountFromCustomer { get; set; } = false; // Show only total on PDFs/portal
+    public decimal SubtotalAfterDiscount { get; set; }       // SubTotal minus all discounts, before rush/tax
 
     public decimal TaxPercent { get; set; }
     public decimal TaxAmount { get; set; }

src/PowderCoating.Core/Entities/QuoteItemCoat.cs

@@ -33,6 +33,13 @@ public class QuoteItemCoat : BaseEntity
     public decimal CoatLaborCost { get; set; }
     public decimal CoatTotalCost { get; set; }
 
+    // Pricing flags
+    /// <summary>
+    /// When true, the additional layer labor charge is not applied for this coat even if it is
+    /// not the first coat in the sequence. Used for clear coats, sealers, etc.
+    /// </summary>
+    public bool NoExtraLayerCharge { get; set; }
+
     // Notes
     public string? Notes { get; set; }
 

src/PowderCoating.Core/Entities/ShopWorker.cs

@@ -1,18 +0,0 @@
-using PowderCoating.Core.Enums;
-
-namespace PowderCoating.Core.Entities;
-
-public class ShopWorker : BaseEntity
-{
-    public string Name { get; set; } = string.Empty;
-    public ShopWorkerRole Role { get; set; } = ShopWorkerRole.GeneralLabor;
-    public string? Phone { get; set; }
-    public string? Email { get; set; }
-    public bool IsActive { get; set; } = true;
-    public string? Notes { get; set; }
-
-    // Relationships
-    public virtual ICollection<Job> AssignedJobs { get; set; } = new List<Job>();
-    public virtual ICollection<MaintenanceRecord> AssignedMaintenanceTasks { get; set; } = new List<MaintenanceRecord>();
-    public virtual ICollection<JobTimeEntry> TimeEntries { get; set; } = new List<JobTimeEntry>();
-}

src/PowderCoating.Core/Entities/ShopWorkerRoleCost.cs

@@ -1,15 +0,0 @@
-using PowderCoating.Core.Enums;
-
-namespace PowderCoating.Core.Entities;
-
-/// <summary>
-/// Optional per-role labor cost rate for job costing / profitability calculations.
-/// If no rate is set for a role, the company's StandardLaborRate is used as fallback.
-/// </summary>
-public class ShopWorkerRoleCost : BaseEntity
-{
-    public ShopWorkerRole Role { get; set; }
-
-    /// <summary>Cost (pay rate) per hour for this role — used in job costing, NOT billing.</summary>
-    public decimal HourlyRate { get; set; }
-}

src/PowderCoating.Core/Enums/Enums.cs

@@ -78,17 +78,6 @@ public enum EquipmentStatus
     Retired = 4
 }
 
-public enum ShopWorkerRole
-{
-    GeneralLabor = 0,
-    Sandblaster = 1,
-    Coater = 2,
-    Masker = 3,
-    QualityControl = 4,
-    OvenOperator = 5,
-    Supervisor = 6,
-    Maintenance = 7
-}
 
 public enum JobPhotoType
 {

src/PowderCoating.Core/Enums/NotificationEnums.cs

@@ -20,5 +20,7 @@ public enum NotificationType
     SmsInboundStop = 12,
     SmsInboundHelp = 13,
     AdminEmail = 14,
-    SmsInboundStart = 15
+    SmsInboundStart = 15,
+    AppointmentReminder = 17,
+    AppointmentReminderStaff = 18
 }

src/PowderCoating.Core/Interfaces/IUnitOfWork.cs

@@ -54,9 +54,7 @@ public interface IUnitOfWork : IDisposable
     IRepository<AppointmentStatusLookup> AppointmentStatusLookups { get; }
     IRepository<AppointmentTypeLookup> AppointmentTypeLookups { get; }
     IRepository<PrepService> PrepServices { get; }
-    IRepository<ShopWorker> ShopWorkers { get; }
-    IRepository<ShopWorkerRoleCost> ShopWorkerRoleCosts { get; }
-    IRepository<ReworkRecord> ReworkRecords { get; }
+IRepository<ReworkRecord> ReworkRecords { get; }
     IRepository<Refund> Refunds { get; }
     IRepository<CreditMemo> CreditMemos { get; }
     IRepository<CreditMemoApplication> CreditMemoApplications { get; }

src/PowderCoating.Core/Interfaces/Services/ICompanyListService.cs

@@ -31,10 +31,13 @@ public interface ICompanyListService
 {
     /// <summary>
     /// Returns a paged, searched, and sorted slice of non-deleted companies together with the
-    /// total unfiltered count for pagination.
+    /// total count for pagination and the count of churned accounts that are currently hidden.
+    /// When <paramref name="hideChurned"/> is true, Expired/Canceled companies whose subscription
+    /// ended more than 14 days ago are excluded from results (but still counted for the banner).
     /// </summary>
-    Task<(List<Company> Companies, int TotalCount)> GetPagedAsync(
-        string? searchTerm, string sortColumn, string sortDirection, int page, int pageSize);
+    Task<(List<Company> Companies, int TotalCount, int ChurnedCount)> GetPagedAsync(
+        string? searchTerm, string sortColumn, string sortDirection, int page, int pageSize,
+        bool hideChurned = true);
 
     /// <summary>
     /// Returns job, quote, customer, and wizard completion counts for each of the supplied

src/PowderCoating.Infrastructure/Data/ApplicationDbContext.cs

@@ -92,7 +92,11 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
             if (companyIdClaim != null && int.TryParse(companyIdClaim, out int companyId))
                 return companyId;
 
-            return null;
+            // Authenticated but CompanyId claim is missing or invalid.
+            // Return 0 (never a real company ID) so the global filter generates
+            // "CompanyId = 0" which matches nothing — prevents null-comparison
+            // ambiguity from leaking cross-tenant rows.
+            return 0;
         }
     }
 
@@ -129,8 +133,11 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
     {
         get
         {
+            // No HTTP context means background service, hosted service, or unit test — bypass tenant filter
+            if (_httpContextAccessor?.HttpContext == null) return true;
             if (!IsSuperAdmin) return false;
-            return CurrentCompanyId == null || CurrentCompanyId == 1;
+            // CompanyId == 0 means no claim was present (break-glass / test SuperAdmins) — treat as platform admin
+            return CurrentCompanyId == null || CurrentCompanyId == 0 || CurrentCompanyId == 1;
         }
     }
 
@@ -205,11 +212,7 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
     public DbSet<MaintenanceRecord> MaintenanceRecords { get; set; }
     /// <summary>Supplier/vendor records used by Purchasing and Accounts Payable; tenant-filtered with soft delete.</summary>
     public DbSet<Vendor> Vendors { get; set; }
-    /// <summary>Shop worker profiles with role assignments; tenant-filtered with soft delete.</summary>
-    public DbSet<ShopWorker> ShopWorkers { get; set; }
-    /// <summary>Per-role labour cost rates used in pricing calculations; unique index on (CompanyId, Role).</summary>
-    public DbSet<ShopWorkerRoleCost> ShopWorkerRoleCosts { get; set; }
-    /// <summary>Rework records tracking quality failures and remediation work against a job; tenant-filtered with soft delete.</summary>
+/// <summary>Rework records tracking quality failures and remediation work against a job; tenant-filtered with soft delete.</summary>
     public DbSet<ReworkRecord> ReworkRecords { get; set; }
     /// <summary>Customer refund records; tenant-filtered with soft delete.</summary>
     public DbSet<Refund> Refunds { get; set; }
@@ -530,11 +533,7 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
             !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
         modelBuilder.Entity<JobStatusHistory>().HasQueryFilter(e =>
             !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
-        modelBuilder.Entity<ShopWorker>().HasQueryFilter(e =>
-            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
-        modelBuilder.Entity<ShopWorkerRoleCost>().HasQueryFilter(e =>
-            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
-        modelBuilder.Entity<ReworkRecord>().HasQueryFilter(e =>
+modelBuilder.Entity<ReworkRecord>().HasQueryFilter(e =>
             !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
         modelBuilder.Entity<Refund>().HasQueryFilter(e =>
             !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
@@ -1314,12 +1313,7 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
             .HasForeignKey(m => m.PerformedById)
             .OnDelete(DeleteBehavior.SetNull);
 
-        // ShopWorker relationships
-        modelBuilder.Entity<ShopWorker>()
-            .HasOne<Company>()
-            .WithMany(c => c.ShopWorkers)
-            .HasForeignKey(e => e.CompanyId)
-            .OnDelete(DeleteBehavior.Restrict);
+
 
         modelBuilder.Entity<Job>()
             .HasOne(j => j.AssignedUser)
@@ -1393,10 +1387,7 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
         modelBuilder.Entity<PricingTier>()
             .HasIndex(p => p.CompanyId);
 
-        modelBuilder.Entity<ShopWorker>()
-            .HasIndex(w => w.CompanyId);
-
-        modelBuilder.Entity<CatalogCategory>()
+modelBuilder.Entity<CatalogCategory>()
             .HasIndex(c => c.CompanyId);
 
         modelBuilder.Entity<CatalogCategory>()
@@ -1431,12 +1422,7 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
             .IsUnique()
             .HasDatabaseName("IX_Jobs_CompanyId_JobNumber");
 
-        modelBuilder.Entity<ShopWorkerRoleCost>()
-            .HasIndex(r => new { r.CompanyId, r.Role })
-            .IsUnique()
-            .HasDatabaseName("IX_ShopWorkerRoleCosts_CompanyId_Role");
-
-        modelBuilder.Entity<Job>()
+modelBuilder.Entity<Job>()
             .Property(j => j.ShopAccessCode)
             .HasDefaultValueSql("NEWID()");
 

src/PowderCoating.Infrastructure/Data/AuditInterceptor.cs

@@ -21,7 +21,7 @@ public class AuditInterceptor : SaveChangesInterceptor
     private static readonly HashSet<string> AuditedTypes = new(StringComparer.Ordinal)
     {
         nameof(Customer), nameof(Job), nameof(Quote), nameof(Equipment),
-        nameof(MaintenanceRecord), nameof(Vendor), nameof(ShopWorker),
+        nameof(MaintenanceRecord), nameof(Vendor),
         nameof(InventoryItem), nameof(Company),
         // Financial entities
         nameof(Invoice), nameof(Payment), nameof(Bill), nameof(BillPayment),

src/PowderCoating.Infrastructure/Migrations/20260316155002_Baseline.cs

@@ -11,26 +11,20 @@ namespace PowderCoating.Infrastructure.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.UpdateData(
-                table: "PricingTiers",
-                keyColumn: "Id",
-                keyValue: 1,
-                column: "CreatedAt",
-                value: new DateTime(2026, 3, 16, 15, 49, 58, 737, DateTimeKind.Utc).AddTicks(7851));
-
-            migrationBuilder.UpdateData(
-                table: "PricingTiers",
-                keyColumn: "Id",
-                keyValue: 2,
-                column: "CreatedAt",
-                value: new DateTime(2026, 3, 16, 15, 49, 58, 737, DateTimeKind.Utc).AddTicks(7856));
-
-            migrationBuilder.UpdateData(
-                table: "PricingTiers",
-                keyColumn: "Id",
-                keyValue: 3,
-                column: "CreatedAt",
-                value: new DateTime(2026, 3, 16, 15, 49, 58, 737, DateTimeKind.Utc).AddTicks(7858));
+            // These UpdateData calls were generated from an existing live database.
+            // On a fresh install the PricingTiers table and its seed rows may not exist yet
+            // (seeding is manual via Platform Management → Seed Data), so guard each update.
+            migrationBuilder.Sql(@"
+                IF OBJECT_ID(N'[PricingTiers]', N'U') IS NOT NULL
+                BEGIN
+                    IF EXISTS (SELECT 1 FROM [PricingTiers] WHERE [Id] = 1)
+                        UPDATE [PricingTiers] SET [CreatedAt] = '2026-03-16T15:49:58.7377851Z' WHERE [Id] = 1;
+                    IF EXISTS (SELECT 1 FROM [PricingTiers] WHERE [Id] = 2)
+                        UPDATE [PricingTiers] SET [CreatedAt] = '2026-03-16T15:49:58.7377856Z' WHERE [Id] = 2;
+                    IF EXISTS (SELECT 1 FROM [PricingTiers] WHERE [Id] = 3)
+                        UPDATE [PricingTiers] SET [CreatedAt] = '2026-03-16T15:49:58.7377858Z' WHERE [Id] = 3;
+                END
+            ");
         }
 
         /// <inheritdoc />

src/PowderCoating.Infrastructure/Migrations/20260514200543_AddJobOvenBatchFields.cs

@@ -0,0 +1,82 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddJobOvenBatchFields : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "OvenBatches",
+                table: "Jobs",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "OvenCycleMinutes",
+                table: "Jobs",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 5, 39, 939, DateTimeKind.Utc).AddTicks(6420));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 5, 39, 939, DateTimeKind.Utc).AddTicks(6425));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 5, 39, 939, DateTimeKind.Utc).AddTicks(6426));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "OvenBatches",
+                table: "Jobs");
+
+            migrationBuilder.DropColumn(
+                name: "OvenCycleMinutes",
+                table: "Jobs");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 2, 27, 27, 993, DateTimeKind.Utc).AddTicks(2349));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 2, 27, 27, 993, DateTimeKind.Utc).AddTicks(2366));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 2, 27, 27, 993, DateTimeKind.Utc).AddTicks(2367));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260514204347_AddJobItemIsAiItem.cs

@@ -0,0 +1,72 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddJobItemIsAiItem : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAiItem",
+                table: "JobItems",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 43, 43, 116, DateTimeKind.Utc).AddTicks(7475));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 43, 43, 116, DateTimeKind.Utc).AddTicks(7481));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 43, 43, 116, DateTimeKind.Utc).AddTicks(7482));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsAiItem",
+                table: "JobItems");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 5, 39, 939, DateTimeKind.Utc).AddTicks(6420));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 5, 39, 939, DateTimeKind.Utc).AddTicks(6425));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 5, 39, 939, DateTimeKind.Utc).AddTicks(6426));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260515003030_AddGiftCertificateBatchId.cs

@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddGiftCertificateBatchId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "BatchId",
+                table: "GiftCertificates",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 0, 30, 26, 297, DateTimeKind.Utc).AddTicks(7656));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 0, 30, 26, 297, DateTimeKind.Utc).AddTicks(7662));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 0, 30, 26, 297, DateTimeKind.Utc).AddTicks(7664));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BatchId",
+                table: "GiftCertificates");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 43, 43, 116, DateTimeKind.Utc).AddTicks(7475));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 43, 43, 116, DateTimeKind.Utc).AddTicks(7481));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 14, 20, 43, 43, 116, DateTimeKind.Utc).AddTicks(7482));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260515162936_AddJobPricingSnapshot.cs

@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddJobPricingSnapshot : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "PricingBreakdownJson",
+                table: "Jobs",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 16, 29, 32, 589, DateTimeKind.Utc).AddTicks(4618));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 16, 29, 32, 589, DateTimeKind.Utc).AddTicks(4623));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 16, 29, 32, 589, DateTimeKind.Utc).AddTicks(4625));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PricingBreakdownJson",
+                table: "Jobs");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 0, 30, 26, 273, DateTimeKind.Utc).AddTicks(2464));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 0, 30, 26, 273, DateTimeKind.Utc).AddTicks(2473));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 0, 30, 26, 273, DateTimeKind.Utc).AddTicks(2474));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260515194344_AddQuotePricingSnapshotFields.cs

@@ -0,0 +1,138 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddQuotePricingSnapshotFields : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "FacilityOverheadCost",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "FacilityOverheadRatePerHour",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "PricingTierDiscountAmount",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "PricingTierDiscountPercent",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "QuoteDiscountAmount",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "QuoteDiscountPercent",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "SubtotalAfterDiscount",
+                table: "Quotes",
+                type: "decimal(18,2)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 19, 43, 40, 586, DateTimeKind.Utc).AddTicks(845));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 19, 43, 40, 586, DateTimeKind.Utc).AddTicks(850));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 19, 43, 40, 586, DateTimeKind.Utc).AddTicks(852));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "FacilityOverheadCost",
+                table: "Quotes");
+
+            migrationBuilder.DropColumn(
+                name: "FacilityOverheadRatePerHour",
+                table: "Quotes");
+
+            migrationBuilder.DropColumn(
+                name: "PricingTierDiscountAmount",
+                table: "Quotes");
+
+            migrationBuilder.DropColumn(
+                name: "PricingTierDiscountPercent",
+                table: "Quotes");
+
+            migrationBuilder.DropColumn(
+                name: "QuoteDiscountAmount",
+                table: "Quotes");
+
+            migrationBuilder.DropColumn(
+                name: "QuoteDiscountPercent",
+                table: "Quotes");
+
+            migrationBuilder.DropColumn(
+                name: "SubtotalAfterDiscount",
+                table: "Quotes");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 16, 29, 32, 589, DateTimeKind.Utc).AddTicks(4618));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 16, 29, 32, 589, DateTimeKind.Utc).AddTicks(4623));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 16, 29, 32, 589, DateTimeKind.Utc).AddTicks(4625));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260515234413_AddLaborCostPerHour.cs

@@ -0,0 +1,81 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddLaborCostPerHour : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "LaborCostPerHour",
+                table: "CompanyOperatingCosts",
+                type: "decimal(18,2)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "LaborCostPerHour",
+                table: "AspNetUsers",
+                type: "decimal(18,2)",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3131));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3137));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3138));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LaborCostPerHour",
+                table: "CompanyOperatingCosts");
+
+            migrationBuilder.DropColumn(
+                name: "LaborCostPerHour",
+                table: "AspNetUsers");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 19, 43, 40, 586, DateTimeKind.Utc).AddTicks(845));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 19, 43, 40, 586, DateTimeKind.Utc).AddTicks(850));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 19, 43, 40, 586, DateTimeKind.Utc).AddTicks(852));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260519151303_AddAppointmentReminderSentAt.cs

@@ -0,0 +1,217 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAppointmentReminderSentAt : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Use IF EXISTS guards for all ShopWorker drops — prod and dev diverged on whether
+            // these objects exist, so unconditional drops would fail on whichever DB is missing them.
+            migrationBuilder.Sql(@"
+                IF EXISTS (SELECT 1 FROM sys.foreign_keys WHERE name = 'FK_Jobs_ShopWorkers_ShopWorkerId')
+                    ALTER TABLE [Jobs] DROP CONSTRAINT [FK_Jobs_ShopWorkers_ShopWorkerId];
+                IF EXISTS (SELECT 1 FROM sys.foreign_keys WHERE name = 'FK_JobTimeEntries_ShopWorkers_ShopWorkerId')
+                    ALTER TABLE [JobTimeEntries] DROP CONSTRAINT [FK_JobTimeEntries_ShopWorkers_ShopWorkerId];
+                IF EXISTS (SELECT 1 FROM sys.foreign_keys WHERE name = 'FK_MaintenanceRecords_ShopWorkers_ShopWorkerId')
+                    ALTER TABLE [MaintenanceRecords] DROP CONSTRAINT [FK_MaintenanceRecords_ShopWorkers_ShopWorkerId];
+                IF EXISTS (SELECT 1 FROM sys.tables WHERE name = 'ShopWorkerRoleCosts')
+                    DROP TABLE [ShopWorkerRoleCosts];
+                IF EXISTS (SELECT 1 FROM sys.tables WHERE name = 'ShopWorkers')
+                    DROP TABLE [ShopWorkers];
+                IF EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_MaintenanceRecords_ShopWorkerId' AND object_id = OBJECT_ID('MaintenanceRecords'))
+                    DROP INDEX [IX_MaintenanceRecords_ShopWorkerId] ON [MaintenanceRecords];
+                IF EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_JobTimeEntries_ShopWorkerId' AND object_id = OBJECT_ID('JobTimeEntries'))
+                    DROP INDEX [IX_JobTimeEntries_ShopWorkerId] ON [JobTimeEntries];
+                IF EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_Jobs_ShopWorkerId' AND object_id = OBJECT_ID('Jobs'))
+                    DROP INDEX [IX_Jobs_ShopWorkerId] ON [Jobs];
+                IF EXISTS (SELECT 1 FROM sys.columns WHERE name = 'ShopWorkerId' AND object_id = OBJECT_ID('MaintenanceRecords'))
+                    ALTER TABLE [MaintenanceRecords] DROP COLUMN [ShopWorkerId];
+                IF EXISTS (SELECT 1 FROM sys.columns WHERE name = 'ShopWorkerId' AND object_id = OBJECT_ID('JobTimeEntries'))
+                    ALTER TABLE [JobTimeEntries] DROP COLUMN [ShopWorkerId];
+                IF EXISTS (SELECT 1 FROM sys.columns WHERE name = 'ShopWorkerId' AND object_id = OBJECT_ID('Jobs'))
+                    ALTER TABLE [Jobs] DROP COLUMN [ShopWorkerId];
+            ");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ReminderSentAt",
+                table: "Appointments",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 15, 12, 57, 355, DateTimeKind.Utc).AddTicks(2970));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 15, 12, 57, 355, DateTimeKind.Utc).AddTicks(2976));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 15, 12, 57, 355, DateTimeKind.Utc).AddTicks(2977));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ReminderSentAt",
+                table: "Appointments");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ShopWorkerId",
+                table: "MaintenanceRecords",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ShopWorkerId",
+                table: "JobTimeEntries",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ShopWorkerId",
+                table: "Jobs",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "ShopWorkerRoleCosts",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    CompanyId = table.Column<int>(type: "int", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    DeletedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    DeletedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    HourlyRate = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
+                    Role = table.Column<int>(type: "int", nullable: false),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    UpdatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ShopWorkerRoleCosts", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ShopWorkers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    CompanyId = table.Column<int>(type: "int", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    DeletedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    DeletedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Email = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Notes = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Phone = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Role = table.Column<int>(type: "int", nullable: false),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    UpdatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ShopWorkers", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ShopWorkers_Companies_CompanyId",
+                        column: x => x.CompanyId,
+                        principalTable: "Companies",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3131));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3137));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3138));
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MaintenanceRecords_ShopWorkerId",
+                table: "MaintenanceRecords",
+                column: "ShopWorkerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTimeEntries_ShopWorkerId",
+                table: "JobTimeEntries",
+                column: "ShopWorkerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Jobs_ShopWorkerId",
+                table: "Jobs",
+                column: "ShopWorkerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopWorkerRoleCosts_CompanyId_Role",
+                table: "ShopWorkerRoleCosts",
+                columns: new[] { "CompanyId", "Role" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ShopWorkers_CompanyId",
+                table: "ShopWorkers",
+                column: "CompanyId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Jobs_ShopWorkers_ShopWorkerId",
+                table: "Jobs",
+                column: "ShopWorkerId",
+                principalTable: "ShopWorkers",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobTimeEntries_ShopWorkers_ShopWorkerId",
+                table: "JobTimeEntries",
+                column: "ShopWorkerId",
+                principalTable: "ShopWorkers",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MaintenanceRecords_ShopWorkers_ShopWorkerId",
+                table: "MaintenanceRecords",
+                column: "ShopWorkerId",
+                principalTable: "ShopWorkers",
+                principalColumn: "Id");
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260519192615_AddNoExtraLayerChargeToCoats.cs

@@ -0,0 +1,83 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddNoExtraLayerChargeToCoats : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "NoExtraLayerCharge",
+                table: "QuoteItemCoats",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "NoExtraLayerCharge",
+                table: "JobItemCoats",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            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));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "NoExtraLayerCharge",
+                table: "QuoteItemCoats");
+
+            migrationBuilder.DropColumn(
+                name: "NoExtraLayerCharge",
+                table: "JobItemCoats");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 15, 44, 18, 742, DateTimeKind.Utc).AddTicks(3960));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 15, 44, 18, 742, DateTimeKind.Utc).AddTicks(3966));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 19, 15, 44, 18, 742, DateTimeKind.Utc).AddTicks(3967));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -556,6 +556,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<bool>("IsBanned")
                         .HasColumnType("bit");
 
+                    b.Property<decimal?>("LaborCostPerHour")
+                        .HasColumnType("decimal(18,2)");
+
                     b.Property<DateTime?>("LastLoginDate")
                         .HasColumnType("datetime2");
 
@@ -713,6 +716,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<int>("ReminderMinutesBefore")
                         .HasColumnType("int");
 
+                    b.Property<DateTime?>("ReminderSentAt")
+                        .HasColumnType("datetime2");
+
                     b.Property<DateTime>("ScheduledEndTime")
                         .HasColumnType("datetime2");
 
@@ -2075,6 +2081,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
+                    b.Property<decimal?>("LaborCostPerHour")
+                        .HasColumnType("decimal(18,2)");
+
                     b.Property<int>("MonthlyBillableHours")
                         .HasColumnType("int");
 
@@ -3290,6 +3299,9 @@ namespace PowderCoating.Infrastructure.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<string>("CertificateCode")
                         .IsRequired()
                         .HasColumnType("nvarchar(450)");
@@ -4205,9 +4217,18 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<decimal>("OvenBatchCost")
                         .HasColumnType("decimal(18,2)");
 
+                    b.Property<int>("OvenBatches")
+                        .HasColumnType("int");
+
                     b.Property<int?>("OvenCostId")
                         .HasColumnType("int");
 
+                    b.Property<int?>("OvenCycleMinutes")
+                        .HasColumnType("int");
+
+                    b.Property<string>("PricingBreakdownJson")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int?>("QuoteId")
                         .HasColumnType("int");
 
@@ -4234,9 +4255,6 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<decimal>("ShopSuppliesPercent")
                         .HasColumnType("decimal(18,2)");
 
-                    b.Property<int?>("ShopWorkerId")
-                        .HasColumnType("int");
-
                     b.Property<string>("SpecialInstructions")
                         .HasColumnType("nvarchar(max)");
 
@@ -4278,8 +4296,6 @@ namespace PowderCoating.Infrastructure.Migrations
 
                     b.HasIndex("ScheduledDate");
 
-                    b.HasIndex("ShopWorkerId");
-
                     b.HasIndex("CompanyId", "CustomerId")
                         .HasDatabaseName("IX_Jobs_CompanyId_CustomerId");
 
@@ -4476,6 +4492,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<bool>("IncludePrepCost")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsAiItem")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
@@ -4599,6 +4618,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<int>("JobItemId")
                         .HasColumnType("int");
 
+                    b.Property<bool>("NoExtraLayerCharge")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Notes")
                         .HasColumnType("nvarchar(max)");
 
@@ -5418,9 +5440,6 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<string>("Notes")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<int?>("ShopWorkerId")
-                        .HasColumnType("int");
-
                     b.Property<string>("Stage")
                         .HasColumnType("nvarchar(max)");
 
@@ -5443,8 +5462,6 @@ namespace PowderCoating.Infrastructure.Migrations
 
                     b.HasIndex("JobId");
 
-                    b.HasIndex("ShopWorkerId");
-
                     b.ToTable("JobTimeEntries");
                 });
 
@@ -5768,9 +5785,6 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<DateTime>("ScheduledDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ShopWorkerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -5801,8 +5815,6 @@ namespace PowderCoating.Infrastructure.Migrations
 
                     b.HasIndex("ScheduledDate");
 
-                    b.HasIndex("ShopWorkerId");
-
                     b.HasIndex("Status");
 
                     b.HasIndex("CompanyId", "ScheduledDate")
@@ -6699,7 +6711,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 1,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 14, 2, 27, 27, 993, DateTimeKind.Utc).AddTicks(2349),
+                            CreatedAt = new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5186),
                             Description = "Standard pricing for regular customers",
                             DiscountPercent = 0m,
                             IsActive = true,
@@ -6710,7 +6722,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 2,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 14, 2, 27, 27, 993, DateTimeKind.Utc).AddTicks(2366),
+                            CreatedAt = new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5190),
                             Description = "5% discount for preferred customers",
                             DiscountPercent = 5m,
                             IsActive = true,
@@ -6721,7 +6733,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 3,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 14, 2, 27, 27, 993, DateTimeKind.Utc).AddTicks(2367),
+                            CreatedAt = new DateTime(2026, 5, 19, 19, 26, 9, 226, DateTimeKind.Utc).AddTicks(5191),
                             Description = "10% discount for premium customers",
                             DiscountPercent = 10m,
                             IsActive = true,
@@ -6968,6 +6980,12 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<DateTime?>("ExpirationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<decimal>("FacilityOverheadCost")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("FacilityOverheadRatePerHour")
+                        .HasColumnType("decimal(18,2)");
+
                     b.Property<bool>("HideDiscountFromCustomer")
                         .HasColumnType("bit");
 
@@ -7013,6 +7031,12 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<string>("PreparedById")
                         .HasColumnType("nvarchar(450)");
 
+                    b.Property<decimal>("PricingTierDiscountAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("PricingTierDiscountPercent")
+                        .HasColumnType("decimal(18,2)");
+
                     b.Property<decimal>("ProfitMargin")
                         .HasColumnType("decimal(18,2)");
 
@@ -7052,6 +7076,12 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<DateTime>("QuoteDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<decimal>("QuoteDiscountAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("QuoteDiscountPercent")
+                        .HasColumnType("decimal(18,2)");
+
                     b.Property<string>("QuoteNumber")
                         .IsRequired()
                         .HasColumnType("nvarchar(450)");
@@ -7077,6 +7107,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<decimal>("SubTotal")
                         .HasColumnType("decimal(18,2)");
 
+                    b.Property<decimal>("SubtotalAfterDiscount")
+                        .HasColumnType("decimal(18,2)");
+
                     b.Property<string>("Tags")
                         .HasColumnType("nvarchar(max)");
 
@@ -7375,6 +7408,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("NoExtraLayerCharge")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Notes")
                         .HasColumnType("nvarchar(max)");
 
@@ -7977,111 +8013,6 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.ToTable("ReworkRecords");
                 });
 
-            modelBuilder.Entity("PowderCoating.Core.Entities.ShopWorker", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CompanyId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("CreatedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("DeletedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Notes")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Phone")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Role")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("UpdatedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CompanyId");
-
-                    b.ToTable("ShopWorkers");
-                });
-
-            modelBuilder.Entity("PowderCoating.Core.Entities.ShopWorkerRoleCost", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CompanyId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("CreatedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime?>("DeletedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("DeletedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<decimal>("HourlyRate")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("Role")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("UpdatedBy")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CompanyId", "Role")
-                        .IsUnique()
-                        .HasDatabaseName("IX_ShopWorkerRoleCosts_CompanyId_Role");
-
-                    b.ToTable("ShopWorkerRoleCosts");
-                });
-
             modelBuilder.Entity("PowderCoating.Core.Entities.StripeWebhookEvent", b =>
                 {
                     b.Property<long>("Id")
@@ -9499,10 +9430,6 @@ namespace PowderCoating.Infrastructure.Migrations
                         .HasForeignKey("PowderCoating.Core.Entities.Job", "QuoteId")
                         .OnDelete(DeleteBehavior.SetNull);
 
-                    b.HasOne("PowderCoating.Core.Entities.ShopWorker", null)
-                        .WithMany("AssignedJobs")
-                        .HasForeignKey("ShopWorkerId");
-
                     b.Navigation("AssignedUser");
 
                     b.Navigation("Customer");
@@ -9805,13 +9732,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("PowderCoating.Core.Entities.ShopWorker", "Worker")
-                        .WithMany("TimeEntries")
-                        .HasForeignKey("ShopWorkerId");
-
                     b.Navigation("Job");
-
-                    b.Navigation("Worker");
                 });
 
             modelBuilder.Entity("PowderCoating.Core.Entities.JournalEntry", b =>
@@ -9882,10 +9803,6 @@ namespace PowderCoating.Infrastructure.Migrations
                         .WithMany()
                         .HasForeignKey("RecurrenceParentId");
 
-                    b.HasOne("PowderCoating.Core.Entities.ShopWorker", null)
-                        .WithMany("AssignedMaintenanceTasks")
-                        .HasForeignKey("ShopWorkerId");
-
                     b.Navigation("AssignedUser");
 
                     b.Navigation("Equipment");
@@ -10369,15 +10286,6 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Navigation("ReworkJob");
                 });
 
-            modelBuilder.Entity("PowderCoating.Core.Entities.ShopWorker", b =>
-                {
-                    b.HasOne("PowderCoating.Core.Entities.Company", null)
-                        .WithMany("ShopWorkers")
-                        .HasForeignKey("CompanyId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
             modelBuilder.Entity("PowderCoating.Core.Entities.Vendor", b =>
                 {
                     b.HasOne("PowderCoating.Core.Entities.Company", null)
@@ -10540,8 +10448,6 @@ namespace PowderCoating.Infrastructure.Migrations
 
                     b.Navigation("Quotes");
 
-                    b.Navigation("ShopWorkers");
-
                     b.Navigation("Users");
 
                     b.Navigation("Vendors");
@@ -10707,15 +10613,6 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Navigation("Quotes");
                 });
 
-            modelBuilder.Entity("PowderCoating.Core.Entities.ShopWorker", b =>
-                {
-                    b.Navigation("AssignedJobs");
-
-                    b.Navigation("AssignedMaintenanceTasks");
-
-                    b.Navigation("TimeEntries");
-                });
-
             modelBuilder.Entity("PowderCoating.Core.Entities.Vendor", b =>
                 {
                     b.Navigation("BillPayments");

src/PowderCoating.Infrastructure/Repositories/JobRepository.cs

@@ -171,7 +171,6 @@ public class JobRepository : Repository<Job>, IJobRepository
             .Include(j => j.JobItems.Where(i => !i.IsDeleted))
                 .ThenInclude(i => i.Coats.Where(c => !c.IsDeleted))
             .Include(j => j.TimeEntries.Where(t => !t.IsDeleted))
-                .ThenInclude(t => t.Worker)
             .AsNoTracking()
             .FirstOrDefaultAsync();
     }

src/PowderCoating.Infrastructure/Repositories/UnitOfWork.cs

@@ -81,7 +81,6 @@ public class UnitOfWork : IUnitOfWork
     private IRepository<AppointmentStatusLookup>? _appointmentStatusLookups;
     private IRepository<AppointmentTypeLookup>? _appointmentTypeLookups;
     private IRepository<PrepService>? _prepServices;
-    private IRepository<ShopWorker>? _shopWorkers;
 
     // Appointments
     private IRepository<Appointment>? _appointments;
@@ -350,16 +349,7 @@ public class UnitOfWork : IUnitOfWork
     public IRepository<PrepService> PrepServices =>
         _prepServices ??= new Repository<PrepService>(_context);
 
-    /// <summary>Repository for <see cref="ShopWorker"/> profiles with role assignments; tenant-filtered with soft delete.</summary>
-    public IRepository<ShopWorker> ShopWorkers =>
-        _shopWorkers ??= new Repository<ShopWorker>(_context);
-
-    /// <summary>Repository for <see cref="ShopWorkerRoleCost"/> per-role labour cost rates; unique on (CompanyId, Role).</summary>
-    private IRepository<ShopWorkerRoleCost>? _shopWorkerRoleCosts;
-    public IRepository<ShopWorkerRoleCost> ShopWorkerRoleCosts =>
-        _shopWorkerRoleCosts ??= new Repository<ShopWorkerRoleCost>(_context);
-
-    /// <summary>Repository for <see cref="ReworkRecord"/> quality-failure and remediation records; tenant-filtered with soft delete.</summary>
+/// <summary>Repository for <see cref="ReworkRecord"/> quality-failure and remediation records; tenant-filtered with soft delete.</summary>
     private IRepository<ReworkRecord>? _reworkRecords;
     public IRepository<ReworkRecord> ReworkRecords =>
         _reworkRecords ??= new Repository<ReworkRecord>(_context);

src/PowderCoating.Infrastructure/Services/CompanyDataPurgeService.cs

@@ -73,7 +73,6 @@ public class CompanyDataPurgeService : ICompanyDataPurgeService
         await _context.NotificationTemplates.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.Announcements.Where(x => x.TargetCompanyId == companyId).ExecuteDeleteAsync();
         await _context.BugReports.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
-        await _context.ShopWorkers.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.PrepServices.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
 
         // ── Tier 4: Company configs and lookup tables ─────────────────────────
@@ -137,7 +136,6 @@ public class CompanyDataPurgeService : ICompanyDataPurgeService
         await _context.PurchaseOrderItems.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.AiItemPredictions.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.PowderUsageLogs.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
-        await _context.ShopWorkerRoleCosts.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.OvenBatches.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.Refunds.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.CreditMemos.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
@@ -160,7 +158,6 @@ public class CompanyDataPurgeService : ICompanyDataPurgeService
         await _context.OvenCosts.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.Accounts.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.NotificationLogs.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
-        await _context.ShopWorkers.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.PrepServices.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.CatalogCategories.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();
         await _context.InventoryCategoryLookups.IgnoreQueryFilters().Where(x => x.CompanyId == companyId).ExecuteDeleteAsync();

src/PowderCoating.Infrastructure/Services/CompanyListService.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PowderCoating.Core.Entities;
+using PowderCoating.Core.Enums;
 using PowderCoating.Core.Interfaces.Services;
 using PowderCoating.Infrastructure.Data;
 
@@ -21,15 +22,34 @@ public class CompanyListService : ICompanyListService
     }
 
     /// <inheritdoc/>
-    public async Task<(List<Company> Companies, int TotalCount)> GetPagedAsync(
-        string? searchTerm, string sortColumn, string sortDirection, int page, int pageSize)
+    public async Task<(List<Company> Companies, int TotalCount, int ChurnedCount)> GetPagedAsync(
+        string? searchTerm, string sortColumn, string sortDirection, int page, int pageSize,
+        bool hideChurned = true)
     {
+        var cutoff = DateTime.UtcNow.AddDays(-14);
+
+        // Always count churned regardless of hideChurned so the banner can show a number.
+        var churnedCount = await _context.Companies
+            .AsNoTracking()
+            .IgnoreQueryFilters()
+            .Where(c => !c.IsDeleted
+                && (c.SubscriptionStatus == SubscriptionStatus.Expired || c.SubscriptionStatus == SubscriptionStatus.Canceled)
+                && c.SubscriptionEndDate != null
+                && c.SubscriptionEndDate < cutoff)
+            .CountAsync();
+
         var query = _context.Companies
             .AsNoTracking()
             .IgnoreQueryFilters()
             .Where(c => !c.IsDeleted)
             .AsQueryable();
 
+        if (hideChurned)
+            query = query.Where(c =>
+                !((c.SubscriptionStatus == SubscriptionStatus.Expired || c.SubscriptionStatus == SubscriptionStatus.Canceled)
+                  && c.SubscriptionEndDate != null
+                  && c.SubscriptionEndDate < cutoff));
+
         if (!string.IsNullOrWhiteSpace(searchTerm))
         {
             var s = searchTerm.ToLower();
@@ -61,7 +81,7 @@ public class CompanyListService : ICompanyListService
             .Take(pageSize)
             .ToListAsync();
 
-        return (companies, totalCount);
+        return (companies, totalCount, churnedCount);
     }
 
     /// <inheritdoc/>

src/PowderCoating.Infrastructure/Services/CsvImportService.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text;
 using CsvHelper;
 using CsvHelper.Configuration;
@@ -2164,168 +2164,6 @@ public class CsvImportService : ICsvImportService
     }
 
     #endregion
-
-    #region Shop Worker Import
-
-    /// <summary>
-    /// Generates a downloadable CSV template with two example shop worker rows covering different roles.
-    /// Two rows help users see how Role values (Coater, Sandblaster, etc.) are expressed and remind
-    /// them that Role is optional — the importer will default to GeneralLabor when it is omitted.
-    /// </summary>
-    public byte[] GenerateShopWorkerTemplate()
-    {
-        using var memoryStream = new MemoryStream();
-        using var writer = new StreamWriter(memoryStream);
-        using var csv = new CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture));
-
-        csv.WriteHeader<ShopWorkerImportDto>();
-        csv.NextRecord();
-
-        csv.WriteRecord(new ShopWorkerImportDto
-        {
-            Name = "John Doe",
-            Role = "Coater",
-            Phone = "555-1234",
-            Email = "johndoe@example.com",
-            IsActive = true,
-            Notes = "Experienced powder coater"
-        });
-        csv.NextRecord();
-
-        csv.WriteRecord(new ShopWorkerImportDto
-        {
-            Name = "Jane Smith",
-            Role = "Sandblaster",
-            Phone = "555-5678",
-            Email = "janesmith@example.com",
-            IsActive = true,
-            Notes = ""
-        });
-        csv.NextRecord();
-
-        writer.Flush();
-        return memoryStream.ToArray();
-    }
-
-    /// <summary>
-    /// Imports shop workers from a CSV stream using an upsert strategy keyed on worker Name.
-    /// Like vendor import, this is intentionally an upsert rather than insert-only so that a
-    /// company can re-import their HR list to update phone/email/role details without worrying
-    /// about creating duplicates. Role is parsed case-insensitively with spaces stripped so that
-    /// "General Labor" and "GeneralLabor" are both accepted; an unrecognised role falls back to
-    /// GeneralLabor with a warning rather than failing the row.
-    /// </summary>
-    /// <param name="csvStream">Readable stream of CSV data (header row required).</param>
-    /// <param name="companyId">Tenant company that will own newly inserted worker records.</param>
-    public async Task<CsvImportResultDto> ImportShopWorkersAsync(Stream csvStream, int companyId)
-    {
-        var result = new CsvImportResultDto();
-        var rowNumber = 0;
-
-        try
-        {
-            using var reader = new StreamReader(csvStream);
-            using var csv = new CsvReader(reader, new CsvConfiguration(CultureInfo.InvariantCulture)
-            {
-                HeaderValidated = null,
-                MissingFieldFound = null
-            });
-
-            var records = csv.GetRecords<ShopWorkerImportDto>().ToList();
-            result.TotalRows = records.Count;
-
-            _logger.LogInformation("Starting import of {Count} shop workers for company {CompanyId}", records.Count, companyId);
-
-            // Load existing workers for upsert matching by name
-            var existingWorkers = await _unitOfWork.ShopWorkers.GetAllAsync();
-            var workerDict = existingWorkers
-                .Where(w => !string.IsNullOrEmpty(w.Name))
-                .GroupBy(w => w.Name.Trim().ToUpperInvariant())
-                .ToDictionary(g => g.Key, g => g.First());
-
-            foreach (var record in records)
-            {
-                rowNumber++;
-                try
-                {
-                    if (string.IsNullOrWhiteSpace(record.Name))
-                    {
-                        result.Errors.Add($"Row {rowNumber}: Name is required.");
-                        result.ErrorCount++;
-                        continue;
-                    }
-
-                    // Parse role
-                    ShopWorkerRole role = ShopWorkerRole.GeneralLabor;
-                    if (!string.IsNullOrEmpty(record.Role))
-                    {
-                        if (!Enum.TryParse<ShopWorkerRole>(record.Role.Replace(" ", ""), true, out role))
-                        {
-                            result.Warnings.Add($"Row {rowNumber}: Role '{record.Role}' not recognized. Valid values: GeneralLabor, Sandblaster, Coater, Masker, QualityControl, OvenOperator, Supervisor, Maintenance. Using 'GeneralLabor'.");
-                            role = ShopWorkerRole.GeneralLabor;
-                        }
-                    }
-
-                    var key = record.Name.Trim().ToUpperInvariant();
-                    var now = DateTime.UtcNow;
-
-                    if (workerDict.TryGetValue(key, out var existing))
-                    {
-                        // Update
-                        existing.Role = role;
-                        existing.Phone = record.Phone ?? existing.Phone;
-                        existing.Email = record.Email ?? existing.Email;
-                        if (record.IsActive.HasValue) existing.IsActive = record.IsActive.Value;
-                        existing.Notes = record.Notes ?? existing.Notes;
-                        existing.UpdatedAt = now;
-
-                        await _unitOfWork.CompleteAsync();
-                        result.Warnings.Add($"Row {rowNumber}: Updated existing shop worker '{record.Name}'.");
-                        result.SuccessCount++;
-                    }
-                    else
-                    {
-                        var worker = new Core.Entities.ShopWorker
-                        {
-                            CompanyId = companyId,
-                            Name = record.Name.Trim(),
-                            Role = role,
-                            Phone = record.Phone,
-                            Email = record.Email,
-                            IsActive = record.IsActive ?? true,
-                            Notes = record.Notes,
-                            CreatedAt = now,
-                            UpdatedAt = now
-                        };
-
-                        await _unitOfWork.ShopWorkers.AddAsync(worker);
-                        await _unitOfWork.CompleteAsync();
-                        result.SuccessCount++;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    result.Errors.Add($"Row {rowNumber}: Database error - {ex.Message}");
-                    result.ErrorCount++;
-                    _logger.LogError(ex, "Error saving shop worker at row {RowNumber}", rowNumber);
-                }
-            }
-
-            _logger.LogInformation("Shop worker import completed: {SuccessCount} succeeded, {ErrorCount} failed", result.SuccessCount, result.ErrorCount);
-            result.Success = result.SuccessCount > 0;
-        }
-        catch (Exception ex)
-        {
-            result.Errors.Add($"Fatal error: {ex.Message}");
-            result.Success = false;
-            _logger.LogError(ex, "Fatal error importing shop workers");
-        }
-
-        return result;
-    }
-
-    #endregion
-
     #region Prep Service Import
 
     /// <summary>

src/PowderCoating.Infrastructure/Services/NotificationService.cs

@@ -1152,6 +1152,156 @@ public class NotificationService : INotificationService
         };
     }
 
+    /// <summary>
+    /// Sends appointment reminder emails when an appointment's reminder window opens.
+    /// Two emails are dispatched independently:
+    /// <list type="bullet">
+    ///   <item>Customer email — sent when a customer is linked, has an email address, and has
+    ///   email notifications enabled (<see cref="Customer.NotifyByEmail"/>).</item>
+    ///   <item>Staff email — sent to <see cref="BaseEntity.CreatedBy"/> (the user who created
+    ///   the appointment). This fires regardless of whether a customer is linked.</item>
+    /// </list>
+    /// Called exclusively by
+    /// <see cref="PowderCoating.Web.BackgroundServices.AppointmentReminderBackgroundService"/>
+    /// after it stamps <c>ReminderSentAt</c> — the caller owns deduplication.
+    /// </summary>
+    public async Task NotifyAppointmentReminderAsync(Appointment appointment)
+    {
+        try
+        {
+            var (companyName, company) = await GetCompanyAsync(appointment.CompanyId);
+            var (replyToEmail, replyToName) = await GetEmailFromAsync(appointment.CompanyId);
+            var baseUrl = await GetBaseUrlAsync();
+
+            var locationLine = !string.IsNullOrWhiteSpace(appointment.Location)
+                ? $"<br/><strong>Location:</strong> {WebUtility.HtmlEncode(appointment.Location)}"
+                : string.Empty;
+
+            var appointmentDate = appointment.ScheduledStartTime.ToString("dddd, MMMM d, yyyy");
+            var appointmentTime = appointment.IsAllDay
+                ? "All Day"
+                : appointment.ScheduledStartTime.ToString("h:mm tt");
+            var defaultSubject = $"Appointment Reminder — {appointment.Title} on {appointment.ScheduledStartTime:MMMM d, yyyy}";
+
+            // ── Customer email ────────────────────────────────────────────────
+            if (appointment.CustomerId != null)
+            {
+                var customer = appointment.Customer
+                    ?? await _context.Customers.FindAsync(appointment.CustomerId.Value);
+
+                if (customer != null)
+                {
+                    var customerName    = GetCustomerDisplayName(customer);
+                    var reminderEmails  = ParseEmailList(customer.Email);
+
+                    if (!customer.NotifyByEmail || reminderEmails.Count == 0)
+                    {
+                        if (reminderEmails.Count > 0)
+                        {
+                            await WriteLog(SkippedLog(NotificationChannel.Email, NotificationType.AppointmentReminder,
+                                customerName, string.Join(", ", reminderEmails), appointment.CompanyId,
+                                customerId: customer.Id));
+                        }
+                    }
+                    else
+                    {
+                        var customerValues = new Dictionary<string, string>
+                        {
+                            ["companyName"]      = companyName,
+                            ["customerName"]     = customerName,
+                            ["appointmentTitle"] = appointment.Title,
+                            ["appointmentDate"]  = appointmentDate,
+                            ["appointmentTime"]  = appointmentTime,
+                            ["locationLine"]     = locationLine
+                        };
+
+                        var (custSubject, custHtml) = await GetRenderedEmailAsync(
+                            appointment.CompanyId, NotificationType.AppointmentReminder, customerValues, defaultSubject);
+
+                        var custFullHtml  = AppendUnsubscribeFooterHtml(custHtml, customer.UnsubscribeToken, company, baseUrl);
+                        var custPlainText = StripHtml(custFullHtml);
+
+                        var (custOk, custErr, custLog) = await SendToEmailListAsync(
+                            customer.Email, customerName, custSubject, custPlainText, custFullHtml,
+                            replyToEmail: replyToEmail, replyToName: replyToName);
+
+                        await WriteLog(new NotificationLog
+                        {
+                            Channel          = NotificationChannel.Email,
+                            NotificationType = NotificationType.AppointmentReminder,
+                            Status           = custOk ? NotificationStatus.Sent : NotificationStatus.Failed,
+                            RecipientName    = customerName,
+                            Recipient        = custLog,
+                            Subject          = custSubject,
+                            Message          = custPlainText,
+                            ErrorMessage     = custErr,
+                            SentAt           = DateTime.UtcNow,
+                            CustomerId       = customer.Id,
+                            CompanyId        = appointment.CompanyId
+                        });
+                    }
+                }
+            }
+
+            // ── Staff email ───────────────────────────────────────────────────
+            // Send to whoever created the appointment so they get an out-of-app reminder.
+            if (!string.IsNullOrWhiteSpace(appointment.CreatedBy))
+            {
+                // Look up the user's display name from Identity if available.
+                var staffUser = await _context.Users
+                    .FirstOrDefaultAsync(u => u.Email == appointment.CreatedBy);
+                var staffName = !string.IsNullOrWhiteSpace(staffUser?.FullName)
+                    ? staffUser.FullName
+                    : appointment.CreatedBy;
+
+                // Include a customer line only when a customer is linked.
+                var customerLine = appointment.Customer != null
+                    ? $"<br/><strong>Customer:</strong> {WebUtility.HtmlEncode(GetCustomerDisplayName(appointment.Customer))}"
+                    : string.Empty;
+
+                var staffValues = new Dictionary<string, string>
+                {
+                    ["companyName"]      = companyName,
+                    ["staffName"]        = staffName,
+                    ["appointmentTitle"] = appointment.Title,
+                    ["appointmentDate"]  = appointmentDate,
+                    ["appointmentTime"]  = appointmentTime,
+                    ["customerLine"]     = customerLine,
+                    ["locationLine"]     = locationLine
+                };
+
+                var staffDefaultSubject = $"[Reminder] {appointment.Title} — {appointment.ScheduledStartTime:MMMM d, yyyy 'at' h:mm tt}";
+
+                var (staffSubject, staffHtml) = await GetRenderedEmailAsync(
+                    appointment.CompanyId, NotificationType.AppointmentReminderStaff, staffValues, staffDefaultSubject);
+
+                var staffPlainText = StripHtml(staffHtml);
+
+                var (staffOk, staffErr, staffLog) = await SendToEmailListAsync(
+                    appointment.CreatedBy, staffName, staffSubject, staffPlainText, staffHtml,
+                    replyToEmail: replyToEmail, replyToName: replyToName);
+
+                await WriteLog(new NotificationLog
+                {
+                    Channel          = NotificationChannel.Email,
+                    NotificationType = NotificationType.AppointmentReminderStaff,
+                    Status           = staffOk ? NotificationStatus.Sent : NotificationStatus.Failed,
+                    RecipientName    = staffName,
+                    Recipient        = staffLog,
+                    Subject          = staffSubject,
+                    Message          = staffPlainText,
+                    ErrorMessage     = staffErr,
+                    SentAt           = DateTime.UtcNow,
+                    CompanyId        = appointment.CompanyId
+                });
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "NotifyAppointmentReminderAsync failed for appointment {AppointmentId}", appointment.Id);
+        }
+    }
+
     // -----------------------------------------------------------------------
     // Fallback default templates (used when company has no DB template)
     // -----------------------------------------------------------------------
@@ -1217,6 +1367,14 @@ public class NotificationService : INotificationService
                     "Payment Reminder — Invoice {{invoiceNumber}} ({{daysOverdue}} days overdue)",
                     "<p>Dear {{customerName}},</p><p>This is a friendly reminder that invoice <strong>{{invoiceNumber}}</strong> for <strong>{{invoiceTotal}}</strong> was due on <strong>{{dueDate}}</strong> and is now <strong>{{daysOverdue}} days overdue</strong>.</p><p>Outstanding balance: <strong>{{balanceDue}}</strong></p><p>Please arrange payment at your earliest convenience. If you have already sent payment, please disregard this notice.</p><p>Thank you for your business with {{companyName}}.</p>"
                 ),
+                [(NotificationType.AppointmentReminder, NotificationChannel.Email)] = (
+                    "Appointment Reminder — {{appointmentTitle}} on {{appointmentDate}}",
+                    "<p>Dear {{customerName}},</p><p>This is a reminder that you have an upcoming appointment with <strong>{{companyName}}</strong>.</p><p><strong>Appointment:</strong> {{appointmentTitle}}<br/><strong>Date &amp; Time:</strong> {{appointmentDate}} at {{appointmentTime}}{{locationLine}}</p><p>If you have any questions or need to reschedule, please contact us at your earliest convenience.</p><p>Thank you for choosing {{companyName}}.</p>"
+                ),
+                [(NotificationType.AppointmentReminderStaff, NotificationChannel.Email)] = (
+                    "[Reminder] {{appointmentTitle}} — {{appointmentDate}}",
+                    "<p>Hi {{staffName}},</p><p>This is a reminder that you have an upcoming appointment.</p><p><strong>Appointment:</strong> {{appointmentTitle}}<br/><strong>Date &amp; Time:</strong> {{appointmentDate}} at {{appointmentTime}}{{customerLine}}{{locationLine}}</p><p>&#8212; {{companyName}}</p>"
+                ),
             };
 
         public static (string? Subject, string Body)? Get(NotificationType type, NotificationChannel channel)

src/PowderCoating.Web/BackgroundServices/AppointmentReminderBackgroundService.cs

@@ -0,0 +1,162 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using PowderCoating.Application.Interfaces;
+using PowderCoating.Infrastructure.Data;
+
+namespace PowderCoating.Web.BackgroundServices;
+
+/// <summary>
+/// Polls every 60 seconds for appointments whose reminder window has opened and dispatches
+/// an email to the linked customer plus an in-app bell notification to company staff.
+///
+/// Deduplication strategy: after selecting candidates the service immediately stamps
+/// <c>ReminderSentAt</c> on each appointment and saves before calling the notification
+/// methods. This prevents a second loop iteration from re-sending if notifications are slow
+/// or the application restarts mid-batch. A 24-hour lookback window caps the query so that
+/// appointments that slipped through (e.g., server downtime) are silently skipped rather
+/// than sending a stale reminder.
+/// </summary>
+public class AppointmentReminderBackgroundService : BackgroundService
+{
+    private readonly IServiceScopeFactory _scopeFactory;
+    private readonly ILogger<AppointmentReminderBackgroundService> _logger;
+
+    private static readonly TimeSpan PollingInterval = TimeSpan.FromMinutes(1);
+
+    /// <summary>
+    /// Appointments whose scheduled start is more than this far in the past are ignored even
+    /// if their reminder was never sent (server was down, etc.). We do not want to blast a
+    /// customer with a "your appointment is in 30 minutes" email hours after it was due.
+    /// </summary>
+    private static readonly TimeSpan MaxLookback = TimeSpan.FromHours(24);
+
+    public AppointmentReminderBackgroundService(
+        IServiceScopeFactory scopeFactory,
+        ILogger<AppointmentReminderBackgroundService> logger)
+    {
+        _scopeFactory = scopeFactory;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Long-running loop that wakes every <see cref="PollingInterval"/> (60 s) and calls
+    /// <see cref="RunAsync"/>. Uses <see cref="Task.Delay"/> with the cancellation token so
+    /// the service shuts down promptly when the application stops.
+    /// </summary>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        _logger.LogInformation("AppointmentReminderBackgroundService started.");
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            try
+            {
+                await Task.Delay(PollingInterval, stoppingToken);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+
+            if (stoppingToken.IsCancellationRequested) break;
+
+            await RunAsync(stoppingToken);
+        }
+
+        _logger.LogInformation("AppointmentReminderBackgroundService stopped.");
+    }
+
+    /// <summary>
+    /// One poll iteration: find all appointments whose reminder window has opened, stamp them,
+    /// then dispatch email + in-app notifications. A fresh DI scope is created per poll so that
+    /// the DbContext change tracker is clean each time.
+    /// </summary>
+    private async Task RunAsync(CancellationToken ct)
+    {
+        try
+        {
+            using var scope = _scopeFactory.CreateScope();
+            var db                   = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+            var notificationService  = scope.ServiceProvider.GetRequiredService<INotificationService>();
+            var inAppService         = scope.ServiceProvider.GetRequiredService<IInAppNotificationService>();
+
+            // ScheduledStartTime is stored as server-local time (no UTC conversion on form submit),
+            // so compare against DateTime.Now rather than UtcNow to avoid a 4-hour EDT offset.
+            var now       = DateTime.Now;
+            var lookback  = now - MaxLookback;
+
+            // Find appointments where:
+            //   - Reminder is enabled and has not been sent yet
+            //   - The reminder window has opened: ScheduledStartTime - ReminderMinutesBefore <= now
+            //   - The appointment hasn't been sitting unprocessed for more than MaxLookback
+            //   - The appointment status is not terminal (not cancelled, completed, no-show, etc.)
+            // IgnoreQueryFilters bypasses the tenant filter — no HTTP context in a background service.
+            var candidates = await db.Appointments
+                .IgnoreQueryFilters()
+                .Include(a => a.Customer)
+                .Include(a => a.AppointmentStatus)
+                .Where(a =>
+                    !a.IsDeleted &&
+                    a.IsReminderEnabled &&
+                    a.ReminderSentAt == null &&
+                    a.ScheduledStartTime > lookback &&
+                    EF.Functions.DateDiffMinute(now, a.ScheduledStartTime) <= a.ReminderMinutesBefore &&
+                    !a.AppointmentStatus.IsTerminalStatus)
+                .ToListAsync(ct);
+
+            if (candidates.Count == 0) return;
+
+            _logger.LogInformation(
+                "AppointmentReminderBackgroundService: {Count} appointment reminder(s) to dispatch.",
+                candidates.Count);
+
+            // Stamp ReminderSentAt before sending — prevents a restart from re-sending.
+            var stampedAt = now;
+            foreach (var appt in candidates)
+                appt.ReminderSentAt = stampedAt;
+
+            await db.SaveChangesAsync(ct);
+
+            // Now send notifications. Failures here don't roll back the stamp because we'd
+            // rather skip one reminder than spam a customer on every restart.
+            foreach (var appt in candidates)
+            {
+                if (ct.IsCancellationRequested) break;
+
+                try
+                {
+                    // Email to linked customer (no-ops internally if customer has opted out)
+                    await notificationService.NotifyAppointmentReminderAsync(appt);
+
+                    // In-app bell notification for company staff
+                    var when = appt.IsAllDay
+                        ? appt.ScheduledStartTime.ToString("MMMM d, yyyy")
+                        : appt.ScheduledStartTime.ToString("MMMM d, yyyy 'at' h:mm tt");
+
+                    await inAppService.CreateAsync(
+                        companyId:        appt.CompanyId,
+                        title:            $"Appointment Reminder: {appt.Title}",
+                        message:          $"{appt.AppointmentNumber} is scheduled for {when}.",
+                        notificationType: "AppointmentReminder",
+                        link:             $"/Appointments/Details/{appt.Id}",
+                        customerId:       appt.CustomerId);
+
+                    _logger.LogInformation(
+                        "Reminder dispatched for appointment {AppointmentNumber} (id {Id}, company {CompanyId}).",
+                        appt.AppointmentNumber, appt.Id, appt.CompanyId);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex,
+                        "Failed to dispatch reminder for appointment {AppointmentId}.", appt.Id);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "AppointmentReminderBackgroundService poll failed.");
+        }
+    }
+}

src/PowderCoating.Web/Controllers/AccountDataExportController.cs

@@ -133,7 +133,6 @@ public class AccountDataExportController : Controller
                 case "Inventory":   await AddInventorySheet(package, companyId, headerColor); break;
                 case "Equipment":   await AddEquipmentSheet(package, companyId, headerColor); break;
                 case "Vendors":     await AddVendorsSheet(package, companyId, headerColor); break;
-                case "ShopWorkers": await AddShopWorkersSheet(package, companyId, headerColor); break;
                 case "Users":       await AddUsersSheet(package, companyId, headerColor); break;
             }
         }
@@ -182,7 +181,6 @@ public class AccountDataExportController : Controller
                 case "Inventory":   WriteCsvEntry(zip, "Inventory.csv",   await BuildInventoryCsv(companyId)); break;
                 case "Equipment":   WriteCsvEntry(zip, "Equipment.csv",   await BuildEquipmentCsv(companyId)); break;
                 case "Vendors":     WriteCsvEntry(zip, "Vendors.csv",     await BuildVendorsCsv(companyId)); break;
-                case "ShopWorkers": WriteCsvEntry(zip, "ShopWorkers.csv", await BuildShopWorkersCsv(companyId)); break;
                 case "Users":       WriteCsvEntry(zip, "Users.csv",       await BuildUsersCsv(companyId)); break;
             }
         }
@@ -268,12 +266,6 @@ public class AccountDataExportController : Controller
             .Where(s => s.CompanyId == companyId && !s.IsDeleted)
             .OrderBy(s => s.CompanyName).ToListAsync();
 
-    /// <summary>Fetches all non-deleted shop workers for the company.</summary>
-    private Task<List<ShopWorker>> FetchShopWorkersAsync(int companyId) =>
-        _db.ShopWorkers.AsNoTracking().IgnoreQueryFilters()
-            .Where(w => w.CompanyId == companyId && !w.IsDeleted)
-            .OrderBy(w => w.Name).ToListAsync();
-
     /// <summary>
     /// Fetches all users for the company. <c>IsDeleted</c> is intentionally omitted because
     /// Identity users use <c>IsActive = false</c> for soft-deletion, not the base-entity flag.
@@ -462,23 +454,6 @@ public class AccountDataExportController : Controller
         AutoFit(ws, headers.Length);
     }
 
-    private async Task AddShopWorkersSheet(ExcelPackage pkg, int companyId, Color hdr)
-    {
-        var data = await FetchShopWorkersAsync(companyId);
-        var ws = pkg.Workbook.Worksheets.Add("Shop Workers");
-        var headers = new[] { "ID", "Name", "Role", "Phone", "Email", "Active", "Notes" };
-        WriteHeader(ws, headers, hdr);
-        for (int i = 0; i < data.Count; i++)
-        {
-            var r = i + 2; var w = data[i];
-            ws.Cells[r, 1].Value = w.Id;   ws.Cells[r, 2].Value = w.Name;
-            ws.Cells[r, 3].Value = w.Role.ToString(); ws.Cells[r, 4].Value = w.Phone;
-            ws.Cells[r, 5].Value = w.Email; ws.Cells[r, 6].Value = w.IsActive ? "Yes" : "No";
-            ws.Cells[r, 7].Value = w.Notes;
-        }
-        AutoFit(ws, headers.Length);
-    }
-
     /// <summary>
     /// Adds a "Users" worksheet. All users (active and inactive) are included because Identity
     /// uses <c>IsActive = false</c> for soft-deletion; <c>IsDeleted</c> is not applicable here.
@@ -611,17 +586,6 @@ public class AccountDataExportController : Controller
         return sb.ToString();
     }
 
-    /// <summary>Column names match <c>ShopWorkerImportDto</c> exactly so the file can be re-imported.</summary>
-    private async Task<string> BuildShopWorkersCsv(int companyId)
-    {
-        var data = await FetchShopWorkersAsync(companyId);
-        var sb = new StringBuilder();
-        sb.AppendLine("Name,Role,Phone,Email,IsActive,Notes");
-        foreach (var w in data)
-            sb.AppendLine($"{CsvEscape(w.Name)},{w.Role},{CsvEscape(w.Phone)},{CsvEscape(w.Email)},{w.IsActive.ToString().ToLower()},{CsvEscape(w.Notes)}");
-        return sb.ToString();
-    }
-
     /// <summary>
     /// All users (active and inactive) are exported for completeness and compliance — mirrors
     /// the reasoning in <see cref="AddUsersSheet"/> and <see cref="FetchUsersAsync"/>.
@@ -675,13 +639,13 @@ public class AccountDataExportController : Controller
 
     /// <summary>
     /// Returns the subset of selected sheet names reordered into the canonical export sequence
-    /// (Customers → Jobs → Quotes → Invoices → Inventory → Equipment → Vendors → ShopWorkers → Users).
+    /// (Customers → Jobs → Quotes → Invoices → Inventory → Equipment → Vendors → Users).
     /// Guarantees consistent file layout regardless of the order check-boxes were ticked on the form.
     /// Sheet names not in the canonical list are silently dropped.
     /// </summary>
     private static string[] OrderSheets(string[] sheets)
     {
-        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "ShopWorkers", "Users" };
+        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "Users" };
         return order.Where(sheets.Contains).ToArray();
     }
 

src/PowderCoating.Web/Controllers/AccountingExportController.cs

@@ -60,10 +60,11 @@ public class AccountingExportController : Controller
     {
         var start         = startDate.Date;
         var end           = endDate.Date.AddDays(1).AddTicks(-1);
+        var companyId     = _tenantContext.GetCurrentCompanyId() ?? 0;
 
         // ── Load data ─────────────────────────────────────────────────────────
         var invoices = (await _unitOfWork.Invoices.FindAsync(
-                i => i.InvoiceDate >= start && i.InvoiceDate <= end,
+                i => i.CompanyId == companyId && i.InvoiceDate >= start && i.InvoiceDate <= end,
                 false,
                 i => i.InvoiceItems,
                 i => i.Payments,
@@ -72,7 +73,7 @@ public class AccountingExportController : Controller
             .ToList();
 
         var expenses = (await _unitOfWork.Expenses.FindAsync(
-                e => e.Date >= start && e.Date <= end,
+                e => e.CompanyId == companyId && e.Date >= start && e.Date <= end,
                 false,
                 e => e.Vendor,
                 e => e.ExpenseAccount,
@@ -82,7 +83,7 @@ public class AccountingExportController : Controller
 
         var bills = await _unitOfWork.Bills.GetForDateRangeAsync(start, end);
 
-        var customers = (await _unitOfWork.Customers.GetAllAsync())
+        var customers = (await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId))
             .OrderBy(c => c.CompanyName ?? c.ContactFirstName)
             .ToList();
 

src/PowderCoating.Web/Controllers/AppointmentsController.cs

@@ -381,9 +381,15 @@ public class AppointmentsController : Controller
                 return View(dto);
             }
 
-            // Map changes
+            // Map changes — capture old start before overwrite so we can detect a reschedule.
+            var previousStart = appointment.ScheduledStartTime;
             _mapper.Map(dto, appointment);
 
+            // If the appointment was rescheduled, clear the reminder stamp so the background
+            // service will fire again at the new time.
+            if (appointment.ScheduledStartTime != previousStart)
+                appointment.ReminderSentAt = null;
+
             // Update
             await _unitOfWork.Appointments.UpdateAsync(appointment);
             await _unitOfWork.CompleteAsync();
@@ -486,9 +492,12 @@ public class AppointmentsController : Controller
         try
         {
             var events = new List<CalendarEventDto>();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
             // 1. Fetch appointments in date range
-            var allAppointments = await _unitOfWork.Appointments.GetAllAsync(false,
+            var allAppointments = await _unitOfWork.Appointments.FindAsync(
+                a => a.CompanyId == companyId,
+                false,
                 a => a.Customer,
                 a => a.AppointmentType,
                 a => a.AppointmentStatus);
@@ -501,7 +510,9 @@ public class AppointmentsController : Controller
             events.AddRange(appointmentEvents);
 
             // 2. Fetch maintenance records in date range
-            var allMaintenanceRecords = await _unitOfWork.MaintenanceRecords.GetAllAsync(false,
+            var allMaintenanceRecords = await _unitOfWork.MaintenanceRecords.FindAsync(
+                m => m.CompanyId == companyId,
+                false,
                 m => m.Equipment);
 
             var maintenanceRecords = allMaintenanceRecords
@@ -539,7 +550,9 @@ public class AppointmentsController : Controller
             }
 
             // 3. Fetch jobs and add as all-day events
-            var allJobs = await _unitOfWork.Jobs.GetAllAsync(false,
+            var allJobs = await _unitOfWork.Jobs.FindAsync(
+                j => j.CompanyId == companyId,
+                false,
                 j => j.Customer,
                 j => j.JobStatus);
 
@@ -718,6 +731,8 @@ public class AppointmentsController : Controller
             var duration = appointment.ScheduledEndTime - appointment.ScheduledStartTime;
             appointment.ScheduledStartTime = start;
             appointment.ScheduledEndTime = end;
+            // Drag-drop always changes the time — reset so the reminder fires at the new time.
+            appointment.ReminderSentAt = null;
 
             await _unitOfWork.Appointments.UpdateAsync(appointment);
             await _unitOfWork.CompleteAsync();
@@ -746,13 +761,16 @@ public class AppointmentsController : Controller
         try
         {
             var terminalCodes = new[] { AppConstants.StatusCodes.Job.Completed, AppConstants.StatusCodes.Job.Delivered, AppConstants.StatusCodes.Job.Cancelled };
-            var allJobs = await _unitOfWork.Jobs.GetAllAsync(false,
+            var calCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var allJobs = await _unitOfWork.Jobs.FindAsync(
+                j => j.CompanyId == calCompanyId,
+                false,
                 j => j.Customer, j => j.JobStatus, j => j.JobItems);
 
             // Load coats separately — filter by JobItemId using already-loaded item IDs
             var jobItemIds = allJobs.SelectMany(j => j.JobItems.Select(i => i.Id)).ToList();
             var allCoats = await _unitOfWork.JobItemCoats.FindAsync(
-                c => jobItemIds.Contains(c.JobItemId));
+                c => jobItemIds.Contains(c.JobItemId) && c.CompanyId == calCompanyId);
 
             var coatsByItemId = allCoats
                 .Where(c => !c.IsDeleted)
@@ -891,7 +909,9 @@ public class AppointmentsController : Controller
     /// </summary>
     private async Task PopulateCreateDropdowns()
     {
-        var customers = await _unitOfWork.Customers.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+
+        var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
         var customerList = customers.Select(c => new
         {
             c.Id,
@@ -903,19 +923,16 @@ public class AppointmentsController : Controller
         .ToList();
         ViewBag.Customers = new SelectList(customerList, "Id", "DisplayName");
 
-        // Use cached appointment types
-        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
         var types = await _lookupCache.GetAppointmentTypeLookupsAsync(companyId);
         ViewBag.AppointmentTypes = new SelectList(types.Where(t => t.IsActive).OrderBy(t => t.DisplayOrder), "Id", "DisplayName");
 
-        var companyIdForWorkers = _tenantContext.GetCurrentCompanyId() ?? 0;
         var workers = await _userManager.Users
-            .Where(u => u.CompanyId == companyIdForWorkers && u.IsActive && u.CompanyRole != null)
+            .Where(u => u.CompanyId == companyId && u.IsActive && u.CompanyRole != null)
             .OrderBy(u => u.FirstName).ThenBy(u => u.LastName)
             .ToListAsync();
         ViewBag.Workers = new SelectList(workers.Select(u => new { u.Id, FullName = u.FullName }), "Id", "FullName");
 
-        var jobs = await _unitOfWork.Jobs.GetAllAsync();
+        var jobs = await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId);
         ViewBag.Jobs = new SelectList(jobs.OrderBy(j => j.JobNumber), "Id", "JobNumber");
     }
 

src/PowderCoating.Web/Controllers/CatalogCategoriesController.cs

@@ -27,15 +27,18 @@ namespace PowderCoating.Web.Controllers
     {
         private readonly IUnitOfWork _unitOfWork;
         private readonly IMapper _mapper;
+        private readonly ITenantContext _tenantContext;
         private readonly ILogger<CatalogCategoriesController> _logger;
 
         public CatalogCategoriesController(
             IUnitOfWork unitOfWork,
             IMapper mapper,
+            ITenantContext tenantContext,
             ILogger<CatalogCategoriesController> logger)
         {
             _unitOfWork = unitOfWork;
             _mapper = mapper;
+            _tenantContext = tenantContext;
             _logger = logger;
         }
 
@@ -52,8 +55,9 @@ namespace PowderCoating.Web.Controllers
         {
             try
             {
+                var indexCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
                 var categories = await _unitOfWork.CatalogCategories
-                    .GetAllAsync(false,
+                    .FindAsync(c => c.CompanyId == indexCompanyId, false,
                         c => c.ParentCategory,
                         c => c.SubCategories,
                         c => c.Items);
@@ -164,7 +168,8 @@ namespace PowderCoating.Web.Controllers
                 if (ModelState.IsValid)
                 {
                     // Check for duplicate category name under the same parent (case-insensitive)
-                    var allCategories = await _unitOfWork.CatalogCategories.GetAllAsync();
+                    var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+                    var allCategories = await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == companyId);
                     var existingCategory = allCategories.FirstOrDefault(c =>
                         c.Name.Equals(dto.Name.Trim(), StringComparison.OrdinalIgnoreCase) &&
                         c.ParentCategoryId == dto.ParentCategoryId);
@@ -272,7 +277,8 @@ namespace PowderCoating.Web.Controllers
 
                     if (nameChanged || parentChanged)
                     {
-                        var allCategories = await _unitOfWork.CatalogCategories.GetAllAsync();
+                        var editCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+                        var allCategories = await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == editCompanyId);
                         var existingCategory = allCategories.FirstOrDefault(c =>
                             c.Id != id &&
                             c.Name.Equals(dto.Name.Trim(), StringComparison.OrdinalIgnoreCase) &&
@@ -444,7 +450,8 @@ namespace PowderCoating.Web.Controllers
                 var trimmedName = request.Name.Trim();
 
                 // Check for duplicate category name under the same parent (case-insensitive)
-                var allCategories = await _unitOfWork.CatalogCategories.GetAllAsync();
+                var quickCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+                var allCategories = await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == quickCompanyId);
                 var existingCategory = allCategories.FirstOrDefault(c =>
                     c.Name.Equals(trimmedName, StringComparison.OrdinalIgnoreCase) &&
                     c.ParentCategoryId == request.ParentCategoryId);
@@ -500,8 +507,9 @@ namespace PowderCoating.Web.Controllers
         {
             try
             {
+                var treeCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
                 var categories = await _unitOfWork.CatalogCategories
-                    .GetAllAsync(false, c => c.SubCategories, c => c.Items);
+                    .FindAsync(c => c.CompanyId == treeCompanyId, false, c => c.SubCategories, c => c.Items);
 
                 // Build tree from root categories
                 var rootCategories = categories
@@ -535,7 +543,8 @@ namespace PowderCoating.Web.Controllers
         {
             try
             {
-                var categories = (await _unitOfWork.CatalogCategories.GetAllAsync()).ToList();
+                var dropdownCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+                var categories = (await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == dropdownCompanyId)).ToList();
 
                 // Build hierarchical list (parents before children)
                 var hierarchicalList = new List<CatalogCategory>();
@@ -573,7 +582,8 @@ namespace PowderCoating.Web.Controllers
         /// </param>
         private async Task PopulateParentCategoryDropdown(int? excludeCategoryId = null)
         {
-            var categories = (await _unitOfWork.CatalogCategories.GetAllAsync()).ToList();
+            var parentDropCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var categories = (await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == parentDropCompanyId)).ToList();
 
             // Exclude the current category and its descendants to prevent circular references
             var excludedIds = new HashSet<int>();
@@ -700,7 +710,8 @@ namespace PowderCoating.Web.Controllers
             if (categoryId == newParentId)
                 return true;
 
-            var categories = (await _unitOfWork.CatalogCategories.GetAllAsync()).ToList();
+            var circleCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var categories = (await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == circleCompanyId)).ToList();
             var current = categories.FirstOrDefault(c => c.Id == newParentId);
 
             while (current != null)

src/PowderCoating.Web/Controllers/CatalogItemsController.cs

@@ -83,7 +83,8 @@ namespace PowderCoating.Web.Controllers
             try
             {
                 // Get all categories with their items
-                var allCategories = (await _unitOfWork.CatalogCategories.GetAllAsync(false, c => c.Items)).ToList();
+                var itemsCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+                var allCategories = (await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == itemsCompanyId, false, c => c.Items)).ToList();
                 var allItems = allCategories.SelectMany(c => c.Items).ToList();
 
                 // Apply search filter
@@ -578,7 +579,8 @@ namespace PowderCoating.Web.Controllers
                     return Json(new List<object>());
                 }
 
-                var allItems = await _unitOfWork.CatalogItems.GetAllAsync(false, i => i.Category);
+                var searchCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+                var allItems = await _unitOfWork.CatalogItems.FindAsync(i => i.CompanyId == searchCompanyId, false, i => i.Category);
                 var search = searchTerm.ToLower();
 
                 var items = allItems
@@ -694,7 +696,8 @@ namespace PowderCoating.Web.Controllers
         /// </summary>
         private async Task PopulateCategoryDropdown()
         {
-            var categories = (await _unitOfWork.CatalogCategories.GetAllAsync()).ToList();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var categories = (await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == companyId)).ToList();
 
             // Build hierarchical list (parents before children)
             var hierarchicalList = new List<CatalogCategory>();
@@ -1045,7 +1048,7 @@ namespace PowderCoating.Web.Controllers
                 // Load all categories so we can build full paths (e.g. "Cerakote > Firearms").
                 // The full path gives Claude the coating-type context it needs — an item in
                 // "Firearms" under "Cerakote" costs very differently than one under "Powder Coat".
-                var allCategories = (await _unitOfWork.CatalogCategories.GetAllAsync())
+                var allCategories = (await _unitOfWork.CatalogCategories.FindAsync(c => c.CompanyId == currentUser.CompanyId))
                     .ToDictionary(c => c.Id);
 
                 // Load company operating costs

src/PowderCoating.Web/Controllers/CompaniesController.cs

@@ -66,15 +66,16 @@ public class CompaniesController : Controller
         string sortColumn = "CompanyName",
         string sortDirection = "asc",
         int pageNumber = 1,
-        int pageSize = 25)
+        int pageSize = 25,
+        bool showChurned = false)
     {
         try
         {
             pageNumber = Math.Max(1, pageNumber);
             pageSize = pageSize is 10 or 25 or 50 or 100 ? pageSize : 25;
 
-            var (companies, totalCount) = await _companyList.GetPagedAsync(
-                searchTerm, sortColumn, sortDirection, pageNumber, pageSize);
+            var (companies, totalCount, churnedCount) = await _companyList.GetPagedAsync(
+                searchTerm, sortColumn, sortDirection, pageNumber, pageSize, hideChurned: !showChurned);
 
             var companyDtos = _mapper.Map<List<CompanyListDto>>(companies);
 
@@ -128,6 +129,8 @@ public class CompaniesController : Controller
             ViewBag.PageSize = pageSize;
             ViewBag.TotalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
             ViewBag.ImpersonatingCompanyId = HttpContext.Session.GetInt32("ImpersonatingCompanyId");
+            ViewBag.ShowChurned = showChurned;
+            ViewBag.ChurnedCount = churnedCount;
 
             return View(companyDtos);
         }

src/PowderCoating.Web/Controllers/CompanyHealthController.cs

@@ -45,18 +45,30 @@ public class CompanyHealthController : Controller
     /// user's risk/search filters, so the KPI cards always show platform-wide totals.
     /// </para>
     /// </summary>
-    public async Task<IActionResult> Index(string? risk, string? search, bool configIssuesOnly = false)
+    public async Task<IActionResult> Index(string? risk, string? search, bool configIssuesOnly = false, bool showChurned = false)
     {
         var now = DateTime.UtcNow;
         var d30 = now.AddDays(-30);
         var d90 = now.AddDays(-90);
+        var churnedCutoff = now.AddDays(-14);
 
         // One query per signal — all keyed by CompanyId
-        var companies = await _db.Companies
+        var allCompanies = await _db.Companies
             .AsNoTracking().IgnoreQueryFilters()
             .Where(c => !c.IsDeleted)
             .ToListAsync();
 
+        var churnedCount = allCompanies.Count(c =>
+            (c.SubscriptionStatus == SubscriptionStatus.Expired || c.SubscriptionStatus == SubscriptionStatus.Canceled)
+            && c.SubscriptionEndDate.HasValue && c.SubscriptionEndDate.Value < churnedCutoff);
+
+        var companies = showChurned
+            ? allCompanies
+            : allCompanies.Where(c =>
+                !((c.SubscriptionStatus == SubscriptionStatus.Expired || c.SubscriptionStatus == SubscriptionStatus.Canceled)
+                  && c.SubscriptionEndDate.HasValue && c.SubscriptionEndDate.Value < churnedCutoff))
+              .ToList();
+
         var lastLogins = await _db.Users
             .AsNoTracking().IgnoreQueryFilters()
             .Where(u => u.LastLoginDate != null)
@@ -163,6 +175,8 @@ public class CompanyHealthController : Controller
         ViewBag.Risk              = risk;
         ViewBag.Search            = search;
         ViewBag.ConfigIssuesOnly  = configIssuesOnly;
+        ViewBag.ShowChurned       = showChurned;
+        ViewBag.ChurnedCount      = churnedCount;
 
         if (!string.IsNullOrWhiteSpace(search))
             all = all.Where(h =>

src/PowderCoating.Web/Controllers/CompanySettingsController.cs

@@ -142,10 +142,10 @@ public class CompanySettingsController : Controller
                 && !connectClientId.Contains("your_connect_client_id_here", StringComparison.OrdinalIgnoreCase);
 
             // Load notification templates for inline tab
-            var existing = await _unitOfWork.NotificationTemplates.GetAllAsync();
+            var existing = await _unitOfWork.NotificationTemplates.FindAsync(t => t.CompanyId == companyId.Value);
             var seeded = await EnsureNotificationTemplatesSeededAsync(companyId.Value, existing.ToList());
             if (seeded > 0)
-                existing = await _unitOfWork.NotificationTemplates.GetAllAsync();
+                existing = await _unitOfWork.NotificationTemplates.FindAsync(t => t.CompanyId == companyId.Value);
 
             dto.NotificationTemplates = existing
                 .OrderBy(t => (int)t.NotificationType).ThenBy(t => (int)t.Channel)
@@ -755,9 +755,8 @@ public class CompanySettingsController : Controller
 
             var costs = company.OperatingCosts;
 
-            var ovens   = (await _unitOfWork.OvenCosts.FindAsync(o => o.IsActive)).OrderBy(o => o.DisplayOrder).ToList();
-            var workers = (await _unitOfWork.ShopWorkers.FindAsync(w => w.IsActive)).ToList();
-            var coatingCategories = (await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.IsCoating)).ToList();
+            var ovens   = (await _unitOfWork.OvenCosts.FindAsync(o => o.IsActive && o.CompanyId == companyId.Value)).OrderBy(o => o.DisplayOrder).ToList();
+            var coatingCategories = (await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.IsCoating && c.CompanyId == companyId.Value)).ToList();
 
             var sb = new System.Text.StringBuilder();
 
@@ -783,8 +782,7 @@ public class CompanySettingsController : Controller
                     ShopCapabilityTier.Large  => "high-volume",
                     _ => "small"
                 };
-                sb.AppendLine($"We are a {tierLabel} operation" +
-                    (workers.Count > 0 ? $" with {workers.Count} active shop worker{(workers.Count == 1 ? "" : "s")}." : "."));
+                sb.AppendLine($"We are a {tierLabel} operation.");
             }
 
             // Ovens
@@ -827,32 +825,6 @@ public class CompanySettingsController : Controller
                 sb.AppendLine($"Powder categories we stock: {string.Join(", ", catNames)}.");
             }
 
-            // Worker roles
-            if (workers.Any())
-            {
-                var roles = workers
-                    .Select(w => w.Role)
-                    .Distinct()
-                    .Select(r => r switch
-                    {
-                        ShopWorkerRole.Sandblaster   => "sandblasting",
-                        ShopWorkerRole.Coater        => "powder coating",
-                        ShopWorkerRole.Masker        => "masking",
-                        ShopWorkerRole.QualityControl => "quality control",
-                        ShopWorkerRole.OvenOperator  => "oven operation",
-                        ShopWorkerRole.Supervisor    => "supervision",
-                        ShopWorkerRole.Maintenance   => "equipment maintenance",
-                        _                            => "general labor"
-                    })
-                    .Distinct()
-                    .ToList();
-                if (roles.Count > 1)
-                {
-                    sb.AppendLine();
-                    sb.AppendLine($"Staff specialties on hand: {string.Join(", ", roles)}.");
-                }
-            }
-
             // Rates hint
             if (costs != null && costs.StandardLaborRate > 0)
             {
@@ -948,7 +920,8 @@ public class CompanySettingsController : Controller
     {
         try
         {
-            var statuses = await _unitOfWork.JobStatusLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var statuses = await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == companyId);
             var sortedStatuses = statuses.OrderBy(s => s.DisplayOrder).ToList();
 
             var dtos = _mapper.Map<List<JobStatusLookupDto>>(sortedStatuses);
@@ -1099,7 +1072,8 @@ public class CompanySettingsController : Controller
             if (!ModelState.IsValid)
                 return Json(new { success = false, message = "Invalid data" });
 
-            var statuses = await _unitOfWork.JobStatusLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId();
+            var statuses = await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == (companyId ?? 0));
 
             for (int i = 0; i < dto.OrderedIds.Count; i++)
             {
@@ -1112,7 +1086,6 @@ public class CompanySettingsController : Controller
             }
 
             await _unitOfWork.CompleteAsync();
-            var companyId = _tenantContext.GetCurrentCompanyId();
             if (companyId.HasValue) _lookupCache.InvalidateCompanyCache(companyId.Value);
 
             _logger.LogInformation("Job statuses reordered");
@@ -1141,7 +1114,8 @@ public class CompanySettingsController : Controller
     {
         try
         {
-            var priorities = await _unitOfWork.JobPriorityLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var priorities = await _unitOfWork.JobPriorityLookups.FindAsync(p => p.CompanyId == companyId);
             var sortedPriorities = priorities.OrderBy(p => p.DisplayOrder).ToList();
 
             var dtos = _mapper.Map<List<JobPriorityLookupDto>>(sortedPriorities);
@@ -1286,7 +1260,8 @@ public class CompanySettingsController : Controller
             if (!ModelState.IsValid)
                 return Json(new { success = false, message = "Invalid data" });
 
-            var priorities = await _unitOfWork.JobPriorityLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var priorities = await _unitOfWork.JobPriorityLookups.FindAsync(p => p.CompanyId == companyId);
 
             for (int i = 0; i < dto.OrderedIds.Count; i++)
             {
@@ -1325,7 +1300,8 @@ public class CompanySettingsController : Controller
     {
         try
         {
-            var statuses = await _unitOfWork.QuoteStatusLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var statuses = await _unitOfWork.QuoteStatusLookups.FindAsync(s => s.CompanyId == companyId);
             var sortedStatuses = statuses.OrderBy(s => s.DisplayOrder).ToList();
 
             var dtos = _mapper.Map<List<QuoteStatusLookupDto>>(sortedStatuses);
@@ -1506,7 +1482,8 @@ public class CompanySettingsController : Controller
             if (!ModelState.IsValid)
                 return Json(new { success = false, message = "Invalid data" });
 
-            var statuses = await _unitOfWork.QuoteStatusLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var statuses = await _unitOfWork.QuoteStatusLookups.FindAsync(s => s.CompanyId == companyId);
 
             for (int i = 0; i < dto.OrderedIds.Count; i++)
             {
@@ -1545,7 +1522,8 @@ public class CompanySettingsController : Controller
     {
         try
         {
-            var services = await _unitOfWork.PrepServices.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var services = await _unitOfWork.PrepServices.FindAsync(s => s.CompanyId == companyId);
             var sortedServices = services.OrderBy(s => s.DisplayOrder).ToList();
 
             var dtos = _mapper.Map<List<PrepServiceDto>>(sortedServices);
@@ -1667,7 +1645,8 @@ public class CompanySettingsController : Controller
             if (!ModelState.IsValid)
                 return Json(new { success = false, message = "Invalid data" });
 
-            var services = await _unitOfWork.PrepServices.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var services = await _unitOfWork.PrepServices.FindAsync(s => s.CompanyId == companyId);
 
             for (int i = 0; i < dto.OrderedIds.Count; i++)
             {
@@ -1840,7 +1819,8 @@ public class CompanySettingsController : Controller
     {
         try
         {
-            var types = await _unitOfWork.AppointmentTypeLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var types = await _unitOfWork.AppointmentTypeLookups.FindAsync(t => t.CompanyId == companyId);
             var sortedTypes = types.OrderBy(t => t.DisplayOrder).ToList();
 
             var dtos = _mapper.Map<List<AppointmentTypeLookupDto>>(sortedTypes);
@@ -1984,7 +1964,8 @@ public class CompanySettingsController : Controller
             if (!ModelState.IsValid)
                 return Json(new { success = false, message = "Invalid data" });
 
-            var types = await _unitOfWork.AppointmentTypeLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var types = await _unitOfWork.AppointmentTypeLookups.FindAsync(t => t.CompanyId == companyId);
 
             for (int i = 0; i < dto.OrderedIds.Count; i++)
             {
@@ -2024,7 +2005,8 @@ public class CompanySettingsController : Controller
     {
         try
         {
-            var categories = await _unitOfWork.InventoryCategoryLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var categories = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId);
             var sortedCategories = categories.OrderBy(c => c.DisplayOrder).ToList();
 
             var dtos = _mapper.Map<List<InventoryCategoryLookupDto>>(sortedCategories);
@@ -2160,7 +2142,8 @@ public class CompanySettingsController : Controller
             if (!ModelState.IsValid)
                 return Json(new { success = false, message = "Invalid data" });
 
-            var categories = await _unitOfWork.InventoryCategoryLookups.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var categories = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId);
 
             for (int i = 0; i < dto.OrderedIds.Count; i++)
             {
@@ -2377,12 +2360,12 @@ public class CompanySettingsController : Controller
         if (companyId == null) return RedirectToAction(nameof(Index));
 
         // Load all existing templates for this company
-        var existing = await _unitOfWork.NotificationTemplates.GetAllAsync();
+        var existing = await _unitOfWork.NotificationTemplates.FindAsync(t => t.CompanyId == companyId.Value);
 
         // Auto-seed any missing canonical combinations
         var seeded = await EnsureNotificationTemplatesSeededAsync(companyId.Value, existing.ToList());
         if (seeded > 0)
-            existing = await _unitOfWork.NotificationTemplates.GetAllAsync();
+            existing = await _unitOfWork.NotificationTemplates.FindAsync(t => t.CompanyId == companyId.Value);
 
         var dtos = existing.OrderBy(t => (int)t.NotificationType).ThenBy(t => (int)t.Channel)
             .Select(t => new NotificationTemplateDto
@@ -2719,79 +2702,6 @@ public class CompanySettingsController : Controller
 
     // ── Role-Based Labor Rates ────────────────────────────────────────────────
 
-    /// <summary>
-    /// Returns the per-role hourly labor rates configured for the current company, keyed by
-    /// <see cref="PowderCoating.Core.Enums.ShopWorkerRole"/> integer value. An empty list is returned
-    /// (rather than a 404) when no rates have been configured yet, so the UI can render the rate grid
-    /// without special-casing an empty state. The global multi-tenant filter on
-    /// <c>ShopWorkerRoleCosts</c> ensures only this company's rates are returned.
-    /// </summary>
-    [HttpGet]
-    public async Task<IActionResult> GetRoleCosts()
-    {
-        var companyId = _tenantContext.GetCurrentCompanyId();
-        if (companyId == null) return Json(new List<object>());
-
-        var rates = await _unitOfWork.ShopWorkerRoleCosts.FindAsync(r => r.CompanyId == companyId.Value);
-        var result = rates.Select(r => new { role = (int)r.Role, hourlyRate = r.HourlyRate }).ToList();
-        return Json(result);
-    }
-
-    /// <summary>
-    /// Upserts the per-role hourly labor rates for the current company. The operation handles three cases
-    /// per rate in a single pass: (1) rate cleared (≤ 0) — soft-delete the existing record; (2) rate set
-    /// but no existing record — insert new; (3) rate changed — update existing. This avoids full
-    /// table replace semantics that could cause audit log noise or trigger unintended EF change-tracking.
-    /// These rates are used by the pricing calculator when <c>UseRoleBasedLaborRates</c> is enabled in
-    /// <c>CompanyOperatingCosts</c>.
-    /// </summary>
-    [HttpPost]
-    public async Task<IActionResult> SaveRoleCosts([FromBody] List<SaveRoleCostDto> rates)
-    {
-        try
-        {
-            var companyId = _tenantContext.GetCurrentCompanyId();
-            if (companyId == null) return Json(new { success = false, message = "No company found." });
-
-            var existing = (await _unitOfWork.ShopWorkerRoleCosts.FindAsync(r => r.CompanyId == companyId.Value)).ToList();
-
-            foreach (var dto in rates)
-            {
-                var record = existing.FirstOrDefault(r => (int)r.Role == dto.Role);
-                if (dto.HourlyRate <= 0)
-                {
-                    // Remove rate if cleared
-                    if (record != null)
-                        await _unitOfWork.ShopWorkerRoleCosts.SoftDeleteAsync(record.Id);
-                }
-                else if (record == null)
-                {
-                    await _unitOfWork.ShopWorkerRoleCosts.AddAsync(new PowderCoating.Core.Entities.ShopWorkerRoleCost
-                    {
-                        CompanyId = companyId.Value,
-                        Role = (PowderCoating.Core.Enums.ShopWorkerRole)dto.Role,
-                        HourlyRate = dto.HourlyRate,
-                        CreatedAt = DateTime.UtcNow
-                    });
-                }
-                else
-                {
-                    record.HourlyRate = dto.HourlyRate;
-                    record.UpdatedAt = DateTime.UtcNow;
-                    await _unitOfWork.ShopWorkerRoleCosts.UpdateAsync(record);
-                }
-            }
-
-            await _unitOfWork.CompleteAsync();
-            return Json(new { success = true });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error saving role costs");
-            return Json(new { success = false, message = "An error occurred saving role rates." });
-        }
-    }
-
     // ─── Stripe Connect ───────────────────────────────────────────────────────
 
     /// <summary>
@@ -3055,7 +2965,6 @@ public class CompanySettingsController : Controller
 }
 
 public record SaveTemplateJsonRequest(int Id, string? Subject, string? Body);
-public record SaveRoleCostDto(int Role, decimal HourlyRate);
 public record SaveOnlinePaymentSettingsDto(
     OnlinePaymentSurchargeType SurchargeType,
     decimal SurchargeValue,

src/PowderCoating.Web/Controllers/CompanyUsersController.cs

@@ -226,11 +226,9 @@ public class CompanyUsersController : Controller
     /// Creates a new company user, enforcing the subscription user-count limit and a whitelist
     /// of valid <c>CompanyRole</c> values (preventing callers from submitting a null role to
     /// create a SuperAdmin-equivalent account). CompanyAdmin users automatically receive all
-    /// per-feature permissions unless a SuperAdmin is explicitly customising them. Workers
-    /// additionally get an auto-created <see cref="ShopWorker"/> record so they appear in job
-    /// assignment dropdowns without a separate onboarding step. A legacy ASP.NET Identity role
-    /// (Administrator / Manager / Employee / ReadOnly) is also assigned to satisfy policy
-    /// checks that still reference the role system.
+    /// per-feature permissions unless a SuperAdmin is explicitly customising them. A legacy
+    /// ASP.NET Identity role (Administrator / Manager / Employee / ReadOnly) is also assigned
+    /// to satisfy policy checks that still reference the role system.
     /// </summary>
     // POST: CompanyUsers/Create
     [HttpPost]
@@ -351,27 +349,7 @@ public class CompanyUsersController : Controller
 
                 await _userManager.AddToRoleAsync(user, legacyRole);
 
-                // If Worker role, automatically create a ShopWorker record
-                if (model.CompanyRole == AppConstants.CompanyRoles.Worker)
-                {
-                    var shopWorker = new ShopWorker
-                    {
-                        Name = user.FullName,
-                        Email = user.Email,
-                        Phone = user.PhoneNumber,
-                        IsActive = true,
-                        Notes = $"Auto-created from user account: {user.Email}",
-                        Role = Core.Enums.ShopWorkerRole.GeneralLabor, // Default role
-                        CompanyId = companyId!.Value
-                    };
-
-                    await _unitOfWork.ShopWorkers.AddAsync(shopWorker);
-                    await _unitOfWork.CompleteAsync();
-
-                    _logger.LogInformation("ShopWorker record created for user {Email}", user.Email);
-                }
-
-                _logger.LogInformation("User {Email} created successfully by {Admin}",
+_logger.LogInformation("User {Email} created successfully by {Admin}",
                     user.Email, User.Identity?.Name);
 
                 TempData["Success"] = $"User '{user.FullName}' created successfully.";
@@ -441,6 +419,7 @@ public class CompanyUsersController : Controller
                 CompanyRole = user.CompanyRole ?? AppConstants.CompanyRoles.Viewer,
                 Department = user.Department,
                 Position = user.Position,
+                LaborCostPerHour = user.LaborCostPerHour,
                 Phone = user.PhoneNumber,
                 IsActive = user.IsActive,
                 HireDate = user.HireDate,
@@ -479,11 +458,9 @@ public class CompanyUsersController : Controller
     /// Saves changes to an existing company user. Validates company isolation and role whitelist
     /// (same checks as <see cref="Edit(string, string)"/>). Prevents two dangerous deactivation
     /// scenarios: a user deactivating themselves, and deactivating the last active CompanyAdmin
-    /// for a company (which would lock out the tenant). When the role changes to Worker and no
-    /// matching <see cref="ShopWorker"/> record exists, one is created automatically; if one
-    /// already exists, its name, email, and active status are kept in sync. Email changes are
-    /// applied via <c>SetEmailAsync</c> / <c>SetUserNameAsync</c> after the main update so
-    /// Identity's own normalisation logic runs correctly.
+    /// for a company (which would lock out the tenant). Email changes are applied via
+    /// <c>SetEmailAsync</c> / <c>SetUserNameAsync</c> after the main update so Identity's own
+    /// normalisation logic runs correctly.
     /// </summary>
     // POST: CompanyUsers/Edit/id
     [HttpPost]
@@ -596,6 +573,7 @@ public class CompanyUsersController : Controller
             user.CompanyRole = model.CompanyRole;
             user.Department = model.Department;
             user.Position = model.Position;
+            user.LaborCostPerHour = model.LaborCostPerHour;
             user.PhoneNumber = model.Phone;
             user.IsActive = model.IsActive;
             user.HireDate = model.HireDate;
@@ -632,60 +610,7 @@ public class CompanyUsersController : Controller
                         user.Id, oldEmail, model.Email, User.Identity?.Name);
                 }
 
-                // If role changed to Worker, ensure ShopWorker record exists
-                if (model.CompanyRole == AppConstants.CompanyRoles.Worker)
-                {
-                    // Search by oldEmail so we find the record even when the email just changed
-                    var lookupEmail = emailChanged ? oldEmail : user.Email;
-                    var existingShopWorker = (await _unitOfWork.ShopWorkers.FindAsync(
-                        sw => sw.Email == lookupEmail && sw.CompanyId == user.CompanyId)).ToList();
-
-                    if (!existingShopWorker.Any())
-                    {
-                        var shopWorker = new ShopWorker
-                        {
-                            Name = user.FullName,
-                            Email = user.Email,
-                            Phone = user.PhoneNumber,
-                            IsActive = user.IsActive,
-                            Notes = $"Auto-created from user account: {user.Email}",
-                            Role = Core.Enums.ShopWorkerRole.GeneralLabor, // Default role
-                            CompanyId = user.CompanyId
-                        };
-
-                        await _unitOfWork.ShopWorkers.AddAsync(shopWorker);
-                        await _unitOfWork.CompleteAsync();
-
-                        _logger.LogInformation("ShopWorker record created for user {Email}", user.Email);
-                    }
-                    else
-                    {
-                        // Update existing ShopWorker to ensure it's active
-                        var shopWorker = existingShopWorker.First();
-                        var shopWorkerDirty = false;
-
-                        if (!shopWorker.IsActive && user.IsActive)
-                        {
-                            shopWorker.IsActive = true;
-                            shopWorkerDirty = true;
-                            _logger.LogInformation("ShopWorker record reactivated for user {Email}", user.Email);
-                        }
-
-                        if (emailChanged && shopWorker.Email == oldEmail)
-                        {
-                            shopWorker.Email = user.Email;
-                            shopWorkerDirty = true;
-                        }
-
-                        shopWorker.Name = user.FullName;
-                        shopWorker.Phone = user.PhoneNumber;
-
-                        if (shopWorkerDirty)
-                            await _unitOfWork.CompleteAsync();
-                    }
-                }
-
-                _logger.LogInformation("User {Email} updated successfully by {Admin}",
+_logger.LogInformation("User {Email} updated successfully by {Admin}",
                     user.Email, User.Identity?.Name);
 
                 TempData["Success"] = "User updated successfully.";

src/PowderCoating.Web/Controllers/CreditMemosController.cs

@@ -315,7 +315,8 @@ public class CreditMemosController : Controller
 
     private async Task PopulateCustomersAsync(int? selectedId)
     {
-        var customers = await _unitOfWork.Customers.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
         ViewBag.Customers = customers
             .OrderBy(c => c.CompanyName ?? $"{c.ContactFirstName} {c.ContactLastName}".Trim())
             .Select(c => new SelectListItem

src/PowderCoating.Web/Controllers/DashboardController.cs

@@ -342,14 +342,16 @@ public class DashboardController : Controller
                 TipOfTheDay = data.TipOfTheDay
             };
 
+            // Resolve company once so all remaining queries are explicitly scoped
+            var currentCompanyId = _tenantContext.GetCurrentCompanyId();
+            var companyId = currentCompanyId ?? 0;
+
             // Dropdowns for the "Add Custom Powder to Inventory" modal
-            var inventoryCategories = (await _unitOfWork.InventoryCategoryLookups.GetAllAsync())
-                .Where(c => c.IsActive)
+            var inventoryCategories = (await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.IsActive && c.CompanyId == companyId))
                 .OrderBy(c => c.DisplayOrder)
                 .Select(c => new { c.Id, c.DisplayName })
                 .ToList();
-            var vendors = (await _unitOfWork.Vendors.GetAllAsync())
-                .Where(v => v.IsActive)
+            var vendors = (await _unitOfWork.Vendors.FindAsync(v => v.IsActive && v.CompanyId == companyId))
                 .OrderBy(v => v.CompanyName)
                 .Select(v => new { v.Id, v.CompanyName })
                 .ToList();
@@ -357,7 +359,6 @@ public class DashboardController : Controller
             ViewBag.VendorList = vendors;
 
             // Config health check — surface setup gaps to company admins
-            var currentCompanyId = _tenantContext.GetCurrentCompanyId();
             if (currentCompanyId.HasValue)
             {
                 ViewBag.ConfigHealth = await _configHealth.CheckAsync(currentCompanyId.Value);
@@ -711,8 +712,8 @@ public class DashboardController : Controller
                 i => i.Coats.Any(c => c.Id == coatId), false, i => i.Job);
             var companyId = jobItem?.Job?.CompanyId ?? _tenantContext.GetCurrentCompanyId() ?? 0;
 
-            // Check SKU uniqueness
-            if (await _unitOfWork.InventoryItems.AnyAsync(i => i.SKU == sku.Trim()))
+            // Check SKU uniqueness within this company
+            if (await _unitOfWork.InventoryItems.AnyAsync(i => i.SKU == sku.Trim() && i.CompanyId == companyId))
                 return Json(new { success = false, message = $"SKU '{sku}' already exists in inventory." });
 
             // Determine category display name for legacy field

src/PowderCoating.Web/Controllers/DataExportController.cs

@@ -122,7 +122,6 @@ public class DataExportController : Controller
                 case "Inventory":   await AddInventorySheet(package, companyId, headerColor); break;
                 case "Equipment":   await AddEquipmentSheet(package, companyId, headerColor); break;
                 case "Vendors":     await AddVendorsSheet(package, companyId, headerColor); break;
-                case "ShopWorkers": await AddShopWorkersSheet(package, companyId, headerColor); break;
                 case "Users":       await AddUsersSheet(package, companyId, headerColor); break;
             }
         }
@@ -172,7 +171,6 @@ public class DataExportController : Controller
                 case "Inventory":   WriteCsvEntry(zip, "Inventory.csv",   await BuildInventoryCsv(companyId)); break;
                 case "Equipment":   WriteCsvEntry(zip, "Equipment.csv",   await BuildEquipmentCsv(companyId)); break;
                 case "Vendors":     WriteCsvEntry(zip, "Vendors.csv",     await BuildVendorsCsv(companyId)); break;
-                case "ShopWorkers": WriteCsvEntry(zip, "ShopWorkers.csv", await BuildShopWorkersCsv(companyId)); break;
                 case "Users":       WriteCsvEntry(zip, "Users.csv",       await BuildUsersCsv(companyId)); break;
             }
         }
@@ -441,38 +439,6 @@ public class DataExportController : Controller
         AutoFit(ws, headers.Length);
     }
 
-    /// <summary>
-    /// Adds a "Shop Workers" worksheet with one row per non-deleted shop worker for the
-    /// specified company.  <c>Role.ToString()</c> converts the enum to a string; the view
-    /// typically formats these with spaces (e.g. "QualityControl" → "Quality Control") but the
-    /// raw enum name is used here so the export value is round-trip parseable.
-    /// </summary>
-    private async Task AddShopWorkersSheet(ExcelPackage pkg, int companyId, Color hdr)
-    {
-        var data = await _db.ShopWorkers.AsNoTracking().IgnoreQueryFilters()
-            .Where(w => w.CompanyId == companyId && !w.IsDeleted)
-            .OrderBy(w => w.Name)
-            .ToListAsync();
-
-        var ws = pkg.Workbook.Worksheets.Add("Shop Workers");
-        var headers = new[] { "ID", "Name", "Role", "Phone", "Email", "Active", "Notes" };
-        WriteHeader(ws, headers, hdr);
-
-        for (int i = 0; i < data.Count; i++)
-        {
-            var r = i + 2;
-            var w = data[i];
-            ws.Cells[r, 1].Value = w.Id;
-            ws.Cells[r, 2].Value = w.Name;
-            ws.Cells[r, 3].Value = w.Role.ToString();
-            ws.Cells[r, 4].Value = w.Phone;
-            ws.Cells[r, 5].Value = w.Email;
-            ws.Cells[r, 6].Value = w.IsActive ? "Yes" : "No";
-            ws.Cells[r, 7].Value = w.Notes;
-        }
-        AutoFit(ws, headers.Length);
-    }
-
     /// <summary>
     /// Adds an "Invoices" worksheet with one row per non-deleted invoice for the specified company.
     /// The customer navigation is eagerly loaded so the customer name can be rendered; when a
@@ -687,21 +653,6 @@ public class DataExportController : Controller
         return sb.ToString();
     }
 
-    /// <summary>
-    /// Builds the shop workers CSV string for the specified company, ordered alphabetically by name.
-    /// Column names match <see cref="ShopWorkerImportDto"/> exactly so the file can be re-imported.
-    /// </summary>
-    private async Task<string> BuildShopWorkersCsv(int companyId)
-    {
-        var data = await _db.ShopWorkers.AsNoTracking().IgnoreQueryFilters()
-            .Where(w => w.CompanyId == companyId && !w.IsDeleted).OrderBy(w => w.Name).ToListAsync();
-        var sb = new StringBuilder();
-        sb.AppendLine("Name,Role,Phone,Email,IsActive,Notes");
-        foreach (var w in data)
-            sb.AppendLine($"{CsvEscape(w.Name)},{w.Role},{CsvEscape(w.Phone)},{CsvEscape(w.Email)},{w.IsActive.ToString().ToLower()},{CsvEscape(w.Notes)}");
-        return sb.ToString();
-    }
-
     /// <summary>
     /// Builds the users CSV string for the specified company, ordered by last name.
     /// Like <see cref="AddUsersSheet"/>, the <c>IsDeleted</c> filter is intentionally omitted
@@ -761,7 +712,7 @@ public class DataExportController : Controller
 
     /// <summary>
     /// Returns the requested sheet names sorted into the canonical export order
-    /// (Customers → Jobs → Quotes → Invoices → Inventory → Equipment → Vendors → ShopWorkers → Users).
+    /// (Customers → Jobs → Quotes → Invoices → Inventory → Equipment → Vendors → Users).
     /// This ensures that the workbook and ZIP archive always have a predictable, logical layout
     /// regardless of the order the administrator checked the boxes on the form.
     /// Any sheet name not in the canonical list is silently ignored.
@@ -769,7 +720,7 @@ public class DataExportController : Controller
     /// <param name="sheets">Raw sheet names from the form POST.</param>
     private static string[] OrderSheets(string[] sheets)
     {
-        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "ShopWorkers", "Users" };
+        var order = new[] { "Customers", "Jobs", "Quotes", "Invoices", "Inventory", "Equipment", "Vendors", "Users" };
         return order.Where(sheets.Contains).ToArray();
     }
 

src/PowderCoating.Web/Controllers/DataPurgeController.cs

@@ -175,7 +175,6 @@ public class DataPurgeController : Controller
         stats.Add(await Stat("Equipment",         "Equipment",           "bi-tools",       "Inventory & Ops", _db.Equipment.Where(e => e.IsDeleted)));
         stats.Add(await Stat("MaintenanceRecords","Maintenance Records",  "bi-wrench",      "Inventory & Ops", _db.MaintenanceRecords.Where(e => e.IsDeleted)));
         stats.Add(await Stat("Vendors",           "Vendors",             "bi-truck",       "Inventory & Ops", _db.Vendors.Where(e => e.IsDeleted)));
-        stats.Add(await Stat("ShopWorkers",       "Shop Workers",        "bi-person-badge","Inventory & Ops", _db.ShopWorkers.Where(e => e.IsDeleted)));
 
         return stats;
     }
@@ -204,7 +203,6 @@ public class DataPurgeController : Controller
             "Equipment"          => await QueryCount(_db.Equipment, cutoff),
             "MaintenanceRecords" => await QueryCount(_db.MaintenanceRecords, cutoff),
             "Vendors"            => await QueryCount(_db.Vendors, cutoff),
-            "ShopWorkers"        => await QueryCount(_db.ShopWorkers, cutoff),
             _                    => (0, null)
         };
     }
@@ -324,11 +322,6 @@ public class DataPurgeController : Controller
                     .Where(e => e.IsDeleted && e.DeletedAt <= cutoff).ExecuteDeleteAsync();
                 break;
 
-            case "ShopWorkers":
-                count = await _db.ShopWorkers.IgnoreQueryFilters()
-                    .Where(e => e.IsDeleted && e.DeletedAt <= cutoff).ExecuteDeleteAsync();
-                break;
-
             default:
                 return 0;
         }
@@ -359,7 +352,7 @@ public class DataPurgeController : Controller
             "MaintenanceRecords",
             "Jobs", "Customers", "Quotes",
             "InventoryItems", "Equipment",
-            "Vendors", "ShopWorkers"
+            "Vendors"
         };
         return order.Where(entities.Contains).ToArray();
     }

src/PowderCoating.Web/Controllers/GiftCertificatesController.cs

@@ -107,7 +107,8 @@ public class GiftCertificatesController : Controller
                 IssuedReason = gc.IssuedReason,
                 Status = gc.Status,
                 IssueDate = gc.IssueDate,
-                ExpiryDate = gc.ExpiryDate
+                ExpiryDate = gc.ExpiryDate,
+                BatchId = gc.BatchId
             })
             .ToList();
 
@@ -440,6 +441,183 @@ public class GiftCertificatesController : Controller
         return acct?.Id;
     }
 
+    /// <summary>
+    /// Shows the bulk certificate creation form. Defaults to Promotional reason and 25 certificates
+    /// since the primary use case is car shows and events where a batch of same-value certificates
+    /// is distributed to attendees.
+    /// </summary>
+    public IActionResult BulkCreate()
+    {
+        return View(new BulkCreateGiftCertificateDto());
+    }
+
+    /// <summary>
+    /// Creates N gift certificates in a single batch, records GL entries for each, then redirects
+    /// to a confirmation page where the user can download the full batch as a single print-ready PDF.
+    /// Certificate codes are generated sequentially so the batch occupies a contiguous range (e.g.
+    /// GC-2506-0012 through GC-2506-0036), making it easy to audit which codes belong to each event.
+    /// GL treatment mirrors single-certificate issuance: Sold certs debit Checking, all others debit
+    /// Sales Discounts (4950) and credit GC Liability (2500).
+    /// </summary>
+    [HttpPost, ValidateAntiForgeryToken]
+    public async Task<IActionResult> BulkCreate(BulkCreateGiftCertificateDto dto)
+    {
+        if (!ModelState.IsValid)
+            return View(dto);
+
+        try
+        {
+            var currentUser = await _userManager.GetUserAsync(User);
+            var companyId = currentUser?.CompanyId ?? 0;
+
+            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(companyId);
+            int? checkingAcctId = null;
+            int? discountAcctId = null;
+
+            if (dto.IssuedReason == GiftCertificateIssuedReason.Sold)
+            {
+                var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                    a => a.IsActive && (a.AccountSubType == AccountSubTypeEnum.Checking
+                                     || a.AccountSubType == AccountSubTypeEnum.Cash));
+                checkingAcctId = acct?.Id;
+            }
+            else
+            {
+                var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                    a => a.IsActive && a.AccountNumber == "4950");
+                discountAcctId = acct?.Id;
+            }
+
+            var batchId = Guid.NewGuid();
+            var now = DateTime.UtcNow;
+
+            for (int i = 0; i < dto.Quantity; i++)
+            {
+                var code = await GenerateCertificateCodeAsync(companyId);
+
+                var cert = new GiftCertificate
+                {
+                    CertificateCode = code,
+                    OriginalAmount = dto.Amount,
+                    RedeemedAmount = 0,
+                    IssuedReason = dto.IssuedReason,
+                    Status = GiftCertificateStatus.Active,
+                    IssueDate = now,
+                    ExpiryDate = dto.ExpiryDate,
+                    Notes = dto.Notes,
+                    IssuedById = currentUser?.Id,
+                    CompanyId = companyId,
+                    CreatedAt = now,
+                    CreatedBy = currentUser?.Email,
+                    BatchId = batchId
+                };
+
+                await _unitOfWork.GiftCertificates.AddAsync(cert);
+                await _unitOfWork.CompleteAsync();
+
+                await _accountBalanceService.CreditAsync(gcLiabilityAcctId, cert.OriginalAmount);
+                if (dto.IssuedReason == GiftCertificateIssuedReason.Sold)
+                    await _accountBalanceService.DebitAsync(checkingAcctId, cert.OriginalAmount);
+                else
+                    await _accountBalanceService.DebitAsync(discountAcctId, cert.OriginalAmount);
+            }
+
+            return RedirectToAction(nameof(BulkResult), new { batchId });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error creating bulk gift certificates");
+            this.ToastError("An error occurred creating the certificates.");
+            return View(dto);
+        }
+    }
+
+    /// <summary>
+    /// Displays the batch confirmation page. Driven by BatchId so it is bookmarkable and survives
+    /// browser back/refresh — the user can return here any time to re-download the batch PDF.
+    /// </summary>
+    public async Task<IActionResult> BulkResult(Guid batchId)
+    {
+        if (batchId == Guid.Empty)
+            return RedirectToAction(nameof(Index));
+
+        var certs = await _unitOfWork.GiftCertificates.FindAsync(
+            gc => gc.BatchId == batchId, false);
+
+        if (!certs.Any())
+            return RedirectToAction(nameof(Index));
+
+        return View(certs.OrderBy(c => c.CertificateCode).ToList());
+    }
+
+    /// <summary>
+    /// Streams a multi-page PDF for an entire batch identified by BatchId. GET endpoint so the
+    /// user can bookmark or re-open it at any time after the batch was originally created.
+    /// </summary>
+    public async Task<IActionResult> BatchDownloadPdf(Guid batchId)
+    {
+        if (batchId == Guid.Empty)
+            return BadRequest();
+
+        var currentUser = await _userManager.GetUserAsync(User);
+        var companyId = currentUser?.CompanyId ?? 0;
+        var company = await _unitOfWork.Companies.GetByIdAsync(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 certs = await _unitOfWork.GiftCertificates.FindAsync(
+            gc => gc.BatchId == batchId, false,
+            gc => gc.RecipientCustomer);
+
+        if (!certs.Any())
+            return NotFound();
+
+        var dtos = certs.OrderBy(c => c.CertificateCode).Select(cert => new GiftCertificateDto
+        {
+            Id = cert.Id,
+            CertificateCode = cert.CertificateCode,
+            OriginalAmount = cert.OriginalAmount,
+            RedeemedAmount = cert.RedeemedAmount,
+            RemainingBalance = cert.RemainingBalance,
+            RecipientName = cert.RecipientCustomer != null
+                ? (cert.RecipientCustomer.CompanyName ?? $"{cert.RecipientCustomer.ContactFirstName} {cert.RecipientCustomer.ContactLastName}".Trim())
+                : cert.RecipientName,
+            RecipientEmail = cert.RecipientEmail,
+            IssuedReason = cert.IssuedReason,
+            Status = cert.Status,
+            IssueDate = cert.IssueDate,
+            ExpiryDate = cert.ExpiryDate,
+            Notes = cert.Notes
+        }).ToList();
+
+        try
+        {
+            var (logoData, logoContentType) = await LoadCompanyLogoAsync(company);
+            var pdfBytes = await _pdfService.GenerateBulkGiftCertificatePdfAsync(dtos, logoData, logoContentType, companyInfo);
+            var first = dtos.First().CertificateCode;
+            var last = dtos.Last().CertificateCode;
+            var fileName = dtos.Count == 1
+                ? $"GiftCertificate-{first}.pdf"
+                : $"GiftCertificates-{first}-to-{last}.pdf";
+            return File(pdfBytes, "application/pdf", fileName);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error generating batch gift certificate PDF for batch {BatchId}", batchId);
+            TempData["Error"] = "Could not generate PDF.";
+            return RedirectToAction(nameof(BulkResult), new { batchId });
+        }
+    }
+
     private async Task<(byte[]? LogoData, string? LogoContentType)> LoadCompanyLogoAsync(Company? company)
     {
         if (company == null) return (null, null);

src/PowderCoating.Web/Controllers/HelpController.cs

@@ -38,14 +38,6 @@ namespace PowderCoating.Web.Controllers
             return View();
         }
 
-        /// <summary>
-        /// Serves the Shop Workers help article describing roles, assignment to jobs, and maintenance tasks.
-        /// </summary>
-        public IActionResult ShopWorkers()
-        {
-            return View();
-        }
-
         /// <summary>
         /// Serves the Equipment help article explaining the equipment status lifecycle and maintenance scheduling.
         /// </summary>

src/PowderCoating.Web/Controllers/InventoryController.cs

@@ -160,7 +160,8 @@ 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
-            var allItems = (await _unitOfWork.InventoryItems.GetAllAsync()).ToList();
+            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.StatsLowStockCount = allItems.Count(i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint);
             ViewBag.StatsActiveCount   = allItems.Count(i => i.IsActive);
@@ -304,6 +305,32 @@ public class InventoryController : Controller
                 await _unitOfWork.SaveChangesAsync();
             }
 
+            // Contribute/sync to the platform powder catalog if we have enough identity data.
+            // Runs silently — a failure here never blocks the inventory save.
+            if (!string.IsNullOrWhiteSpace(dto.Manufacturer) && !string.IsNullOrWhiteSpace(dto.ManufacturerPartNumber))
+            {
+                var catalogResult = new InventoryAiLookupResult
+                {
+                    Manufacturer           = dto.Manufacturer,
+                    ManufacturerPartNumber = dto.ManufacturerPartNumber,
+                    ColorName              = dto.ColorName ?? item.Name,
+                    Finish                 = dto.Finish,
+                    CureTemperatureF       = dto.CureTemperatureF,
+                    CureTimeMinutes        = dto.CureTimeMinutes,
+                    ColorFamilies          = dto.ColorFamilies,
+                    RequiresClearCoat      = dto.RequiresClearCoat ? true : (bool?)null,
+                    CoverageSqFtPerLb      = dto.CoverageSqFtPerLb,
+                    SpecificGravity        = dto.SpecificGravity,
+                    TransferEfficiency     = dto.TransferEfficiency,
+                    UnitCostPerLb          = dto.UnitCost > 0 ? dto.UnitCost : null,
+                    SpecPageUrl            = dto.SpecPageUrl,
+                    ImageUrl               = dto.ImageUrl,
+                    SdsUrl                 = dto.SdsUrl,
+                    TdsUrl                 = dto.TdsUrl,
+                };
+                await EnrichFromCatalogAsync(catalogResult, autoContribute: true);
+            }
+
             TempData["Success"] = "Inventory item created successfully.";
             return RedirectToAction(nameof(Details), new { id = item.Id });
         }
@@ -704,6 +731,8 @@ public class InventoryController : Controller
             return Json(new { success = false, errorMessage = "No product URL provided." });
 
         var result = await _aiLookupService.LookupByUrlAsync(productUrl, colorName);
+        if (result.Success)
+            await EnrichFromCatalogAsync(result, autoContribute: true);
         return Json(result);
     }
 
@@ -750,6 +779,39 @@ public class InventoryController : Controller
             result.SdsUrl      ??= match.SdsUrl;
             result.TdsUrl      ??= match.TdsUrl;
             if (match.UnitPrice > 0) result.UnitCostPerLb ??= match.UnitPrice;
+
+            // Back-sync: fill NULL catalog fields from the incoming result so the catalog
+            // gets richer over time without overwriting anything already stored.
+            bool catalogDirty = false;
+            if (match.Finish             == null && !string.IsNullOrWhiteSpace(result.Finish))       { match.Finish             = result.Finish;             catalogDirty = true; }
+            if (match.CureTemperatureF   == null && result.CureTemperatureF  != null)                { match.CureTemperatureF   = result.CureTemperatureF;   catalogDirty = true; }
+            if (match.CureTimeMinutes    == null && result.CureTimeMinutes   != null)                { match.CureTimeMinutes    = result.CureTimeMinutes;     catalogDirty = true; }
+            if (match.ColorFamilies      == null && !string.IsNullOrWhiteSpace(result.ColorFamilies)){ match.ColorFamilies      = result.ColorFamilies;       catalogDirty = true; }
+            if (match.RequiresClearCoat  == null && result.RequiresClearCoat != null)                { match.RequiresClearCoat  = result.RequiresClearCoat;   catalogDirty = true; }
+            if (match.CoverageSqFtPerLb  == null && result.CoverageSqFtPerLb != null)               { match.CoverageSqFtPerLb  = result.CoverageSqFtPerLb;  catalogDirty = true; }
+            if (match.SpecificGravity    == null && result.SpecificGravity   != null)                { match.SpecificGravity    = result.SpecificGravity;     catalogDirty = true; }
+            if (match.TransferEfficiency == null && result.TransferEfficiency != null)               { match.TransferEfficiency = result.TransferEfficiency;  catalogDirty = true; }
+            if (string.IsNullOrWhiteSpace(match.ImageUrl)   && !string.IsNullOrWhiteSpace(result.ImageUrl))   { match.ImageUrl   = result.ImageUrl;   catalogDirty = true; }
+            if (string.IsNullOrWhiteSpace(match.ProductUrl) && !string.IsNullOrWhiteSpace(result.SpecPageUrl)){ match.ProductUrl = result.SpecPageUrl; catalogDirty = true; }
+            if (string.IsNullOrWhiteSpace(match.SdsUrl)     && !string.IsNullOrWhiteSpace(result.SdsUrl))     { match.SdsUrl     = result.SdsUrl;     catalogDirty = true; }
+            if (string.IsNullOrWhiteSpace(match.TdsUrl)     && !string.IsNullOrWhiteSpace(result.TdsUrl))     { match.TdsUrl     = result.TdsUrl;     catalogDirty = true; }
+            if (match.UnitPrice == 0 && (result.UnitCostPerLb ?? 0) > 0)                            { match.UnitPrice  = result.UnitCostPerLb!.Value;        catalogDirty = true; }
+
+            if (catalogDirty)
+            {
+                match.UpdatedAt = DateTime.UtcNow;
+                try
+                {
+                    await _unitOfWork.PowderCatalog.UpdateAsync(match);
+                    await _unitOfWork.CompleteAsync();
+                    _logger.LogInformation("Back-synced catalog gaps for {VendorName} {Sku}", match.VendorName, match.Sku);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning(ex, "Failed to back-sync catalog entry {Id}", match.Id);
+                }
+            }
+
             return (true, false);
         }
 
@@ -767,6 +829,7 @@ public class InventoryController : Controller
                 VendorName         = manufacturer,
                 Sku                = sku,
                 ColorName          = colorName,
+                UnitPrice          = result.UnitCostPerLb ?? 0m,
                 CureTemperatureF   = result.CureTemperatureF,
                 CureTimeMinutes    = result.CureTimeMinutes,
                 Finish             = result.Finish,
@@ -1044,67 +1107,57 @@ public class InventoryController : Controller
 
         // Build a set of SKUs already in this company's inventory so we can exclude them.
         // When editing, the current item's own SKU is re-included so its catalog entry still appears.
-        var existingItems = await _unitOfWork.InventoryItems.GetAllAsync();
+        var skuCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var existingItems = await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == skuCompanyId);
         var existingSkus = existingItems
             .Where(i => !string.IsNullOrWhiteSpace(i.ManufacturerPartNumber) && i.Id != (currentId ?? 0))
             .Select(i => i.ManufacturerPartNumber!.Trim().ToLower())
             .ToHashSet();
 
-        // When a vendor is specified, search vendor-scoped first. Only widen to all vendors
-        // if the scoped search returns nothing — prevents a cross-vendor color match from
-        // being returned as the only result when the user clearly intended a specific manufacturer.
-        IEnumerable<PowderCatalogItem> matches;
-        if (!string.IsNullOrEmpty(vendorTerm))
-        {
-            matches = await _unitOfWork.PowderCatalog.FindAsync(p =>
-                p.VendorName.ToLower().Contains(vendorTerm) && (
-                    p.Sku.ToLower() == term ||
-                    p.ColorName.ToLower().Contains(term) ||
-                    p.Sku.ToLower().Contains(term)));
-
-            // Fall back to all vendors only when the scoped search finds nothing
-            if (!matches.Any())
-            {
-                matches = await _unitOfWork.PowderCatalog.FindAsync(p =>
-                    p.Sku.ToLower() == term ||
-                    p.ColorName.ToLower().Contains(term) ||
-                    p.Sku.ToLower().Contains(term));
-            }
-        }
-        else
-        {
-            matches = await _unitOfWork.PowderCatalog.FindAsync(p =>
-                p.Sku.ToLower() == term ||
-                p.ColorName.ToLower().Contains(term) ||
-                p.Sku.ToLower().Contains(term));
-        }
+        // Single query — all partial color/SKU matches across all vendors.
+        // Results are ranked: exact vendor + exact color (isExact=true) sorts first and
+        // triggers auto-fill in the JS. Everything else goes to the picker modal.
+        // This means a user who typed "Columbia Coatings" + "Lime Green" gets auto-fill
+        // only when that exact product is in the catalog; otherwise they see a ranked modal
+        // with same-vendor results at the top and a "Not Listed — Search Online" escape hatch.
+        var matches = await _unitOfWork.PowderCatalog.FindAsync(p =>
+            p.ColorName.ToLower().Contains(term) ||
+            p.Sku.ToLower() == term ||
+            p.Sku.ToLower().Contains(term));
 
         var results = matches
             .Where(p => !existingSkus.Contains(p.Sku.ToLower()))
-            .OrderBy(p => p.Sku.ToLower() == term ? 0 : 1)
-            .ThenBy(p => p.ColorName)
-            .Select(p => new
+            .Select(p =>
             {
-                id = p.Id,
-                vendorName = p.VendorName,
-                sku = p.Sku,
-                colorName = p.ColorName,
-                description = p.Description,
-                unitPrice = p.UnitPrice,
-                imageUrl = p.ImageUrl,
-                sdsUrl = p.SdsUrl,
-                tdsUrl = p.TdsUrl,
-                applicationGuideUrl = p.ApplicationGuideUrl,
-                productUrl = p.ProductUrl,
-                isDiscontinued = p.IsDiscontinued,
-                cureTemperatureF = p.CureTemperatureF,
-                cureTimeMinutes = p.CureTimeMinutes,
-                finish = p.Finish,
-                colorFamilies = p.ColorFamilies,
-                requiresClearCoat = p.RequiresClearCoat,
-                coverageSqFtPerLb = p.CoverageSqFtPerLb,
-                specificGravity = p.SpecificGravity,
-                transferEfficiency = GetEffectiveTransferEfficiency(p.TransferEfficiency)
+                var vendorMatch = string.IsNullOrEmpty(vendorTerm) || p.VendorName.ToLower().Contains(vendorTerm);
+                var colorExact  = p.ColorName.ToLower() == term;
+                return (p, isExact: vendorMatch && colorExact, vendorMatch, colorExact);
+            })
+            .OrderBy(x => x.isExact ? 0 : x.vendorMatch ? 1 : x.colorExact ? 2 : 3)
+            .ThenBy(x => x.p.ColorName)
+            .Select(x => new
+            {
+                id = x.p.Id,
+                vendorName = x.p.VendorName,
+                sku = x.p.Sku,
+                colorName = x.p.ColorName,
+                description = x.p.Description,
+                unitPrice = x.p.UnitPrice,
+                imageUrl = x.p.ImageUrl,
+                sdsUrl = x.p.SdsUrl,
+                tdsUrl = x.p.TdsUrl,
+                applicationGuideUrl = x.p.ApplicationGuideUrl,
+                productUrl = x.p.ProductUrl,
+                isDiscontinued = x.p.IsDiscontinued,
+                isExact = x.isExact,
+                cureTemperatureF = x.p.CureTemperatureF,
+                cureTimeMinutes = x.p.CureTimeMinutes,
+                finish = x.p.Finish,
+                colorFamilies = x.p.ColorFamilies,
+                requiresClearCoat = x.p.RequiresClearCoat,
+                coverageSqFtPerLb = x.p.CoverageSqFtPerLb,
+                specificGravity = x.p.SpecificGravity,
+                transferEfficiency = GetEffectiveTransferEfficiency(x.p.TransferEfficiency)
             })
             .ToList();
 
@@ -1131,7 +1184,7 @@ public class InventoryController : Controller
             var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
             // Find the default coating category to assign
-            var categories = await _unitOfWork.InventoryCategoryLookups.GetAllAsync();
+            var categories = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId);
             var coatingCategory = categories
                 .Where(c => c.IsActive && c.IsCoating)
                 .OrderBy(c => c.DisplayOrder)
@@ -1318,11 +1371,11 @@ public class InventoryController : Controller
         var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
         ViewBag.AiInventoryAssistEnabled = await _subscriptionService.IsAiInventoryAssistEnabledAsync(companyId);
 
-        var vendors = await _unitOfWork.Vendors.GetAllAsync();
+        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");
 
         // Load categories from lookup table
-        var allCategories = await _unitOfWork.InventoryCategoryLookups.GetAllAsync();
+        var allCategories = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId);
         var categories = allCategories
             .Where(c => c.IsActive)
             .OrderBy(c => c.DisplayOrder)
@@ -1687,7 +1740,8 @@ public class InventoryController : Controller
         DateTime? dateTo,
         string? typeFilter)
     {
-        var allItems = await _unitOfWork.InventoryItems.GetAllAsync();
+        var ledgerCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allItems = await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == ledgerCompanyId);
         var itemList = allItems
             .Where(i => i.IsActive || i.QuantityOnHand > 0)
             .OrderBy(i => i.Name)

src/PowderCoating.Web/Controllers/InvoicesController.cs

@@ -1,9 +1,11 @@
+using System.Text.Json;
 using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using PowderCoating.Application.DTOs.Common;
 using PowderCoating.Application.DTOs.Invoice;
+using PowderCoating.Application.DTOs.Quote;
 using PowderCoating.Application.Interfaces;
 using PowderCoating.Core.Entities;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -338,13 +340,14 @@ public class InvoicesController : Controller
             var costs = await _unitOfWork.CompanyOperatingCosts
                 .FirstOrDefaultAsync(c => c.CompanyId == currentUser.CompanyId && !c.IsDeleted);
 
+            var defaultTerms = prefs?.DefaultPaymentTerms ?? "Net 30";
             var dto = new CreateInvoiceDto
             {
                 PreparedById = currentUser.Id,
                 InvoiceDate = DateTime.Today,
-                DueDate = DateTime.Today.AddDays(prefs?.DefaultTurnaroundDays ?? 30),
+                DueDate = PaymentTermsParser.CalculateDueDate(defaultTerms, DateTime.Today),
                 TaxPercent = costs?.TaxPercent ?? 0,
-                Terms = prefs?.DefaultPaymentTerms ?? "Net 30"
+                Terms = defaultTerms
             };
 
             if (jobId.HasValue)
@@ -376,6 +379,13 @@ public class InvoicesController : Controller
                 var defaultRevenueAccount = await _unitOfWork.Accounts
                     .FirstOrDefaultAsync(a => a.AccountNumber == "4000" && a.IsActive);
 
+                // Deserialize the job's pricing snapshot up front — it is authoritative for discount,
+                // tax, and fees for both quote-based and direct jobs, because it is recalculated on
+                // every save and reflects any edits made after quote conversion.
+                QuotePricingBreakdownDto? jobBreakdown = null;
+                if (!string.IsNullOrEmpty(job.PricingBreakdownJson))
+                    jobBreakdown = JsonSerializer.Deserialize<QuotePricingBreakdownDto>(job.PricingBreakdownJson);
+
                 // If the job came from a quote, load it so we can use the agreed pricing.
                 // The quote stores the approved total including oven batch cost and shop supplies —
                 // these are quote-level charges that are NOT stored on individual job items.
@@ -396,13 +406,15 @@ public class InvoicesController : Controller
 
                     dto.InvoiceItems.Add(new CreateInvoiceItemDto
                     {
-                        SourceJobItemId = item.Id,
-                        Description = item.Description ?? "Powder Coating",
-                        Quantity = 1,
-                        UnitPrice = item.TotalPrice,
-                        TotalPrice = item.TotalPrice,
-                        ColorName = item.ColorName,
-                        DisplayOrder = order++,
+                        SourceJobItemId  = item.Id,
+                        CatalogItemId    = item.CatalogItemId,
+                        Description      = item.Description ?? "Powder Coating",
+                        Quantity         = item.Quantity > 0 ? item.Quantity : 1,
+                        UnitPrice        = item.UnitPrice,
+                        TotalPrice       = item.TotalPrice,
+                        ColorName        = item.ColorName,
+                        Notes            = item.Notes,
+                        DisplayOrder     = order++,
                         RevenueAccountId = revenueAccountId
                     });
                 }
@@ -437,7 +449,10 @@ public class InvoicesController : Controller
                 // because FinalPrice is recalculated on every item edit and can drift from the original quote.
                 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;
 
@@ -454,21 +469,21 @@ public class InvoicesController : Controller
                         });
                     }
 
-                    // Use the quote's agreed tax rate and discount — not current company defaults
-                    dto.TaxPercent = sourceQuote.TaxPercent;
+                    // Use the quote's agreed tax rate and discount — these represent the customer-approved
+                    // price and must not be recomputed from the job's current state.
+                    dto.TaxPercent     = sourceQuote.TaxPercent;
                     dto.DiscountAmount = sourceQuote.DiscountAmount;
                 }
                 else if (hadJobItems)
                 {
-                    // Direct job — no source quote. Use the stored job-level fees rather than
-                    // recalculating, so the invoice always matches the total shown on the job page.
-                    // OvenBatchCost and ShopSuppliesAmount are saved by the pricing engine (with
-                    // OvenCostId) when job items are created or updated.
+                    // Direct job — no source quote. Read all charges from the pricing snapshot so the
+                    // invoice always matches the total shown on the job's Pricing Summary card.
+
                     if (job.OvenBatchCost > 0.01m)
                     {
                         dto.InvoiceItems.Add(new CreateInvoiceItemDto
                         {
-                            Description = $"Oven Processing Fee",
+                            Description = "Oven Processing Fee",
                             Quantity = 1,
                             UnitPrice = Math.Round(job.OvenBatchCost, 2),
                             TotalPrice = Math.Round(job.OvenBatchCost, 2),
@@ -477,6 +492,20 @@ public class InvoicesController : Controller
                         });
                     }
 
+                    var facilityOverhead = jobBreakdown?.FacilityOverheadCost ?? 0m;
+                    if (facilityOverhead > 0.01m)
+                    {
+                        dto.InvoiceItems.Add(new CreateInvoiceItemDto
+                        {
+                            Description = "Facility Overhead",
+                            Quantity = 1,
+                            UnitPrice = Math.Round(facilityOverhead, 2),
+                            TotalPrice = Math.Round(facilityOverhead, 2),
+                            DisplayOrder = order++,
+                            RevenueAccountId = defaultRevenueAccount?.Id
+                        });
+                    }
+
                     if (job.ShopSuppliesAmount > 0.01m)
                     {
                         var suppliesDesc = job.ShopSuppliesPercent > 0
@@ -488,10 +517,40 @@ public class InvoicesController : Controller
                             Quantity = 1,
                             UnitPrice = Math.Round(job.ShopSuppliesAmount, 2),
                             TotalPrice = Math.Round(job.ShopSuppliesAmount, 2),
+                            DisplayOrder = order++,
+                            RevenueAccountId = defaultRevenueAccount?.Id
+                        });
+                    }
+
+                    var rushFee = jobBreakdown?.RushFee ?? 0m;
+                    if (rushFee > 0.01m)
+                    {
+                        dto.InvoiceItems.Add(new CreateInvoiceItemDto
+                        {
+                            Description = "Rush Fee",
+                            Quantity = 1,
+                            UnitPrice = Math.Round(rushFee, 2),
+                            TotalPrice = Math.Round(rushFee, 2),
                             DisplayOrder = order,
                             RevenueAccountId = defaultRevenueAccount?.Id
                         });
                     }
+
+                    dto.DiscountAmount = jobBreakdown?.DiscountAmount ?? 0;
+                }
+
+                // Inherit payment terms from the source quote or the customer — more specific than
+                // the company-wide default set in the outer DTO. Quote terms take priority because
+                // they represent the agreed price; customer terms are next best for direct jobs.
+                var inheritedTerms = sourceQuote?.Terms ?? job.Customer?.PaymentTerms;
+                if (!string.IsNullOrWhiteSpace(inheritedTerms))
+                {
+                    dto.Terms  = inheritedTerms;
+                    dto.DueDate = PaymentTermsParser.CalculateDueDate(inheritedTerms, DateTime.Today)
+                                  ?? dto.DueDate;
+                    var (discPct, discDays) = PaymentTermsParser.ParseEarlyPaymentDiscount(inheritedTerms);
+                    dto.EarlyPaymentDiscountPercent = discPct;
+                    dto.EarlyPaymentDiscountDays    = discDays;
                 }
 
                 // Override tax to 0 for tax-exempt customers, regardless of company default or quote rate
@@ -2154,7 +2213,7 @@ public class InvoicesController : Controller
     /// </summary>
     private async Task PopulateCreateViewBagAsync(int companyId, string? selectedTerms = null)
     {
-        var customers = await _unitOfWork.Customers.GetAllAsync();
+        var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
         ViewBag.Customers = customers.Where(c => c.IsActive).OrderBy(c => c.CompanyName ?? c.ContactLastName).ToList();
 
         // Expose company default tax rate and exempt customer IDs for client-side tax handling

src/PowderCoating.Web/Controllers/JobTemplatesController.cs

@@ -36,7 +36,9 @@ public class JobTemplatesController : Controller
     /// </summary>
     public async Task<IActionResult> Index()
     {
-        var templates = await _unitOfWork.JobTemplates.GetAllAsync(
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var templates = await _unitOfWork.JobTemplates.FindAsync(
+            t => t.CompanyId == companyId,
             false,
             t => t.Customer,
             t => t.Items);

src/PowderCoating.Web/Controllers/JobsController.cs

@@ -422,72 +422,24 @@ public class JobsController : Controller
             // Populate Edit Items wizard data (inline modal on Details page)
             var wizardCosts = await _pricingService.GetOperatingCostsAsync(job.CompanyId);
             await PopulateJobItemDropDownsAsync(job.CompanyId, wizardCosts?.OvenOperatingCostPerHour ?? 45m);
-            ViewBag.WizardTaxPercent = wizardCosts?.TaxPercent ?? 0m;
+            ViewBag.WizardTaxPercent = await GetEffectiveTaxPercentAsync(job.CustomerId, wizardCosts?.TaxPercent ?? 0m);
 
-            // Internal pricing breakdown (not printed — mirrors quote details breakdown)
-            var breakdownItems = job.JobItems
-                .Where(ji => !ji.IsDeleted)
-                .Select(ji => new CreateQuoteItemDto
-                {
-                    Description      = ji.Description,
-                    Quantity         = ji.Quantity,
-                    SurfaceAreaSqFt  = ji.SurfaceAreaSqFt,
-                    EstimatedMinutes = ji.EstimatedMinutes,
-                    CatalogItemId    = ji.CatalogItemId,
-                    IsGenericItem    = ji.IsGenericItem || (!ji.CatalogItemId.HasValue && !ji.Coats.Any() && !ji.IsSalesItem),
-                    IsLaborItem      = ji.IsLaborItem,
-                    IsSalesItem      = ji.IsSalesItem,
-                    ManualUnitPrice  = ji.ManualUnitPrice ?? ((ji.IsGenericItem || ji.IsSalesItem) ? ji.UnitPrice : (decimal?)null),
-                    PowderCostOverride = ji.PowderCostOverride,
-                    IncludePrepCost  = ji.IncludePrepCost,
-                    Complexity       = ji.Complexity,
-                    Coats            = ji.Coats.OrderBy(c => c.Sequence).Select(c => new CreateQuoteItemCoatDto
-                    {
-                        CoverageSqFtPerLb  = c.CoverageSqFtPerLb,
-                        TransferEfficiency = c.TransferEfficiency,
-                        PowderCostPerLb    = c.PowderCostPerLb,
-                        PowderToOrder      = c.PowderToOrder
-                    }).ToList(),
-                    PrepServices = ji.PrepServices.Select(ps => new CreateQuoteItemPrepServiceDto
-                    {
-                        PrepServiceId    = ps.PrepServiceId,
-                        EstimatedMinutes = ps.EstimatedMinutes
-                    }).ToList()
-                }).ToList();
-
-            if (breakdownItems.Any())
+            // Display the pricing snapshot stored when items were last saved.
+            // Never recalculate on load — operating cost changes must not retroactively alter existing jobs.
+            if (!string.IsNullOrEmpty(job.PricingBreakdownJson))
             {
-                var pr = await _pricingService.CalculateQuoteTotalsAsync(
-                    breakdownItems, job.CompanyId, job.CustomerId,
-                    wizardCosts?.TaxPercent ?? 0m,
-                    job.DiscountType.ToString(), job.DiscountValue, job.IsRushJob,
-                    job.OvenCostId, 1, null);
-
+                ViewBag.JobPricingBreakdown = JsonSerializer.Deserialize<QuotePricingBreakdownDto>(job.PricingBreakdownJson);
+            }
+            else if (job.FinalPrice > 0)
+            {
+                // Legacy job created before snapshot was introduced — show what we have stored
                 ViewBag.JobPricingBreakdown = new QuotePricingBreakdownDto
                 {
-                    MaterialCosts          = pr.MaterialCosts,
-                    LaborCosts             = pr.LaborCosts,
-                    EquipmentCosts         = pr.EquipmentCosts,
-                    ItemsSubtotal          = pr.ItemsSubtotal,
-                    OvenBatchCost          = pr.OvenBatchCost,
-                    OvenBatches            = pr.OvenBatches,
-                    OvenCycleMinutes       = pr.OvenCycleMinutes > 0 ? pr.OvenCycleMinutes : (wizardCosts?.DefaultOvenCycleMinutes ?? 0),
-                    FacilityOverheadCost   = pr.FacilityOverheadCost,
-                    FacilityOverheadRatePerHour = pr.FacilityOverheadRatePerHour,
-                    ShopSuppliesAmount     = pr.ShopSuppliesAmount,
-                    ShopSuppliesPercent    = pr.ShopSuppliesPercent,
-                    OverheadCosts          = pr.OverheadCosts,
-                    OverheadPercent        = pr.OverheadPercent,
-                    ProfitMargin           = pr.ProfitMargin,
-                    ProfitPercent          = pr.ProfitPercent,
-                    SubtotalBeforeDiscount = pr.SubtotalBeforeDiscount,
-                    DiscountAmount         = pr.DiscountAmount,
-                    DiscountPercent        = pr.DiscountPercent,
-                    SubtotalAfterDiscount  = pr.SubtotalAfterDiscount,
-                    RushFee                = pr.RushFee,
-                    TaxAmount              = pr.TaxAmount,
-                    TaxPercent             = pr.TaxPercent,
-                    Total                  = pr.Total
+                    OvenBatchCost       = job.OvenBatchCost,
+                    OvenBatches         = job.OvenBatches,
+                    ShopSuppliesAmount  = job.ShopSuppliesAmount,
+                    ShopSuppliesPercent = job.ShopSuppliesPercent,
+                    Total               = job.FinalPrice
                 };
             }
             ViewBag.ComplexitySimplePercent   = wizardCosts?.ComplexitySimplePercent   ?? 0m;
@@ -506,6 +458,7 @@ public class JobsController : Controller
                     isGenericItem        = ji.IsGenericItem || (!ji.CatalogItemId.HasValue && !ji.Coats.Any() && !ji.IsSalesItem),
                     isLaborItem          = ji.IsLaborItem,
                     isSalesItem          = ji.IsSalesItem,
+                    isAiItem             = ji.IsAiItem,
                     sku                  = ji.Sku,
                     requiresSandblasting = ji.RequiresSandblasting,
                     requiresMasking      = ji.RequiresMasking,
@@ -524,6 +477,7 @@ public class JobsController : Controller
                         transferEfficiency = c.TransferEfficiency,
                         powderCostPerLb    = c.PowderCostPerLb,
                         powderToOrder      = c.PowderToOrder,
+                        noExtraLayerCharge = c.NoExtraLayerCharge,
                         notes              = c.Notes
                     }),
                     prepServices = ji.PrepServices.Select(ps => new {
@@ -545,6 +499,23 @@ public class JobsController : Controller
                 .OrderByDescending(t => t.TransactionDate).ToList();
             ViewBag.MaterialsUsed = allJobTransactions;
 
+            // Inventory items for the manual log-material modal
+            var inventoryItemsForModal = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == job.CompanyId))
+                .OrderBy(i => i.Name)
+                .Select(i => new { i.Id, i.Name, i.Manufacturer, i.UnitOfMeasure, i.QuantityOnHand })
+                .ToList();
+            var jsonOpts = new System.Text.Json.JsonSerializerOptions { PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase };
+            ViewBag.InventoryItemsForModal = System.Text.Json.JsonSerializer.Serialize(inventoryItemsForModal, jsonOpts);
+
+            // IDs of powders already assigned to this job's coats — shown at top of log-material dropdown
+            var jobPowderIds = (jobDto.Items ?? new List<PowderCoating.Application.DTOs.Job.JobItemDto>())
+                .SelectMany(i => i.Coats ?? new List<PowderCoating.Application.DTOs.Job.JobItemCoatDto>())
+                .Where(c => c.InventoryItemId.HasValue)
+                .Select(c => c.InventoryItemId!.Value)
+                .Distinct()
+                .ToList();
+            ViewBag.JobPowderIds = System.Text.Json.JsonSerializer.Serialize(jobPowderIds, jsonOpts);
+
             // Pre-logged powder grouped by InventoryItemId (for Complete Job modal pre-fill)
             ViewBag.PreLoggedPowder = allJobTransactions
                 .GroupBy(t => t.InventoryItemId)
@@ -558,7 +529,7 @@ public class JobsController : Controller
             ViewBag.JobPhotoMax = photoMax;
 
             // Customer list for inline customer-change dropdown
-            var allCustomers = await _unitOfWork.Customers.GetAllAsync();
+            var allCustomers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == job.CompanyId);
             ViewBag.CustomerSelectList = allCustomers
                 .Where(c => c.IsActive)
                 .Select(c => new SelectListItem
@@ -664,7 +635,8 @@ public class JobsController : Controller
 
         if (job == null) return NotFound();
 
-        var allStatuses = (await _unitOfWork.JobStatusLookups.GetAllAsync())
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allStatuses = (await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == companyId))
             .OrderBy(s => s.DisplayOrder).ToList();
 
         ViewBag.AllStatuses = allStatuses;
@@ -687,7 +659,7 @@ public class JobsController : Controller
 
         if (job == null) return NotFound();
 
-        var allStatuses = (await _unitOfWork.JobStatusLookups.GetAllAsync()).ToList();
+        var allStatuses = (await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == job.CompanyId)).ToList();
         var newStatus = allStatuses.FirstOrDefault(s => s.Id == newStatusId);
         if (newStatus == null) return BadRequest("Invalid status.");
 
@@ -875,7 +847,7 @@ public class JobsController : Controller
         // Optionally advance status to In Preparation
         if (advanceToInPreparation && jobToUpdate.JobStatus.StatusCode != AppConstants.StatusCodes.Job.InPreparation)
         {
-            var allStatuses = await _unitOfWork.JobStatusLookups.GetAllAsync();
+            var allStatuses = await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == jobToUpdate.CompanyId);
             var inPrepStatus = allStatuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.InPreparation);
             if (inPrepStatus != null)
             {
@@ -932,7 +904,7 @@ public class JobsController : Controller
 
         if (advanceToInPreparation && job.JobStatus.StatusCode != AppConstants.StatusCodes.Job.InPreparation && !job.JobStatus.IsTerminalStatus)
         {
-            var allStatuses = await _unitOfWork.JobStatusLookups.GetAllAsync();
+            var allStatuses = await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == job.CompanyId);
             var inPrepStatus = allStatuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.InPreparation);
             if (inPrepStatus != null)
             {
@@ -1106,6 +1078,9 @@ public class JobsController : Controller
                 CustomerId = dto.CustomerId,
                 QuoteId = dto.QuoteId,
                 AssignedUserId = dto.AssignedUserId,
+                OvenCostId = dto.OvenCostId,
+                OvenBatches = dto.OvenBatches > 0 ? dto.OvenBatches : 1,
+                OvenCycleMinutes = dto.OvenCycleMinutes,
                 Description = dto.Description,
                 JobPriorityId = dto.JobPriorityId,
                 JobStatusId = pendingStatus?.Id ?? 1,
@@ -1167,15 +1142,23 @@ public class JobsController : Controller
 
                 // Recalculate total from wizard items
                 var createCosts = await _pricingService.GetOperatingCostsAsync(companyId);
+                decimal? createOvenRate = null;
+                if (dto.OvenCostId.HasValue)
+                {
+                    var createOven = await _unitOfWork.OvenCosts.GetByIdAsync(dto.OvenCostId.Value);
+                    if (createOven != null && createOven.CompanyId == companyId)
+                        createOvenRate = createOven.CostPerHour;
+                }
                 var totals = await _pricingService.CalculateQuoteTotalsAsync(
                     dto.JobItems, companyId, dto.CustomerId,
-                    createCosts?.TaxPercent ?? 0m,
-                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, job.OvenCostId, 1, null);
+                    await GetEffectiveTaxPercentAsync(dto.CustomerId, createCosts?.TaxPercent ?? 0m),
+                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, createOvenRate, dto.OvenBatches > 0 ? dto.OvenBatches : 1, dto.OvenCycleMinutes);
 
                 job.FinalPrice             = totals.Total;
                 job.OvenBatchCost          = totals.OvenBatchCost;
                 job.ShopSuppliesAmount     = totals.ShopSuppliesAmount;
                 job.ShopSuppliesPercent    = totals.ShopSuppliesPercent;
+                job.PricingBreakdownJson   = JsonSerializer.Serialize(BuildPricingSnapshotDto(totals));
                 job.UpdatedAt  = DateTime.UtcNow;
                 await _unitOfWork.Jobs.UpdateAsync(job);
                 await _unitOfWork.SaveChangesAsync();
@@ -1237,6 +1220,9 @@ public class JobsController : Controller
                 CustomerId = job.CustomerId,
                 QuoteId = job.QuoteId,
                 AssignedUserId = job.AssignedUserId,
+                OvenCostId = job.OvenCostId,
+                OvenBatches = job.OvenBatches > 0 ? job.OvenBatches : 1,
+                OvenCycleMinutes = job.OvenCycleMinutes,
                 Description = job.Description,
                 JobStatusId = job.JobStatusId,
                 JobPriorityId = job.JobPriorityId,
@@ -1262,6 +1248,7 @@ public class JobsController : Controller
                     PowderCostOverride   = ji.PowderCostOverride,
                     IsGenericItem        = ji.IsGenericItem || (!ji.CatalogItemId.HasValue && ji.Coats.Count == 0),
                     IsLaborItem          = ji.IsLaborItem,
+                    IsAiItem             = ji.IsAiItem,
                     RequiresSandblasting = ji.RequiresSandblasting,
                     RequiresMasking      = ji.RequiresMasking,
                     Notes                = ji.Notes,
@@ -1280,6 +1267,7 @@ public class JobsController : Controller
                         TransferEfficiency = c.TransferEfficiency,
                         PowderCostPerLb    = c.PowderCostPerLb,
                         PowderToOrder      = c.PowderToOrder,
+                        NoExtraLayerCharge = c.NoExtraLayerCharge,
                         Notes              = c.Notes
                     }).ToList(),
                     PrepServices = ji.PrepServices.Select(ps => new CreateQuoteItemPrepServiceDto
@@ -1410,6 +1398,9 @@ public class JobsController : Controller
             job.CustomerId = dto.CustomerId;
             job.QuoteId = dto.QuoteId;
             job.Description = dto.Description;
+            job.OvenCostId = dto.OvenCostId;
+            job.OvenBatches = dto.OvenBatches > 0 ? dto.OvenBatches : 1;
+            job.OvenCycleMinutes = dto.OvenCycleMinutes;
             await RecordStatusChangeAsync(job, dto.JobStatusId);
             job.JobStatusId = dto.JobStatusId;
             job.JobPriorityId = dto.JobPriorityId;
@@ -1626,14 +1617,22 @@ public class JobsController : Controller
             if (dto.JobItems.Any())
             {
                 var editCosts = await _pricingService.GetOperatingCostsAsync(companyId);
+                decimal? editOvenRate = null;
+                if (job.OvenCostId.HasValue)
+                {
+                    var editOven = await _unitOfWork.OvenCosts.GetByIdAsync(job.OvenCostId.Value);
+                    if (editOven != null && editOven.CompanyId == companyId)
+                        editOvenRate = editOven.CostPerHour;
+                }
                 var totals = await _pricingService.CalculateQuoteTotalsAsync(
                     dto.JobItems, companyId, dto.CustomerId,
-                    editCosts?.TaxPercent ?? 0m,
-                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, job.OvenCostId, 1, null);
-                job.FinalPrice          = totals.Total;
-                job.OvenBatchCost       = totals.OvenBatchCost;
-                job.ShopSuppliesAmount  = totals.ShopSuppliesAmount;
-                job.ShopSuppliesPercent = totals.ShopSuppliesPercent;
+                    await GetEffectiveTaxPercentAsync(dto.CustomerId, editCosts?.TaxPercent ?? 0m),
+                    dto.DiscountType, dto.DiscountValue, dto.IsRushJob, editOvenRate, dto.OvenBatches > 0 ? dto.OvenBatches : 1, dto.OvenCycleMinutes);
+                job.FinalPrice             = totals.Total;
+                job.OvenBatchCost          = totals.OvenBatchCost;
+                job.ShopSuppliesAmount     = totals.ShopSuppliesAmount;
+                job.ShopSuppliesPercent    = totals.ShopSuppliesPercent;
+                job.PricingBreakdownJson   = JsonSerializer.Serialize(BuildPricingSnapshotDto(totals));
             }
 
             // Save change history records
@@ -1821,7 +1820,7 @@ public class JobsController : Controller
         ViewBag.AiPhotoQuotesEnabled = await _subscriptionService.CanUseAiPhotoQuoteAsync(companyId);
 
         await PopulateDropdowns();
-        await PopulatePrepServicesAsync();
+        await PopulatePrepServicesAsync(companyId);
         var costs = await _pricingService.GetOperatingCostsAsync(companyId);
         await PopulateJobItemDropDownsAsync(companyId, costs?.OvenOperatingCostPerHour ?? 45m);
         ViewBag.TaxPercent                = costs?.TaxPercent               ?? 0m;
@@ -1829,6 +1828,7 @@ public class JobsController : Controller
         ViewBag.ComplexityModeratePercent = costs?.ComplexityModeratePercent ?? 5m;
         ViewBag.ComplexityComplexPercent  = costs?.ComplexityComplexPercent  ?? 15m;
         ViewBag.ComplexityExtremePercent  = costs?.ComplexityExtremePercent  ?? 25m;
+        ViewBag.DefaultOvenCycleMinutes   = costs?.DefaultOvenCycleMinutes  ?? 45;
         var useMetric = await _tenantContext.UseMetricSystemAsync();
         ViewBag.UseMetric = useMetric;
         ViewBag.AreaUnit = _measurementService.GetAreaUnitLabel(useMetric);
@@ -1841,7 +1841,9 @@ public class JobsController : Controller
     /// </summary>
     private async Task PopulateDropdowns()
     {
-        var customers = await _unitOfWork.Customers.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+
+        var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
         ViewBag.Customers = new SelectList(
             customers.Where(c => c.IsActive).Select(c => new
             {
@@ -1852,8 +1854,6 @@ public class JobsController : Controller
             }).OrderBy(c => c.DisplayName),
             "Id",
             "DisplayName");
-
-        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
         var users = await _userManager.Users
             .Where(u => u.CompanyId == companyId && u.IsActive && u.CompanyRole != null)
             .OrderBy(u => u.FirstName).ThenBy(u => u.LastName)
@@ -2235,13 +2235,13 @@ public class JobsController : Controller
     /// Loads all active prep services into ViewBag for the item wizard's prep services step.
     /// Prep services are ordered by DisplayOrder so they appear in the intended workflow sequence.
     /// </summary>
-    private async Task PopulatePrepServicesAsync()
+    private async Task PopulatePrepServicesAsync(int companyId)
     {
-        var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.IsActive);
+        var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.IsActive && ps.CompanyId == companyId);
         ViewBag.PrepServices = prepServices.OrderBy(ps => ps.DisplayOrder).ToList();
         _logger.LogInformation("Populated {Count} active prep services", prepServices.Count());
 
-        var blastSetups = await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive);
+        var blastSetups = await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive && b.CompanyId == companyId);
         ViewBag.BlastSetups = blastSetups.OrderBy(b => b.DisplayOrder)
             .Select(b => new { id = b.Id, name = b.Name, derivedRate = ShopCapabilityCalculator.GetBlastRateSqFtPerHour(b), isDefault = b.IsDefault })
             .ToList();
@@ -2677,78 +2677,80 @@ public class JobsController : Controller
                 .GroupBy(t => t.InventoryItemId)
                 .ToDictionary(g => g.Key, g => Math.Abs(g.Sum(t => t.Quantity)));
 
-            // Update actual powder usage for each coat
-            foreach (var coatUsage in dto.CoatUsages)
+            // Process powder usage submitted per inventory item (color) for the whole job.
+            // Distribute entered lbs across coats sharing that InventoryItemId proportionally
+            // by estimated PowderToOrder so per-coat reporting stays meaningful.
+            // One inventory deduction per powder (net of pre-logged credit).
+            if (dto.PowderUsages.Any())
             {
-                var jobItemCoat = await _unitOfWork.JobItemCoats.GetByIdAsync(
-                    coatUsage.JobItemCoatId,
-                    false,
-                    jic => jic.InventoryItem);
+                // Load all coats for the job with their inventory items
+                var allCoats = (await _unitOfWork.JobItemCoats.FindAsync(
+                    jic => jic.JobItem != null && jic.JobItem.JobId == dto.JobId,
+                    false, jic => jic.InventoryItem, jic => jic.JobItem))
+                    .ToList();
 
-                if (jobItemCoat != null)
+                foreach (var powderUsage in dto.PowderUsages)
                 {
-                    jobItemCoat.ActualPowderUsedLbs = coatUsage.ActualPowderUsedLbs;
-                    await _unitOfWork.JobItemCoats.UpdateAsync(jobItemCoat);
+                    if (!powderUsage.ActualPowderUsedLbs.HasValue || powderUsage.ActualPowderUsedLbs.Value <= 0)
+                        continue;
 
-                    _logger.LogInformation("Updated JobItemCoat {CoatId} with {Lbs} lbs actual powder used",
-                        coatUsage.JobItemCoatId, coatUsage.ActualPowderUsedLbs);
+                    var invItemId = powderUsage.InventoryItemId;
+                    var totalActualLbs = powderUsage.ActualPowderUsedLbs.Value;
 
-                    // Deduct powder from inventory if using stock powder
-                    if (jobItemCoat.InventoryItemId.HasValue &&
-                        coatUsage.ActualPowderUsedLbs.HasValue &&
-                        coatUsage.ActualPowderUsedLbs.Value > 0)
+                    // Distribute across coats using this powder proportionally by estimated lbs
+                    var coatsForPowder = allCoats.Where(c => c.InventoryItemId == invItemId).ToList();
+                    if (coatsForPowder.Any())
                     {
-                        var invItemId = jobItemCoat.InventoryItemId.Value;
-                        var actualLbs = coatUsage.ActualPowderUsedLbs.Value;
-
-                        // Apply available pre-logged credit so we don't double-deduct
-                        var credit = preLoggedCredit.GetValueOrDefault(invItemId, 0m);
-                        var deductNow = Math.Max(0m, actualLbs - credit);
-                        // Consume credit (other coats sharing the same powder get whatever remains)
-                        preLoggedCredit[invItemId] = Math.Max(0m, credit - actualLbs);
-
-                        if (deductNow > 0)
+                        var totalEstimated = coatsForPowder.Sum(c => c.PowderToOrder ?? 0m);
+                        foreach (var coat in coatsForPowder)
                         {
-                            var inventoryItem = await _unitOfWork.InventoryItems.GetByIdAsync(invItemId);
-                            if (inventoryItem != null)
-                            {
-                                var transaction = new InventoryTransaction
-                                {
-                                    InventoryItemId = inventoryItem.Id,
-                                    TransactionType = InventoryTransactionType.JobUsage,
-                                    Quantity = -deductNow,
-                                    UnitCost = inventoryItem.UnitCost,
-                                    TotalCost = inventoryItem.UnitCost * deductNow,
-                                    TransactionDate = DateTime.UtcNow,
-                                    JobId = job.Id,
-                                    Reference = job.JobNumber,
-                                    Notes = $"Powder used for Job {job.JobNumber} - {jobItemCoat.CoatName} ({jobItemCoat.ColorName ?? "N/A"}) by {currentUser!.FirstName} {currentUser.LastName}",
-                                    BalanceAfter = inventoryItem.QuantityOnHand - deductNow,
-                                    CompanyId = job.CompanyId
-                                };
-
-                                await _unitOfWork.InventoryTransactions.AddAsync(transaction);
-                                inventoryItem.QuantityOnHand -= deductNow;
-                                await _unitOfWork.InventoryItems.UpdateAsync(inventoryItem);
-
-                                // GL: DR COGS, CR Inventory Asset (accrual) — no-op if accounts not configured
-                                if (inventoryItem.CogsAccountId.HasValue && inventoryItem.InventoryAccountId.HasValue)
-                                {
-                                    var cost = deductNow * (inventoryItem.AverageCost > 0 ? inventoryItem.AverageCost : inventoryItem.UnitCost);
-                                    await _accountBalanceService.DebitAsync(inventoryItem.CogsAccountId, cost);
-                                    await _accountBalanceService.CreditAsync(inventoryItem.InventoryAccountId, cost);
-                                }
-
-                                _logger.LogInformation(
-                                    "Deducted {Lbs} lbs (net of pre-logged) of {Item} from inventory for Job {JobNumber}. New quantity: {NewQty}",
-                                    deductNow, inventoryItem.Name, job.JobNumber, inventoryItem.QuantityOnHand);
-                            }
+                            var share = totalEstimated > 0
+                                ? totalActualLbs * ((coat.PowderToOrder ?? 0m) / totalEstimated)
+                                : totalActualLbs / coatsForPowder.Count;
+                            coat.ActualPowderUsedLbs = Math.Round(share, 4);
+                            await _unitOfWork.JobItemCoats.UpdateAsync(coat);
                         }
-                        else
+                    }
+
+                    // Single inventory deduction for the whole powder, net of pre-logged credit
+                    var credit = preLoggedCredit.GetValueOrDefault(invItemId, 0m);
+                    var deductNow = Math.Max(0m, totalActualLbs - credit);
+                    preLoggedCredit[invItemId] = 0m;
+
+                    if (deductNow > 0)
+                    {
+                        var inventoryItem = await _unitOfWork.InventoryItems.GetByIdAsync(invItemId);
+                        if (inventoryItem != null)
                         {
+                            inventoryItem.QuantityOnHand -= deductNow;
+                            await _unitOfWork.InventoryItems.UpdateAsync(inventoryItem);
+
+                            var transaction = new InventoryTransaction
+                            {
+                                InventoryItemId = inventoryItem.Id,
+                                TransactionType = InventoryTransactionType.JobUsage,
+                                Quantity        = -deductNow,
+                                UnitCost        = inventoryItem.UnitCost,
+                                TotalCost       = inventoryItem.UnitCost * deductNow,
+                                TransactionDate = DateTime.UtcNow,
+                                JobId           = job.Id,
+                                Reference       = job.JobNumber,
+                                Notes           = $"Powder used for Job {job.JobNumber} by {currentUser!.FirstName} {currentUser.LastName}",
+                                BalanceAfter    = inventoryItem.QuantityOnHand,
+                                CompanyId       = job.CompanyId
+                            };
+                            await _unitOfWork.InventoryTransactions.AddAsync(transaction);
+
+                            if (inventoryItem.CogsAccountId.HasValue && inventoryItem.InventoryAccountId.HasValue)
+                            {
+                                var cost = deductNow * (inventoryItem.AverageCost > 0 ? inventoryItem.AverageCost : inventoryItem.UnitCost);
+                                await _accountBalanceService.DebitAsync(inventoryItem.CogsAccountId, cost);
+                                await _accountBalanceService.CreditAsync(inventoryItem.InventoryAccountId, cost);
+                            }
+
                             _logger.LogInformation(
-                                "Skipped inventory deduction for JobItemCoat {CoatId} — {Lbs} lbs already pre-logged for inventory item {InvItemId}",
-                                coatUsage.JobItemCoatId, actualLbs, invItemId);
+                                "Deducted {Lbs} lbs (net of pre-logged) of {Item} from inventory for Job {JobNumber}. New quantity: {NewQty}",
+                                deductNow, inventoryItem.Name, job.JobNumber, inventoryItem.QuantityOnHand);
                         }
                     }
                 }
@@ -2926,6 +2928,7 @@ public class JobsController : Controller
             PowderCostOverride  = ji.PowderCostOverride,
             IsGenericItem       = ji.IsGenericItem || (!ji.CatalogItemId.HasValue && ji.Coats.Count == 0),
             IsLaborItem         = ji.IsLaborItem,
+            IsAiItem            = ji.IsAiItem,
             RequiresSandblasting = ji.RequiresSandblasting,
             RequiresMasking     = ji.RequiresMasking,
             Notes               = ji.Notes,
@@ -2944,6 +2947,7 @@ public class JobsController : Controller
                 TransferEfficiency = c.TransferEfficiency,
                 PowderCostPerLb    = c.PowderCostPerLb,
                 PowderToOrder      = c.PowderToOrder,
+                NoExtraLayerCharge = c.NoExtraLayerCharge,
                 Notes              = c.Notes
             }).ToList(),
             PrepServices = ji.PrepServices.Select(ps => new CreateQuoteItemPrepServiceDto
@@ -2955,11 +2959,14 @@ public class JobsController : Controller
 
         var viewModel = new JobEditItemsViewModel
         {
-            JobId      = job.Id,
-            JobNumber  = job.JobNumber,
-            CustomerId = job.CustomerId,
-            TaxPercent = costs?.TaxPercent ?? 0m,
-            JobItems   = existingItems
+            JobId            = job.Id,
+            JobNumber        = job.JobNumber,
+            CustomerId       = job.CustomerId,
+            TaxPercent       = await GetEffectiveTaxPercentAsync(job.CustomerId, costs?.TaxPercent ?? 0m),
+            OvenCostId       = job.OvenCostId,
+            OvenBatches      = job.OvenBatches > 0 ? job.OvenBatches : 1,
+            OvenCycleMinutes = job.OvenCycleMinutes,
+            JobItems         = existingItems
         };
 
         await PopulateJobItemDropDownsAsync(currentUser.CompanyId, costs?.OvenOperatingCostPerHour ?? 45m);
@@ -2992,7 +2999,7 @@ public class JobsController : Controller
         {
             ModelState.AddModelError("", "Please add at least one job item.");
             var costs = await _pricingService.GetOperatingCostsAsync(currentUser.CompanyId);
-            model.TaxPercent = costs?.TaxPercent ?? 0m;
+            model.TaxPercent = await GetEffectiveTaxPercentAsync(job.CustomerId, costs?.TaxPercent ?? 0m);
             await PopulateJobItemDropDownsAsync(currentUser.CompanyId, costs?.OvenOperatingCostPerHour ?? 45m);
             ViewBag.ComplexitySimplePercent   = costs?.ComplexitySimplePercent   ?? 0m;
             ViewBag.ComplexityModeratePercent = costs?.ComplexityModeratePercent ?? 5m;
@@ -3037,15 +3044,26 @@ public class JobsController : Controller
                 }
             }
 
-            // Calculate full total (overhead, margins, tax) to match what the wizard displays
+            // Calculate full total (overhead, margins, tax) matching what Details shows
+            decimal? ovenRateOverride = null;
+            if (job.OvenCostId.HasValue)
+            {
+                var oven = await _unitOfWork.OvenCosts.GetByIdAsync(job.OvenCostId.Value);
+                if (oven != null && oven.CompanyId == currentUser.CompanyId)
+                    ovenRateOverride = oven.CostPerHour;
+            }
+            var updateCosts = await _pricingService.GetOperatingCostsAsync(currentUser.CompanyId);
             var totals = await _pricingService.CalculateQuoteTotalsAsync(
                 model.JobItems, currentUser.CompanyId, job.CustomerId,
-                model.TaxPercent, "None", 0, false, job.OvenCostId, 1, null);
+                await GetEffectiveTaxPercentAsync(job.CustomerId, updateCosts?.TaxPercent ?? 0m),
+                job.DiscountType.ToString(), job.DiscountValue, job.IsRushJob,
+                ovenRateOverride, job.OvenBatches, job.OvenCycleMinutes);
 
-            job.FinalPrice          = totals.Total;
-            job.OvenBatchCost       = totals.OvenBatchCost;
-            job.ShopSuppliesAmount  = totals.ShopSuppliesAmount;
-            job.ShopSuppliesPercent = totals.ShopSuppliesPercent;
+            job.FinalPrice             = totals.Total;
+            job.OvenBatchCost          = totals.OvenBatchCost;
+            job.ShopSuppliesAmount     = totals.ShopSuppliesAmount;
+            job.ShopSuppliesPercent    = totals.ShopSuppliesPercent;
+            job.PricingBreakdownJson   = JsonSerializer.Serialize(BuildPricingSnapshotDto(totals));
             job.UpdatedAt  = DateTime.UtcNow;
             job.UpdatedBy  = currentUser.UserName;
             await _unitOfWork.Jobs.UpdateAsync(job);
@@ -3059,7 +3077,7 @@ public class JobsController : Controller
             _logger.LogError(ex, "Error updating items for job {JobId}", job.Id);
             TempData["Error"] = "An error occurred while saving job items.";
             var costs = await _pricingService.GetOperatingCostsAsync(currentUser.CompanyId);
-            model.TaxPercent = costs?.TaxPercent ?? 0m;
+            model.TaxPercent = await GetEffectiveTaxPercentAsync(job.CustomerId, costs?.TaxPercent ?? 0m);
             await PopulateJobItemDropDownsAsync(currentUser.CompanyId, costs?.OvenOperatingCostPerHour ?? 45m);
             return View("EditItems", model);
         }
@@ -3101,30 +3119,48 @@ public class JobsController : Controller
             CatalogItemId    = ji.CatalogItemId,
             IsGenericItem    = ji.IsGenericItem,
             IsLaborItem      = ji.IsLaborItem,
-            ManualUnitPrice  = ji.ManualUnitPrice,
-            Coats            = ji.Coats.Select(c => new CreateQuoteItemCoatDto
+            IsSalesItem      = ji.IsSalesItem,
+            IsAiItem         = ji.IsAiItem,
+            ManualUnitPrice  = ji.ManualUnitPrice ?? ((ji.IsGenericItem || ji.IsSalesItem) ? ji.UnitPrice : (decimal?)null),
+            IncludePrepCost  = ji.IncludePrepCost,
+            Coats            = ji.Coats.OrderBy(c => c.Sequence).Select(c => new CreateQuoteItemCoatDto
             {
+                InventoryItemId    = c.InventoryItemId,
                 CoverageSqFtPerLb  = c.CoverageSqFtPerLb,
                 TransferEfficiency = c.TransferEfficiency,
-                PowderCostPerLb    = c.PowderCostPerLb
+                PowderCostPerLb    = c.PowderCostPerLb,
+                NoExtraLayerCharge = c.NoExtraLayerCharge
             }).ToList()
         }).ToList();
 
+        var costs = await _pricingService.GetOperatingCostsAsync(currentUser.CompanyId);
         if (remainingDtos.Any())
         {
-            var costs = await _pricingService.GetOperatingCostsAsync(currentUser.CompanyId);
+            decimal? deleteOvenRate = null;
+            if (job.OvenCostId.HasValue)
+            {
+                var deleteOven = await _unitOfWork.OvenCosts.GetByIdAsync(job.OvenCostId.Value);
+                if (deleteOven != null && deleteOven.CompanyId == currentUser.CompanyId)
+                    deleteOvenRate = deleteOven.CostPerHour;
+            }
             var totals = await _pricingService.CalculateQuoteTotalsAsync(
                 remainingDtos, currentUser.CompanyId, job.CustomerId,
-                costs?.TaxPercent ?? 0m, "None", 0, false, null, 1, null);
-            job.FinalPrice          = totals.Total;
-            job.ShopSuppliesAmount  = totals.ShopSuppliesAmount;
-            job.ShopSuppliesPercent = totals.ShopSuppliesPercent;
+                await GetEffectiveTaxPercentAsync(job.CustomerId, costs?.TaxPercent ?? 0m),
+                job.DiscountType.ToString(), job.DiscountValue, job.IsRushJob,
+                deleteOvenRate, job.OvenBatches, job.OvenCycleMinutes);
+            job.FinalPrice             = totals.Total;
+            job.OvenBatchCost          = totals.OvenBatchCost;
+            job.ShopSuppliesAmount     = totals.ShopSuppliesAmount;
+            job.ShopSuppliesPercent    = totals.ShopSuppliesPercent;
+            job.PricingBreakdownJson   = JsonSerializer.Serialize(BuildPricingSnapshotDto(totals));
         }
         else
         {
-            job.FinalPrice          = 0;
-            job.ShopSuppliesAmount  = 0;
-            job.ShopSuppliesPercent = 0;
+            job.FinalPrice             = 0;
+            job.OvenBatchCost          = 0;
+            job.ShopSuppliesAmount     = 0;
+            job.ShopSuppliesPercent    = 0;
+            job.PricingBreakdownJson   = null;
         }
 
         job.UpdatedAt = DateTime.UtcNow;
@@ -3144,7 +3180,7 @@ public class JobsController : Controller
     /// </summary>
     private async Task PopulateJobItemDropDownsAsync(int companyId, decimal fallbackOvenRate)
     {
-        var inventory = await _unitOfWork.InventoryItems.GetAllAsync(false, i => i.InventoryCategory);
+        var inventory = await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId, false, i => i.InventoryCategory);
         ViewBag.InventoryCoatings = inventory
             .Where(i => i.IsActive && i.InventoryCategory?.IsActive == true && i.InventoryCategory.IsCoating)
             .OrderBy(i => i.IsIncoming ? 1 : 0).ThenBy(i => i.InventoryCategory!.DisplayOrder).ThenBy(i => i.ColorName ?? i.Name)
@@ -3164,12 +3200,12 @@ public class JobsController : Controller
                 isIncoming = i.IsIncoming
             }).ToList();
 
-        var vendors = await _unitOfWork.Vendors.GetAllAsync(false);
+        var vendors = await _unitOfWork.Vendors.FindAsync(s => s.CompanyId == companyId, false);
         ViewBag.Vendors = vendors
             .Where(s => s.IsActive).OrderBy(s => s.CompanyName)
             .Select(s => new { value = s.Id.ToString(), text = s.CompanyName }).ToList();
 
-        var catalogItems = await _unitOfWork.CatalogItems.GetAllAsync(false, i => i.Category, i => i.Category.ParentCategory);
+        var catalogItems = await _unitOfWork.CatalogItems.FindAsync(i => i.CompanyId == companyId, false, i => i.Category, i => i.Category.ParentCategory);
         ViewBag.CatalogItems = catalogItems
             .Where(i => i.IsActive)
             .OrderBy(i => i.Category.DisplayOrder).ThenBy(i => i.DisplayOrder)
@@ -3198,10 +3234,10 @@ public class JobsController : Controller
                 description = i.Description
             }).ToList();
 
-        var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.IsActive);
+        var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.IsActive && ps.CompanyId == companyId);
         ViewBag.PrepServices = prepServices.OrderBy(ps => ps.DisplayOrder).ToList();
 
-        var blastSetupsForEditItems = await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive);
+        var blastSetupsForEditItems = await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive && b.CompanyId == companyId);
         ViewBag.BlastSetups = blastSetupsForEditItems.OrderBy(b => b.DisplayOrder)
             .Select(b => new { id = b.Id, name = b.Name, derivedRate = ShopCapabilityCalculator.GetBlastRateSqFtPerHour(b), isDefault = b.IsDefault })
             .ToList();
@@ -3234,6 +3270,57 @@ public class JobsController : Controller
         return $"{string.Join(" > ", path)} > {item.Name}{sku} - {item.DefaultPrice:C}";
     }
 
+    /// <summary>
+    /// Converts a <see cref="QuotePricingResult"/> into the DTO used for both display and JSON snapshot storage.
+    /// All save paths (Create, Edit, UpdateItems, DeleteJobItem) call this so the snapshot is always consistent.
+    /// </summary>
+    /// <summary>
+    /// Returns the effective tax rate for a job, respecting customer tax-exempt status.
+    /// Always call this instead of using costs.TaxPercent directly so tax-exempt customers
+    /// are never charged tax when a job is saved or recalculated.
+    /// </summary>
+    private async Task<decimal> GetEffectiveTaxPercentAsync(int? customerId, decimal companyDefaultRate)
+    {
+        if (customerId is > 0)
+        {
+            var customer = await _unitOfWork.Customers.GetByIdAsync(customerId.Value);
+            if (customer?.IsTaxExempt == true) return 0m;
+        }
+        return companyDefaultRate;
+    }
+
+    private static QuotePricingBreakdownDto BuildPricingSnapshotDto(QuotePricingResult pr) =>
+        new QuotePricingBreakdownDto
+        {
+            MaterialCosts               = pr.MaterialCosts,
+            LaborCosts                  = pr.LaborCosts,
+            EquipmentCosts              = pr.EquipmentCosts,
+            ItemsSubtotal               = pr.ItemsSubtotal,
+            OvenBatchCost               = pr.OvenBatchCost,
+            OvenBatches                 = pr.OvenBatches,
+            OvenCycleMinutes            = pr.OvenCycleMinutes,
+            FacilityOverheadCost        = pr.FacilityOverheadCost,
+            FacilityOverheadRatePerHour = pr.FacilityOverheadRatePerHour,
+            ShopSuppliesAmount          = pr.ShopSuppliesAmount,
+            ShopSuppliesPercent         = pr.ShopSuppliesPercent,
+            OverheadCosts               = pr.OverheadCosts,
+            OverheadPercent             = pr.OverheadPercent,
+            ProfitMargin                = pr.ProfitMargin,
+            ProfitPercent               = pr.ProfitPercent,
+            SubtotalBeforeDiscount      = pr.SubtotalBeforeDiscount,
+            PricingTierDiscountAmount   = pr.PricingTierDiscountAmount,
+            PricingTierDiscountPercent  = pr.PricingTierDiscountPercent,
+            QuoteDiscountAmount         = pr.QuoteDiscountAmount,
+            QuoteDiscountPercent        = pr.QuoteDiscountPercent,
+            DiscountAmount              = pr.DiscountAmount,
+            DiscountPercent             = pr.DiscountPercent,
+            SubtotalAfterDiscount       = pr.SubtotalAfterDiscount,
+            RushFee                     = pr.RushFee,
+            TaxAmount                   = pr.TaxAmount,
+            TaxPercent                  = pr.TaxPercent,
+            Total                       = pr.Total
+        };
+
     #endregion
 
     #region Item Pricing (AJAX)
@@ -3314,8 +3401,7 @@ public class JobsController : Controller
     public async Task<IActionResult> GetTimeEntries(int jobId)
     {
         var entries = await _unitOfWork.JobTimeEntries.FindAsync(
-            e => e.JobId == jobId, false,
-            e => e.Worker);  // Worker nav loaded for display of legacy entries that pre-date user migration
+            e => e.JobId == jobId, false);
         var dtos = _mapper.Map<List<JobTimeEntryDto>>(entries.OrderByDescending(e => e.WorkDate).ToList());
         return Json(dtos);
     }
@@ -3769,15 +3855,24 @@ public class JobsController : Controller
 
             // Operating costs for fallback labor rate and oven rate
             var opCosts = (await _unitOfWork.CompanyOperatingCosts.FindAsync(c => c.CompanyId == companyId)).FirstOrDefault();
-            var fallbackLaborRate = opCosts?.StandardLaborRate ?? 0m;
             var effectiveOvenMinutes = (opCosts?.DefaultOvenCycleMinutes > 0 ? (int?)opCosts!.DefaultOvenCycleMinutes : null) ?? 45;
             var defaultOvenCycleHours = effectiveOvenMinutes / 60.0m;
 
-            // Role cost rates map: role → hourly rate
-            var roleCosts = await _unitOfWork.ShopWorkerRoleCosts.FindAsync(r => r.CompanyId == companyId);
-            var roleCostMap = roleCosts.ToDictionary(r => r.Role, r => r.HourlyRate);
+            // Labor cost rate priority: per-user LaborCostPerHour → company LaborCostPerHour → 20% of StandardLaborRate
+            var companyLaborCostRate = opCosts?.LaborCostPerHour ?? ((opCosts?.StandardLaborRate ?? 0m) * 0.20m);
+            var companyUsers = await _userManager.Users
+                .Where(u => u.CompanyId == companyId && u.LaborCostPerHour != null)
+                .Select(u => new { u.Id, u.LaborCostPerHour })
+                .ToListAsync();
+            var userLaborCostMap = companyUsers.ToDictionary(u => u.Id, u => u.LaborCostPerHour!.Value);
 
             // 1. Powder / Material cost
+            // Priority: PowderUsageLog actuals (sum per coat) > coat.ActualPowderUsedLbs > coat.PowderToOrder (estimated)
+            var usageLogs = await _unitOfWork.PowderUsageLogs.FindAsync(u => u.JobId == jobId);
+            var actualByCoat = usageLogs
+                .GroupBy(u => u.JobItemCoatId)
+                .ToDictionary(g => g.Key, g => g.Sum(u => u.ActualLbsUsed));
+
             decimal powderCost = 0m;
             var powderLines = new List<object>();
             bool hasCoatsWithRateButNoQty = false;
@@ -3785,7 +3880,19 @@ public class JobsController : Controller
             {
                 foreach (var coat in item.Coats)
                 {
-                    var lbs = coat.ActualPowderUsedLbs ?? coat.PowderToOrder ?? 0m;
+                    bool isActual;
+                    decimal lbs;
+                    if (actualByCoat.TryGetValue(coat.Id, out var loggedLbs) && loggedLbs > 0)
+                    {
+                        lbs = loggedLbs;
+                        isActual = true;
+                    }
+                    else
+                    {
+                        lbs = coat.ActualPowderUsedLbs ?? coat.PowderToOrder ?? 0m;
+                        isActual = coat.ActualPowderUsedLbs.HasValue;
+                    }
+
                     var costPerLb = coat.PowderCostPerLb ?? 0m;
                     var lineCost = lbs * costPerLb;
                     powderCost += lineCost;
@@ -3796,7 +3903,7 @@ public class JobsController : Controller
                             lbs = Math.Round(lbs, 3),
                             costPerLb = Math.Round(costPerLb, 4),
                             total = Math.Round(lineCost, 2),
-                            isActual = coat.ActualPowderUsedLbs.HasValue
+                            isActual
                         });
                     }
                     else if (costPerLb > 0 && lbs == 0)
@@ -3808,20 +3915,23 @@ public class JobsController : Controller
             }
 
             // 2. Labor cost
+            // Priority: per-user LaborCostPerHour → company LaborCostPerHour → 20% of StandardLaborRate
             decimal laborCost = 0m;
             var laborLines = new List<object>();
             foreach (var entry in job.TimeEntries)
             {
-                var rate = entry.Worker != null && roleCostMap.TryGetValue(entry.Worker.Role, out var r) ? r : fallbackLaborRate;
+                bool usingPerUser = entry.UserId != null && userLaborCostMap.TryGetValue(entry.UserId, out _);
+                var rate = usingPerUser
+                    ? userLaborCostMap[entry.UserId!]
+                    : companyLaborCostRate;
                 var lineCost = entry.HoursWorked * rate;
                 laborCost += lineCost;
                 laborLines.Add(new {
-                    worker = entry.Worker?.Name ?? "Unknown",
-                    role = entry.Worker != null ? System.Text.RegularExpressions.Regex.Replace(entry.Worker.Role.ToString(), "([a-z])([A-Z])", "$1 $2") : "",
+                    worker = entry.UserDisplayName ?? "Unknown",
                     hours = entry.HoursWorked,
                     rate = Math.Round(rate, 2),
                     total = Math.Round(lineCost, 2),
-                    usingFallback = entry.Worker == null || !roleCostMap.ContainsKey(entry.Worker.Role),
+                    usingFallback = !usingPerUser,
                     stage = entry.Stage,
                     workDate = entry.WorkDate.ToString("MM/dd/yyyy")
                 });
@@ -3895,7 +4005,7 @@ public class JobsController : Controller
                 grossMargin,
                 quotedMargin,
                 quotedPrice = Math.Round(job.QuotedPrice, 2),
-                fallbackLaborRate,
+                companyLaborCostRate,
                 powderLines,
                 laborLines,
                 hasPowderData = powderLines.Count > 0,
@@ -4003,9 +4113,87 @@ public class JobsController : Controller
 
         _logger.LogInformation("Recorded first job creation for company {CompanyId}", companyId);
     }
+
+    /// <summary>
+    /// Logs manual material usage from the job details page. Mirrors the QR scan LogUsage
+    /// flow in InventoryController but returns JSON so the modal can close and refresh inline.
+    /// Quantity is always the amount USED (caller converts from remaining if needed).
+    /// </summary>
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> LogMaterial([FromBody] LogMaterialRequest req)
+    {
+        try
+        {
+            if (req.QuantityUsed <= 0)
+                return Json(new { success = false, message = "Quantity used must be greater than zero." });
+
+            var item = await _unitOfWork.InventoryItems.GetByIdAsync(req.InventoryItemId);
+            if (item == null) return Json(new { success = false, message = "Inventory item not found." });
+
+            var job = await _unitOfWork.Jobs.GetByIdAsync(req.JobId);
+            if (job == null) return Json(new { success = false, message = "Job not found." });
+
+            var txnType = req.TransactionType == "Waste"
+                ? InventoryTransactionType.Waste
+                : InventoryTransactionType.JobUsage;
+
+            item.QuantityOnHand -= req.QuantityUsed;
+            item.UpdatedAt = DateTime.UtcNow;
+            await _unitOfWork.InventoryItems.UpdateAsync(item);
+
+            var txn = new PowderCoating.Core.Entities.InventoryTransaction
+            {
+                InventoryItemId = item.Id,
+                TransactionType = txnType,
+                Quantity        = -req.QuantityUsed,
+                UnitCost        = item.UnitCost,
+                TotalCost       = req.QuantityUsed * item.UnitCost,
+                TransactionDate = DateTime.UtcNow,
+                BalanceAfter    = item.QuantityOnHand,
+                JobId           = req.JobId,
+                Reference       = $"Job {job.JobNumber}",
+                Notes           = req.Notes?.Trim(),
+                CompanyId       = item.CompanyId,
+                CreatedAt       = DateTime.UtcNow
+            };
+            await _unitOfWork.InventoryTransactions.AddAsync(txn);
+            await _unitOfWork.CompleteAsync();
+
+            // GL: DR COGS, CR Inventory Asset
+            if (item.CogsAccountId.HasValue && item.InventoryAccountId.HasValue)
+            {
+                var cost = req.QuantityUsed * (item.AverageCost > 0 ? item.AverageCost : item.UnitCost);
+                await _accountBalanceService.DebitAsync(item.CogsAccountId, cost);
+                await _accountBalanceService.CreditAsync(item.InventoryAccountId, cost);
+            }
+
+            return Json(new
+            {
+                success    = true,
+                message    = $"Logged {req.QuantityUsed:N2} {item.UnitOfMeasure} of {item.Name}.",
+                newBalance = item.QuantityOnHand,
+                unitOfMeasure = item.UnitOfMeasure,
+                itemName   = item.Name
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error logging material for job {JobId}", req.JobId);
+            return Json(new { success = false, message = "An error occurred. Please try again." });
+        }
+    }
 }
 
 public class DeleteTimeEntryRequest { public int Id { get; set; } }
+public class LogMaterialRequest
+{
+    public int     JobId           { get; set; }
+    public int     InventoryItemId { get; set; }
+    public decimal QuantityUsed    { get; set; }
+    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 UpdateWorkerAssignmentRequest

src/PowderCoating.Web/Controllers/JobsPriorityController.cs

@@ -90,8 +90,8 @@ public class JobsPriorityController : Controller
         .ToList();
 
         // Get priorities and workers for modal options
-        var priorities = await _unitOfWork.JobPriorityLookups.GetAllAsync();
         var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var priorities = await _unitOfWork.JobPriorityLookups.FindAsync(p => p.CompanyId == companyId);
         var workers = await _userManager.Users
             .Where(u => u.CompanyId == companyId && u.IsActive && u.CompanyRole != null)
             .OrderBy(u => u.FirstName).ThenBy(u => u.LastName)

src/PowderCoating.Web/Controllers/KioskController.cs

@@ -916,8 +916,13 @@ public class KioskController : Controller
         ViewBag.SessionToken = session.SessionToken;
         ViewBag.SessionType  = session.SessionType;
 
-        // Reset to Welcome screen after 45 s of inactivity on any intake step.
-        // The Welcome screen itself stays on indefinitely (no timeout override there).
-        ViewBag.InactivityTimeoutMs = 45_000;
+        // In-person kiosk: reset to Welcome screen after 45 s of inactivity so an
+        // abandoned tablet doesn't stay on a customer's half-filled form indefinitely.
+        // Remote sessions: customer is on their own phone — never redirect; they may
+        // take several minutes between steps and have no KioskDevice cookie anyway.
+        if (session.SessionType == KioskSessionType.InPerson)
+            ViewBag.InactivityTimeoutMs = 45_000;
+        else
+            ViewBag.ShowInactivityTimer = false;
     }
 }

src/PowderCoating.Web/Controllers/MaintenanceController.cs

@@ -16,15 +16,18 @@ public class MaintenanceController : Controller
 {
     private readonly IUnitOfWork _unitOfWork;
     private readonly IMapper _mapper;
+    private readonly ITenantContext _tenantContext;
     private readonly ILogger<MaintenanceController> _logger;
 
     public MaintenanceController(
         IUnitOfWork unitOfWork,
         IMapper mapper,
+        ITenantContext tenantContext,
         ILogger<MaintenanceController> logger)
     {
         _unitOfWork = unitOfWork;
         _mapper = mapper;
+        _tenantContext = tenantContext;
         _logger = logger;
     }
 
@@ -740,7 +743,8 @@ public class MaintenanceController : Controller
     /// </summary>
     private async Task PopulateViewBagAsync(int? selectedEquipmentId = null)
     {
-        var equipment = await _unitOfWork.Equipment.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var equipment = await _unitOfWork.Equipment.FindAsync(e => e.CompanyId == companyId);
         ViewBag.EquipmentList = new SelectList(
             equipment.Where(e => e.IsActive).OrderBy(e => e.EquipmentName),
             "Id",

src/PowderCoating.Web/Controllers/OvenSchedulerController.cs

@@ -179,8 +179,9 @@ public class OvenSchedulerController : Controller
     public async Task<IActionResult> Suggest([FromBody] SuggestRequest req)
     {
         var goal = req?.OptimizationGoal ?? "maximize_throughput";
+        var suggestCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
-        var equipmentList = (await _unitOfWork.OvenCosts.GetAllAsync())
+        var equipmentList = (await _unitOfWork.OvenCosts.FindAsync(o => o.CompanyId == suggestCompanyId))
             .Where(o => o.IsActive)
             .OrderBy(o => o.DisplayOrder).ThenBy(o => o.Label)
             .ToList();
@@ -188,10 +189,11 @@ public class OvenSchedulerController : Controller
         if (!equipmentList.Any())
             return Json(new { success = false, error = "No active ovens found. Add Named Ovens in Settings → Operating Costs." });
 
-        var companyCosts = await _unitOfWork.CompanyOperatingCosts.GetAllAsync();
+        var companyCosts = await _unitOfWork.CompanyOperatingCosts.FindAsync(c => c.CompanyId == suggestCompanyId);
         var defaultCycleMinutes = companyCosts.FirstOrDefault()?.DefaultOvenCycleMinutes ?? 45;
 
-        var queueJobs = (await _unitOfWork.Jobs.GetAllAsync(
+        var queueJobs = (await _unitOfWork.Jobs.FindAsync(
+                j => j.CompanyId == suggestCompanyId,
                 false,
                 j => j.Customer,
                 j => j.JobStatus,
@@ -265,7 +267,8 @@ public class OvenSchedulerController : Controller
         if (req?.Batches == null || !req.Batches.Any())
             return Json(new { success = false, error = "No batches provided." });
 
-        var companyCosts = await _unitOfWork.CompanyOperatingCosts.GetAllAsync();
+        var acceptCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var companyCosts = await _unitOfWork.CompanyOperatingCosts.FindAsync(c => c.CompanyId == acceptCompanyId);
         var defaultCycleMinutes = companyCosts.FirstOrDefault()?.DefaultOvenCycleMinutes ?? 45;
 
         var createdBatches = new List<object>();
@@ -357,7 +360,8 @@ public class OvenSchedulerController : Controller
         if (oven == null)
             return Json(new { success = false, error = "Oven not found." });
 
-        var companyCosts = await _unitOfWork.CompanyOperatingCosts.GetAllAsync();
+        var createBatchCompanyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var companyCosts = await _unitOfWork.CompanyOperatingCosts.FindAsync(c => c.CompanyId == createBatchCompanyId);
         var defaultCycleMinutes = companyCosts.FirstOrDefault()?.DefaultOvenCycleMinutes ?? 45;
 
         var batchNumber = await GenerateBatchNumberAsync();
@@ -651,7 +655,8 @@ public class OvenSchedulerController : Controller
         if (inOvenStatus != null)
         {
             var jobIds = batch.Items.Select(i => i.JobId).Distinct().ToHashSet();
-            var jobs = (await _unitOfWork.Jobs.GetAllAsync()).Where(j => jobIds.Contains(j.Id));
+            var startBatchCid = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var jobs = await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == startBatchCid && jobIds.Contains(j.Id));
             foreach (var job in jobs)
                 job.JobStatusId = inOvenStatus.Id;
         }

src/PowderCoating.Web/Controllers/PricingTiersController.cs

@@ -14,12 +14,14 @@ public class PricingTiersController : Controller
     private readonly IUnitOfWork _unitOfWork;
     private readonly IMapper _mapper;
     private readonly ILogger<PricingTiersController> _logger;
+    private readonly ITenantContext _tenantContext;
 
-    public PricingTiersController(IUnitOfWork unitOfWork, IMapper mapper, ILogger<PricingTiersController> logger)
+    public PricingTiersController(IUnitOfWork unitOfWork, IMapper mapper, ILogger<PricingTiersController> logger, ITenantContext tenantContext)
     {
         _unitOfWork = unitOfWork;
         _mapper = mapper;
         _logger = logger;
+        _tenantContext = tenantContext;
     }
 
     /// <summary>
@@ -27,8 +29,9 @@ public class PricingTiersController : Controller
     /// </summary>
     public async Task<IActionResult> Index()
     {
-        var tiers = await _unitOfWork.PricingTiers.GetAllAsync();
-        var customers = await _unitOfWork.Customers.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var tiers = await _unitOfWork.PricingTiers.FindAsync(t => t.CompanyId == companyId);
+        var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
 
         var customerCountByTier = customers
             .Where(c => c.PricingTierId.HasValue)

src/PowderCoating.Web/Controllers/QuotesController.cs

@@ -1,4 +1,5 @@
-using AutoMapper;
+using System.Text.Json;
+using AutoMapper;
 using Microsoft.Extensions.Configuration;
 using PowderCoating.Shared.Constants;
 using Microsoft.AspNetCore.Authorization;
@@ -254,7 +255,7 @@ public class QuotesController : Controller
 
             // Calibration nudge — suppress when named blast setups exist OR legacy CFM is set
             var costs = (await _unitOfWork.CompanyOperatingCosts.FindAsync(c => c.CompanyId == companyId)).FirstOrDefault();
-            var hasNamedSetups = (await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive)).Any();
+            var hasNamedSetups = (await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive && b.CompanyId == companyId)).Any();
             ViewBag.QuotingNotCalibrated = costs != null
                 && !hasNamedSetups
                 && costs.CompressorCfm == 0
@@ -440,7 +441,7 @@ public class QuotesController : Controller
             ViewBag.Deposits = quoteDeposits;
 
             // Customer list for inline customer-change dropdown
-            var allCustomers = await _unitOfWork.Customers.GetAllAsync();
+            var allCustomers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == quote.CompanyId);
             ViewBag.CustomerSelectList = allCustomers
                 .Where(c => c.IsActive)
                 .Select(c => new SelectListItem
@@ -2429,7 +2430,7 @@ public class QuotesController : Controller
         ViewBag.QuotePhotosEnabled = quotePhotoMax != 0; // 0 = feature disabled for this plan
 
         // Customers
-        var customers = await _unitOfWork.Customers.GetAllAsync();
+        var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
         ViewBag.Customers = customers
             .Select(c => new SelectListItem
             {
@@ -2470,7 +2471,7 @@ public class QuotesController : Controller
         }
 
         // Inventory coatings — include incoming items so they can be quoted while powder is in transit
-        var inventory = await _unitOfWork.InventoryItems.GetAllAsync(false, i => i.InventoryCategory);
+        var inventory = await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId, false, i => i.InventoryCategory);
         ViewBag.InventoryCoatings = inventory
             .Where(i => i.IsActive && i.InventoryCategory?.IsActive == true && i.InventoryCategory.IsCoating)
             .OrderBy(i => i.IsIncoming ? 1 : 0).ThenBy(i => i.InventoryCategory!.DisplayOrder).ThenBy(i => i.ColorName ?? i.Name)
@@ -2491,13 +2492,13 @@ public class QuotesController : Controller
             }).ToList();
 
         // Vendors
-        var vendors = await _unitOfWork.Vendors.GetAllAsync(false);
+        var vendors = await _unitOfWork.Vendors.FindAsync(s => s.CompanyId == companyId, false);
         ViewBag.Vendors = vendors
             .Where(s => s.IsActive).OrderBy(s => s.CompanyName)
             .Select(s => new { value = s.Id.ToString(), text = s.CompanyName }).ToList();
 
         // Catalog items
-        var catalogItems = await _unitOfWork.CatalogItems.GetAllAsync(false, i => i.Category, i => i.Category.ParentCategory);
+        var catalogItems = await _unitOfWork.CatalogItems.FindAsync(i => i.CompanyId == companyId, false, i => i.Category, i => i.Category.ParentCategory);
         ViewBag.CatalogItems = catalogItems
             .Where(i => i.IsActive)
             .OrderBy(i => i.Category.DisplayOrder).ThenBy(i => i.DisplayOrder)
@@ -2527,11 +2528,11 @@ public class QuotesController : Controller
             }).ToList();
 
         // Prep services
-        var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.IsActive);
+        var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.IsActive && ps.CompanyId == companyId);
         ViewBag.PrepServices = prepServices.OrderBy(ps => ps.DisplayOrder).ToList();
 
         // Blast setups for wizard dropdown
-        var blastSetups = await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive);
+        var blastSetups = await _unitOfWork.BlastSetups.FindAsync(b => b.IsActive && b.CompanyId == companyId);
         ViewBag.BlastSetups = blastSetups.OrderBy(b => b.DisplayOrder)
             .Select(b => new { id = b.Id, name = b.Name, derivedRate = ShopCapabilityCalculator.GetBlastRateSqFtPerHour(b), isDefault = b.IsDefault })
             .ToList();
@@ -2598,7 +2599,8 @@ public class QuotesController : Controller
     /// </summary>
     private async Task PopulatePricingTiersDropDownAsync()
     {
-        var pricingTiers = await _unitOfWork.PricingTiers.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var pricingTiers = await _unitOfWork.PricingTiers.FindAsync(pt => pt.CompanyId == companyId);
         ViewBag.PricingTiers = pricingTiers.OrderBy(pt => pt.TierName)
             .Select(pt => new SelectListItem
             {
@@ -2824,9 +2826,9 @@ public class QuotesController : Controller
         // Do NOT assign fullItems to quote.QuoteItems — quote is a tracked entity and assigning
         // no-tracking children (which may share InventoryItem instances) causes EF identity conflicts.
 
-        // Get default job statuses and priorities
-        var jobStatuses = await _unitOfWork.JobStatusLookups.GetAllAsync();
-        var jobPriorities = await _unitOfWork.JobPriorityLookups.GetAllAsync();
+        // Get default job statuses and priorities — scope to quote's company for defense-in-depth
+        var jobStatuses = await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == quote.CompanyId);
+        var jobPriorities = await _unitOfWork.JobPriorityLookups.FindAsync(p => p.CompanyId == quote.CompanyId);
         var approvedStatus = jobStatuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.Approved);
         var normalPriority = jobPriorities.FirstOrDefault(p => p.PriorityCode == "NORMAL");
         var rushPriority = jobPriorities.FirstOrDefault(p => p.PriorityCode == "RUSH");
@@ -2839,14 +2841,47 @@ public class QuotesController : Controller
             JobNumber = await GenerateJobNumberAsync(),
             CustomerId = quote.CustomerId ?? 0, // Should always have a customer by approval time
             QuoteId = quote.Id,
-            OvenCostId = quote.OvenCostId, // Carry oven selection from quote
+            OvenCostId       = quote.OvenCostId,       // Carry oven selection from quote
+            OvenBatches      = quote.OvenBatches > 0 ? quote.OvenBatches : 1,
+            OvenCycleMinutes = quote.OvenCycleMinutes,
             Description = quote.Description ?? $"Job from Quote {quote.QuoteNumber}",
             JobStatusId = approvedStatus?.Id ?? 1,
             JobPriorityId = selectedPriority?.Id ?? 1,
             QuotedPrice             = quote.Total,
             FinalPrice              = quote.Total,
+            OvenBatchCost           = quote.OvenBatchCost,
             ShopSuppliesAmount      = quote.ShopSuppliesAmount,
             ShopSuppliesPercent     = quote.ShopSuppliesPercent,
+            PricingBreakdownJson    = JsonSerializer.Serialize(new QuotePricingBreakdownDto
+            {
+                MaterialCosts               = quote.MaterialCosts,
+                LaborCosts                  = quote.LaborCosts,
+                EquipmentCosts              = quote.EquipmentCosts,
+                ItemsSubtotal               = quote.ItemsSubtotal,
+                OvenBatchCost               = quote.OvenBatchCost,
+                OvenBatches                 = quote.OvenBatches,
+                OvenCycleMinutes            = quote.OvenCycleMinutes ?? 0,
+                FacilityOverheadCost        = quote.FacilityOverheadCost,
+                FacilityOverheadRatePerHour = quote.FacilityOverheadRatePerHour,
+                ShopSuppliesAmount          = quote.ShopSuppliesAmount,
+                ShopSuppliesPercent         = quote.ShopSuppliesPercent,
+                OverheadCosts               = quote.OverheadAmount,
+                OverheadPercent             = quote.OverheadPercent,
+                ProfitMargin                = quote.ProfitMargin,
+                ProfitPercent               = quote.ProfitPercent,
+                SubtotalBeforeDiscount      = quote.SubTotal,
+                PricingTierDiscountAmount   = quote.PricingTierDiscountAmount,
+                PricingTierDiscountPercent  = quote.PricingTierDiscountPercent,
+                QuoteDiscountAmount         = quote.QuoteDiscountAmount,
+                QuoteDiscountPercent        = quote.QuoteDiscountPercent,
+                DiscountAmount              = quote.DiscountAmount,
+                DiscountPercent             = quote.DiscountPercent,
+                SubtotalAfterDiscount       = quote.SubtotalAfterDiscount,
+                RushFee                     = quote.RushFee,
+                TaxAmount                   = quote.TaxAmount,
+                TaxPercent                  = quote.TaxPercent,
+                Total                       = quote.Total
+            }),
             CustomerPO              = quote.CustomerPO,
             InternalNotes           = quote.Notes,  // Copy internal notes from quote
             IsCustomerApproved      = true,
@@ -3313,7 +3348,7 @@ public class QuotesController : Controller
             CompanyBlastSetup? selectedBlastSetup = null;
             if (request.BlastSetupId.HasValue)
             {
-                var setups = await _unitOfWork.BlastSetups.FindAsync(b => b.Id == request.BlastSetupId.Value && b.IsActive);
+                var setups = await _unitOfWork.BlastSetups.FindAsync(b => b.Id == request.BlastSetupId.Value && b.IsActive && b.CompanyId == companyId);
                 selectedBlastSetup = setups.FirstOrDefault();
             }
 

src/PowderCoating.Web/Controllers/RecurringTemplatesController.cs

@@ -44,7 +44,8 @@ public class RecurringTemplatesController : Controller
     /// <summary>Lists all recurring templates for the current company, active first then by name.</summary>
     public async Task<IActionResult> Index()
     {
-        var templates = await _unitOfWork.RecurringTemplates.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var templates = await _unitOfWork.RecurringTemplates.FindAsync(t => t.CompanyId == companyId);
         return View(templates.OrderByDescending(t => t.IsActive).ThenBy(t => t.Name).ToList());
     }
 
@@ -425,11 +426,12 @@ public class RecurringTemplatesController : Controller
     /// <summary>Loads dropdowns for vendors, accounts, and payment methods into ViewBag.</summary>
     private async Task PopulateDropDownsAsync()
     {
-        var vendors = await _unitOfWork.Vendors.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var vendors = await _unitOfWork.Vendors.FindAsync(v => v.CompanyId == companyId);
         ViewBag.Vendors = vendors.OrderBy(v => v.CompanyName)
             .Select(v => new SelectListItem(v.CompanyName, v.Id.ToString())).ToList();
 
-        var accounts = await _unitOfWork.Accounts.GetAllAsync();
+        var accounts = await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId);
         ViewBag.APAccounts = accounts
             .Where(a => a.AccountSubType == AccountSubType.AccountsPayable)
             .OrderBy(a => a.AccountNumber)

src/PowderCoating.Web/Controllers/ReportsController.cs

@@ -11,6 +11,7 @@ using PowderCoating.Core.Interfaces;
 using PowderCoating.Core.Entities;
 using PowderCoating.Shared.Constants;
 using PowderCoating.Web.ViewModels.Reports;
+using System.Security.Claims;
 
 namespace PowderCoating.Web.Controllers;
 
@@ -25,8 +26,9 @@ public class ReportsController : Controller
     private readonly UserManager<ApplicationUser> _userManager;
     private readonly IAccountingAiService _accountingAi;
     private readonly IAiUsageLogger _usageLogger;
+    private readonly ITenantContext _tenantContext;
 
-    public ReportsController(IUnitOfWork unitOfWork, ILogger<ReportsController> logger, IFinancialReportService financialReports, IOperationalReportService operationalReports, IPdfService pdfService, UserManager<ApplicationUser> userManager, IAccountingAiService accountingAi, IAiUsageLogger usageLogger)
+    public ReportsController(IUnitOfWork unitOfWork, ILogger<ReportsController> logger, IFinancialReportService financialReports, IOperationalReportService operationalReports, IPdfService pdfService, UserManager<ApplicationUser> userManager, IAccountingAiService accountingAi, IAiUsageLogger usageLogger, ITenantContext tenantContext)
     {
         _unitOfWork = unitOfWork;
         _logger = logger;
@@ -36,6 +38,7 @@ public class ReportsController : Controller
         _userManager = userManager;
         _accountingAi = accountingAi;
         _usageLogger = usageLogger;
+        _tenantContext = tenantContext;
     }
 
     /// <summary>
@@ -79,27 +82,26 @@ public class ReportsController : Controller
             var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
             var activeStatusCodes = new[] { "PENDING", "QUOTED", "APPROVED", "IN_PREPARATION", "SANDBLASTING",
                 "MASKING_TAPING", "CLEANING", "IN_OVEN", "COATING", "CURING", "QUALITY_CHECK", "ON_HOLD" };
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
-            // Load only necessary data - optimized with filtering and minimal eager loading
-            // Jobs: Load all jobs (we need various status filters and the collection is needed for job status distribution)
-            // Note: Date filtering would exclude data needed for jobsByStatus calculation
-            var jobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.Customer, j => j.JobStatus, j => j.JobPriority, j => j.AssignedUser)).ToList();
+            // Load only necessary data — all explicitly scoped to this company
+            var jobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.Customer, j => j.JobStatus, j => j.JobPriority, j => j.AssignedUser)).ToList();
 
             // Quotes: Load all quotes (needed for quote status distribution and conversion funnel)
-            var quotes = (await _unitOfWork.Quotes.GetAllAsync(false, q => q.Customer, q => q.QuoteStatus)).ToList();
+            var quotes = (await _unitOfWork.Quotes.FindAsync(q => q.CompanyId == companyId, false, q => q.Customer, q => q.QuoteStatus)).ToList();
 
             // Customers: Load all (needed for active count and customer creation trend across all months)
-            var customers = (await _unitOfWork.Customers.GetAllAsync()).ToList();
+            var customers = (await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId)).ToList();
 
             // Equipment: Load all for status distribution
-            var equipment = (await _unitOfWork.Equipment.GetAllAsync()).ToList();
+            var equipment = (await _unitOfWork.Equipment.FindAsync(e => e.CompanyId == companyId)).ToList();
 
             // Inventory: Load all for low stock analysis
-            var inventory = (await _unitOfWork.InventoryItems.GetAllAsync()).ToList();
+            var inventory = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId)).ToList();
 
             // Appointments: Filter to relevant date range at DB level
             var appointments = (await _unitOfWork.Appointments.FindAsync(
-                a => a.ScheduledStartTime >= startDate,
+                a => a.CompanyId == companyId && a.ScheduledStartTime >= startDate,
                 false,
                 a => a.Customer,
                 a => a.AppointmentType,
@@ -108,7 +110,7 @@ public class ReportsController : Controller
             // Users with assigned jobs/appointments will be loaded below when building worker stats
 
             // CatalogItems: Load all for category distribution
-            var catalogItems = (await _unitOfWork.CatalogItems.GetAllAsync(false, c => c.Category)).ToList();
+            var catalogItems = (await _unitOfWork.CatalogItems.FindAsync(ci => ci.CompanyId == companyId, false, c => c.Category)).ToList();
 
             // === OVERVIEW METRICS ===
             var completedJobs = jobs.Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
@@ -382,7 +384,7 @@ public class ReportsController : Controller
                 .ToDictionary(g => g.Key, g => g.Count());
 
             // === FINANCIAL ANALYTICS ===
-            var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments)).ToList();
+            var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments)).ToList();
             var activeInvoices = allInvoices.Where(i => i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff).ToList();
 
             var totalInvoiced = activeInvoices.Sum(i => i.Total);
@@ -781,7 +783,7 @@ public class ReportsController : Controller
 
             // === POWDER CONSUMPTION VS PURCHASE ===
             var allInventoryTransactions = (await _unitOfWork.InventoryTransactions
-                .GetAllAsync(false, t => t.InventoryItem))
+                .FindAsync(t => t.CompanyId == companyId, false, t => t.InventoryItem))
                 .ToList();
 
             var powderConsumptionItems = allInventoryTransactions
@@ -1309,14 +1311,15 @@ public class ReportsController : Controller
         var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
         var activeStatusCodes = new[] { "PENDING", "QUOTED", "APPROVED", "IN_PREPARATION", "SANDBLASTING",
             "MASKING_TAPING", "CLEANING", "IN_OVEN", "COATING", "CURING", "QUALITY_CHECK", "ON_HOLD" };
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
-        var jobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.Customer, j => j.JobStatus, j => j.JobPriority)).ToList();
-        var customers = (await _unitOfWork.Customers.GetAllAsync()).ToList();
-        var quotes = (await _unitOfWork.Quotes.GetAllAsync(false, q => q.QuoteStatus)).ToList();
-        var equipment = (await _unitOfWork.Equipment.GetAllAsync()).ToList();
-        var inventory = (await _unitOfWork.InventoryItems.GetAllAsync()).ToList();
-        var allAppointments = await _unitOfWork.Appointments.GetAllAsync(false, a => a.AppointmentStatus);
-        var appointments = allAppointments.Where(a => a.ScheduledStartTime >= startDate).ToList();
+        var jobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.Customer, j => j.JobStatus, j => j.JobPriority)).ToList();
+        var customers = (await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId)).ToList();
+        var quotes = (await _unitOfWork.Quotes.FindAsync(q => q.CompanyId == companyId, false, q => q.QuoteStatus)).ToList();
+        var equipment = (await _unitOfWork.Equipment.FindAsync(e => e.CompanyId == companyId)).ToList();
+        var inventory = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId)).ToList();
+        var allAppointments = await _unitOfWork.Appointments.FindAsync(a => a.CompanyId == companyId && a.ScheduledStartTime >= startDate, false, a => a.AppointmentStatus);
+        var appointments = allAppointments.ToList();
 
         var completedJobs = jobs.Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
         var activeJobs = jobs.Where(j => activeStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
@@ -1384,7 +1387,8 @@ public class ReportsController : Controller
         var now = DateTime.UtcNow;
         var startDate = now.AddMonths(-months);
         var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
-        var jobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.Customer, j => j.JobStatus, j => j.JobPriority)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var jobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.Customer, j => j.JobStatus, j => j.JobPriority)).ToList();
         var completedJobs = jobs.Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
         var inRange = completedJobs.Where(j => j.UpdatedAt >= startDate).ToList();
         var byMonth = inRange.GroupBy(j => new DateTime(j.UpdatedAt!.Value.Year, j.UpdatedAt.Value.Month, 1)).ToDictionary(g => g.Key, g => g.ToList());
@@ -1430,12 +1434,13 @@ public class ReportsController : Controller
         var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
         var activeStatusCodes = new[] { "PENDING", "QUOTED", "APPROVED", "IN_PREPARATION", "SANDBLASTING",
             "MASKING_TAPING", "CLEANING", "IN_OVEN", "COATING", "CURING", "QUALITY_CHECK", "ON_HOLD" };
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
-        var jobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.JobStatus, j => j.JobPriority, j => j.AssignedUser)).ToList();
-        var equipment = (await _unitOfWork.Equipment.GetAllAsync()).ToList();
-        var inventory = (await _unitOfWork.InventoryItems.GetAllAsync()).ToList();
-        var allAppts = await _unitOfWork.Appointments.GetAllAsync(false, a => a.AppointmentType, a => a.AppointmentStatus);
-        var appointments = allAppts.Where(a => a.ScheduledStartTime >= startDate).ToList();
+        var jobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.JobStatus, j => j.JobPriority, j => j.AssignedUser)).ToList();
+        var equipment = (await _unitOfWork.Equipment.FindAsync(e => e.CompanyId == companyId)).ToList();
+        var inventory = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId)).ToList();
+        var allAppts = await _unitOfWork.Appointments.FindAsync(a => a.CompanyId == companyId && a.ScheduledStartTime >= startDate, false, a => a.AppointmentType, a => a.AppointmentStatus);
+        var appointments = allAppts.ToList();
 
         var activeJobs = jobs.Where(j => activeStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
         var completedJobs = jobs.Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
@@ -1483,10 +1488,11 @@ public class ReportsController : Controller
         var now = DateTime.UtcNow;
         var startDate = now.AddMonths(-months);
         var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
-        var customers = (await _unitOfWork.Customers.GetAllAsync()).ToList();
-        var quotes = (await _unitOfWork.Quotes.GetAllAsync(false, q => q.QuoteStatus)).ToList();
-        var catalogItems = (await _unitOfWork.CatalogItems.GetAllAsync(false, c => c.Category)).ToList();
-        var completedJobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.Customer, j => j.JobStatus, j => j.JobPriority))
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var customers = (await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId)).ToList();
+        var quotes = (await _unitOfWork.Quotes.FindAsync(q => q.CompanyId == companyId, false, q => q.QuoteStatus)).ToList();
+        var catalogItems = (await _unitOfWork.CatalogItems.FindAsync(ci => ci.CompanyId == companyId, false, c => c.Category)).ToList();
+        var completedJobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.Customer, j => j.JobStatus, j => j.JobPriority))
             .Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
 
         var customersByMonth = customers.Where(c => c.CreatedAt >= startDate).GroupBy(c => new DateTime(c.CreatedAt.Year, c.CreatedAt.Month, 1)).ToDictionary(g => g.Key, g => g.Count());
@@ -1523,7 +1529,8 @@ public class ReportsController : Controller
         if (!AllowAccounting()) return RedirectToAction(nameof(Landing));
         var now = DateTime.UtcNow;
         var today = DateTime.Today;
-        var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments)).ToList();
         var activeInvoices = allInvoices.Where(i => i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff).ToList();
         var outstandingInvoices = activeInvoices.Where(i => i.Status != InvoiceStatus.Paid && i.Total > i.AmountPaid).ToList();
         var overdueInvoices = activeInvoices.Where(i => i.Status != InvoiceStatus.Paid && i.DueDate.HasValue && i.DueDate.Value < today).ToList();
@@ -1574,7 +1581,8 @@ public class ReportsController : Controller
 
         var monthLabels = new List<string>(); var monthlyBillsPaid = new List<decimal>(); var monthlyDirectExpenses = new List<decimal>();
         // Also load collected payments for P&L comparison
-        var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Payments)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Payments)).ToList();
         var paymentsByMonth = allInvoices.SelectMany(i => i.Payments.Where(p => !p.IsDeleted)).GroupBy(p => new DateTime(p.PaymentDate.Year, p.PaymentDate.Month, 1)).ToDictionary(g => g.Key, g => g.ToList());
         var plRevenue = new List<decimal>(); var plExpenses = new List<decimal>(); var plNet = new List<decimal>();
         for (var i = months - 1; i >= 0; i--)
@@ -1609,8 +1617,10 @@ public class ReportsController : Controller
     {
         var now = DateTime.UtcNow;
         var startDate = now.AddMonths(-months);
-        var powderTransactions = (await _unitOfWork.InventoryTransactions.GetAllAsync(false, t => t.InventoryItem))
-            .Where(t => t.TransactionType == InventoryTransactionType.JobUsage && t.TransactionDate >= startDate).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var powderTransactions = (await _unitOfWork.InventoryTransactions.FindAsync(
+                t => t.CompanyId == companyId && t.TransactionType == InventoryTransactionType.JobUsage && t.TransactionDate >= startDate, false, t => t.InventoryItem))
+            .ToList();
 
         var topColors = powderTransactions.Where(t => t.InventoryItem != null).GroupBy(t => t.InventoryItemId)
             .Select(g => new PowderUsageByColorItem { InventoryItemId = g.Key, ColorName = g.First().InventoryItem!.ColorName ?? g.First().InventoryItem.Name, ColorCode = g.First().InventoryItem!.ColorCode, SKU = g.First().InventoryItem!.SKU, Manufacturer = g.First().InventoryItem!.Manufacturer, TotalLbsUsed = g.Sum(t => Math.Abs(t.Quantity)), TotalCost = g.Sum(t => Math.Abs(t.TotalCost)), JobCount = g.Where(t => !string.IsNullOrEmpty(t.Reference)).Select(t => t.Reference).Distinct().Count() })
@@ -1631,7 +1641,8 @@ public class ReportsController : Controller
     /// <summary>Sales by Customer report — all active (non-voided) invoices grouped by customer, sorted by total invoiced.</summary>
     public async Task<IActionResult> SalesByCustomer(int months = 6)
     {
-        var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments)).ToList();
         var activeInvoices = allInvoices.Where(i => i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff).ToList();
         var items = activeInvoices.Where(i => i.Customer != null)
             .GroupBy(i => new { i.CustomerId, Name = i.Customer!.IsCommercial ? i.Customer.CompanyName : $"{i.Customer.ContactFirstName} {i.Customer.ContactLastName}".Trim(), i.Customer.IsCommercial })
@@ -1650,8 +1661,9 @@ public class ReportsController : Controller
     {
         var now = DateTime.UtcNow;
         var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
-        var customers = (await _unitOfWork.Customers.GetAllAsync()).ToList();
-        var completedJobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.JobStatus)).Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var customers = (await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId)).ToList();
+        var completedJobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.JobStatus)).Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
         var items = customers.Where(c => c.IsActive).Select(c =>
         {
             var cJobs = completedJobs.Where(j => j.CustomerId == c.Id).ToList();
@@ -1682,7 +1694,8 @@ public class ReportsController : Controller
     {
         var now = DateTime.UtcNow;
         var completedStatusCodes = new[] { "COMPLETED", "READY_FOR_PICKUP", "DELIVERED" };
-        var completedJobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.JobStatus)).Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode) && j.CompletedDate.HasValue).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var completedJobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.JobStatus)).Where(j => completedStatusCodes.Contains(j.JobStatus.StatusCode) && j.CompletedDate.HasValue).ToList();
         var allStatusHistory = await _operationalReports.GetAllJobStatusHistoryAsync();
         var historyByJob = allStatusHistory.GroupBy(h => h.JobId).ToDictionary(g => g.Key, g => g.OrderBy(h => h.ChangedDate).ToList());
         var statusDisplayOrder = new[] { "PENDING", "QUOTED", "APPROVED", "IN_PREPARATION", "SANDBLASTING", "MASKING_TAPING", "CLEANING", "IN_OVEN", "COATING", "CURING", "QUALITY_CHECK" };
@@ -1720,7 +1733,8 @@ public class ReportsController : Controller
         var now = DateTime.UtcNow;
         var today = DateTime.Today;
         var activeStatusCodes = new[] { "PENDING", "QUOTED", "APPROVED", "IN_PREPARATION", "SANDBLASTING", "MASKING_TAPING", "CLEANING", "IN_OVEN", "COATING", "CURING", "QUALITY_CHECK", "ON_HOLD" };
-        var activeJobs = (await _unitOfWork.Jobs.GetAllAsync(false, j => j.Customer, j => j.JobStatus, j => j.JobPriority)).Where(j => activeStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var activeJobs = (await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId, false, j => j.Customer, j => j.JobStatus, j => j.JobPriority)).Where(j => activeStatusCodes.Contains(j.JobStatus.StatusCode)).ToList();
         var items = activeJobs.Select(j => new JobStatusAgingItem
         {
             JobId = j.Id, JobNumber = j.JobNumber, CustomerName = j.Customer?.IsCommercial == true ? j.Customer.CompanyName ?? "Unknown" : $"{j.Customer?.ContactFirstName} {j.Customer?.ContactLastName}".Trim(),
@@ -1740,7 +1754,8 @@ public class ReportsController : Controller
     {
         if (!AllowAccounting()) return RedirectToAction(nameof(Landing));
         var today = DateTime.Today;
-        var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments)).ToList();
         var items = allInvoices.Where(i => i.Customer != null && i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff && i.Status != InvoiceStatus.Paid)
             .Select(i =>
             {
@@ -1758,7 +1773,8 @@ public class ReportsController : Controller
     /// </summary>
     public async Task<IActionResult> PowderConsumption(int months = 6)
     {
-        var allTx = (await _unitOfWork.InventoryTransactions.GetAllAsync(false, t => t.InventoryItem)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allTx = (await _unitOfWork.InventoryTransactions.FindAsync(t => t.CompanyId == companyId, false, t => t.InventoryItem)).ToList();
         var items = allTx.Where(t => t.InventoryItem != null)
             .GroupBy(t => new { t.InventoryItemId, t.InventoryItem!.Name, t.InventoryItem.SKU, t.InventoryItem.ColorName, t.InventoryItem.ColorCode, t.InventoryItem.Manufacturer })
             .Select(g => new PowderConsumptionItem { InventoryItemId = g.Key.InventoryItemId, ItemName = g.Key.Name, SKU = g.Key.SKU, ColorName = g.Key.ColorName, ColorCode = g.Key.ColorCode, Manufacturer = g.Key.Manufacturer, TotalPurchasedLbs = g.Where(t => t.TransactionType == InventoryTransactionType.Purchase || t.TransactionType == InventoryTransactionType.Initial).Sum(t => t.Quantity), TotalConsumedLbs = g.Where(t => t.TransactionType == InventoryTransactionType.JobUsage || t.TransactionType == InventoryTransactionType.Waste).Sum(t => Math.Abs(t.Quantity)), PurchaseCount = g.Count(t => t.TransactionType == InventoryTransactionType.Purchase), UsageJobCount = g.Where(t => t.TransactionType == InventoryTransactionType.JobUsage && !string.IsNullOrEmpty(t.Reference)).Select(t => t.Reference).Distinct().Count() })
@@ -1776,8 +1792,9 @@ public class ReportsController : Controller
     public async Task<IActionResult> InventoryTurnover(int months = 6)
     {
         var daysInPeriod = months * 30.0;
-        var inventory = (await _unitOfWork.InventoryItems.GetAllAsync()).ToList();
-        var allTx = (await _unitOfWork.InventoryTransactions.GetAllAsync(false, t => t.InventoryItem)).ToList();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var inventory = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId)).ToList();
+        var allTx = (await _unitOfWork.InventoryTransactions.FindAsync(t => t.CompanyId == companyId, false, t => t.InventoryItem)).ToList();
         var items = inventory.Where(i => i.IsActive).Select(i =>
         {
             var iTx = allTx.Where(t => t.InventoryItemId == i.Id).ToList();
@@ -1835,8 +1852,9 @@ public class ReportsController : Controller
             var now = DateTime.UtcNow;
             var today = DateTime.Today;
 
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
             // Load invoices for AR data
-            var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments)).ToList();
+            var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments)).ToList();
             var activeInvoices = allInvoices.Where(i => i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff).ToList();
             var outstandingInvoices = activeInvoices.Where(i => i.BalanceDue > 0 && i.Status != InvoiceStatus.Paid).ToList();
 
@@ -1930,13 +1948,14 @@ public class ReportsController : Controller
             var companyName = await GetCompanyNameAsync();
             var today = DateTime.Today;
 
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
             // Open AR invoices
-            var openInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments))
+            var openInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments))
                 .Where(i => i.BalanceDue > 0 && i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff && i.Status != InvoiceStatus.Paid)
                 .ToList();
 
             // Compute avg days to pay per customer from paid invoices
-            var paidInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Payments))
+            var paidInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Payments))
                 .Where(i => i.Status == InvoiceStatus.Paid && i.InvoiceDate != default)
                 .ToList();
             var avgDaysByCustomer = paidInvoices
@@ -2137,7 +2156,8 @@ public class ReportsController : Controller
             var companyName = await GetCompanyNameAsync();
             var today = DateTime.Today;
 
-            var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments)).ToList();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments)).ToList();
             var activeInvoices = allInvoices.Where(i =>
                 i.Status != InvoiceStatus.Voided &&
                 i.Status != InvoiceStatus.WrittenOff).ToList();
@@ -2256,8 +2276,9 @@ public class ReportsController : Controller
         var companyName = await GetCompanyNameAsync();
         var now = DateTime.UtcNow;
         var startOfYear = new DateTime(now.Year, 1, 1);
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
 
-        var allInvoices = (await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Payments))
+        var allInvoices = (await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId, false, i => i.Customer, i => i.Payments))
             .Where(i => i.Status != InvoiceStatus.Voided && i.Status != InvoiceStatus.WrittenOff)
             .ToList();
 

src/PowderCoating.Web/Controllers/SmsConsentAuditController.cs

@@ -15,11 +15,13 @@ namespace PowderCoating.Web.Controllers;
 public class SmsConsentAuditController : Controller
 {
     private readonly IUnitOfWork _unitOfWork;
+    private readonly ITenantContext _tenantContext;
     private readonly ILogger<SmsConsentAuditController> _logger;
 
-    public SmsConsentAuditController(IUnitOfWork unitOfWork, ILogger<SmsConsentAuditController> logger)
+    public SmsConsentAuditController(IUnitOfWork unitOfWork, ITenantContext tenantContext, ILogger<SmsConsentAuditController> logger)
     {
         _unitOfWork = unitOfWork;
+        _tenantContext = tenantContext;
         _logger = logger;
     }
 
@@ -30,7 +32,8 @@ public class SmsConsentAuditController : Controller
     {
         try
         {
-            var allCustomers = await _unitOfWork.Customers.GetAllAsync();
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var allCustomers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId);
 
             if (!string.IsNullOrWhiteSpace(search))
             {
@@ -98,7 +101,8 @@ public class SmsConsentAuditController : Controller
     {
         try
         {
-            var customers = (await _unitOfWork.Customers.GetAllAsync())
+            var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+            var customers = (await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId))
                 .OrderBy(c => c.CompanyName ?? c.ContactLastName ?? c.ContactFirstName)
                 .ToList();
 

src/PowderCoating.Web/Controllers/TaxRatesController.cs

@@ -32,7 +32,8 @@ public class TaxRatesController : Controller
     [HttpGet]
     public async Task<IActionResult> Index()
     {
-        var rates = await _unitOfWork.TaxRates.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var rates = await _unitOfWork.TaxRates.FindAsync(r => r.CompanyId == companyId);
         return View(rates.OrderBy(r => r.Name).ToList());
     }
 

src/PowderCoating.Web/Controllers/ToolsController.cs

@@ -87,7 +87,8 @@ public class ToolsController : Controller
     [HttpGet]
     public async Task<IActionResult> GetImportAccounts()
     {
-        var allAccounts = await _unitOfWork.Accounts.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allAccounts = await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId);
 
         var revenue = allAccounts
             .Where(a => a.AccountType == AccountType.Revenue && a.IsActive)
@@ -123,7 +124,8 @@ public class ToolsController : Controller
     /// </summary>
     private async Task PopulateImportAccountDropdownsAsync()
     {
-        var allAccounts = await _unitOfWork.Accounts.GetAllAsync();
+        var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
+        var allAccounts = await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId);
 
         var revenueAccounts = allAccounts
             .Where(a => a.AccountType == AccountType.Revenue && a.IsActive)
@@ -911,7 +913,7 @@ public class ToolsController : Controller
     /// <c>CompanyId</c> provides the multi-tenant isolation that global query filters would
     /// normally enforce for other entity types.
     /// </summary>
-    // GET: Tools/GetShopWorkers - For randomizer wheel
+    // GET: Tools/GetShopWorkers - Returns active company users for randomizer wheel
     [HttpGet]
     public async Task<IActionResult> GetShopWorkers()
     {
@@ -1102,7 +1104,7 @@ public class ToolsController : Controller
 
             // Validate account IDs belong to this company — stale page load can produce IDs
             // that were valid before a data reset but no longer exist.
-            var validAccountIds = (await _unitOfWork.Accounts.GetAllAsync())
+            var validAccountIds = (await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId.Value))
                 .Select(a => a.Id).ToHashSet();
             if (revenueAccountId.HasValue && !validAccountIds.Contains(revenueAccountId.Value))
                 revenueAccountId = null;
@@ -1167,7 +1169,7 @@ public class ToolsController : Controller
 
             // Validate account IDs belong to this company — stale page load can produce IDs
             // that were valid before a data reset but no longer exist.
-            var validAccountIds = (await _unitOfWork.Accounts.GetAllAsync())
+            var validAccountIds = (await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId.Value))
                 .Select(a => a.Id).ToHashSet();
             if (inventoryAccountId.HasValue && !validAccountIds.Contains(inventoryAccountId.Value))
                 inventoryAccountId = null;
@@ -1939,7 +1941,7 @@ public class ToolsController : Controller
             using (var archive = new System.IO.Compression.ZipArchive(memoryStream, System.IO.Compression.ZipArchiveMode.Create, true))
             {
                 // 1. Customers
-                var customers = await _unitOfWork.Customers.GetAllAsync();
+                var customers = await _unitOfWork.Customers.FindAsync(c => c.CompanyId == companyId.Value);
                 var customersCsv = GenerateCustomersCsv(customers);
                 var customersEntry = archive.CreateEntry($"customers_{timestamp}.csv");
                 using (var entryStream = customersEntry.Open())
@@ -1949,7 +1951,7 @@ public class ToolsController : Controller
                 }
 
                 // 2. Quotes
-                var quotes = await _unitOfWork.Quotes.GetAllAsync(false, q => q.Customer, q => q.QuoteStatus);
+                var quotes = await _unitOfWork.Quotes.FindAsync(q => q.CompanyId == companyId.Value, false, q => q.Customer, q => q.QuoteStatus);
                 var quotesCsv = GenerateQuotesCsv(quotes);
                 var quotesEntry = archive.CreateEntry($"quotes_{timestamp}.csv");
                 using (var entryStream = quotesEntry.Open())
@@ -1959,7 +1961,7 @@ public class ToolsController : Controller
                 }
 
                 // 3. Jobs
-                var jobs = await _unitOfWork.Jobs.GetAllAsync(false, j => j.Customer, j => j.JobStatus, j => j.JobPriority);
+                var jobs = await _unitOfWork.Jobs.FindAsync(j => j.CompanyId == companyId.Value, false, j => j.Customer, j => j.JobStatus, j => j.JobPriority);
                 var jobsCsv = GenerateJobsCsv(jobs);
                 var jobsEntry = archive.CreateEntry($"jobs_{timestamp}.csv");
                 using (var entryStream = jobsEntry.Open())
@@ -1969,7 +1971,7 @@ public class ToolsController : Controller
                 }
 
                 // 4. Appointments
-                var appointments = await _unitOfWork.Appointments.GetAllAsync(false,
+                var appointments = await _unitOfWork.Appointments.FindAsync(a => a.CompanyId == companyId.Value, false,
                     a => a.Customer, a => a.AppointmentType, a => a.AppointmentStatus);
                 var appointmentsCsv = GenerateAppointmentsCsv(appointments);
                 var appointmentsEntry = archive.CreateEntry($"appointments_{timestamp}.csv");
@@ -1980,9 +1982,9 @@ public class ToolsController : Controller
                 }
 
                 // 5. Catalog
-                var catalogCategories = await _unitOfWork.CatalogCategories.GetAllAsync();
+                var catalogCategories = await _unitOfWork.CatalogCategories.FindAsync(cc => cc.CompanyId == companyId.Value);
                 var catalogCategoryPaths = BuildCategoryPathMap(catalogCategories);
-                var catalog = await _unitOfWork.CatalogItems.GetAllAsync();
+                var catalog = await _unitOfWork.CatalogItems.FindAsync(ci => ci.CompanyId == companyId.Value);
                 var catalogCsv = GenerateCatalogCsv(catalog, catalogCategoryPaths);
                 var catalogEntry = archive.CreateEntry($"catalog_{timestamp}.csv");
                 using (var entryStream = catalogEntry.Open())
@@ -1992,7 +1994,7 @@ public class ToolsController : Controller
                 }
 
                 // 6. Inventory
-                var inventory = await _unitOfWork.InventoryItems.GetAllAsync();
+                var inventory = await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId.Value);
                 var inventoryCsv = GenerateInventoryCsv(inventory);
                 var inventoryEntry = archive.CreateEntry($"inventory_{timestamp}.csv");
                 using (var entryStream = inventoryEntry.Open())
@@ -2002,7 +2004,7 @@ public class ToolsController : Controller
                 }
 
                 // 7. Equipment
-                var equipment = await _unitOfWork.Equipment.GetAllAsync();
+                var equipment = await _unitOfWork.Equipment.FindAsync(e => e.CompanyId == companyId.Value);
                 var equipmentCsv = GenerateEquipmentCsv(equipment);
                 var equipmentEntry = archive.CreateEntry($"equipment_{timestamp}.csv");
                 using (var entryStream = equipmentEntry.Open())
@@ -2012,7 +2014,7 @@ public class ToolsController : Controller
                 }
 
                 // 8. Maintenance
-                var maintenance = await _unitOfWork.MaintenanceRecords.GetAllAsync(false, m => m.Equipment);
+                var maintenance = await _unitOfWork.MaintenanceRecords.FindAsync(m => m.CompanyId == companyId.Value, false, m => m.Equipment);
                 var maintenanceCsv = GenerateMaintenanceCsv(maintenance);
                 var maintenanceEntry = archive.CreateEntry($"maintenance_{timestamp}.csv");
                 using (var entryStream = maintenanceEntry.Open())
@@ -2022,7 +2024,7 @@ public class ToolsController : Controller
                 }
 
                 // 9. Vendors
-                var vendors = await _unitOfWork.Vendors.GetAllAsync();
+                var vendors = await _unitOfWork.Vendors.FindAsync(v => v.CompanyId == companyId.Value);
                 var vendorsCsv = GenerateVendorsCsv(vendors);
                 var vendorsEntry = archive.CreateEntry($"vendors_{timestamp}.csv");
                 using (var entryStream = vendorsEntry.Open())
@@ -2032,7 +2034,7 @@ public class ToolsController : Controller
                 }
 
                 // 10. Prep Services
-                var prepServices = await _unitOfWork.PrepServices.GetAllAsync();
+                var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.CompanyId == companyId.Value);
                 var prepServicesCsv = GeneratePrepServicesCsv(prepServices);
                 var prepServicesEntry = archive.CreateEntry($"prep_services_{timestamp}.csv");
                 using (var entryStream = prepServicesEntry.Open())
@@ -2042,7 +2044,7 @@ public class ToolsController : Controller
                 }
 
                 // 11. Invoices
-                var invoices = await _unitOfWork.Invoices.GetAllAsync(false, i => i.Customer, i => i.Job);
+                var invoices = await _unitOfWork.Invoices.FindAsync(i => i.CompanyId == companyId.Value, false, i => i.Customer, i => i.Job);
                 var invoicesCsv = GenerateInvoicesCsv(invoices);
                 var invoicesEntry = archive.CreateEntry($"invoices_{timestamp}.csv");
                 using (var entryStream = invoicesEntry.Open())
@@ -2052,7 +2054,7 @@ public class ToolsController : Controller
                 }
 
                 // 12. Chart of Accounts
-                var accounts = await _unitOfWork.Accounts.GetAllAsync();
+                var accounts = await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId.Value);
                 var accountsCsv = GenerateChartOfAccountsCsv(accounts);
                 var accountsEntry = archive.CreateEntry($"chart_of_accounts_{timestamp}.csv");
                 using (var entryStream = accountsEntry.Open())
@@ -2062,7 +2064,7 @@ public class ToolsController : Controller
                 }
 
                 // 13. Expenses
-                var expenses = await _unitOfWork.Expenses.GetAllAsync(false, e => e.ExpenseAccount, e => e.PaymentAccount, e => e.Vendor, e => e.Job);
+                var expenses = await _unitOfWork.Expenses.FindAsync(e => e.CompanyId == companyId.Value, false, e => e.ExpenseAccount, e => e.PaymentAccount, e => e.Vendor, e => e.Job);
                 var expensesCsv = GenerateExpensesCsv(expenses);
                 var expensesEntry = archive.CreateEntry($"expenses_{timestamp}.csv");
                 using (var entryStream = expensesEntry.Open())
@@ -2072,7 +2074,7 @@ public class ToolsController : Controller
                 }
 
                 // 14. Payments
-                var payments = await _unitOfWork.Payments.GetAllAsync(false, p => p.Invoice);
+                var payments = await _unitOfWork.Payments.FindAsync(p => p.CompanyId == companyId.Value, false, p => p.Invoice);
                 var paymentsCsv = GeneratePaymentsCsv(payments);
                 var paymentsEntry = archive.CreateEntry($"payments_{timestamp}.csv");
                 using (var entryStream = paymentsEntry.Open())
@@ -2258,9 +2260,9 @@ public class ToolsController : Controller
                 return RedirectToAction(nameof(Index));
             }
 
-            var catalogCategories = await _unitOfWork.CatalogCategories.GetAllAsync();
+            var catalogCategories = await _unitOfWork.CatalogCategories.FindAsync(cc => cc.CompanyId == companyId.Value);
             var catalogCategoryPaths = BuildCategoryPathMap(catalogCategories);
-            var catalogItems = await _unitOfWork.CatalogItems.GetAllAsync();
+            var catalogItems = await _unitOfWork.CatalogItems.FindAsync(ci => ci.CompanyId == companyId.Value);
             var csv = GenerateCatalogCsv(catalogItems, catalogCategoryPaths);
             var fileName = $"catalog_export_{DateTime.UtcNow:yyyyMMddHHmmss}.csv";
 
@@ -2326,7 +2328,7 @@ public class ToolsController : Controller
                 return RedirectToAction(nameof(Index));
             }
 
-            var equipment = await _unitOfWork.Equipment.GetAllAsync();
+            var equipment = await _unitOfWork.Equipment.FindAsync(e => e.CompanyId == companyId.Value);
             var csv = GenerateEquipmentCsv(equipment);
             var fileName = $"equipment_export_{DateTime.UtcNow:yyyyMMddHHmmss}.csv";
 
@@ -2407,13 +2409,13 @@ public class ToolsController : Controller
                 return RedirectToAction(nameof(Index));
             }
 
-            // Load all lookup tables
-            var jobStatuses = await _unitOfWork.JobStatusLookups.GetAllAsync();
-            var jobPriorities = await _unitOfWork.JobPriorityLookups.GetAllAsync();
-            var quoteStatuses = await _unitOfWork.QuoteStatusLookups.GetAllAsync();
-            var inventoryCategories = await _unitOfWork.InventoryCategoryLookups.GetAllAsync();
-            var appointmentStatuses = await _unitOfWork.AppointmentStatusLookups.GetAllAsync();
-            var appointmentTypes = await _unitOfWork.AppointmentTypeLookups.GetAllAsync();
+            // Load all lookup tables — scoped to this company
+            var jobStatuses = await _unitOfWork.JobStatusLookups.FindAsync(s => s.CompanyId == companyId.Value);
+            var jobPriorities = await _unitOfWork.JobPriorityLookups.FindAsync(p => p.CompanyId == companyId.Value);
+            var quoteStatuses = await _unitOfWork.QuoteStatusLookups.FindAsync(s => s.CompanyId == companyId.Value);
+            var inventoryCategories = await _unitOfWork.InventoryCategoryLookups.FindAsync(c => c.CompanyId == companyId.Value);
+            var appointmentStatuses = await _unitOfWork.AppointmentStatusLookups.FindAsync(s => s.CompanyId == companyId.Value);
+            var appointmentTypes = await _unitOfWork.AppointmentTypeLookups.FindAsync(t => t.CompanyId == companyId.Value);
 
             var csv = GenerateCompanySettingsCsv(company, jobStatuses, jobPriorities,
                 quoteStatuses, inventoryCategories, appointmentStatuses, appointmentTypes);
@@ -4092,7 +4094,7 @@ public class ToolsController : Controller
                 return RedirectToAction(nameof(Index));
             }
 
-            var prepServices = await _unitOfWork.PrepServices.GetAllAsync();
+            var prepServices = await _unitOfWork.PrepServices.FindAsync(ps => ps.CompanyId == companyId.Value);
             var csv = GeneratePrepServicesCsv(prepServices);
             var fileName = $"prep_services_export_{DateTime.UtcNow:yyyyMMddHHmmss}.csv";
 
@@ -4124,7 +4126,7 @@ public class ToolsController : Controller
                 return RedirectToAction(nameof(Index));
             }
 
-            var vendors = await _unitOfWork.Vendors.GetAllAsync();
+            var vendors = await _unitOfWork.Vendors.FindAsync(v => v.CompanyId == companyId.Value);
             var csv = GenerateVendorsCsv(vendors);
             var fileName = $"vendors_export_{DateTime.UtcNow:yyyyMMddHHmmss}.csv";
 
@@ -4156,7 +4158,7 @@ public class ToolsController : Controller
                 return RedirectToAction(nameof(Index));
             }
 
-            var accounts = await _unitOfWork.Accounts.GetAllAsync();
+            var accounts = await _unitOfWork.Accounts.FindAsync(a => a.CompanyId == companyId.Value);
             var csv = GenerateChartOfAccountsCsv(accounts);
             var fileName = $"chart_of_accounts_export_{DateTime.UtcNow:yyyyMMddHHmmss}.csv";
 

src/PowderCoating.Web/Helpers/HelpKnowledgeBase.cs

@@ -302,7 +302,7 @@ public static class HelpKnowledgeBase
 
         **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."
+        **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.
 
         **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.
 
@@ -314,6 +314,8 @@ public static class HelpKnowledgeBase
 
         All QR codes require login — workers must have an active account. Logging in once on their phone is sufficient for the session.
 
+        **Logging material usage from a PC (without QR scan):** On the Job Details page, expand the Materials Used section and click **Log Material**. A modal opens where you can: select any inventory item from a dropdown (current stock level shown), choose whether to enter the amount used or the amount remaining (the system calculates usage automatically), pick a reason (Job Usage or Waste/Spillage), and add optional notes. Saves immediately and updates inventory on hand.
+
         **Blank Work Order:** Print a pre-formatted paper work order to hand to a walk-in customer before creating a digital job record.
         - Access: Jobs list page → printer icon button "Blank Work Order" in the top-right toolbar. Or navigate directly to /WorkOrder/Blank.
         - The PDF opens in a new tab ready to print. It includes: company logo and address, Drop Off Date field, Client Name / Client Phone / Due Date fields, 12-row parts table (Part Description / Color / Quote), Notes box, customizable Terms & Conditions text, and a Customer Signature line.
@@ -1219,7 +1221,6 @@ public static class HelpKnowledgeBase
         - [Accounts Payable](/Help/AccountsPayable)
         - [Equipment & Maintenance](/Help/Equipment)
         - [Vendors](/Help/Vendors)
-        - [Shop Workers](/Help/ShopWorkers)
         - [Reports](/Help/Reports)
         - [Settings](/Help/Settings)
         - [User Profile](/Help/UserProfile)

src/PowderCoating.Web/Middleware/OnlineUserMiddleware.cs

@@ -50,6 +50,12 @@ public class OnlineUserMiddleware
     {
         await _next(context);
 
+        // Skip AJAX/JSON responses — they are not page navigations and would
+        // cause the "current page" to show the polling endpoint (e.g. /InAppNotifications/Recent)
+        // rather than the actual page the user is on.
+        if (context.Response.ContentType?.Contains("application/json", StringComparison.OrdinalIgnoreCase) == true)
+            return;
+
         // Only track authenticated, non-API, non-asset requests
         if (!context.User.Identity?.IsAuthenticated ?? true) return;
         var path = context.Request.Path.Value ?? string.Empty;

src/PowderCoating.Web/Program.cs

@@ -240,6 +240,7 @@ builder.Services.AddHostedService<AuditLogRetentionBackgroundService>();
 builder.Services.AddHostedService<StripeWebhookRetentionBackgroundService>();
 builder.Services.AddHostedService<SetupWizardReminderBackgroundService>();
 builder.Services.AddHostedService<RecurringTransactionService>();
+builder.Services.AddHostedService<AppointmentReminderBackgroundService>();
 builder.Services.AddScoped<ISubscriptionService, SubscriptionService>();
 builder.Services.AddScoped<IStripeService, StripeService>();
 builder.Services.AddScoped<IStripeConnectService, StripeConnectService>();
@@ -270,8 +271,7 @@ builder.Services.AddSingleton<IMapper>(sp =>
         cfg.AddProfile(new InventoryProfile());
         cfg.AddProfile(new EquipmentProfile());
         cfg.AddProfile(new MaintenanceProfile());
-        cfg.AddProfile(new ShopWorkerProfile());
-        cfg.AddProfile(new CatalogProfile());
+cfg.AddProfile(new CatalogProfile());
         cfg.AddProfile(new VendorProfile());
         cfg.AddProfile(new LookupProfile());
         cfg.AddProfile(new AppointmentProfile());