Merge branch 'dev' - invoice fixes, log material modal, complete job UX

The modal was showing one row per coat per item, so a job with 5 items
each with 2 coats of the same powder produced 10 identical input rows.

Now groups by unique InventoryItemId and shows one row per powder color
for the whole job. The controller distributes the entered total across
coats proportionally by their estimated PowderToOrder so per-coat
reporting data is preserved. A single inventory transaction is created
per powder (net of any pre-logged scan credit).

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/CompanyPreferencesDtos.cs

@@ -59,6 +59,9 @@ public class CompanyPreferencesDto
     // Blank Work Order PDF Template
     public string WoAccentColor { get; set; } = "#374151";
     public string? WoTerms { get; set; }
+
+    // Kiosk settings
+    public string KioskIntakeOutput { get; set; } = "Quote";
 }
 
 public class UpdateAppDefaultsDto
@@ -136,3 +139,11 @@ public class UpdateWorkOrderTemplateDto
     public string WoAccentColor { get; set; } = "#374151";
     [StringLength(2000)] public string? WoTerms { get; set; }
 }
+
+
+public class UpdateKioskSettingsDto
+{
+    /// <summary>"Quote" (default) or "Job" — what the kiosk creates on submission.</summary>
+    [Required]
+    public string KioskIntakeOutput { get; set; } = "Quote";
+}

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

@@ -389,7 +389,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 +400,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 +515,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/Kiosk/KioskDtos.cs

@@ -76,12 +76,13 @@ public class KioskSessionListDto
     public DateTime         ExpiresAt          { get; set; }
     public int?             LinkedCustomerId   { get; set; }
     public int?             LinkedJobId        { get; set; }
+    public int?             LinkedQuoteId      { get; set; }
     public string?          RemoteLinkEmail    { get; set; }
 
     public string CustomerFullName => $"{CustomerFirstName} {CustomerLastName}".Trim();
     public string JobDescriptionSnippet =>
         JobDescription.Length > 80 ? JobDescription[..80] + "…" : JobDescription;
-    public bool IsConverted => LinkedJobId.HasValue;
+    public bool IsConverted => LinkedJobId.HasValue || LinkedQuoteId.HasValue;
     public bool IsExpired   => Status == KioskSessionStatus.Expired ||
                                (Status == KioskSessionStatus.Active && DateTime.UtcNow > ExpiresAt);
 }

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; }
 

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/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/CompanyProfile.cs

@@ -54,5 +54,6 @@ public class CompanyProfile : Profile
         CreateMap<UpdateQuoteTemplateDto, CompanyPreferences>();
         CreateMap<UpdateInvoiceTemplateDto, CompanyPreferences>();
         CreateMap<UpdateWorkOrderTemplateDto, CompanyPreferences>();
+        CreateMap<UpdateKioskSettingsDto, CompanyPreferences>();
     }
 }

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

@@ -21,12 +21,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,
@@ -106,12 +107,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,
@@ -191,6 +193,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,
@@ -270,6 +273,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,
@@ -364,6 +368,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; }

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

@@ -30,23 +30,30 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         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;
     }
 
     public async Task<IReadOnlyList<QuoteItem>> CreateQuoteItemsAsync(

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/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/CompanyPreferences.cs

@@ -86,6 +86,14 @@ public class CompanyPreferences : BaseEntity
     /// <summary>JSON blob persisting QB Migration Wizard step state across sessions.</summary>
     public string? QbMigrationStateJson { get; set; }
 
+    // Kiosk settings
+    /// <summary>
+    /// Controls what the kiosk creates on submission: "Quote" (default) or "Job".
+    /// Quote aligns with the default Terms text ("subject to a formal quote").
+    /// Job is for shops that price on the spot and want the work order ready immediately.
+    /// </summary>
+    public string KioskIntakeOutput { get; set; } = "Quote";
+
     // Guided activation / first-workflow onboarding
     /// <summary>Selected first-workflow path: quote_first or job_first. Null until chosen.</summary>
     public string? OnboardingPath { get; set; }

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/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/KioskSession.cs

@@ -36,7 +36,10 @@ public class KioskSession : BaseEntity
 
     // ── Outcome ───────────────────────────────────────────────────────────────
     public int?      LinkedCustomerId { get; set; }
+    /// <summary>Set when KioskIntakeOutput = "Job". Null when a Quote was created instead.</summary>
     public int?      LinkedJobId      { get; set; }
+    /// <summary>Set when KioskIntakeOutput = "Quote". Null when a Job was created instead.</summary>
+    public int?      LinkedQuoteId    { get; set; }
     public DateTime? SubmittedAt      { get; set; }
     /// <summary>Sessions auto-expire 2 h after creation (InPerson) or 48 h (Remote). ExpiresAt is set at creation.</summary>
     public DateTime  ExpiresAt        { get; set; }

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/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/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

@@ -205,11 +205,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 +526,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 +1306,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 +1380,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 +1415,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/20260514022731_AddKioskIntakeOutputSetting.cs

@@ -0,0 +1,82 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddKioskIntakeOutputSetting : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "LinkedQuoteId",
+                table: "KioskSessions",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "KioskIntakeOutput",
+                table: "CompanyPreferences",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+
+            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));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LinkedQuoteId",
+                table: "KioskSessions");
+
+            migrationBuilder.DropColumn(
+                name: "KioskIntakeOutput",
+                table: "CompanyPreferences");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 19, 28, 44, 26, DateTimeKind.Utc).AddTicks(4259));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 19, 28, 44, 26, DateTimeKind.Utc).AddTicks(4264));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 19, 28, 44, 26, DateTimeKind.Utc).AddTicks(4266));
+        }
+    }
+}

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/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");
 
@@ -2075,6 +2078,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");
 
@@ -2253,6 +2259,10 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<int>("JobRetentionYears")
                         .HasColumnType("int");
 
+                    b.Property<string>("KioskIntakeOutput")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("LogRetentionDays")
                         .HasColumnType("int");
 
@@ -3286,6 +3296,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)");
@@ -4201,9 +4214,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");
 
@@ -4472,6 +4494,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<bool>("IncludePrepCost")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsAiItem")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
@@ -5637,6 +5662,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<int?>("LinkedJobId")
                         .HasColumnType("int");
 
+                    b.Property<int?>("LinkedQuoteId")
+                        .HasColumnType("int");
+
                     b.Property<string>("RemoteLinkEmail")
                         .HasColumnType("nvarchar(max)");
 
@@ -6692,7 +6720,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 1,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 13, 19, 28, 44, 26, DateTimeKind.Utc).AddTicks(4259),
+                            CreatedAt = new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3131),
                             Description = "Standard pricing for regular customers",
                             DiscountPercent = 0m,
                             IsActive = true,
@@ -6703,7 +6731,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 2,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 13, 19, 28, 44, 26, DateTimeKind.Utc).AddTicks(4264),
+                            CreatedAt = new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3137),
                             Description = "5% discount for preferred customers",
                             DiscountPercent = 5m,
                             IsActive = true,
@@ -6714,7 +6742,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 3,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 13, 19, 28, 44, 26, DateTimeKind.Utc).AddTicks(4266),
+                            CreatedAt = new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3138),
                             Description = "10% discount for premium customers",
                             DiscountPercent = 10m,
                             IsActive = true,
@@ -6961,6 +6989,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");
 
@@ -7006,6 +7040,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)");
 
@@ -7045,6 +7085,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)");
@@ -7070,6 +7116,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)");
 

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

@@ -543,6 +543,15 @@ public class CompanySettingsController : Controller
     public Task<IActionResult> UpdateWorkOrderTemplate([FromBody] UpdateWorkOrderTemplateDto dto) =>
         UpdatePreferences(dto, "Work order settings saved successfully.");
 
+    /// <summary>
+    /// Saves kiosk intake output preference ("Quote" or "Job") to <see cref="CompanyPreferences"/>.
+    /// Delegates to <see cref="UpdatePreferences{TDto}"/>.
+    /// </summary>
+    // POST: CompanySettings/UpdateKioskSettings
+    [HttpPost]
+    public Task<IActionResult> UpdateKioskSettings([FromBody] UpdateKioskSettingsDto dto) =>
+        UpdatePreferences(dto, "Kiosk settings saved successfully.");
+
     /// <summary>
     /// Persists the company's pricing model parameters — labor rates, sandblasting/masking multipliers,
     /// oven cost per hour, overhead admin/facility percentages, profit margin, and default tax rate —
@@ -747,7 +756,6 @@ 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 sb = new System.Text.StringBuilder();
@@ -774,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
@@ -818,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)
             {
@@ -2710,79 +2691,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>
@@ -3046,7 +2954,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/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>
@@ -125,5 +117,13 @@ namespace PowderCoating.Web.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// Serves the Customer Intake Kiosk help article explaining the tablet kiosk setup, the staff-triggered intake flow, and the Intakes review page.
+        /// </summary>
+        public IActionResult CustomerIntakeKiosk()
+        {
+            return View();
+        }
     }
 }

src/PowderCoating.Web/Controllers/InventoryController.cs

@@ -304,6 +304,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 +730,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 +778,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 +828,7 @@ public class InventoryController : Controller
                 VendorName         = manufacturer,
                 Sku                = sku,
                 ColorName          = colorName,
+                UnitPrice          = result.UnitCostPerLb ?? 0m,
                 CureTemperatureF   = result.CureTemperatureF,
                 CureTimeMinutes    = result.CureTimeMinutes,
                 Finish             = result.Finish,
@@ -1050,61 +1112,50 @@ public class InventoryController : Controller
             .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();
 

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

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,
@@ -545,6 +498,13 @@ 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.GetAllAsync())
+                .OrderBy(i => i.Name)
+                .Select(i => new { i.Id, i.Name, i.UnitOfMeasure, i.QuantityOnHand })
+                .ToList();
+            ViewBag.InventoryItemsForModal = System.Text.Json.JsonSerializer.Serialize(inventoryItemsForModal);
+
             // Pre-logged powder grouped by InventoryItemId (for Complete Job modal pre-fill)
             ViewBag.PreLoggedPowder = allJobTransactions
                 .GroupBy(t => t.InventoryItemId)
@@ -1106,6 +1066,7 @@ public class JobsController : Controller
                 CustomerId = dto.CustomerId,
                 QuoteId = dto.QuoteId,
                 AssignedUserId = dto.AssignedUserId,
+                OvenCostId = dto.OvenCostId,
                 Description = dto.Description,
                 JobPriorityId = dto.JobPriorityId,
                 JobStatusId = pendingStatus?.Id ?? 1,
@@ -1167,15 +1128,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, 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));
                 job.UpdatedAt  = DateTime.UtcNow;
                 await _unitOfWork.Jobs.UpdateAsync(job);
                 await _unitOfWork.SaveChangesAsync();
@@ -1262,6 +1231,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,
@@ -1626,14 +1596,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, 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));
             }
 
             // Save change history records
@@ -2677,78 +2655,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 +2906,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,
@@ -2955,11 +2936,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 +2976,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 +3021,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 +3054,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 +3096,47 @@ 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
             }).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;
@@ -3234,6 +3246,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 +3377,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 +3831,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 +3856,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 +3879,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 +3891,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 +3981,7 @@ public class JobsController : Controller
                 grossMargin,
                 quotedMargin,
                 quotedPrice = Math.Round(job.QuotedPrice, 2),
-                fallbackLaborRate,
+                companyLaborCostRate,
                 powderLines,
                 laborLines,
                 hasPowderData = powderLines.Count > 0,
@@ -4003,9 +4089,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/KioskController.cs

@@ -2,6 +2,7 @@ using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using PowderCoating.Application.DTOs.Kiosk;
 using PowderCoating.Application.Interfaces;
@@ -39,6 +40,9 @@ public class KioskController : Controller
     private readonly IHubContext<KioskHub>        _kioskHub;
     private readonly ILogger<KioskController>     _logger;
     private readonly ICompanyLogoService          _logoService;
+    private readonly IMemoryCache                 _cache;
+
+    private static string SmsConsentCacheKey(int companyId) => $"kiosk-sms-consent:{companyId}";
 
     /// <summary>Initialises all dependencies for the kiosk controller.</summary>
     public KioskController(
@@ -49,7 +53,8 @@ public class KioskController : Controller
         IEmailService             emailService,
         IHubContext<KioskHub>     kioskHub,
         ILogger<KioskController>  logger,
-        ICompanyLogoService       logoService)
+        ICompanyLogoService       logoService,
+        IMemoryCache              cache)
     {
         _unitOfWork   = unitOfWork;
         _mapper       = mapper;
@@ -59,6 +64,7 @@ public class KioskController : Controller
         _kioskHub     = kioskHub;
         _logger       = logger;
         _logoService  = logoService;
+        _cache        = cache;
     }
 
     // =========================================================================
@@ -68,7 +74,8 @@ public class KioskController : Controller
     /// <summary>
     /// Idle branded screen displayed on the front-desk tablet.
     /// Validates the KioskDevice cookie; returns 403 if missing or token mismatch.
-    /// The view connects to KioskHub and listens for StartIntake events.
+    /// The view polls /Kiosk/PollSession every 3 seconds and navigates when staff
+    /// triggers a session via the Dashboard "Start Intake" button.
     /// </summary>
     [AllowAnonymous]
     public async Task<IActionResult> Welcome()
@@ -86,6 +93,149 @@ public class KioskController : Controller
         return View();
     }
 
+    /// <summary>
+    /// Lightweight polling endpoint called every 3 seconds by the kiosk Welcome screen.
+    /// Returns the most recent InPerson KioskSession created in the last 60 seconds so
+    /// the tablet can navigate without relying on SignalR (which Azure App Service blocks
+    /// for anonymous WebSocket/SSE connections through its ingress proxy).
+    /// </summary>
+    [AllowAnonymous, HttpGet]
+    [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
+    public async Task<IActionResult> PollSession()
+    {
+        var cookie = ReadKioskCookie();
+        if (cookie == null) return Json(new { hasSession = false });
+
+        var company = await _unitOfWork.Companies.GetByIdAsync(cookie.Value.companyId, ignoreQueryFilters: true);
+        if (company == null || company.KioskActivationToken != cookie.Value.token)
+            return Json(new { hasSession = false });
+
+        // Check for a staff-pushed SMS consent request before checking for intake sessions.
+        if (_cache.TryGetValue(SmsConsentCacheKey(cookie.Value.companyId), out (int customerId, string customerName) pending))
+            return Json(new { hasSession = false, smsConsentPending = true, customerId = pending.customerId, customerName = pending.customerName });
+
+        var window  = DateTime.UtcNow.AddSeconds(-60);
+        var session = await _unitOfWork.KioskSessions.FirstOrDefaultAsync(
+            s => s.CompanyId == cookie.Value.companyId
+              && s.SessionType == KioskSessionType.InPerson
+              && s.Status == KioskSessionStatus.Active
+              && s.CreatedAt >= window,
+            ignoreQueryFilters: true);
+
+        if (session == null) return Json(new { hasSession = false });
+        return Json(new { hasSession = true, sessionToken = session.SessionToken });
+    }
+
+    // =========================================================================
+    // SMS CONSENT  (staff pushes to kiosk; customer agrees on tablet)
+    // =========================================================================
+
+    /// <summary>
+    /// Staff calls this (authenticated) from the Customer Details page to push an SMS
+    /// consent request to the front-desk kiosk tablet. Stores the customer ID in
+    /// IMemoryCache under a company-scoped key; the kiosk's PollSession endpoint picks
+    /// it up and returns smsConsentPending so the tablet can navigate to the consent page.
+    /// The cache entry expires in 10 minutes in case the customer never approaches the tablet.
+    /// </summary>
+    [HttpPost, ValidateAntiForgeryToken]
+    public async Task<IActionResult> PushSmsConsent(int customerId)
+    {
+        var customer = await _unitOfWork.Customers.GetByIdAsync(customerId);
+        if (customer == null) return Json(new { success = false, message = "Customer not found." });
+
+        if (customer.NotifyBySms)
+            return Json(new { success = false, message = "Customer has already given SMS consent." });
+
+        var companyId = customer.CompanyId;
+        var name      = !string.IsNullOrWhiteSpace(customer.ContactFirstName)
+            ? $"{customer.ContactFirstName} {customer.ContactLastName}".Trim()
+            : customer.CompanyName ?? "Customer";
+
+        _cache.Set(SmsConsentCacheKey(companyId), (customerId, name),
+            new MemoryCacheEntryOptions { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(10) });
+
+        _logger.LogInformation("SMS consent pushed to kiosk for customer {CustomerId} by staff", customerId);
+        return Json(new { success = true });
+    }
+
+    /// <summary>
+    /// Cancels a pending kiosk SMS consent request, freeing the kiosk to return to the Welcome
+    /// screen. Called by staff if they pushed consent accidentally or the customer isn't coming.
+    /// </summary>
+    [HttpPost, ValidateAntiForgeryToken]
+    public IActionResult CancelSmsConsent()
+    {
+        var companyId = HttpContext.User.FindFirst("CompanyId")?.Value;
+        if (int.TryParse(companyId, out var cid))
+            _cache.Remove(SmsConsentCacheKey(cid));
+        return Json(new { success = true });
+    }
+
+    /// <summary>
+    /// Displays the full-screen SMS consent form on the kiosk tablet (anonymous, kiosk layout).
+    /// Loads the customer by ID with ignoreQueryFilters because the kiosk has no tenant context.
+    /// </summary>
+    [AllowAnonymous]
+    public async Task<IActionResult> SmsConsent(int id)
+    {
+        var cookie = ReadKioskCookie();
+        if (cookie == null) return Forbid();
+
+        // Clear the pending entry immediately — the kiosk is now showing the form,
+        // so Welcome must not redirect again if the customer cancels or navigates back.
+        _cache.Remove(SmsConsentCacheKey(cookie.Value.companyId));
+
+        var customer = await _unitOfWork.Customers.GetByIdAsync(id, ignoreQueryFilters: true);
+        if (customer == null) return NotFound();
+
+        var company = await _unitOfWork.Companies.GetByIdAsync(cookie.Value.companyId, ignoreQueryFilters: true);
+        ViewBag.CompanyName    = company?.CompanyName;
+        ViewBag.CompanyLogoUrl = !string.IsNullOrEmpty(company?.LogoFilePath) ? Url.Action("Logo", "Kiosk") : null;
+        ViewBag.ShowInactivityTimer = false;
+        ViewBag.CustomerName   = !string.IsNullOrWhiteSpace(customer.ContactFirstName)
+            ? $"{customer.ContactFirstName} {customer.ContactLastName}".Trim()
+            : customer.CompanyName ?? "Customer";
+
+        return View(id);
+    }
+
+    /// <summary>
+    /// Records the customer's SMS consent from the kiosk tablet.
+    /// Sets NotifyBySms, SmsConsentedAt, SmsConsentMethod = "KioskInPerson" on the customer record.
+    /// Cache is already cleared by the GET; this handles the agree/decline outcome.
+    /// </summary>
+    [AllowAnonymous, HttpPost]
+    public async Task<IActionResult> SmsConsent(int id, bool agreed)
+    {
+        var cookie = ReadKioskCookie();
+        if (cookie == null) return Forbid();
+
+        if (agreed)
+        {
+            var customer = await _unitOfWork.Customers.GetByIdAsync(id, ignoreQueryFilters: true);
+            if (customer != null)
+            {
+                customer.NotifyBySms      = true;
+                customer.SmsConsentedAt   = DateTime.UtcNow;
+                customer.SmsConsentMethod = "KioskInPerson";
+                customer.SmsOptedOutAt    = null;
+                await _unitOfWork.Customers.UpdateAsync(customer);
+                await _unitOfWork.CompleteAsync();
+                _logger.LogInformation("SMS consent recorded via kiosk for customer {CustomerId}", id);
+
+                await _inApp.CreateAsync(
+                    customer.CompanyId,
+                    "SMS Consent Recorded",
+                    $"{customer.ContactFirstName} {customer.ContactLastName} agreed to SMS notifications on the kiosk.",
+                    "KioskConsent",
+                    link: $"/Customers/Details/{id}",
+                    customerId: id);
+            }
+        }
+
+        return Redirect("/Kiosk/Welcome");
+    }
+
     /// <summary>
     /// Serves the company logo for anonymous kiosk pages. Resolves the company from the
     /// KioskDevice cookie so no tenant context is needed on the anonymous request.
@@ -364,6 +514,9 @@ public class KioskController : Controller
         var session = await LoadSessionAsync(token);
         if (session == null) return View("KioskError", "Session not found.");
 
+        // Expired/already-submitted sessions go straight to Confirmation
+        if (!await ValidateSessionState(session)) return RedirectToAction(nameof(Confirmation), new { token });
+
         // Require signature for in-person sessions
         if (session.SessionType == KioskSessionType.InPerson &&
             string.IsNullOrEmpty(dto.SignatureDataBase64))
@@ -393,8 +546,9 @@ public class KioskController : Controller
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error processing kiosk submission for session {SessionToken}", token);
-            // Don't fail the customer-facing page — save what we have and let staff convert manually
-            await _unitOfWork.CompleteAsync();
+            // Customer-facing page always succeeds — staff can convert the session manually.
+            // Persist the session's agreed/submitted state even if job creation failed.
+            try { await _unitOfWork.CompleteAsync(); } catch { /* best-effort */ }
         }
 
         return RedirectToAction(nameof(Confirmation), new { token });
@@ -449,6 +603,7 @@ public class KioskController : Controller
                 ExpiresAt        = s.ExpiresAt,
                 LinkedCustomerId = s.LinkedCustomerId,
                 LinkedJobId      = s.LinkedJobId,
+                LinkedQuoteId    = s.LinkedQuoteId,
                 RemoteLinkEmail  = s.RemoteLinkEmail
             })
             .ToList();
@@ -556,48 +711,117 @@ public class KioskController : Controller
                                             : "RemoteIntake";
         }
 
-        // 3. Create Job in Pending status
-        var statuses     = await _lookupCache.GetJobStatusLookupsAsync(companyId);
-        var pendingStatus = statuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.Pending);
+        // 3. Resolve company preference: create a Quote (default) or a Job
+        var prefs          = await _unitOfWork.CompanyPreferences.FirstOrDefaultAsync(
+            p => p.CompanyId == companyId && !p.IsDeleted, ignoreQueryFilters: true);
+        var intakeOutput   = prefs?.KioskIntakeOutput ?? "Quote";
+        var createQuote    = !string.Equals(intakeOutput, "Job", StringComparison.OrdinalIgnoreCase);
 
-        var jobNumber = await GenerateJobNumberAsync(companyId);
-        var job = new Job
+        session.LinkedCustomerId = customer!.Id;
+
+        if (createQuote)
         {
-            CompanyId           = companyId,
-            CustomerId          = customer!.Id,
-            JobNumber           = jobNumber,
-            JobStatusId         = pendingStatus?.Id ?? 1,
-            SpecialInstructions = session.JobDescription,
-            Description         = $"Walk-in intake — {session.CustomerFirstName} {session.CustomerLastName}".Trim()
-        };
+            // 3a. Create a Draft Quote so staff can price and send for approval
+            var quoteStatuses = await _lookupCache.GetQuoteStatusLookupsAsync(companyId);
+            var draftStatus   = quoteStatuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Quote.Draft);
+            if (draftStatus == null)
+                throw new InvalidOperationException($"No Draft quote status found for company {companyId}. Run Seed Data from Platform Management.");
 
-        await _unitOfWork.Jobs.AddAsync(job);
+            var quoteNumber = await GenerateQuoteNumberAsync(companyId);
+            var quote = new Quote
+            {
+                CompanyId       = companyId,
+                CustomerId      = customer.Id,
+                QuoteNumber     = quoteNumber,
+                QuoteStatusId   = draftStatus.Id,
+                Description     = session.JobDescription,
+                Notes           = $"Source: {session.SessionType} kiosk intake",
+                QuoteDate       = DateTime.UtcNow,
+                ExpirationDate  = DateTime.UtcNow.AddDays(prefs?.DefaultQuoteValidityDays ?? 30)
+            };
 
-        // 4. Update session links
-        session.LinkedCustomerId = customer.Id;
-        session.LinkedJobId      = job.Id;   // will be populated after SaveChanges below
+            await _unitOfWork.Quotes.AddAsync(quote);
+            await _unitOfWork.CompleteAsync();  // quote.Id now valid
 
-        await _unitOfWork.CompleteAsync();
-
-        // job.Id is now set — update session again if needed
-        if (session.LinkedJobId == 0)
+            session.LinkedQuoteId = quote.Id;
+        }
+        else
         {
+            // 3b. Create a Pending Job directly (for shops that price on the spot)
+            var jobStatuses   = await _lookupCache.GetJobStatusLookupsAsync(companyId);
+            var pendingStatus = jobStatuses.FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Job.Pending);
+            if (pendingStatus == null)
+                throw new InvalidOperationException($"No Pending job status found for company {companyId}. Run Seed Data from Platform Management.");
+
+            var priorities     = await _lookupCache.GetJobPriorityLookupsAsync(companyId);
+            var normalPriority = priorities.FirstOrDefault(p => p.PriorityCode == "NORMAL")
+                              ?? priorities.FirstOrDefault();
+            if (normalPriority == null)
+                throw new InvalidOperationException($"No job priority rows found for company {companyId}. Run Seed Data from Platform Management.");
+
+            var jobNumber = await GenerateJobNumberAsync(companyId);
+            var job = new Job
+            {
+                CompanyId           = companyId,
+                CustomerId          = customer.Id,
+                JobNumber           = jobNumber,
+                JobStatusId         = pendingStatus.Id,
+                JobPriorityId       = normalPriority.Id,
+                Description         = session.JobDescription,
+                SpecialInstructions = $"Source: {session.SessionType} kiosk intake"
+            };
+
+            await _unitOfWork.Jobs.AddAsync(job);
+            await _unitOfWork.CompleteAsync();  // job.Id now valid
+
             session.LinkedJobId = job.Id;
-            await _unitOfWork.CompleteAsync();
         }
 
+        // 4. Persist session links
+        await _unitOfWork.CompleteAsync();
+
         // 5. Fire staff notification
-        var snippet  = session.JobDescription.Length > 60 ? session.JobDescription[..60] + "…" : session.JobDescription;
-        var fullName = $"{session.CustomerFirstName} {session.CustomerLastName}".Trim();
+        var jobDesc   = session.JobDescription ?? "";
+        var snippet   = jobDesc.Length > 60 ? jobDesc[..60] + "…" : jobDesc;
+        var fullName  = $"{session.CustomerFirstName} {session.CustomerLastName}".Trim();
+        var intakeLabel = session.SessionType == KioskSessionType.Remote ? "Remote Intake" : "Walk-in Intake";
         await _inApp.CreateAsync(
             companyId,
-            "Walk-in Intake Submitted",
+            $"{intakeLabel} Submitted",
             $"{fullName} completed their intake form — {snippet}",
             "KioskIntake",
             link: $"/Kiosk/Intakes",
             customerId: customer.Id);
     }
 
+    /// <summary>
+    /// Generates the next sequential quote number using the company's configured prefix.
+    /// Mirrors GenerateQuoteNumberAsync in QuotesController — same format: PREFIX-YYMM-####.
+    /// Implemented here because KioskController processes anonymous requests and cannot
+    /// rely on ITenantContext to resolve the company ID.
+    /// </summary>
+    private async Task<string> GenerateQuoteNumberAsync(int companyId)
+    {
+        var now = DateTime.UtcNow;
+
+        var prefs = await _unitOfWork.CompanyPreferences.FirstOrDefaultAsync(
+            p => p.CompanyId == companyId && !p.IsDeleted, ignoreQueryFilters: true);
+
+        var quotePrefix = !string.IsNullOrWhiteSpace(prefs?.QuoteNumberPrefix) ? prefs.QuoteNumberPrefix : "QT";
+        var prefix      = $"{quotePrefix}-{now:yy}{now:MM}";
+
+        var lastQuoteNumber = await _unitOfWork.Quotes.GetLastQuoteNumberByPrefixAsync(companyId, prefix);
+
+        if (lastQuoteNumber != null)
+        {
+            var lastNumberStr = lastQuoteNumber[(prefix.Length + 1)..];
+            if (int.TryParse(lastNumberStr, out int lastNumber))
+                return $"{prefix}-{(lastNumber + 1):D4}";
+        }
+
+        return $"{prefix}-0001";
+    }
+
     /// <summary>
     /// Generates the next sequential job number using the company's configured prefix.
     /// Mirrors the logic in JobsController.GenerateJobNumber() — same format: PREFIX-YYMM-####.
@@ -675,7 +899,11 @@ public class KioskController : Controller
             ? Url.Action("Logo", "Kiosk")
             : null;
         ViewBag.WelcomeUrl = "/Kiosk/Welcome";
-        await Task.CompletedTask;
+
+        // Pass the intake output setting so Terms.cshtml can show matching wording
+        var prefs = await _unitOfWork.CompanyPreferences.FirstOrDefaultAsync(
+            p => p.CompanyId == company.Id && !p.IsDeleted, ignoreQueryFilters: true);
+        ViewBag.KioskIntakeOutput = prefs?.KioskIntakeOutput ?? "Quote";
     }
 
     /// <summary>Loads the company from a session's CompanyId and populates ViewBag.</summary>
@@ -687,5 +915,14 @@ public class KioskController : Controller
 
         ViewBag.SessionToken = session.SessionToken;
         ViewBag.SessionType  = session.SessionType;
+
+        // 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/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;
@@ -2839,14 +2840,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,

src/PowderCoating.Web/Controllers/ToolsController.cs

@@ -911,7 +911,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()
     {

src/PowderCoating.Web/Helpers/HelpKnowledgeBase.cs

@@ -109,6 +109,7 @@ public static class HelpKnowledgeBase
         - Job Priority Board → /JobsPriority
         - Online Payments → /Invoices/OnlinePayments
         - Gift Certificates → /GiftCertificates
+        - Intake Sessions → /Kiosk/Intakes (walk-in and remote intake sessions submitted via the kiosk tablet)
 
         **Inventory section:**
         - Catalog Items → /CatalogItems
@@ -301,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.
 
@@ -313,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.
@@ -1218,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)
@@ -1265,6 +1267,60 @@ public static class HelpKnowledgeBase
 
         ---
 
+        ## CUSTOMER INTAKE KIOSK
+
+        **Where:** Kiosk Setup → [/Kiosk/Activate](/Kiosk/Activate) | Intake Sessions → [/Kiosk/Intakes](/Kiosk/Intakes)
+
+        **What it does:** Lets walk-in customers fill out their own intake form on a front-desk tablet. On submission, a Customer record and either a Draft Quote or a Pending Job are auto-created (controlled by the Kiosk Output Setting), and staff receive an in-app notification. Also supports remote intake via email link so customers fill out the form on their own phone before arriving.
+
+        **Kiosk Output Setting (Company Settings → Kiosk tab):**
+        - "Create a Quote" (default) — creates a Draft quote on submission; terms shown to customer say "subject to a formal quote." Best for shops that price after seeing the parts.
+        - "Create a Job" — creates a Pending job on submission; terms say "team member will reach out about pricing." Best for shops that price on the spot.
+
+        **Setup (one-time per device):**
+        1. Go to Settings → Kiosk Setup (or /Kiosk/Activate)
+        2. Click Activate Kiosk — generates a secure activation token and sets a device cookie (365-day lifespan)
+        3. On the tablet browser, navigate to /Kiosk/Welcome — the tablet is now in kiosk mode
+        4. Add to Home Screen on iOS/Android for a full-screen PWA experience that preserves camera permissions
+
+        **Starting an in-person intake:**
+        1. Customer approaches the tablet — it shows the Welcome screen with company logo and a green "Ready" dot
+        2. Staff member clicks "Start Intake" on the Dashboard (Kiosk card)
+        3. Tablet picks up the new session within 3 seconds and auto-navigates to the intake form
+        4. Customer completes 3 steps: Contact info → Job description → Terms & drawn signature
+        5. On submit: thank-you screen shown, kiosk returns to Welcome after 30 seconds
+        6. If idle for 45 seconds during any intake step, the form resets to the Welcome screen automatically
+
+        **Sending a remote intake link:**
+        - Click "Send Intake Link" on the Dashboard Kiosk card OR from /Kiosk/Intakes → Send Intake Link
+        - Enter the customer's email → they receive a link to complete the form on their own device
+        - Remote sessions use a checkbox agreement instead of a drawn signature
+
+        **What happens on submission:**
+        - Customer is matched by email (first), then phone; if no match, a new non-commercial customer is created
+        - A Draft Quote or Pending Job is created depending on the Kiosk Output Setting (see above)
+        - SMS opt-in updates the customer record with NotifyBySms = true and a TCPA-compliant consent timestamp
+        - In-app notification fires: "Walk-in Intake Submitted" (in-person) or "Remote Intake Submitted" (remote link) with a link to /Kiosk/Intakes
+
+        **Reviewing submissions (Intake Sessions page):**
+        - Filter tabs: All / Submitted / Pending / Expired
+        - Each row shows customer name, phone, email, job description snippet, session type badge, SMS opt-in icon
+        - "View Quote" button → appears in Quote mode; opens the auto-created Draft quote for pricing and review
+        - "View Job" button → appears in Job mode; opens the auto-created Pending job so staff can assign and progress it
+        - "Customer" button → opens the matched/created customer record
+        - If submission failed (e.g. seed data not run), the session is still marked Submitted but buttons won't appear — raw intake data is still visible so staff can create manually
+
+        **Dashboard Kiosk card:** Shows whether the kiosk is activated. Contains "Start Intake" (triggers in-person session) and "Send Intake Link" (opens email dialog) buttons. Both are disabled if the kiosk is not activated.
+
+        **Troubleshooting:**
+        - "Connection issue — retrying…" on tablet: Wi-Fi problem; dot auto-recovers when connectivity returns
+        - Tablet doesn't respond to Start Intake: waits up to 3 s; reload Welcome page if still stuck
+        - No View Quote/Job button after submission: Seed Data not run — Platform Admin must run it from Platform Management → Seed Data
+        - Signature pad not working: requires capacitive touch (finger or stylus); ensure "Request Desktop Site" is off in browser settings
+        - AI quote times out on mobile: photos are auto-compressed; "Still analyzing…" message appears after 30 s; retry on stronger connection
+
+        ---
+
         ## COMMON WORKFLOWS
 
         **New company first-time setup:**
@@ -1279,6 +1335,15 @@ public static class HelpKnowledgeBase
         **Prospect to customer:**
         Create Quote for prospect → Quote Approved → Convert Prospect to Customer → Convert Quote to Job
 
+        **Walk-in customer intake (kiosk — Quote mode):**
+        Staff clicks "Start Intake" on Dashboard → tablet navigates to intake form within 3 s → customer fills out 3 steps (contact, job description, terms + signature) → system creates Customer + Draft Quote → "Walk-in Intake Submitted" notification fires → staff reviews at /Kiosk/Intakes → clicks "View Quote" to price and send the quote
+
+        **Walk-in customer intake (kiosk — Job mode):**
+        Same flow as above, but system creates a Pending Job instead of a Quote → staff clicks "View Job" to assign a worker and progress the job through the workflow
+
+        **Remote intake (customer fills out before arriving):**
+        Staff clicks "Send Intake Link" on Dashboard or Intakes page → enters customer email → customer receives link and completes form on their own device → same auto-create flow as in-person; notification reads "Remote Intake Submitted"
+
         **Walk-in / phone quote (quick estimate):**
         Click the AI Quick Quote button (dark-blue floating button, bottom-right) → type description → AI returns price estimate → Save as draft under "Walk-In / Phone" → open the quote → reassign the Customer dropdown on Quote Details to the real customer record once you have their info
 

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

@@ -270,8 +270,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());

src/PowderCoating.Web/Services/InAppNotificationService.cs

@@ -72,6 +72,7 @@ public class InAppNotificationService : IInAppNotificationService
                 message = notification.Message,
                 link = notification.Link,
                 notificationType = notification.NotificationType,
+                customerId = notification.CustomerId,
                 createdAt = now.ToString("o")
             });
         }

src/PowderCoating.Web/Views/Accounts/Index.cshtml

@@ -232,4 +232,3 @@
         });
     </script>
 }
-

src/PowderCoating.Web/Views/AiUsageReport/Index.cshtml

@@ -109,6 +109,69 @@
             <span class="fw-semibold">Per-Company Breakdown</span>
             <span class="text-muted small">@Model.Rows.Count companies total</span>
         </div>
+        <div class="mobile-card-view">
+            <div class="mobile-card-list">
+                @foreach (var row in Model.Rows)
+                {
+                    <div class="mobile-data-card">
+                        <div class="mobile-card-header">
+                            <div class="mobile-card-icon" style="background: linear-gradient(135deg, #7c3aed 0%, #5b21b6 100%);">
+                                <i class="bi bi-robot"></i>
+                            </div>
+                            <div class="mobile-card-title">
+                                <h6>@row.CompanyName @if (!row.IsActive) { <span class="badge bg-secondary ms-1">Inactive</span> }</h6>
+                                <small><span class="badge bg-secondary-subtle text-secondary-emphasis border border-secondary-subtle">@row.Plan</span></small>
+                            </div>
+                        </div>
+                        <div class="mobile-card-body">
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Today</span>
+                                <span class="mobile-card-value @(row.Today > 0 ? "fw-semibold" : "text-muted")">
+                                    @if (row.Today > 0) { @row.Today.ToString("N0") } else { <span>&mdash;</span> }
+                                </span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">30 Days</span>
+                                <span class="mobile-card-value @(row.Last30Days > 0 ? "fw-semibold" : "text-muted")">
+                                    @if (row.Last30Days > 0) { @row.Last30Days.ToString("N0") } else { <span>&mdash;</span> }
+                                </span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">All Time</span>
+                                <span class="mobile-card-value @(row.AllTime > 0 ? "" : "text-muted")">
+                                    @if (row.AllTime > 0) { @row.AllTime.ToString("N0") } else { <span>&mdash;</span> }
+                                </span>
+                            </div>
+                            @if (row.TopFeature != null)
+                            {
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Top Feature</span>
+                                    <span class="mobile-card-value">
+                                        <i class="bi @FeatureIcon(row.TopFeature) me-1 text-muted"></i>@row.FeatureDisplayName(row.TopFeature)
+                                    </span>
+                                </div>
+                            }
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Tier</span>
+                                <span class="mobile-card-value"><span class="badge @row.TierBadgeClass">@row.UsageTier</span></span>
+                            </div>
+                        </div>
+                        <div class="mobile-card-footer">
+                            <a asp-controller="Companies" asp-action="Details" asp-route-id="@row.CompanyId" class="btn btn-sm btn-outline-secondary">
+                                <i class="bi bi-building me-1"></i>Company
+                            </a>
+                        </div>
+                    </div>
+                }
+                @if (!Model.Rows.Any())
+                {
+                    <div class="text-center text-muted py-5">
+                        <i class="bi bi-robot fs-1 d-block mb-2 opacity-25"></i>
+                        No AI usage logged yet.
+                    </div>
+                }
+            </div>
+        </div>
         <div class="table-responsive">
             <table class="table table-hover mb-0 align-middle" id="aiUsageTable">
                 <thead class="table-light">

src/PowderCoating.Web/Views/Appointments/Index.cshtml

@@ -176,6 +176,60 @@
     <div class="card-body">
         @if (Model.Items.Any())
         {
+            <div class="mobile-card-view">
+                <div class="mobile-card-list">
+                    @foreach (var appointment in Model.Items)
+                    {
+                        <div class="mobile-data-card">
+                            <div class="mobile-card-header">
+                                <div class="mobile-card-icon" style="background: linear-gradient(135deg, #0ea5e9 0%, #0284c7 100%);">
+                                    <i class="bi bi-calendar-event"></i>
+                                </div>
+                                <div class="mobile-card-title">
+                                    <h6>@appointment.Title</h6>
+                                    <small>@appointment.ScheduledStartTime.ToString("MMM dd, yyyy")<br />@(!appointment.IsAllDay ? $"{appointment.ScheduledStartTime:h:mm tt} &ndash; {appointment.ScheduledEndTime:h:mm tt}" : "All Day")</small>
+                                </div>
+                            </div>
+                            <div class="mobile-card-body">
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Status</span>
+                                    <span class="mobile-card-value">
+                                        <span class="badge bg-@appointment.StatusColorClass">@appointment.StatusDisplayName</span>
+                                    </span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Type</span>
+                                    <span class="mobile-card-value">
+                                        <span class="badge bg-@appointment.TypeColorClass">@appointment.TypeDisplayName</span>
+                                    </span>
+                                </div>
+                                @if (!string.IsNullOrEmpty(appointment.CustomerName))
+                                {
+                                    <div class="mobile-card-row">
+                                        <span class="mobile-card-label">Customer</span>
+                                        <span class="mobile-card-value">@appointment.CustomerName</span>
+                                    </div>
+                                }
+                                @if (!string.IsNullOrEmpty(appointment.AssignedWorkerName))
+                                {
+                                    <div class="mobile-card-row">
+                                        <span class="mobile-card-label">Worker</span>
+                                        <span class="mobile-card-value">@appointment.AssignedWorkerName</span>
+                                    </div>
+                                }
+                            </div>
+                            <div class="mobile-card-footer">
+                                <a asp-action="Details" asp-route-id="@appointment.Id" class="btn btn-sm btn-outline-primary">
+                                    <i class="bi bi-eye me-1"></i>View
+                                </a>
+                                <a asp-action="Edit" asp-route-id="@appointment.Id" class="btn btn-sm btn-outline-secondary">
+                                    <i class="bi bi-pencil me-1"></i>Edit
+                                </a>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
             <div class="table-responsive">
                 <table class="table table-hover align-middle">
                     <thead>

src/PowderCoating.Web/Views/BankReconciliations/Index.cshtml

@@ -21,6 +21,64 @@
 
 <div class="card shadow-sm">
     <div class="card-body p-0">
+        <div class="mobile-card-view">
+            <div class="mobile-card-list">
+                @foreach (var br in Model)
+                {
+                    <div class="mobile-data-card">
+                        <div class="mobile-card-header">
+                            <div class="mobile-card-icon" style="background: linear-gradient(135deg, #14b8a6 0%, #0f766e 100%);">
+                                <i class="bi bi-bank"></i>
+                            </div>
+                            <div class="mobile-card-title">
+                                <h6>@br.Account?.Name</h6>
+                                <small>Statement: @br.StatementDate.ToString("MMM d, yyyy")</small>
+                            </div>
+                        </div>
+                        <div class="mobile-card-body">
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Status</span>
+                                <span class="mobile-card-value">
+                                    @if (br.Status == BankReconciliationStatus.Completed)
+                                    {
+                                        <span class="badge bg-success">Completed</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-warning text-dark">In Progress</span>
+                                    }
+                                </span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Ending Balance</span>
+                                <span class="mobile-card-value fw-semibold">@br.EndingBalance.ToString("C")</span>
+                            </div>
+                            @if (br.CompletedAt.HasValue)
+                            {
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Completed By</span>
+                                    <span class="mobile-card-value">@br.CompletedBy</span>
+                                </div>
+                            }
+                        </div>
+                        <div class="mobile-card-footer">
+                            @if (br.Status == BankReconciliationStatus.Completed)
+                            {
+                                <a asp-action="Report" asp-route-id="@br.Id" class="btn btn-sm btn-outline-secondary">
+                                    <i class="bi bi-file-earmark-text me-1"></i>Report
+                                </a>
+                            }
+                            else
+                            {
+                                <a asp-action="Reconcile" asp-route-id="@br.Id" class="btn btn-sm btn-outline-primary">
+                                    <i class="bi bi-check2-square me-1"></i>Continue
+                                </a>
+                            }
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
         <div class="table-responsive">
             <table class="table table-hover mb-0">
                 <thead class="table-light">

src/PowderCoating.Web/Views/BannedIps/Index.cshtml

@@ -60,6 +60,59 @@
         <div class="card-body p-0">
             @if (active.Any())
             {
+                <div class="mobile-card-view">
+                    <div class="mobile-card-list">
+                        @foreach (var ban in active)
+                        {
+                            <div class="mobile-data-card">
+                                <div class="mobile-card-header">
+                                    <div class="mobile-card-icon" style="background: linear-gradient(135deg, #dc2626 0%, #991b1b 100%);">
+                                        <i class="bi bi-slash-circle"></i>
+                                    </div>
+                                    <div class="mobile-card-title">
+                                        <h6 class="font-monospace">@ban.IpAddress</h6>
+                                        <small class="text-muted">@(ban.Reason ?? "No reason given")</small>
+                                    </div>
+                                </div>
+                                <div class="mobile-card-body">
+                                    <div class="mobile-card-row">
+                                        <span class="mobile-card-label">Banned</span>
+                                        <span class="mobile-card-value">@ban.BannedAt.ToString("MMM d, yyyy HH:mm")</span>
+                                    </div>
+                                    <div class="mobile-card-row">
+                                        <span class="mobile-card-label">Expires</span>
+                                        <span class="mobile-card-value">
+                                            @if (ban.ExpiresAt.HasValue)
+                                            {
+                                                <span class="badge bg-warning text-dark">@ban.ExpiresAt.Value.ToString("MMM d, yyyy")</span>
+                                            }
+                                            else
+                                            {
+                                                <span class="badge bg-secondary">Permanent</span>
+                                            }
+                                        </span>
+                                    </div>
+                                </div>
+                                <div class="mobile-card-footer">
+                                    <form asp-action="Lift" asp-route-id="@ban.Id" method="post" class="d-inline"
+                                          onsubmit="return confirm('Lift the ban on @ban.IpAddress?')">
+                                        @Html.AntiForgeryToken()
+                                        <button type="submit" class="btn btn-sm btn-outline-success">
+                                            <i class="bi bi-check-circle me-1"></i>Lift
+                                        </button>
+                                    </form>
+                                    <form asp-action="Delete" asp-route-id="@ban.Id" method="post" class="d-inline"
+                                          onsubmit="return confirm('Delete ban record for @ban.IpAddress?')">
+                                        @Html.AntiForgeryToken()
+                                        <button type="submit" class="btn btn-sm btn-outline-danger">
+                                            <i class="bi bi-trash"></i>
+                                        </button>
+                                    </form>
+                                </div>
+                            </div>
+                        }
+                    </div>
+                </div>
                 <div class="table-responsive">
                     <table class="table table-hover mb-0">
                         <thead class="table-light">
@@ -130,6 +183,55 @@
                 <h6 class="mb-0 text-muted"><i class="bi bi-clock-history"></i> Lifted / Expired Bans</h6>
             </div>
             <div class="card-body p-0">
+                <div class="mobile-card-view">
+                    <div class="mobile-card-list">
+                        @foreach (var ban in inactive)
+                        {
+                            <div class="mobile-data-card">
+                                <div class="mobile-card-header">
+                                    <div class="mobile-card-icon" style="background: linear-gradient(135deg, #6b7280 0%, #4b5563 100%);">
+                                        <i class="bi bi-clock-history"></i>
+                                    </div>
+                                    <div class="mobile-card-title">
+                                        <h6 class="font-monospace">@ban.IpAddress</h6>
+                                        <small>
+                                            @if (!ban.IsActive)
+                                            {
+                                                <span class="badge bg-success">Lifted</span>
+                                            }
+                                            else
+                                            {
+                                                <span class="badge bg-secondary">Expired</span>
+                                            }
+                                        </small>
+                                    </div>
+                                </div>
+                                <div class="mobile-card-body">
+                                    @if (!string.IsNullOrEmpty(ban.Reason))
+                                    {
+                                        <div class="mobile-card-row">
+                                            <span class="mobile-card-label">Reason</span>
+                                            <span class="mobile-card-value text-muted">@ban.Reason</span>
+                                        </div>
+                                    }
+                                    <div class="mobile-card-row">
+                                        <span class="mobile-card-label">Banned</span>
+                                        <span class="mobile-card-value text-muted">@ban.BannedAt.ToString("MMM d, yyyy")</span>
+                                    </div>
+                                </div>
+                                <div class="mobile-card-footer">
+                                    <form asp-action="Delete" asp-route-id="@ban.Id" method="post" class="d-inline"
+                                          onsubmit="return confirm('Delete ban record for @ban.IpAddress?')">
+                                        @Html.AntiForgeryToken()
+                                        <button type="submit" class="btn btn-sm btn-outline-danger">
+                                            <i class="bi bi-trash me-1"></i>Delete
+                                        </button>
+                                    </form>
+                                </div>
+                            </div>
+                        }
+                    </div>
+                </div>
                 <div class="table-responsive">
                     <table class="table table-sm table-hover mb-0">
                         <thead class="table-light">

src/PowderCoating.Web/Views/Bills/Edit.cshtml

@@ -4,7 +4,7 @@
     ViewData["Title"] = "Edit Bill";
     ViewData["PageIcon"] = "bi-pencil-square";
     ViewData["PageHelpTitle"] = "Edit Bill";
-    ViewData["PageHelpContent"] = "Bills can only be edited while in Draft status. Once marked Open, they are locked — Void the bill and recreate it if corrections are needed after confirmation.";
+    ViewData["PageHelpContent"] = "Bills can only be edited while in Draft status. Once marked Open, they are locked — Void the bill and recreate it if corrections are needed after confirmation.";
 }
 
 <div class="d-flex justify-content-start mb-4">
@@ -24,7 +24,7 @@
                     <a tabindex="0" class="help-icon" role="button"
                        data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                        data-bs-title="Bill Details"
-                       data-bs-content="Vendor: who you're paying. AP Account: the liability account this bill posts to (e.g. Accounts Payable). Bill Date: date on the vendor's invoice. Due Date: when payment is due — drives overdue status. Vendor Invoice #: the vendor's own reference number for reconciliation.">
+                       data-bs-content="Vendor: who you're paying. AP Account: the liability account this bill posts to (e.g. Accounts Payable). Bill Date: date on the vendor's invoice. Due Date: when payment is due — drives overdue status. Vendor Invoice #: the vendor's own reference number for reconciliation.">
                         <i class="bi bi-question-circle"></i>
                     </a>
                 </div>
@@ -34,8 +34,8 @@
                             <label asp-for="VendorId" class="form-label fw-medium">Vendor <span class="text-danger">*</span></label>
                             <select asp-for="VendorId" asp-items="ViewBag.Vendors" class="form-select"
                                     data-quick-add-url="/Vendors/Create" data-quick-add-title="Add New Vendor">
-                                <option value="">— Select Vendor —</option>
-                                <option value="__new__">+ Add New Vendor…</option>
+                                <option value="">— Select Vendor —</option>
+                                <option value="__new__">+ Add New Vendor…</option>
                             </select>
                         </div>
                         <div class="col-md-6">
@@ -87,7 +87,7 @@
                             }
                             <input type="file" name="receiptFile" id="receiptFile" class="form-control"
                                    accept=".jpg,.jpeg,.png,.gif,.webp,.pdf" />
-                            <div class="form-text">JPG, PNG, GIF, WebP, or PDF — up to 10 MB.</div>
+                            <div class="form-text">JPG, PNG, GIF, WebP, or PDF — up to 10 MB.</div>
                         </div>
                     </div>
                 </div>
@@ -100,7 +100,7 @@
                         <a tabindex="0" class="help-icon" role="button"
                            data-bs-toggle="popover" data-bs-placement="right" data-bs-trigger="focus"
                            data-bs-title="Line Items"
-                           data-bs-content="Each line maps to an expense account (e.g. Supplies, Materials, Subcontractors). Optionally link a line to a Job to track costs against specific work orders. Qty × Unit Price = Amount. Use multiple lines to split one bill across different expense categories.">
+                           data-bs-content="Each line maps to an expense account (e.g. Supplies, Materials, Subcontractors). Optionally link a line to a Job to track costs against specific work orders. Qty × Unit Price = Amount. Use multiple lines to split one bill across different expense categories.">
                             <i class="bi bi-question-circle"></i>
                         </a>
                     </div>
@@ -134,7 +134,7 @@
                     <a tabindex="0" class="help-icon" role="button"
                        data-bs-toggle="popover" data-bs-placement="left" data-bs-trigger="focus"
                        data-bs-title="Bill Summary"
-                       data-bs-content="Tax % is applied to the line-item subtotal. The resulting Total is the full amount owed to the vendor. Partial payments are allowed — each payment recorded reduces the balance due until the bill is fully paid.">
+                       data-bs-content="Tax % is applied to the line-item subtotal. The resulting Total is the full amount owed to the vendor. Partial payments are allowed — each payment recorded reduces the balance due until the bill is fully paid.">
                         <i class="bi bi-question-circle"></i>
                     </a>
                 </div>
@@ -171,7 +171,7 @@
     <tr class="line-item-row">
         <td>
             <select class="form-select form-select-sm account-select" name="LineItems[INDEX].AccountId" required>
-                <option value="">— Account —</option>
+                <option value="">— Account —</option>
                 @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.ExpenseAccounts)
                 {
                     <option value="@item.Value">@item.Text</option>
@@ -181,7 +181,7 @@
         <td><input type="text" class="form-control form-control-sm" name="LineItems[INDEX].Description" placeholder="Description" /></td>
         <td>
             <select class="form-select form-select-sm" name="LineItems[INDEX].JobId">
-                <option value="">—</option>
+                <option value="">—</option>
                 @foreach (var item in (IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>)ViewBag.Jobs)
                 {
                     <option value="@item.Value">@item.Text</option>

src/PowderCoating.Web/Views/Companies/Index.cshtml

@@ -26,11 +26,13 @@
     var totalPages    = (int)(ViewBag.TotalPages ?? 1);
     var totalCount    = (int)(ViewBag.TotalCount ?? 0);
     var impersonatingId = (int?)(ViewBag.ImpersonatingCompanyId);
+    var showChurned   = (bool)(ViewBag.ShowChurned ?? false);
+    var churnedCount  = (int)(ViewBag.ChurnedCount ?? 0);
 
     string SortLink(string col)
     {
         var dir = (sortColumn == col && sortDirection == "asc") ? "desc" : "asc";
-        return Url.Action("Index", new { searchTerm, sortColumn = col, sortDirection = dir, pageNumber = 1, pageSize })!;
+        return Url.Action("Index", new { searchTerm, sortColumn = col, sortDirection = dir, pageNumber = 1, pageSize, showChurned })!;
     }
 
     string SortIcon(string col)
@@ -54,6 +56,7 @@
                 <input type="hidden" name="sortColumn" value="@sortColumn" />
                 <input type="hidden" name="sortDirection" value="@sortDirection" />
                 <input type="hidden" name="pageSize" value="@pageSize" />
+                <input type="hidden" name="showChurned" value="@showChurned.ToString().ToLower()" />
                 <div class="col-md-6">
                     <div class="input-group">
                         <span class="input-group-text"><i class="bi bi-search"></i></span>
@@ -75,6 +78,25 @@
         </div>
     </div>
 
+    @if (churnedCount > 0 && !showChurned)
+    {
+        <div class="alert alert-secondary alert-permanent d-flex align-items-center gap-2 mb-3 py-2">
+            <i class="bi bi-eye-slash text-muted"></i>
+            <span class="small"><strong>@churnedCount</strong> churned @(churnedCount == 1 ? "account" : "accounts") (expired or canceled 14+ days ago) hidden.</span>
+            <a href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = 1, pageSize, showChurned = true })"
+               class="btn btn-sm btn-outline-secondary ms-auto py-0">Show churned</a>
+        </div>
+    }
+    else if (showChurned && churnedCount > 0)
+    {
+        <div class="alert alert-warning alert-permanent d-flex align-items-center gap-2 mb-3 py-2">
+            <i class="bi bi-eye text-warning"></i>
+            <span class="small">Showing all accounts including <strong>@churnedCount</strong> churned.</span>
+            <a href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = 1, pageSize, showChurned = false })"
+               class="btn btn-sm btn-outline-secondary ms-auto py-0">Hide churned</a>
+        </div>
+    }
+
     <div class="card shadow-sm">
         <div class="card-body p-0">
             @if (Model != null && Model.Any())
@@ -313,18 +335,18 @@
                             <nav>
                                 <ul class="pagination pagination-sm mb-0">
                                     <li class="page-item @(pageNumber == 1 ? "disabled" : "")">
-                                        <a class="page-link" href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = pageNumber - 1, pageSize })">
+                                        <a class="page-link" href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = pageNumber - 1, pageSize, showChurned })">
                                             <i class="bi bi-chevron-left"></i>
                                         </a>
                                     </li>
                                     @for (int p = Math.Max(1, pageNumber - 2); p <= Math.Min(totalPages, pageNumber + 2); p++)
                                     {
                                         <li class="page-item @(p == pageNumber ? "active" : "")">
-                                            <a class="page-link" href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = p, pageSize })">@p</a>
+                                            <a class="page-link" href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = p, pageSize, showChurned })">@p</a>
                                         </li>
                                     }
                                     <li class="page-item @(pageNumber == totalPages ? "disabled" : "")">
-                                        <a class="page-link" href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = pageNumber + 1, pageSize })">
+                                        <a class="page-link" href="@Url.Action("Index", new { searchTerm, sortColumn, sortDirection, pageNumber = pageNumber + 1, pageSize, showChurned })">
                                             <i class="bi bi-chevron-right"></i>
                                         </a>
                                     </li>
@@ -464,6 +486,7 @@
             const url = new URL(window.location.href);
             url.searchParams.set('pageSize', size);
             url.searchParams.set('pageNumber', '1');
+            url.searchParams.set('showChurned', '@showChurned.ToString().ToLower()');
             window.location.href = url.toString();
         }
 

src/PowderCoating.Web/Views/CompanyHealth/Index.cshtml

@@ -4,6 +4,9 @@
 @{
     ViewData["Title"] = "Company Health";
 
+    var showChurned  = (bool)(ViewBag.ShowChurned ?? false);
+    var churnedCount = (int)(ViewBag.ChurnedCount ?? 0);
+
     string RiskBadge(ChurnRisk r) => r switch {
         ChurnRisk.Healthy        => "bg-success",
         ChurnRisk.AtRisk         => "bg-warning text-dark",
@@ -73,6 +76,26 @@
         </div>
     </div>
 
+    @* Churned account visibility banner *@
+    @if (churnedCount > 0 && !showChurned)
+    {
+        <div class="alert alert-secondary alert-permanent d-flex align-items-center gap-2 mb-3 py-2">
+            <i class="bi bi-eye-slash text-muted"></i>
+            <span class="small"><strong>@churnedCount</strong> churned @(churnedCount == 1 ? "account" : "accounts") (expired or canceled 14+ days ago) hidden from scores and totals.</span>
+            <a href="@Url.Action("Index", new { risk = ViewBag.Risk, search = ViewBag.Search, configIssuesOnly = ViewBag.ConfigIssuesOnly, showChurned = true })"
+               class="btn btn-sm btn-outline-secondary ms-auto py-0">Show churned</a>
+        </div>
+    }
+    else if (showChurned && churnedCount > 0)
+    {
+        <div class="alert alert-warning alert-permanent d-flex align-items-center gap-2 mb-3 py-2">
+            <i class="bi bi-eye text-warning"></i>
+            <span class="small">Showing all accounts including <strong>@churnedCount</strong> churned.</span>
+            <a href="@Url.Action("Index", new { risk = ViewBag.Risk, search = ViewBag.Search, configIssuesOnly = ViewBag.ConfigIssuesOnly, showChurned = false })"
+               class="btn btn-sm btn-outline-secondary ms-auto py-0">Hide churned</a>
+        </div>
+    }
+
     @* Summary stat cards *@
     <div class="row g-3 mb-3">
         <div class="col-6 col-lg-3">
@@ -193,6 +216,7 @@
                         <label class="form-check-label small" for="configOnly">Config issues only</label>
                     </div>
                 </div>
+                <input type="hidden" name="showChurned" value="@showChurned.ToString().ToLower()" />
                 <div class="col-auto">
                     <button class="btn btn-sm btn-primary">Filter</button>
                     <a asp-action="Index" class="btn btn-sm btn-outline-secondary ms-1">Clear</a>

src/PowderCoating.Web/Views/CompanySettings/Index.cshtml

@@ -1,4 +1,4 @@
-@model PowderCoating.Application.DTOs.Company.CompanySettingsDto
+@model PowderCoating.Application.DTOs.Company.CompanySettingsDto
 @{
     ViewData["Title"] = "Company Settings";
     ViewData["PageIcon"] = "bi-building";
@@ -34,6 +34,7 @@
             <option value="data-retention">Data Retention</option>
             <option value="data-lookups">Data Lookups</option>
             <option value="pdf-templates">PDF Templates</option>
+            <option value="kiosk">Kiosk</option>
         </select>
     </div>
 
@@ -100,6 +101,11 @@
                 </button>
             </li>
         }
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="kiosk-tab" data-bs-toggle="tab" data-bs-target="#kiosk" type="button" role="tab">
+                <i class="bi bi-tablet"></i> Kiosk
+            </button>
+        </li>
     </ul>
 
     <!-- Tabs Content -->
@@ -338,28 +344,35 @@
 
         <!-- Operating Costs Tab -->
         <div class="tab-pane fade" id="operating-costs" role="tabpanel">
-            <div class="card mt-3">
-                <div class="card-body">
-                    <h5 class="card-title">Operating Costs Configuration
-                        <a tabindex="0" class="help-icon" role="button"
-                           data-bs-toggle="popover" data-bs-placement="right"
-                           data-bs-title="Operating Costs"
-                           data-bs-content="These are the rates the quoting engine uses to price every job automatically. Set them to your real shop costs and the system will produce accurate quotes without manual calculation. &lt;strong&gt;New quotes use the current rates&lt;/strong&gt; — changing a rate here does not retroactively reprice existing quotes.&lt;br&gt;&lt;br&gt;&lt;a href='/Help/Settings#pricing-configuration' target='_blank'&gt;Learn more →&lt;/a&gt;">
-                            <i class="bi bi-question-circle"></i>
-                        </a>
-                    </h5>
-                    <p class="text-muted">Configure your operating costs for accurate job quoting calculations.</p>
+            <form id="operatingCostsForm">
 
-                    <form id="operatingCostsForm">
-                        <!-- Rates & Costs -->
-                        <h6 class="border-bottom pb-2 mb-3">Rates &amp; Costs
+                <!-- Header -->
+                <div class="card mt-3">
+                    <div class="card-body">
+                        <h5 class="card-title mb-1">Operating Costs Configuration
                             <a tabindex="0" class="help-icon" role="button"
                                data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Rates &amp; Costs"
-                               data-bs-content="&lt;strong&gt;Standard Labor Rate&lt;/strong&gt; is the baseline $/hr for all coating work — sandblasting and masking are multiplied from this. &lt;strong&gt;Powder Coating Cost/sq ft&lt;/strong&gt; is the fallback material rate used when you don't select a specific powder inventory item on a quote item. &lt;strong&gt;Additional Coat Labor&lt;/strong&gt; is the percentage of the base labor cost charged for each coat after the first (e.g. 30% means a 2nd coat adds 30% more labor).">
+                               data-bs-title="Operating Costs"
+                               data-bs-content="These are the rates the quoting engine uses to price every job automatically. Set them to your real shop costs and the system will produce accurate quotes without manual calculation. &lt;strong&gt;New quotes use the current rates&lt;/strong&gt; — changing a rate here does not retroactively reprice existing quotes.&lt;br&gt;&lt;br&gt;&lt;a href='/Help/Settings#pricing-configuration' target='_blank'&gt;Learn more →&lt;/a&gt;">
                                 <i class="bi bi-question-circle"></i>
                             </a>
-                        </h6>
+                        </h5>
+                        <p class="text-muted mb-0">Configure your operating costs for accurate job quoting calculations.</p>
+                    </div>
+                </div>
+
+                <!-- Rates & Costs -->
+                <div class="card mt-3 border-0 shadow-sm">
+                    <div class="card-header bg-transparent fw-semibold">
+                        <i class="bi bi-currency-dollar text-primary me-1"></i> Rates &amp; Costs
+                        <a tabindex="0" class="help-icon" role="button"
+                           data-bs-toggle="popover" data-bs-placement="right"
+                           data-bs-title="Rates &amp; Costs"
+                           data-bs-content="&lt;strong&gt;Standard Labor Rate&lt;/strong&gt; is the baseline $/hr for all coating work — sandblasting and masking are multiplied from this. &lt;strong&gt;Powder Coating Cost/sq ft&lt;/strong&gt; is the fallback material rate used when you don't select a specific powder inventory item on a quote item. &lt;strong&gt;Additional Coat Labor&lt;/strong&gt; is the percentage of the base labor cost charged for each coat after the first (e.g. 30% means a 2nd coat adds 30% more labor).">
+                            <i class="bi bi-question-circle"></i>
+                        </a>
+                    </div>
+                    <div class="card-body">
                         <div class="row">
                             <div class="col-md-3">
                                 <div class="mb-3">
@@ -369,6 +382,18 @@
                                         <input type="number" step="0.01" class="form-control" id="standardLaborRate" name="StandardLaborRate" value="@(Model.OperatingCosts?.StandardLaborRate ?? 0)" min="0" max="10000" required>
                                         <span class="input-group-text">/hr</span>
                                     </div>
+                                    <small class="text-muted">Billing rate used in quotes and pricing</small>
+                                </div>
+                            </div>
+                            <div class="col-md-3">
+                                <div class="mb-3">
+                                    <label for="laborCostPerHour" class="form-label">Shop Labor Cost Rate</label>
+                                    <div class="input-group">
+                                        <span class="input-group-text">$</span>
+                                        <input type="number" step="0.01" class="form-control" id="laborCostPerHour" name="LaborCostPerHour" value="@(Model.OperatingCosts?.LaborCostPerHour?.ToString() ?? "")" min="0" max="10000" placeholder="@(((Model.OperatingCosts?.StandardLaborRate ?? 0) * 0.20m).ToString("0.00"))">
+                                        <span class="input-group-text">/hr</span>
+                                    </div>
+                                    <small class="text-muted">Actual wage cost for job costing &amp; profit display only &mdash; never shown to customers. Leave blank to default to 20% of billing rate.</small>
                                 </div>
                             </div>
                             <div class="col-md-3">
@@ -412,16 +437,21 @@
                                 </div>
                             </div>
                         </div>
+                    </div>
+                </div>
 
-                        <!-- Facility Overhead -->
-                        <h6 class="border-bottom pb-2 mb-3 mt-3">Facility Overhead
-                            <a tabindex="0" class="help-icon" role="button"
-                               data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Facility Overhead"
-                               data-bs-content="Enter your monthly shop rent and combined utility costs. The system divides these by your estimated billable hours to derive a per-hour overhead rate, which is then added to every quote proportionally to the estimated job time. This ensures fixed facility costs are recovered across all jobs rather than absorbed into your markup.">
-                                <i class="bi bi-question-circle"></i>
-                            </a>
-                        </h6>
+                <!-- Facility Overhead -->
+                <div class="card mt-3 border-0 shadow-sm">
+                    <div class="card-header bg-transparent fw-semibold">
+                        <i class="bi bi-building text-primary me-1"></i> Facility Overhead
+                        <a tabindex="0" class="help-icon" role="button"
+                           data-bs-toggle="popover" data-bs-placement="right"
+                           data-bs-title="Facility Overhead"
+                           data-bs-content="Enter your monthly shop rent and combined utility costs. The system divides these by your estimated billable hours to derive a per-hour overhead rate, which is then added to every quote proportionally to the estimated job time. This ensures fixed facility costs are recovered across all jobs rather than absorbed into your markup.">
+                            <i class="bi bi-question-circle"></i>
+                        </a>
+                    </div>
+                    <div class="card-body">
                         <div class="row align-items-start">
                             <div class="col-md-3">
                                 <div class="mb-3">
@@ -451,7 +481,7 @@
                                         <input type="number" step="1" class="form-control facility-overhead-input" id="monthlyBillableHours" name="MonthlyBillableHours" value="@(Model.OperatingCosts?.MonthlyBillableHours ?? 160)" min="1" max="10000">
                                         <span class="input-group-text">hrs</span>
                                     </div>
-                                    <small class="text-muted">Typical: 160 hrs (4 wks × 40 hrs)</small>
+                                    <small class="text-muted">Typical: 160 hrs (4 wks &times; 40 hrs)</small>
                                 </div>
                             </div>
                             <div class="col-md-3">
@@ -466,16 +496,21 @@
                                 </div>
                             </div>
                         </div>
+                    </div>
+                </div>
 
-                        <!-- Equipment Operating Costs -->
-                        <h6 class="border-bottom pb-2 mb-3 mt-3">Equipment Operating Costs
-                            <a tabindex="0" class="help-icon" role="button"
-                               data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Equipment Operating Costs"
-                               data-bs-content="The hourly cost of running each piece of equipment, including energy and depreciation. These are added to quote items based on the prep services selected. The &lt;strong&gt;Default Oven Rate&lt;/strong&gt; is used on quotes where no named oven is chosen — add individual shop ovens below if you have multiple ovens with different capacities and costs.">
-                                <i class="bi bi-question-circle"></i>
-                            </a>
-                        </h6>
+                <!-- Equipment Operating Costs -->
+                <div class="card mt-3 border-0 shadow-sm">
+                    <div class="card-header bg-transparent fw-semibold">
+                        <i class="bi bi-tools text-primary me-1"></i> Equipment Operating Costs
+                        <a tabindex="0" class="help-icon" role="button"
+                           data-bs-toggle="popover" data-bs-placement="right"
+                           data-bs-title="Equipment Operating Costs"
+                           data-bs-content="The hourly cost of running each piece of equipment, including energy and depreciation. These are added to quote items based on the prep services selected. The &lt;strong&gt;Default Oven Rate&lt;/strong&gt; is used on quotes where no named oven is chosen — add individual shop ovens below if you have multiple ovens with different capacities and costs.">
+                            <i class="bi bi-question-circle"></i>
+                        </a>
+                    </div>
+                    <div class="card-body">
                         <div class="row">
                             <div class="col-md-4">
                                 <div class="mb-3">
@@ -509,45 +544,21 @@
                                 </div>
                             </div>
                         </div>
+                    </div>
+                </div>
 
-                        <!-- Role-Based Labor Rates -->
-                        <h6 class="border-bottom pb-2 mb-3 mt-4">Role-Based Labor Cost Rates
-                            <a tabindex="0" class="help-icon" role="button"
-                               data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Role-Based Labor Cost Rates"
-                               data-bs-content="Set an optional cost rate per worker role for job profitability calculations. These are your &lt;strong&gt;internal cost rates&lt;/strong&gt; (what you pay), not what you bill customers. If a rate is left blank, the &lt;strong&gt;Standard Labor Rate&lt;/strong&gt; above is used as the fallback.">
-                                <i class="bi bi-question-circle"></i>
-                            </a>
-                        </h6>
-                        <p class="text-muted small">Used for job costing only — not shown to customers. Leave blank to use the Standard Labor Rate.</p>
-                        <div class="table-responsive mb-3">
-                            <table class="table table-sm align-middle" id="roleCostTable">
-                                <thead class="table-light">
-                                    <tr>
-                                        <th>Role</th>
-                                        <th style="width:180px;">Cost Rate / hr</th>
-                                        <th style="width:140px;" class="text-muted small">Fallback if blank</th>
-                                    </tr>
-                                </thead>
-                                <tbody id="roleCostBody">
-                                    <tr><td colspan="3" class="text-center text-muted py-2"><div class="spinner-border spinner-border-sm me-2"></div>Loading...</td></tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <button type="button" class="btn btn-sm btn-primary" onclick="saveRoleCosts()">
-                            <i class="bi bi-floppy me-1"></i>Save Labor Rates
-                        </button>
-                        <span id="roleCostSaveStatus" class="ms-2 small"></span>
-
-                        <!-- Pricing & Overhead -->
-                        <h6 class="border-bottom pb-2 mb-3 mt-4">Pricing &amp; Profit
-                            <a tabindex="0" class="help-icon" role="button"
-                               data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Pricing &amp; Profit"
-                               data-bs-content="&lt;strong&gt;Markup mode&lt;/strong&gt; adds a % on top of material costs only (labor and equipment pass through at cost). &lt;strong&gt;Margin mode&lt;/strong&gt; targets a gross margin % of the total selling price — e.g. 30% margin on a $100 cost base gives a $142.86 price. Note: margin % and markup % are not the same number. &lt;strong&gt;Shop Minimum&lt;/strong&gt; sets a floor price for any job.">
-                                <i class="bi bi-question-circle"></i>
-                            </a>
-                        </h6>
+                <!-- Pricing & Profit -->
+                <div class="card mt-3 border-0 shadow-sm">
+                    <div class="card-header bg-transparent fw-semibold">
+                        <i class="bi bi-graph-up-arrow text-primary me-1"></i> Pricing &amp; Profit
+                        <a tabindex="0" class="help-icon" role="button"
+                           data-bs-toggle="popover" data-bs-placement="right"
+                           data-bs-title="Pricing &amp; Profit"
+                           data-bs-content="&lt;strong&gt;Markup mode&lt;/strong&gt; adds a % on top of material costs only (labor and equipment pass through at cost). &lt;strong&gt;Margin mode&lt;/strong&gt; targets a gross margin % of the total selling price — e.g. 30% margin on a $100 cost base gives a $142.86 price. Note: margin % and markup % are not the same number. &lt;strong&gt;Shop Minimum&lt;/strong&gt; sets a floor price for any job.">
+                            <i class="bi bi-question-circle"></i>
+                        </a>
+                    </div>
+                    <div class="card-body">
                         @{
                             var currentPricingMode = (int)(Model.OperatingCosts?.PricingMode ?? PowderCoating.Core.Enums.PricingMode.MarkupOnMaterial);
                         }
@@ -558,14 +569,14 @@
                                     <input class="form-check-input" type="radio" name="pricingModeRadio" id="pricingModeMarkup" value="0"
                                            @(currentPricingMode == 0 ? "checked" : "") onchange="onPricingModeChange()">
                                     <label class="form-check-label" for="pricingModeMarkup">
-                                        <strong>Markup</strong> — add % to material costs
+                                        <strong>Markup</strong> &mdash; add % to material costs
                                     </label>
                                 </div>
                                 <div class="form-check">
                                     <input class="form-check-input" type="radio" name="pricingModeRadio" id="pricingModeMargin" value="1"
                                            @(currentPricingMode == 1 ? "checked" : "") onchange="onPricingModeChange()">
                                     <label class="form-check-label" for="pricingModeMargin">
-                                        <strong>Margin</strong> — target gross margin % of selling price
+                                        <strong>Margin</strong> &mdash; target gross margin % of selling price
                                     </label>
                                 </div>
                             </div>
@@ -603,16 +614,21 @@
                                 </div>
                             </div>
                         </div>
+                    </div>
+                </div>
 
-                        <!-- Rush Charges -->
-                        <h6 class="border-bottom pb-2 mb-3 mt-3">Rush Charges
-                            <a tabindex="0" class="help-icon" role="button"
-                               data-bs-toggle="popover" data-bs-placement="right"
-                               data-bs-title="Rush Charges"
-                               data-bs-content="When a quote is marked as a &lt;strong&gt;Rush Job&lt;/strong&gt;, this charge is automatically added to the total. Choose &lt;strong&gt;Percentage&lt;/strong&gt; to add a % of the subtotal (e.g. 25% rush surcharge) or &lt;strong&gt;Fixed Amount&lt;/strong&gt; to add a flat fee (e.g. $75 rush fee). The rush charge appears as its own line on the quote.">
-                                <i class="bi bi-question-circle"></i>
-                            </a>
-                        </h6>
+                <!-- Rush Charges -->
+                <div class="card mt-3 border-0 shadow-sm">
+                    <div class="card-header bg-transparent fw-semibold">
+                        <i class="bi bi-lightning-charge text-primary me-1"></i> Rush Charges
+                        <a tabindex="0" class="help-icon" role="button"
+                           data-bs-toggle="popover" data-bs-placement="right"
+                           data-bs-title="Rush Charges"
+                           data-bs-content="When a quote is marked as a &lt;strong&gt;Rush Job&lt;/strong&gt;, this charge is automatically added to the total. Choose &lt;strong&gt;Percentage&lt;/strong&gt; to add a % of the subtotal (e.g. 25% rush surcharge) or &lt;strong&gt;Fixed Amount&lt;/strong&gt; to add a flat fee (e.g. $75 rush fee). The rush charge appears as its own line on the quote.">
+                            <i class="bi bi-question-circle"></i>
+                        </a>
+                    </div>
+                    <div class="card-body">
                         <div class="row">
                             <div class="col-md-6">
                                 <div class="mb-3">
@@ -622,7 +638,6 @@
                                         <label class="btn btn-outline-primary" for="rushChargeTypePercentage">
                                             <i class="bi bi-percent"></i> Percentage
                                         </label>
-
                                         <input type="radio" class="btn-check" name="rushChargeTypeRadio" id="rushChargeTypeFixed" value="FixedAmount" checked="@((Model.OperatingCosts?.RushChargeType) == "FixedAmount")">
                                         <label class="btn btn-outline-primary" for="rushChargeTypeFixed">
                                             <i class="bi bi-currency-dollar"></i> Fixed Amount
@@ -641,7 +656,6 @@
                                         <small class="text-muted">Percentage of subtotal added for rush jobs</small>
                                     </div>
                                 </div>
-
                                 <div id="rushChargeFixedInput" style="display: @((Model.OperatingCosts?.RushChargeType) == "FixedAmount" ? "block" : "none")">
                                     <div class="mb-3">
                                         <label for="rushChargeFixedAmount" class="form-label">Rush Charge Amount</label>
@@ -654,65 +668,66 @@
                                 </div>
                             </div>
                         </div>
-
-                        <!-- Part Complexity Multipliers -->
-                        <div class="card mb-4 border-0 shadow-sm">
-                            <div class="card-header bg-transparent fw-semibold">
-                                <i class="bi bi-layers text-primary me-1"></i> Part Complexity Multipliers
-                                <a tabindex="0" class="help-icon" role="button"
-                                   data-bs-toggle="popover" data-bs-placement="right"
-                                   data-bs-title="Part Complexity Multipliers"
-                                   data-bs-content="A percentage added to the price of &lt;strong&gt;calculated items&lt;/strong&gt; based on how intricate the part is. When adding an item in a quote, staff select a complexity level — the system then applies this multiplier to account for the extra time and care needed. &lt;em&gt;Simple&lt;/em&gt; = 0% (flat panels, basic shapes). &lt;em&gt;Extreme&lt;/em&gt; = highly detailed, tight recesses, masking-intensive parts.">
-                                    <i class="bi bi-question-circle"></i>
-                                </a>
-                            </div>
-                            <div class="card-body">
-                                <p class="text-muted small mb-3">Percentage added to the calculated item price based on part intricacy. Applied to calculated items only (not catalog, generic, or labor items).</p>
-                                <div class="row g-3">
-                                    <div class="col-sm-6 col-md-3">
-                                        <label for="complexitySimplePercent" class="form-label">Simple (%)</label>
-                                        <div class="input-group">
-                                            <input type="number" step="0.1" class="form-control" id="complexitySimplePercent" name="ComplexitySimplePercent" value="@(Model.OperatingCosts?.ComplexitySimplePercent ?? 0)" min="0" max="500">
-                                            <span class="input-group-text">%</span>
-                                        </div>
-                                        <small class="text-muted">No added complexity</small>
-                                    </div>
-                                    <div class="col-sm-6 col-md-3">
-                                        <label for="complexityModeratePercent" class="form-label">Moderate (%)</label>
-                                        <div class="input-group">
-                                            <input type="number" step="0.1" class="form-control" id="complexityModeratePercent" name="ComplexityModeratePercent" value="@(Model.OperatingCosts?.ComplexityModeratePercent ?? 5)" min="0" max="500">
-                                            <span class="input-group-text">%</span>
-                                        </div>
-                                        <small class="text-muted">Some detail work</small>
-                                    </div>
-                                    <div class="col-sm-6 col-md-3">
-                                        <label for="complexityComplexPercent" class="form-label">Complex (%)</label>
-                                        <div class="input-group">
-                                            <input type="number" step="0.1" class="form-control" id="complexityComplexPercent" name="ComplexityComplexPercent" value="@(Model.OperatingCosts?.ComplexityComplexPercent ?? 15)" min="0" max="500">
-                                            <span class="input-group-text">%</span>
-                                        </div>
-                                        <small class="text-muted">Intricate parts</small>
-                                    </div>
-                                    <div class="col-sm-6 col-md-3">
-                                        <label for="complexityExtremePercent" class="form-label">Extreme (%)</label>
-                                        <div class="input-group">
-                                            <input type="number" step="0.1" class="form-control" id="complexityExtremePercent" name="ComplexityExtremePercent" value="@(Model.OperatingCosts?.ComplexityExtremePercent ?? 25)" min="0" max="500">
-                                            <span class="input-group-text">%</span>
-                                        </div>
-                                        <small class="text-muted">Highly detailed/difficult</small>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="d-flex justify-content-end mt-4">
-                            <button type="submit" class="btn btn-primary" id="btnSaveOperatingCosts">
-                                <i class="bi bi-save"></i> Save Operating Costs
-                            </button>
-                        </div>
-                    </form>
+                    </div>
                 </div>
-            </div>
+
+                <!-- Part Complexity Multipliers -->
+                <div class="card mt-3 border-0 shadow-sm">
+                    <div class="card-header bg-transparent fw-semibold">
+                        <i class="bi bi-layers text-primary me-1"></i> Part Complexity Multipliers
+                        <a tabindex="0" class="help-icon" role="button"
+                           data-bs-toggle="popover" data-bs-placement="right"
+                           data-bs-title="Part Complexity Multipliers"
+                           data-bs-content="A percentage added to the price of &lt;strong&gt;calculated items&lt;/strong&gt; based on how intricate the part is. When adding an item in a quote, staff select a complexity level — the system then applies this multiplier to account for the extra time and care needed. &lt;em&gt;Simple&lt;/em&gt; = 0% (flat panels, basic shapes). &lt;em&gt;Extreme&lt;/em&gt; = highly detailed, tight recesses, masking-intensive parts.">
+                            <i class="bi bi-question-circle"></i>
+                        </a>
+                    </div>
+                    <div class="card-body">
+                        <p class="text-muted small mb-3">Percentage added to the calculated item price based on part intricacy. Applied to calculated items only (not catalog, generic, or labor items).</p>
+                        <div class="row g-3">
+                            <div class="col-sm-6 col-md-3">
+                                <label for="complexitySimplePercent" class="form-label">Simple (%)</label>
+                                <div class="input-group">
+                                    <input type="number" step="0.1" class="form-control" id="complexitySimplePercent" name="ComplexitySimplePercent" value="@(Model.OperatingCosts?.ComplexitySimplePercent ?? 0)" min="0" max="500">
+                                    <span class="input-group-text">%</span>
+                                </div>
+                                <small class="text-muted">No added complexity</small>
+                            </div>
+                            <div class="col-sm-6 col-md-3">
+                                <label for="complexityModeratePercent" class="form-label">Moderate (%)</label>
+                                <div class="input-group">
+                                    <input type="number" step="0.1" class="form-control" id="complexityModeratePercent" name="ComplexityModeratePercent" value="@(Model.OperatingCosts?.ComplexityModeratePercent ?? 5)" min="0" max="500">
+                                    <span class="input-group-text">%</span>
+                                </div>
+                                <small class="text-muted">Some detail work</small>
+                            </div>
+                            <div class="col-sm-6 col-md-3">
+                                <label for="complexityComplexPercent" class="form-label">Complex (%)</label>
+                                <div class="input-group">
+                                    <input type="number" step="0.1" class="form-control" id="complexityComplexPercent" name="ComplexityComplexPercent" value="@(Model.OperatingCosts?.ComplexityComplexPercent ?? 15)" min="0" max="500">
+                                    <span class="input-group-text">%</span>
+                                </div>
+                                <small class="text-muted">Intricate parts</small>
+                            </div>
+                            <div class="col-sm-6 col-md-3">
+                                <label for="complexityExtremePercent" class="form-label">Extreme (%)</label>
+                                <div class="input-group">
+                                    <input type="number" step="0.1" class="form-control" id="complexityExtremePercent" name="ComplexityExtremePercent" value="@(Model.OperatingCosts?.ComplexityExtremePercent ?? 25)" min="0" max="500">
+                                    <span class="input-group-text">%</span>
+                                </div>
+                                <small class="text-muted">Highly detailed/difficult</small>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="d-flex justify-content-end mt-4 mb-2">
+                    <button type="submit" class="btn btn-primary" id="btnSaveOperatingCosts">
+                        <i class="bi bi-save"></i> Save Operating Costs
+                    </button>
+                </div>
+
+            </form>
         </div>
         <!-- Oven Cost Add/Edit Modal (outside all forms to avoid form interaction issues) -->
         <div class="modal fade" id="ovenModal" tabindex="-1" aria-labelledby="ovenModalTitle" aria-hidden="true">
@@ -1978,6 +1993,67 @@
                 </div>
             </div>
         }
+
+        <!-- Kiosk Tab -->
+        <div class="tab-pane fade" id="kiosk" role="tabpanel">
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h5 class="mb-0"><i class="bi bi-tablet me-2"></i>Customer Intake Kiosk</h5>
+                </div>
+                <div class="card-body">
+
+                    <h6 class="fw-semibold mb-1">Intake Output</h6>
+                    <p class="text-muted small mb-3">
+                        When a customer completes the intake form, what should be created in the system?
+                    </p>
+
+                    <div class="row g-3 mb-4">
+                        <div class="col-md-6">
+                            <div class="card h-100 border @(Model.Preferences?.KioskIntakeOutput == "Job" ? "" : "border-primary bg-primary-subtle")"
+                                 id="kioskOutputQuoteCard" style="cursor:pointer;" onclick="selectKioskOutput('Quote')">
+                                <div class="card-body">
+                                    <div class="d-flex align-items-center gap-2 mb-2">
+                                        <div class="form-check mb-0">
+                                            <input class="form-check-input" type="radio" name="kioskOutput" id="kioskOutputQuote"
+                                                   value="Quote" @(Model.Preferences?.KioskIntakeOutput != "Job" ? "checked" : "") />
+                                        </div>
+                                        <h6 class="mb-0 fw-semibold"><i class="bi bi-file-earmark-text me-1 text-primary"></i>Create a Quote</h6>
+                                    </div>
+                                    <p class="text-muted small mb-0">
+                                        A draft quote is created and reviewed by staff before work begins.
+                                        Best for shops that price after seeing the parts.
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="card h-100 border @(Model.Preferences?.KioskIntakeOutput == "Job" ? "border-success bg-success-subtle" : "")"
+                                 id="kioskOutputJobCard" style="cursor:pointer;" onclick="selectKioskOutput('Job')">
+                                <div class="card-body">
+                                    <div class="d-flex align-items-center gap-2 mb-2">
+                                        <div class="form-check mb-0">
+                                            <input class="form-check-input" type="radio" name="kioskOutput" id="kioskOutputJob"
+                                                   value="Job" @(Model.Preferences?.KioskIntakeOutput == "Job" ? "checked" : "") />
+                                        </div>
+                                        <h6 class="mb-0 fw-semibold"><i class="bi bi-briefcase me-1 text-success"></i>Create a Job</h6>
+                                    </div>
+                                    <p class="text-muted small mb-0">
+                                        A job is created immediately on submission.
+                                        Best for shops that price on the spot and want the work order ready right away.
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <button type="button" class="btn btn-primary" onclick="saveKioskSettings()">
+                        <i class="bi bi-floppy me-1"></i> Save Kiosk Settings
+                    </button>
+
+                </div>
+            </div>
+        </div>
+
     </div>
 </div>
 
@@ -2882,76 +2958,6 @@
             loadOvenCosts();
         });
 
-        // Reload role costs whenever the Operating Costs tab is shown
-        document.getElementById('operating-costs-tab')?.addEventListener('shown.bs.tab', () => {
-            loadRoleCosts();
-        });
-
-        // If Equipment Profile tab is already active on page load, load immediately
-        if (document.getElementById('quoting-calibration')?.classList.contains('show')) {
-            loadOvenCosts();
-        }
-
-        // If Operating Costs tab is already active on page load, load role costs immediately
-        if (document.getElementById('operating-costs')?.classList.contains('show')) {
-            loadRoleCosts();
-        }
-
-        // ── Role-Based Labor Cost Rates ────────────────────────────────────────
-        const ROLE_NAMES = ['General Labor','Sandblaster','Coater','Masker','Quality Control','Oven Operator','Supervisor','Maintenance'];
-
-        async function loadRoleCosts() {
-            const resp = await fetch('/CompanySettings/GetRoleCosts');
-            const saved = await resp.json(); // [{role, hourlyRate}]
-            const rateMap = {};
-            saved.forEach(r => rateMap[r.role] = r.hourlyRate);
-
-            const fallbackEl = document.getElementById('standardLaborRate');
-            const fallback = fallbackEl ? `$${parseFloat(fallbackEl.value || 0).toFixed(2)}/hr` : 'Standard Rate';
-
-            const tbody = document.getElementById('roleCostBody');
-            tbody.innerHTML = ROLE_NAMES.map((name, i) => `
-                <tr>
-                    <td><span class="badge bg-secondary">${name}</span></td>
-                    <td>
-                        <div class="input-group input-group-sm">
-                            <span class="input-group-text">$</span>
-                            <input type="number" step="0.01" min="0" max="999"
-                                   class="form-control role-cost-input"
-                                   data-role="${i}"
-                                   value="${rateMap[i] > 0 ? rateMap[i] : ''}"
-                                   placeholder="(use default)">
-                        </div>
-                    </td>
-                    <td class="text-muted small">${fallback}</td>
-                </tr>`).join('');
-        }
-
-        async function saveRoleCosts() {
-            const inputs = document.querySelectorAll('.role-cost-input');
-            const rates = Array.from(inputs).map(el => ({
-                role: parseInt(el.dataset.role),
-                hourlyRate: parseFloat(el.value) || 0
-            }));
-            const statusEl = document.getElementById('roleCostSaveStatus');
-            statusEl.textContent = 'Saving...';
-            statusEl.className = 'ms-2 small text-muted';
-            const resp = await fetch('/CompanySettings/SaveRoleCosts', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json', 'RequestVerificationToken': document.querySelector('input[name="__RequestVerificationToken"]')?.value ?? '' },
-                body: JSON.stringify(rates)
-            });
-            const result = await resp.json();
-            if (result.success) {
-                statusEl.textContent = '✓ Saved';
-                statusEl.className = 'ms-2 small text-success';
-                setTimeout(() => statusEl.textContent = '', 3000);
-            } else {
-                statusEl.textContent = result.message || 'Error saving';
-                statusEl.className = 'ms-2 small text-danger';
-            }
-        }
-
         // ── Quote PDF Template ──────────────────────────────────────────────
         function syncColorPicker(hex) {
             if (/^#[0-9A-Fa-f]{6}$/.test(hex)) {
@@ -3248,12 +3254,41 @@
             else showError(data.message);
         }
 
+        function selectKioskOutput(value) {
+            document.getElementById('kioskOutputQuote').checked = value === 'Quote';
+            document.getElementById('kioskOutputJob').checked   = value === 'Job';
+
+            document.getElementById('kioskOutputQuoteCard').classList.toggle('border-primary',  value === 'Quote');
+            document.getElementById('kioskOutputQuoteCard').classList.toggle('bg-primary-subtle', value === 'Quote');
+            document.getElementById('kioskOutputJobCard').classList.toggle('border-success',    value === 'Job');
+            document.getElementById('kioskOutputJobCard').classList.toggle('bg-success-subtle', value === 'Job');
+        }
+
+        async function saveKioskSettings() {
+            const value = document.querySelector('input[name="kioskOutput"]:checked')?.value ?? 'Quote';
+            const resp = await fetch('/CompanySettings/UpdateKioskSettings', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'RequestVerificationToken': $('input[name="__RequestVerificationToken"]').val()
+                },
+                body: JSON.stringify({ kioskIntakeOutput: value })
+            });
+            const data = await resp.json();
+            if (data.success) showSuccess(data.message);
+            else showError(data.message);
+        }
+
         // Auto-open online-payments tab if redirected with ?tab=online-payments
         const urlParams = new URLSearchParams(window.location.search);
         if (urlParams.get('tab') === 'online-payments') {
             const btn = document.querySelector('[data-bs-target="#online-payments"]');
             if (btn) new bootstrap.Tab(btn).show();
         }
+        if (urlParams.get('tab') === 'kiosk') {
+            const btn = document.querySelector('[data-bs-target="#kiosk"]');
+            if (btn) new bootstrap.Tab(btn).show();
+        }
     </script>
 
 }

src/PowderCoating.Web/Views/CompanyUsers/Edit.cshtml

@@ -106,6 +106,16 @@
                                 <input asp-for="Position" class="form-control" />
                                 <span asp-validation-for="Position" class="text-danger"></span>
                             </div>
+                            <div class="col-md-4">
+                                <label asp-for="LaborCostPerHour" class="form-label">Labor Cost Rate</label>
+                                <div class="input-group">
+                                    <span class="input-group-text">$</span>
+                                    <input asp-for="LaborCostPerHour" type="number" step="0.01" min="0" max="10000" class="form-control" placeholder="Use company default" />
+                                    <span class="input-group-text">/hr</span>
+                                </div>
+                                <span asp-validation-for="LaborCostPerHour" class="text-danger"></span>
+                                <small class="text-muted">Used for internal job costing only &mdash; never shown to customers. Overrides the company default when set. Leave blank to use the shop-wide rate.</small>
+                            </div>
                             <div class="col-md-6">
                                 <label asp-for="HireDate" class="form-label">Hire Date</label>
                                 <input asp-for="HireDate" class="form-control" type="date" />

src/PowderCoating.Web/Views/CreditMemos/Index.cshtml

@@ -101,6 +101,73 @@
 else
 {
     <div class="card">
+        <div class="mobile-card-view">
+            <div class="mobile-card-list">
+                @foreach (var m in Model)
+                {
+                    var expired2 = m.ExpiryDate.HasValue && m.ExpiryDate.Value < DateTime.UtcNow
+                                && m.Status != CreditMemoStatus.FullyApplied
+                                && m.Status != CreditMemoStatus.Voided;
+                    var (cmBadge, cmLabel) = m.Status switch
+                    {
+                        CreditMemoStatus.Active           => ("bg-success-subtle text-success", "Active"),
+                        CreditMemoStatus.PartiallyApplied => ("bg-warning-subtle text-warning", "Partial"),
+                        CreditMemoStatus.FullyApplied     => ("bg-secondary-subtle text-secondary", "Applied"),
+                        CreditMemoStatus.Voided           => ("bg-danger-subtle text-danger", "Voided"),
+                        _                                 => ("bg-secondary-subtle text-secondary", m.Status.ToString())
+                    };
+                    var cmCustomer = string.IsNullOrWhiteSpace(m.Customer?.CompanyName)
+                        ? $"{m.Customer?.ContactFirstName} {m.Customer?.ContactLastName}".Trim()
+                        : m.Customer!.CompanyName;
+                    <div class="mobile-data-card" onclick="window.location='@Url.Action("Details", new { id = m.Id })'">
+                        <div class="mobile-card-header">
+                            <div class="mobile-card-icon" style="background: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%);">
+                                <i class="bi bi-journal-minus"></i>
+                            </div>
+                            <div class="mobile-card-title">
+                                <h6>@m.MemoNumber</h6>
+                                <small>@cmCustomer</small>
+                            </div>
+                        </div>
+                        <div class="mobile-card-body">
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Status</span>
+                                <span class="mobile-card-value"><span class="badge @cmBadge">@cmLabel</span></span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Amount</span>
+                                <span class="mobile-card-value">@m.Amount.ToString("C")</span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Remaining</span>
+                                <span class="mobile-card-value @(m.RemainingBalance > 0 && m.Status != CreditMemoStatus.Voided ? "text-success fw-semibold" : "text-muted")">
+                                    @m.RemainingBalance.ToString("C")
+                                </span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Issued</span>
+                                <span class="mobile-card-value">@m.IssueDate.ToLocalTime().ToString("MM/dd/yy")</span>
+                            </div>
+                            @if (m.ExpiryDate.HasValue)
+                            {
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Expires</span>
+                                    <span class="mobile-card-value @(expired2 ? "text-danger fw-semibold" : "")">
+                                        @m.ExpiryDate.Value.ToLocalTime().ToString("MM/dd/yy")
+                                        @if (expired2) { <small>(Expired)</small> }
+                                    </span>
+                                </div>
+                            }
+                        </div>
+                        <div class="mobile-card-footer">
+                            <a asp-action="Details" asp-route-id="@m.Id" class="btn btn-sm btn-outline-primary" onclick="event.stopPropagation()">
+                                Details
+                            </a>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
         <div class="table-responsive">
             <table class="table table-hover align-middle mb-0">
                 <thead class="table-light">

src/PowderCoating.Web/Views/Customers/Details.cshtml

@@ -173,9 +173,11 @@
                                             <i class="bi bi-envelope-slash me-1"></i>Email off
                                         </span>
                                     }
+                                    <span id="sms-status-section">
                                     @if (Model.NotifyBySms)
                                     {
-                                        <span class="badge bg-success bg-opacity-10 text-success border border-success border-opacity-25">
+                                        <span class="badge bg-success bg-opacity-10 text-success border border-success border-opacity-25"
+                                              title="@(Model.SmsConsentedAt.HasValue ? "Consented " + Model.SmsConsentedAt.Value.ToLocalTime().ToString("MM/dd/yyyy") : "")">
                                             <i class="bi bi-chat-fill me-1"></i>SMS on
                                         </span>
                                     }
@@ -184,7 +186,22 @@
                                         <span class="badge bg-secondary bg-opacity-10 text-secondary border border-secondary border-opacity-25">
                                             <i class="bi bi-chat-slash me-1"></i>SMS off
                                         </span>
+                                        <button type="button" id="btnGetSmsConsent"
+                                                class="badge bg-primary bg-opacity-10 text-primary border border-primary border-opacity-25 border-0"
+                                                style="cursor:pointer;"
+                                                title="Send SMS consent form to the front-desk kiosk tablet"
+                                                onclick="pushSmsConsent(@Model.Id)">
+                                            <i class="bi bi-chat-dots me-1"></i>Get SMS Consent
+                                        </button>
+                                        <button type="button" id="btnCancelSmsConsent"
+                                                class="badge bg-warning bg-opacity-10 text-warning border border-warning border-opacity-25 border-0 d-none"
+                                                style="cursor:pointer;"
+                                                title="Cancel the pending kiosk consent request"
+                                                onclick="cancelSmsConsent()">
+                                            <i class="bi bi-x-circle me-1"></i>Cancel Consent
+                                        </button>
                                     }
+                                    </span>
                                 </div>
                             </div>
                         </div>
@@ -543,3 +560,8 @@
         </div>
     </div>
 }
+
+@section Scripts {
+    <script src="~/js/customer-details.js" asp-append-version="true"></script>
+}
+

src/PowderCoating.Web/Views/FixedAssets/Index.cshtml

@@ -118,6 +118,63 @@
         }
         else
         {
+            <div class="mobile-card-view">
+                <div class="mobile-card-list">
+                    @foreach (var a in Model)
+                    {
+                        var fd = a.AccumulatedDepreciation >= (a.PurchaseCost - a.SalvageValue);
+                        <div class="mobile-data-card" onclick="window.location='@Url.Action("Details", new { id = a.Id })'">
+                            <div class="mobile-card-header">
+                                <div class="mobile-card-icon" style="background: linear-gradient(135deg, #8b5cf6 0%, #6d28d9 100%);">
+                                    <i class="bi bi-building-gear"></i>
+                                </div>
+                                <div class="mobile-card-title">
+                                    <h6>@a.Name</h6>
+                                    <small>Purchased @a.PurchaseDate.ToLocalTime().ToString("MM/dd/yyyy")</small>
+                                </div>
+                            </div>
+                            <div class="mobile-card-body">
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Status</span>
+                                    <span class="mobile-card-value">
+                                        @if (a.IsDisposed)
+                                        {
+                                            <span class="badge bg-secondary">Disposed</span>
+                                        }
+                                        else if (fd)
+                                        {
+                                            <span class="badge bg-light text-dark border">Fully Depreciated</span>
+                                        }
+                                        else
+                                        {
+                                            <span class="badge bg-success">Active</span>
+                                        }
+                                    </span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Cost</span>
+                                    <span class="mobile-card-value">@a.PurchaseCost.ToString("C")</span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Book Value</span>
+                                    <span class="mobile-card-value @(a.BookValue <= 0 ? "text-muted" : "text-success fw-semibold")">
+                                        @a.BookValue.ToString("C")
+                                    </span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Monthly Depr.</span>
+                                    <span class="mobile-card-value">@a.MonthlyDepreciation.ToString("C")</span>
+                                </div>
+                            </div>
+                            <div class="mobile-card-footer">
+                                <a asp-action="Details" asp-route-id="@a.Id" class="btn btn-sm btn-outline-secondary" onclick="event.stopPropagation()">
+                                    <i class="bi bi-eye me-1"></i>View
+                                </a>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
             <div class="table-responsive">
                 <table class="table table-hover align-middle mb-0">
                     <thead class="table-light">

src/PowderCoating.Web/Views/GiftCertificates/BulkCreate.cshtml

@@ -0,0 +1,107 @@
+@model PowderCoating.Application.DTOs.GiftCertificate.BulkCreateGiftCertificateDto
+@using PowderCoating.Core.Enums
+
+@{
+    ViewData["Title"] = "Bulk Create Gift Certificates";
+    ViewData["PageIcon"] = "bi-gift";
+}
+
+<div class="row justify-content-center">
+    <div class="col-lg-7">
+        <div class="card border-0 shadow-sm">
+            <div class="card-header bg-white border-bottom py-3">
+                <h5 class="mb-0">
+                    <i class="bi bi-collection me-2 text-primary"></i>Bulk Gift Certificate Generator
+                </h5>
+                <p class="text-muted small mb-0 mt-1">
+                    Create a batch of certificates for car shows, events, or promotions. All certificates will have the same
+                    face value and be generated with sequential codes ready to print.
+                </p>
+            </div>
+            <div class="card-body p-4">
+                <form asp-action="BulkCreate" method="post">
+                    <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
+
+                    <div class="row g-3">
+
+                        <div class="col-md-5">
+                            <label asp-for="Quantity" class="form-label fw-semibold">
+                                <i class="bi bi-123 me-1 text-muted"></i>@Html.DisplayNameFor(m => m.Quantity)
+                            </label>
+                            <input asp-for="Quantity" type="number" class="form-control form-control-lg"
+                                   min="1" max="500" placeholder="25" />
+                            <span asp-validation-for="Quantity" class="text-danger small"></span>
+                            <div class="form-text">Max 500 per batch.</div>
+                        </div>
+
+                        <div class="col-md-7">
+                            <label asp-for="Amount" class="form-label fw-semibold">
+                                <i class="bi bi-currency-dollar me-1 text-muted"></i>@Html.DisplayNameFor(m => m.Amount)
+                            </label>
+                            <div class="input-group input-group-lg">
+                                <span class="input-group-text">$</span>
+                                <input asp-for="Amount" type="number" class="form-control"
+                                       min="1" max="9999.99" step="0.01" placeholder="50.00" />
+                            </div>
+                            <span asp-validation-for="Amount" class="text-danger small"></span>
+                        </div>
+
+                        <div class="col-12">
+                            <label asp-for="IssuedReason" class="form-label fw-semibold">
+                                <i class="bi bi-tag me-1 text-muted"></i>@Html.DisplayNameFor(m => m.IssuedReason)
+                            </label>
+                            <select asp-for="IssuedReason" class="form-select">
+                                @foreach (var reason in Enum.GetValues<GiftCertificateIssuedReason>())
+                                {
+                                    <option value="@reason">@reason</option>
+                                }
+                            </select>
+                            <span asp-validation-for="IssuedReason" class="text-danger small"></span>
+                        </div>
+
+                        <div class="col-12">
+                            <label asp-for="ExpiryDate" class="form-label fw-semibold">
+                                <i class="bi bi-calendar-x me-1 text-muted"></i>@Html.DisplayNameFor(m => m.ExpiryDate)
+                            </label>
+                            <input asp-for="ExpiryDate" type="date" class="form-control" />
+                            <span asp-validation-for="ExpiryDate" class="text-danger small"></span>
+                            <div class="form-text">Leave blank for no expiration.</div>
+                        </div>
+
+                        <div class="col-12">
+                            <label asp-for="Notes" class="form-label fw-semibold">
+                                <i class="bi bi-chat-left-text me-1 text-muted"></i>@Html.DisplayNameFor(m => m.Notes)
+                            </label>
+                            <textarea asp-for="Notes" class="form-control" rows="2"
+                                      placeholder="e.g. Awarded at the 2026 Summer Car Show &mdash; thanks for attending!"></textarea>
+                            <span asp-validation-for="Notes" class="text-danger small"></span>
+                            <div class="form-text">Printed on every certificate in the batch.</div>
+                        </div>
+
+                    </div>
+
+                    <!-- Preview summary -->
+                    <div id="batchPreview" class="alert alert-primary mt-4 mb-0" style="display:none">
+                        <i class="bi bi-info-circle me-2"></i>
+                        You are about to create <strong id="prevQty"></strong> certificates worth
+                        <strong id="prevAmt"></strong> each &mdash; total face value
+                        <strong id="prevTotal"></strong>.
+                    </div>
+
+                    <div class="d-flex justify-content-between align-items-center mt-4 pt-3 border-top">
+                        <a asp-action="Index" class="btn btn-outline-secondary">
+                            <i class="bi bi-arrow-left me-1"></i>Cancel
+                        </a>
+                        <button type="submit" class="btn btn-primary btn-lg" id="submitBtn">
+                            <i class="bi bi-plus-circle me-2"></i>Create Certificates
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+@section Scripts {
+<script src="~/js/gift-certificate-bulk.js" asp-append-version="true"></script>
+}

src/PowderCoating.Web/Views/GiftCertificates/BulkResult.cshtml

@@ -0,0 +1,118 @@
+@model List<PowderCoating.Core.Entities.GiftCertificate>
+@using PowderCoating.Core.Enums
+
+@{
+    ViewData["Title"] = "Batch Gift Certificates";
+    ViewData["PageIcon"] = "bi-gift";
+    var batchId = Model.FirstOrDefault()?.BatchId ?? Guid.Empty;
+    var count = Model.Count;
+    var amount = Model.FirstOrDefault()?.OriginalAmount ?? 0m;
+}
+
+<div class="alert alert-success alert-permanent mb-4">
+    <i class="bi bi-check-circle-fill me-2"></i>
+    <strong>@count gift certificates created</strong> &mdash; each worth @amount.ToString("C").
+    Download the PDF below to print the full batch. This page is bookmarkable &mdash; you can return here any time to re-download.
+</div>
+
+<div class="card border-0 shadow-sm mb-4">
+    <div class="card-header bg-white border-bottom d-flex justify-content-between align-items-center py-3">
+        <h5 class="mb-0">
+            <i class="bi bi-collection me-2 text-primary"></i>Batch Certificates (@count)
+            <span class="text-muted small fw-normal ms-2 font-monospace">@batchId.ToString("N")[..8]&hellip;</span>
+        </h5>
+        <a asp-action="BatchDownloadPdf" asp-route-batchId="@batchId" class="btn btn-primary">
+            <i class="bi bi-file-pdf me-2"></i>Download All as PDF
+        </a>
+    </div>
+    <div class="card-body p-0">
+        <div class="mobile-card-view">
+            <div class="mobile-card-list">
+                @foreach (var cert in Model)
+                {
+                    <div class="mobile-data-card">
+                        <div class="mobile-card-header">
+                            <div class="mobile-card-icon" style="background: linear-gradient(135deg, #10b981 0%, #059669 100%);">
+                                <i class="bi bi-gift"></i>
+                            </div>
+                            <div class="mobile-card-title">
+                                <h6 class="font-monospace">@cert.CertificateCode</h6>
+                                <small>@cert.OriginalAmount.ToString("C")</small>
+                            </div>
+                        </div>
+                        <div class="mobile-card-body">
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Issued</span>
+                                <span class="mobile-card-value">@cert.IssueDate.ToLocalTime().ToString("MMM d, yyyy")</span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Expiry</span>
+                                <span class="mobile-card-value">
+                                    @if (cert.ExpiryDate.HasValue) { @cert.ExpiryDate.Value.ToLocalTime().ToString("MMM d, yyyy") } else { <span class="text-muted">&mdash;</span> }
+                                </span>
+                            </div>
+                            <div class="mobile-card-row">
+                                <span class="mobile-card-label">Status</span>
+                                <span class="mobile-card-value"><span class="badge bg-success">Active</span></span>
+                            </div>
+                        </div>
+                        <div class="mobile-card-footer">
+                            <a asp-action="Details" asp-route-id="@cert.Id" class="btn btn-sm btn-outline-secondary">
+                                <i class="bi bi-eye me-1"></i>View
+                            </a>
+                            <a asp-action="DownloadPdf" asp-route-id="@cert.Id" class="btn btn-sm btn-outline-secondary">
+                                <i class="bi bi-file-pdf me-1"></i>PDF
+                            </a>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+        <div class="table-responsive">
+            <table class="table table-hover mb-0">
+                <thead class="table-light">
+                    <tr>
+                        <th class="ps-3">Certificate Code</th>
+                        <th>Face Value</th>
+                        <th>Issued</th>
+                        <th>Expiry</th>
+                        <th>Status</th>
+                        <th></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var cert in Model)
+                    {
+                        <tr>
+                            <td class="ps-3 fw-semibold font-monospace">@cert.CertificateCode</td>
+                            <td>@cert.OriginalAmount.ToString("C")</td>
+                            <td>@cert.IssueDate.ToLocalTime().ToString("MMM d, yyyy")</td>
+                            <td>
+                                @(cert.ExpiryDate.HasValue
+                                    ? cert.ExpiryDate.Value.ToLocalTime().ToString("MMM d, yyyy")
+                                    : "&mdash;")
+                            </td>
+                            <td><span class="badge bg-success">Active</span></td>
+                            <td class="text-end">
+                                <a asp-action="Details" asp-route-id="@cert.Id" class="btn btn-sm btn-outline-secondary" title="View details">
+                                    <i class="bi bi-eye"></i>
+                                </a>
+                                <a asp-action="DownloadPdf" asp-route-id="@cert.Id" class="btn btn-sm btn-outline-secondary" title="Download single PDF">
+                                    <i class="bi bi-file-pdf"></i>
+                                </a>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="card-footer bg-white border-top d-flex justify-content-between align-items-center py-3">
+        <a asp-action="Index" class="btn btn-outline-secondary">
+            <i class="bi bi-arrow-left me-1"></i>Back to Gift Certificates
+        </a>
+        <a asp-action="BatchDownloadPdf" asp-route-batchId="@batchId" class="btn btn-primary">
+            <i class="bi bi-printer me-2"></i>Print Batch PDF (@count pages)
+        </a>
+    </div>
+</div>

src/PowderCoating.Web/Views/GiftCertificates/Details.cshtml

@@ -28,7 +28,7 @@
     </div>
 </div>
 
-<div class="alert alert-@statusClass alert-permanent d-flex align-items-center mb-4">
+<div class="alert alert-@statusClass d-flex align-items-center mb-4">
     <i class="bi bi-gift me-2" style="font-size:1.4rem;"></i>
     <div>
         <strong>@statusLabel</strong>
@@ -38,7 +38,7 @@
         }
         @if (Model.ExpiryDate.HasValue)
         {
-            <span class="ms-2 small">&middot; Expires @Model.ExpiryDate.Value.Tz(ViewBag.CompanyTimeZone as string).ToString("MMMM d, yyyy")</span>
+            <span class="ms-2 small">· Expires @Model.ExpiryDate.Value.Tz(ViewBag.CompanyTimeZone as string).ToString("MMMM d, yyyy")</span>
         }
     </div>
 </div>

src/PowderCoating.Web/Views/GiftCertificates/Index.cshtml

@@ -7,10 +7,15 @@
 }
 
 <div class="d-flex justify-content-between align-items-center mb-4">
-    <p class="text-muted mb-0">@ViewBag.TotalActive active certificates — @((ViewBag.TotalValue as decimal? ?? 0m).ToString("C")) outstanding value</p>
-    <a asp-action="Create" class="btn btn-primary">
-        <i class="bi bi-plus-circle me-2"></i>New Certificate
-    </a>
+    <p class="text-muted mb-0">@ViewBag.TotalActive active certificates &mdash; @((ViewBag.TotalValue as decimal? ?? 0m).ToString("C")) outstanding value</p>
+    <div class="d-flex gap-2">
+        <a asp-action="BulkCreate" class="btn btn-outline-primary">
+            <i class="bi bi-collection me-2"></i>Bulk Create
+        </a>
+        <a asp-action="Create" class="btn btn-primary">
+            <i class="bi bi-plus-circle me-2"></i>New Certificate
+        </a>
+    </div>
 </div>
 
 <!-- Filters -->
@@ -52,6 +57,73 @@ else
 {
     <div class="card border-0 shadow-sm">
         <div class="card-body p-0">
+            <div class="mobile-card-view">
+                <div class="mobile-card-list">
+                    @foreach (var cert in Model)
+                    {
+                        var (gcBadge, gcLabel) = cert.Status switch
+                        {
+                            GiftCertificateStatus.Active => ("bg-success", "Active"),
+                            GiftCertificateStatus.PartiallyRedeemed => ("bg-info text-dark", "Partial"),
+                            GiftCertificateStatus.FullyRedeemed => ("bg-secondary", "Used"),
+                            GiftCertificateStatus.Expired => ("bg-warning text-dark", "Expired"),
+                            GiftCertificateStatus.Voided => ("bg-danger", "Voided"),
+                            _ => ("bg-secondary", cert.Status.ToString())
+                        };
+                        <div class="mobile-data-card" onclick="window.location='@Url.Action("Details", new { id = cert.Id })'">
+                            <div class="mobile-card-header">
+                                <div class="mobile-card-icon" style="background: linear-gradient(135deg, #a855f7 0%, #7c3aed 100%);">
+                                    <i class="bi bi-gift"></i>
+                                </div>
+                                <div class="mobile-card-title">
+                                    <h6 class="font-monospace">@cert.CertificateCode</h6>
+                                    <small>@(cert.RecipientName ?? cert.RecipientEmail ?? "No recipient")</small>
+                                </div>
+                            </div>
+                            <div class="mobile-card-body">
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Status</span>
+                                    <span class="mobile-card-value"><span class="badge @gcBadge">@gcLabel</span></span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Face Value</span>
+                                    <span class="mobile-card-value">@cert.OriginalAmount.ToString("C")</span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Remaining</span>
+                                    <span class="mobile-card-value @(cert.RemainingBalance > 0 ? "text-success fw-semibold" : "text-muted")">
+                                        @cert.RemainingBalance.ToString("C")
+                                    </span>
+                                </div>
+                                <div class="mobile-card-row">
+                                    <span class="mobile-card-label">Issued</span>
+                                    <span class="mobile-card-value">@cert.IssueDate.Tz(ViewBag.CompanyTimeZone as string).ToString("MM/dd/yy")</span>
+                                </div>
+                                @if (cert.ExpiryDate.HasValue)
+                                {
+                                    <div class="mobile-card-row">
+                                        <span class="mobile-card-label">Expires</span>
+                                        <span class="mobile-card-value @(cert.ExpiryDate.Value < DateTime.Now ? "text-danger" : "")">
+                                            @cert.ExpiryDate.Value.ToString("MM/dd/yy")
+                                        </span>
+                                    </div>
+                                }
+                            </div>
+                            <div class="mobile-card-footer">
+                                <a asp-action="Details" asp-route-id="@cert.Id" class="btn btn-sm btn-outline-primary" onclick="event.stopPropagation()">
+                                    <i class="bi bi-eye me-1"></i>View
+                                </a>
+                                @if (cert.BatchId.HasValue)
+                                {
+                                    <a asp-action="BulkResult" asp-route-batchId="@cert.BatchId" class="btn btn-sm btn-outline-secondary" onclick="event.stopPropagation()">
+                                        <i class="bi bi-collection me-1"></i>Batch
+                                    </a>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
             <div class="table-responsive">
                 <table class="table table-hover mb-0">
                     <thead class="table-light">
@@ -75,6 +147,14 @@ else
                                     <a asp-action="Details" asp-route-id="@cert.Id" class="fw-semibold text-decoration-none font-monospace">
                                         @cert.CertificateCode
                                     </a>
+                                    @if (cert.BatchId.HasValue)
+                                    {
+                                        <a asp-action="BulkResult" asp-route-batchId="@cert.BatchId"
+                                           class="badge bg-primary-subtle text-primary text-decoration-none ms-1"
+                                           title="View &amp; download batch">
+                                            <i class="bi bi-collection me-1"></i>Batch
+                                        </a>
+                                    }
                                 </td>
                                 <td>
                                     @if (!string.IsNullOrEmpty(cert.RecipientName))
@@ -83,7 +163,7 @@ else
                                     }
                                     else
                                     {
-                                        <span class="text-muted">—</span>
+                                        <span class="text-muted">&mdash;</span>
                                     }
                                     @if (!string.IsNullOrEmpty(cert.RecipientEmail))
                                     {

src/PowderCoating.Web/Views/Help/CustomerIntakeKiosk.cshtml

@@ -0,0 +1,209 @@
+@{
+    ViewData["Title"] = "Customer Intake Kiosk";
+}
+
+<div class="d-flex align-items-center gap-2 mb-3">
+    <a asp-controller="Help" asp-action="Index" class="btn btn-sm btn-outline-secondary"><i class="bi bi-arrow-left"></i></a>
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb mb-0">
+            <li class="breadcrumb-item"><a asp-controller="Help" asp-action="Index">Help</a></li>
+            <li class="breadcrumb-item active">Customer Intake Kiosk</li>
+        </ol>
+    </nav>
+</div>
+
+<div class="row g-4">
+    <div class="col-lg-9">
+
+        <section id="overview" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-info-circle text-primary me-2"></i>Overview
+            </h2>
+            <p>
+                The Customer Intake Kiosk lets walk-in customers fill out their own intake form on a front-desk tablet
+                — no staff assistance required. When they're done, a <strong>customer record</strong> is automatically
+                created (or matched to an existing one), a <strong>Draft Quote or Pending Job</strong> is created
+                depending on your setting, and your team receives an in-app notification.
+            </p>
+            <p>
+                The kiosk runs as a browser page (optimised for iPad and Android tablets) and can also send a
+                <strong>remote link</strong> so customers fill out the form on their own phone before they arrive.
+            </p>
+        </section>
+
+        <section id="setup" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-gear text-primary me-2"></i>Setting Up the Kiosk
+            </h2>
+            <ol>
+                <li class="mb-2">
+                    Go to <strong>Settings → Kiosk Setup</strong> (or <a href="/Kiosk/Activate">/Kiosk/Activate</a>).
+                </li>
+                <li class="mb-2">
+                    Click <strong>Activate Kiosk</strong>. This generates a unique activation token for your company
+                    and sets a secure cookie on the current device.
+                </li>
+                <li class="mb-2">
+                    On the tablet, open a browser and navigate to <code>/Kiosk/Welcome</code>. You'll see your
+                    company logo and a "Ready" indicator — the tablet is now in kiosk mode.
+                </li>
+                <li class="mb-2">
+                    <strong>Add to Home Screen</strong> on iOS/Android for a full-screen, app-like experience that
+                    also preserves camera permissions between sessions.
+                </li>
+            </ol>
+            <div class="alert alert-info alert-permanent">
+                <i class="bi bi-info-circle me-2"></i>
+                The kiosk cookie is device-specific and lasts 365 days. If you swap tablets or clear the browser,
+                go back to Kiosk Setup and activate again.
+            </div>
+        </section>
+
+        <section id="starting" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-play-circle text-primary me-2"></i>Starting an Intake Session
+            </h2>
+            <p>There are two ways to start an intake:</p>
+
+            <h3 class="h6 fw-semibold mt-3 mb-2">In-Person (tablet at front desk)</h3>
+            <ol>
+                <li class="mb-1">The tablet sits on the Welcome screen — the customer sees your logo and a "Ready" status dot.</li>
+                <li class="mb-1">A staff member clicks <strong>Start Intake</strong> on the Dashboard (in the Kiosk card).</li>
+                <li class="mb-1">The tablet detects the new session within 3 seconds and automatically navigates to the intake form.</li>
+                <li class="mb-1">The customer fills out <strong>3 steps</strong>: Contact info → Job description → Terms &amp; signature.</li>
+                <li class="mb-1">On Submit, the kiosk shows a thank-you screen and returns to Welcome after 30 seconds.</li>
+            </ol>
+            <div class="alert alert-warning alert-permanent mt-2">
+                <i class="bi bi-clock me-2"></i>
+                If the customer leaves the form untouched for <strong>45 seconds</strong>, it automatically
+                resets to the Welcome screen.
+            </div>
+
+            <h3 class="h6 fw-semibold mt-4 mb-2">Remote Link (customer fills out on their phone)</h3>
+            <ol>
+                <li class="mb-1">Go to <a href="/Kiosk/Intakes">Kiosk → Customer Intakes</a> and click <strong>Send Intake Link</strong>.</li>
+                <li class="mb-1">Or use the <strong>Send Intake Link</strong> button on the Dashboard Kiosk card.</li>
+                <li class="mb-1">Enter the customer's email address and send.</li>
+                <li class="mb-1">The customer receives an email with a secure link and completes the same 3-step form on their own device.</li>
+                <li class="mb-1">Remote sessions don't require a drawn signature — a checkbox agreement is used instead.</li>
+            </ol>
+        </section>
+
+        <section id="output-setting" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-sliders text-primary me-2"></i>Kiosk Output Setting
+            </h2>
+            <p>
+                You can control what gets created when a customer submits the intake form.
+                Go to <a href="/CompanySettings?tab=kiosk">Company Settings → Kiosk</a> and choose:
+            </p>
+            <ul>
+                <li>
+                    <strong>Create a Quote</strong> (default) — a Draft quote is created for staff to review and price
+                    before work begins. The terms shown to the customer will say "subject to a formal quote." Use this
+                    if you price after seeing the parts.
+                </li>
+                <li>
+                    <strong>Create a Job</strong> — a Pending job is created immediately. The terms will say "a team
+                    member will reach out about pricing." Use this if you price on the spot and want the work order
+                    ready right away.
+                </li>
+            </ul>
+        </section>
+
+        <section id="what-happens" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-arrow-right-circle text-primary me-2"></i>What Happens on Submission
+            </h2>
+            <p>When a customer submits their intake form, the system automatically:</p>
+            <ul>
+                <li><strong>Matches or creates a Customer</strong> — searches by email first, then phone. If no match, a new non-commercial customer record is created.</li>
+                <li>
+                    <strong>Creates a Draft Quote or Pending Job</strong> — depending on your
+                    <a href="/CompanySettings?tab=kiosk">Kiosk Output Setting</a>. Quote mode creates a Draft quote
+                    (Normal priority); Job mode creates a Pending job with the customer's description and intake source
+                    in Special Instructions.
+                </li>
+                <li><strong>Applies SMS consent</strong> — if the customer opted in, their customer record is updated with <code>NotifyBySms = true</code> and the consent timestamp (TCPA-compliant).</li>
+                <li>
+                    <strong>Fires an in-app notification</strong> — your team's notification bell shows
+                    "Walk-in Intake Submitted" (or "Remote Intake Submitted" for remote sessions) with a link to
+                    the Intakes page.
+                </li>
+            </ul>
+        </section>
+
+        <section id="reviewing" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-clipboard-check text-primary me-2"></i>Reviewing Submissions (Staff)
+            </h2>
+            <p>
+                Go to <a href="/Kiosk/Intakes">Operations → Intake Sessions</a> to see all sessions.
+                Filter by <strong>Submitted</strong>, <strong>Pending</strong>, or <strong>Expired</strong>.
+            </p>
+            <p>Each row shows:</p>
+            <ul>
+                <li>Customer name, phone, and email</li>
+                <li>Job description snippet</li>
+                <li>Session type (In-Person or Remote) and status badge</li>
+                <li>SMS opt-in indicator</li>
+                <li><strong>View Quote</strong> button — appears when the kiosk is set to Quote mode; opens the auto-created draft quote</li>
+                <li><strong>View Job</strong> button — appears when the kiosk is set to Job mode; opens the auto-created job</li>
+                <li><strong>Customer</strong> button — opens the matched or created customer record</li>
+            </ul>
+            <div class="alert alert-info alert-permanent">
+                <i class="bi bi-info-circle me-2"></i>
+                If submission failed (e.g. a configuration issue), the session is still marked Submitted but the
+                action buttons won't appear. The raw intake data (name, phone, description) is still
+                visible so staff can create the record manually.
+            </div>
+        </section>
+
+        <section id="troubleshooting" class="mb-5">
+            <h2 class="h4 fw-bold border-bottom pb-2 mb-3">
+                <i class="bi bi-exclamation-triangle text-primary me-2"></i>Troubleshooting
+            </h2>
+            <dl>
+                <dt>Kiosk Welcome screen shows "Connection issue — retrying…"</dt>
+                <dd class="mb-3">The tablet can't reach the server. Check the tablet's Wi-Fi connection. Once connectivity is restored the status dot automatically turns green — no refresh needed.</dd>
+
+                <dt>Kiosk doesn't respond when staff clicks Start Intake</dt>
+                <dd class="mb-3">The tablet polls every 3 seconds. Wait up to 3 seconds after clicking Start Intake. If it still doesn't respond, reload the Welcome page on the tablet. Make sure the tablet is on the same domain as the server (use HTTPS).</dd>
+
+                <dt>The tablet shows the wrong company logo or no logo</dt>
+                <dd class="mb-3">Upload your company logo at Settings → Company Settings → Logo. The kiosk reads your logo directly — no separate kiosk logo setting is needed.</dd>
+
+                <dt>Signature pad doesn't work on the tablet</dt>
+                <dd class="mb-3">Use a capacitive stylus or fingertip — the signature pad requires touch input. Make sure the browser isn't in desktop mode (check "Request Desktop Site" is off). The signature is only required for In-Person sessions.</dd>
+
+                <dt>Submission fails — no job or customer created</dt>
+                <dd class="mb-3">This usually means Seed Data hasn't been run for your company. Ask your administrator to go to Platform Management → Seed Data and run the seed. This creates the required job status and priority lookup rows.</dd>
+
+                <dt>AI quote on the quote wizard times out on mobile</dt>
+                <dd class="mb-3">Photos are automatically compressed before upload. If it still times out, your connection may be slow — the spinner will say "Still analyzing…" if it's taking longer than 30 seconds. Try again on a stronger connection.</dd>
+            </dl>
+        </section>
+
+    </div>
+
+    <div class="col-lg-3">
+        @await Html.PartialAsync("_HelpNav")
+
+        <div class="card border-0 shadow-sm">
+            <div class="card-header bg-transparent fw-semibold small text-muted text-uppercase">
+                On This Page
+            </div>
+            <div class="card-body p-0">
+                <nav class="nav flex-column small">
+                    <a class="nav-link py-1 px-3" href="#overview">Overview</a>
+                    <a class="nav-link py-1 px-3" href="#setup">Setting Up the Kiosk</a>
+                    <a class="nav-link py-1 px-3" href="#starting">Starting an Intake</a>
+                    <a class="nav-link py-1 px-3" href="#output-setting">Kiosk Output Setting</a>
+                    <a class="nav-link py-1 px-3" href="#what-happens">What Happens on Submission</a>
+                    <a class="nav-link py-1 px-3" href="#reviewing">Reviewing Submissions</a>
+                    <a class="nav-link py-1 px-3" href="#troubleshooting">Troubleshooting</a>
+                </nav>
+            </div>
+        </div>
+    </div>
+</div>

src/PowderCoating.Web/Views/Help/Index.cshtml

@@ -189,22 +189,6 @@
         <!-- Shop Management -->
         <h2 class="h6 fw-semibold mb-2 text-muted text-uppercase" style="letter-spacing:.05em; font-size:.7rem;">Shop Management</h2>
         <div class="row g-3 mb-4">
-            <div class="col-md-6">
-                <div class="card border-0 shadow-sm h-100">
-                    <div class="card-body">
-                        <div class="d-flex align-items-start gap-3">
-                            <div class="rounded-3 bg-info bg-opacity-10 p-2 flex-shrink-0">
-                                <i class="bi bi-person-badge text-info fs-4"></i>
-                            </div>
-                            <div>
-                                <h5 class="card-title mb-1">Shop Workers</h5>
-                                <p class="card-text text-muted small mb-2">Add floor staff, assign roles like Coater or Sandblaster, and link workers to jobs and maintenance tasks.</p>
-                                <a asp-controller="Help" asp-action="ShopWorkers" class="btn btn-sm btn-outline-info">Read more <i class="bi bi-arrow-right ms-1"></i></a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
             <div class="col-md-6">
                 <div class="card border-0 shadow-sm h-100">
                     <div class="card-body">

src/PowderCoating.Web/Views/Help/Invoices.cshtml

@@ -48,8 +48,9 @@
             <ol class="mb-3">
                 <li class="mb-2">Open the job from <strong>Operations &rsaquo; Jobs</strong> and go to its Details page.</li>
                 <li class="mb-2">Scroll to the <strong>Invoice</strong> section near the bottom of the page.</li>
-                <li class="mb-2">Click <strong>Create Invoice</strong>. The system generates an invoice pre-filled with all the job's line items and the final pricing.</li>
-                <li class="mb-2">Review the invoice — check line items, totals, and the due date — then click <strong>Save Invoice</strong>.</li>
+                <li class="mb-2">Click <strong>Create Invoice</strong>. The system pre-fills all line items, the discount, tax rate, payment terms, and due date from the job and customer automatically.</li>
+                <li class="mb-2">Review the <strong>Totals</strong> panel on the right &mdash; if a discount was applied to the job it shows as a red <em>Discount Applied</em> line below the subtotal. Negative line items are allowed if you need to apply a manual credit or price adjustment.</li>
+                <li class="mb-2">Adjust anything you need, then click <strong>Save Invoice</strong>.</li>
             </ol>
 
             <h3 class="h6 fw-semibold mt-3 mb-2">From the Invoices list (manual)</h3>
@@ -139,7 +140,7 @@
                 <li class="mb-2">Open the invoice from <strong>Operations &rsaquo; Invoices</strong> or from the job's Details page.</li>
                 <li class="mb-2">Click <strong>Send Invoice</strong>. The status changes from Draft to Sent.</li>
                 <li class="mb-2">If email notifications are configured, the customer receives an email with the invoice details and total due.</li>
-                <li class="mb-2">A due date is set automatically based on the customer's payment terms (e.g., Net 30 means the due date is 30 days from today).</li>
+                <li class="mb-2">The due date and payment terms are pre-filled from the source quote (if the job came from a quote) or the customer&rsquo;s payment terms &mdash; you can always override them before saving.</li>
             </ol>
             <p>
                 You can also click <strong>Download PDF</strong> on any invoice to generate a print-ready PDF

src/PowderCoating.Web/Views/Help/Jobs.cshtml

@@ -607,13 +607,28 @@
                 no anonymous bumps.
             </p>
 
-            <h3 class="h6 fw-semibold mt-3 mb-2"><i class="bi bi-box-seam me-1"></i>Bottom QR — Log Powder Usage</h3>
+            <h3 class="h6 fw-semibold mt-3 mb-2"><i class="bi bi-box-seam me-1"></i>Bottom QR &mdash; Log Powder Usage</h3>
             <p>
                 One QR per unique powder on the job. Scanning opens the inventory usage log page pre-filled
                 with that powder and the job number, so you can record actual lbs used in seconds without
                 navigating through the app.
             </p>
 
+            <h3 class="h6 fw-semibold mt-3 mb-2"><i class="bi bi-droplet-half me-1"></i>Logging Material Usage from a PC</h3>
+            <p>
+                You don&rsquo;t need a phone or QR code to log material usage. On the Job Details page, expand the
+                <strong>Materials Used</strong> section and click <strong>Log Material</strong>. A modal opens where you can:
+            </p>
+            <ul class="mb-2">
+                <li>Select any inventory item from a searchable dropdown &mdash; the item&rsquo;s current stock level is shown when you pick it.</li>
+                <li>Choose <strong>Amount Used</strong> (enter how much was consumed) or <strong>Amount Remaining</strong> (enter what&rsquo;s left in the bag &mdash; the system calculates the usage automatically).</li>
+                <li>Pick a reason: <em>Job Usage</em> or <em>Waste / Spillage</em>.</li>
+                <li>Add optional notes.</li>
+            </ul>
+            <p>
+                Saving immediately reduces the item&rsquo;s stock on hand and creates an entry in the Inventory Activity ledger, exactly like a QR scan would. The QR scan icon is still available next to the button for mobile workers.
+            </p>
+
             <div class="alert alert-permanent alert-info d-flex gap-2 mb-0" role="alert">
                 <i class="bi bi-lock flex-shrink-0 mt-1"></i>
                 <div>