Merge branch 'dev'

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/Invoice/InvoiceDtos.cs

@@ -32,7 +32,9 @@ public class InvoiceDto
     public string CustomerName { get; set; } = string.Empty;
     public string? CustomerEmail { get; set; }
     public string? CustomerPhone { get; set; }
+    public string? CustomerMobilePhone { get; set; }
     public bool CustomerNotifyByEmail { get; set; }
+    public bool CustomerNotifyBySms { get; set; }
     public string? PreparedById { get; set; }
     public string? PreparedByName { get; set; }
     public InvoiceStatus Status { get; set; }

src/PowderCoating.Application/DTOs/Invoice/RefundCreditDtos.cs

@@ -36,6 +36,8 @@ public class IssueRefundDto
     public decimal Amount { get; set; }
     public DateTime RefundDate { get; set; } = DateTime.Today;
     public PaymentMethod RefundMethod { get; set; }
+    /// <summary>Bank/cash account money leaves when issuing a cash/card refund. Null for store credit.</summary>
+    public int? DepositAccountId { get; set; }
     public string Reason { get; set; } = string.Empty;
     public string? Reference { get; set; }
     public string? Notes { get; set; }

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

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

@@ -0,0 +1,88 @@
+using System.ComponentModel.DataAnnotations;
+using PowderCoating.Core.Enums;
+
+namespace PowderCoating.Application.DTOs.Kiosk;
+
+// ── Staff-facing ──────────────────────────────────────────────────────────────
+
+/// <summary>Input for sending a remote intake link to a customer by email.</summary>
+public class SendRemoteLinkDto
+{
+    [Required, EmailAddress]
+    public string Email { get; set; } = string.Empty;
+
+    /// <summary>Optional — used to personalise the email greeting.</summary>
+    public string? CustomerName { get; set; }
+}
+
+// ── Customer-facing step DTOs ─────────────────────────────────────────────────
+
+/// <summary>Step 1 — Contact information submitted by the customer.</summary>
+public class SubmitKioskContactDto
+{
+    [Required, MaxLength(100)]
+    public string FirstName { get; set; } = string.Empty;
+
+    [Required, MaxLength(100)]
+    public string LastName { get; set; } = string.Empty;
+
+    [Required, Phone]
+    public string Phone { get; set; } = string.Empty;
+
+    [Required, EmailAddress]
+    public string Email { get; set; } = string.Empty;
+
+    public bool IsReturningCustomer { get; set; }
+}
+
+/// <summary>Step 2 — Job description submitted by the customer.</summary>
+public class SubmitKioskJobDto
+{
+    [Required, MaxLength(2000)]
+    public string JobDescription { get; set; } = string.Empty;
+
+    public string? HowDidYouHearAboutUs { get; set; }
+}
+
+/// <summary>Step 3 — Terms agreement (+ optional drawn signature for in-person sessions).</summary>
+public class SubmitKioskTermsDto
+{
+    [Required]
+    [Range(typeof(bool), "true", "true", ErrorMessage = "You must agree to the terms to continue.")]
+    public bool AgreedToTerms { get; set; }
+
+    public bool SmsOptIn { get; set; }
+
+    /// <summary>Base-64 PNG from signature_pad; required for InPerson sessions, null for Remote.</summary>
+    public string? SignatureDataBase64 { get; set; }
+}
+
+// ── Staff review list ─────────────────────────────────────────────────────────
+
+/// <summary>One row in the Kiosk Intakes staff review list.</summary>
+public class KioskSessionListDto
+{
+    public int              Id                 { get; set; }
+    public Guid             SessionToken       { get; set; }
+    public KioskSessionType SessionType        { get; set; }
+    public KioskSessionStatus Status           { get; set; }
+    public string           CustomerFirstName  { get; set; } = string.Empty;
+    public string           CustomerLastName   { get; set; } = string.Empty;
+    public string           CustomerEmail      { get; set; } = string.Empty;
+    public string           CustomerPhone      { get; set; } = string.Empty;
+    public string           JobDescription     { get; set; } = string.Empty;
+    public bool             SmsOptIn           { get; set; }
+    public DateTime?        SubmittedAt        { get; set; }
+    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 || 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,17 +136,6 @@ 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>
     /// Generate a CSV template file for prep service imports.
     /// </summary>

src/PowderCoating.Application/Interfaces/INotificationService.cs

@@ -58,7 +58,7 @@ public interface INotificationService
     /// Notify customer when an invoice has been sent.
     /// Optionally includes an online payment link in the email body.
     /// </summary>
-    Task NotifyInvoiceSentAsync(Invoice invoice, byte[]? pdfAttachment = null, string? pdfFilename = null, string? paymentUrl = null, string? overrideEmail = null);
+    Task NotifyInvoiceSentAsync(Invoice invoice, byte[]? pdfAttachment = null, string? pdfFilename = null, string? paymentUrl = null, string? overrideEmail = null, bool sendSms = false, string? viewUrl = null);
 
     /// <summary>
     /// Notify customer (internal) when a payment has been recorded on an invoice.

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

@@ -28,7 +28,9 @@ public class InvoiceProfile : Profile
                 ? (s.Customer.BillingEmail ?? s.Customer.Email)
                 : null))
             .ForMember(d => d.CustomerPhone, o => o.MapFrom(s => s.Customer != null ? s.Customer.Phone : null))
+            .ForMember(d => d.CustomerMobilePhone, o => o.MapFrom(s => s.Customer != null ? s.Customer.MobilePhone : null))
             .ForMember(d => d.CustomerNotifyByEmail, o => o.MapFrom(s => s.Customer == null || s.Customer.NotifyByEmail))
+            .ForMember(d => d.CustomerNotifyBySms, o => o.MapFrom(s => s.Customer != null && s.Customer.NotifyBySms))
             .ForMember(d => d.PreparedByName, o => o.MapFrom(s => s.PreparedBy != null
                 ? $"{s.PreparedBy.FirstName} {s.PreparedBy.LastName}".Trim()
                 : null))

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

@@ -35,6 +35,8 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         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;
@@ -42,8 +44,13 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
         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;

src/PowderCoating.Core/Entities/Accounting.cs

@@ -246,6 +246,8 @@ public class VendorCredit : BaseEntity
     public decimal Total { get; set; }
     public decimal RemainingAmount { get; set; }
     public string? Memo { get; set; }
+    /// <summary>Set by Post() when GL entries are made (DR AP / CR expense lines). Null = unposted.</summary>
+    public DateTime? PostedDate { get; set; }
 
     // Navigation
     public virtual Vendor Vendor { get; set; } = null!;

src/PowderCoating.Core/Entities/ApplicationUser.cs

@@ -59,6 +59,13 @@ 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

@@ -123,6 +123,16 @@ public class Company : BaseEntity
     public byte[]? LogoData { get; set; }  // Legacy - kept for backward compatibility
     public string? LogoContentType { get; set; }  // Legacy - kept for backward compatibility
     public string? LogoFilePath { get; set; }  // Filesystem path: /media/{CompanyId}/company-logo.{ext}
+
+    // Kiosk
+    /// <summary>
+    /// Random token written to a long-lived HttpOnly cookie on the front-desk tablet when the
+    /// owner activates the kiosk. Kiosk routes validate this token against the cookie so the
+    /// tablet can serve the intake form without requiring a logged-in user.
+    /// Null = kiosk not activated. Regenerate to revoke the current device.
+    /// </summary>
+    public string? KioskActivationToken { get; set; }
+
     // Navigation Properties
     public virtual ICollection<ApplicationUser> Users { get; set; } = new List<ApplicationUser>();
     public virtual ICollection<Customer> Customers { get; set; } = new List<Customer>();
@@ -131,7 +141,6 @@ 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 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/Deposit.cs

@@ -15,6 +15,10 @@ public class Deposit : BaseEntity
     public string? Notes { get; set; }
     public string? RecordedById { get; set; }
 
+    /// <summary>Bank/checking account this deposit was deposited into. Set at recording time
+    /// so the Trial Balance can immediately debit the correct bank account.</summary>
+    public int? DepositAccountId { get; set; }
+
     // Applied to invoice when invoice is created
     public int? AppliedToInvoiceId { get; set; }
     public DateTime? AppliedDate { 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/Invoice.cs

@@ -28,6 +28,13 @@ public class Invoice : BaseEntity
     public decimal GiftCertificateRedeemed { get; set; }   // Sum of gift certificate redemptions
     public decimal BalanceDue => Total - AmountPaid - CreditApplied - GiftCertificateRedeemed;
 
+    /// <summary>
+    /// Permanent public token for the customer-facing invoice view page (/invoice/{token}).
+    /// Generated when the invoice is first sent (regardless of Stripe status) and never expires.
+    /// Distinct from PaymentLinkToken which is Stripe-gated and expires in 5 days.
+    /// </summary>
+    public string? PublicViewToken { get; set; }
+
     // Online payments (Stripe Connect)
     public OnlinePaymentStatus OnlinePaymentStatus { get; set; } = OnlinePaymentStatus.NotApplicable;
     public string? PaymentLinkToken { get; set; }           // Signed token for /pay/{token}

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

@@ -0,0 +1,54 @@
+using PowderCoating.Core.Enums;
+
+namespace PowderCoating.Core.Entities;
+
+/// <summary>
+/// Represents one customer self-service intake session — either completed on the front-desk tablet
+/// (InPerson) or via an emailed link the customer fills out on their own device (Remote).
+/// Sessions are tenant-scoped and soft-deletable. Load anonymous sessions with ignoreQueryFilters:true.
+/// </summary>
+public class KioskSession : BaseEntity
+{
+    /// <summary>URL-safe GUID used in all kiosk routes; unique across the table.</summary>
+    public Guid SessionToken { get; set; } = Guid.NewGuid();
+
+    public KioskSessionType SessionType { get; set; }
+    public KioskSessionStatus Status { get; set; } = KioskSessionStatus.Active;
+
+    // ── Step 1 — Contact ─────────────────────────────────────────────────────
+    public string CustomerFirstName { get; set; } = string.Empty;
+    public string CustomerLastName  { get; set; } = string.Empty;
+    public string CustomerPhone     { get; set; } = string.Empty;
+    public string CustomerEmail     { get; set; } = string.Empty;
+    public bool   IsReturningCustomer { get; set; }
+
+    // ── Step 2 — Job Description ──────────────────────────────────────────────
+    public string  JobDescription        { get; set; } = string.Empty;
+    public string? HowDidYouHearAboutUs  { get; set; }
+
+    // ── Step 3 — Terms & Consent ──────────────────────────────────────────────
+    public bool      AgreedToTerms        { get; set; }
+    public DateTime? AgreedToTermsAt      { get; set; }
+    /// <summary>Customer opted in to SMS order updates; sets Customer.NotifyBySms on submission.</summary>
+    public bool      SmsOptIn             { get; set; }
+    /// <summary>Base-64 PNG from signature_pad; null for Remote sessions (no drawn signature required).</summary>
+    public string?   SignatureDataBase64  { get; set; }
+
+    // ── 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; }
+
+    // ── Remote-only ───────────────────────────────────────────────────────────
+    public string?   RemoteLinkEmail   { get; set; }
+    public DateTime? RemoteLinkSentAt  { get; set; }
+
+    // ── Navigation ────────────────────────────────────────────────────────────
+    public virtual Customer? LinkedCustomer { get; set; }
+    public virtual Job?      LinkedJob      { get; set; }
+}

src/PowderCoating.Core/Entities/Quote.cs

@@ -45,21 +45,28 @@ public class Quote : BaseEntity
     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; }      // 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 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 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/Refund.cs

@@ -22,6 +22,10 @@ public class Refund : BaseEntity
     public DateTime? IssuedDate { get; set; }
     public string? IssuedById { get; set; }
 
+    /// <summary>Bank/checking account the refund was paid from. Mirrors Payment.DepositAccountId so
+    /// the Trial Balance can credit this account when computing bank balance.</summary>
+    public int? DepositAccountId { get; set; }
+
     // For store-credit refunds: the CreditMemo created on their behalf
     public int? CreditMemoId { get; set; }
 

src/PowderCoating.Core/Entities/ShopWorker.cs

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

src/PowderCoating.Core/Entities/ShopWorkerRoleCost.cs

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

src/PowderCoating.Core/Enums/Enums.cs

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

src/PowderCoating.Core/Enums/KioskEnums.cs

@@ -0,0 +1,15 @@
+namespace PowderCoating.Core.Enums;
+
+public enum KioskSessionType
+{
+    InPerson = 0,
+    Remote   = 1
+}
+
+public enum KioskSessionStatus
+{
+    Active    = 0,
+    Submitted = 1,
+    Expired   = 2,
+    Cancelled = 3
+}

src/PowderCoating.Core/Interfaces/IUnitOfWork.cs

@@ -54,8 +54,6 @@ 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<Refund> Refunds { get; }
     IRepository<CreditMemo> CreditMemos { get; }
@@ -154,6 +152,9 @@ public interface IUnitOfWork : IDisposable
     IRepository<GiftCertificate> GiftCertificates { get; }
     IRepository<GiftCertificateRedemption> GiftCertificateRedemptions { get; }
 
+    // Customer Intake Kiosk
+    IRepository<KioskSession> KioskSessions { get; }
+
     Task<int> SaveChangesAsync();
     Task<int> CompleteAsync(); // Alias for SaveChangesAsync
 

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,10 +205,6 @@ 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>
     public DbSet<ReworkRecord> ReworkRecords { get; set; }
     /// <summary>Customer refund records; tenant-filtered with soft delete.</summary>
@@ -367,6 +363,10 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
     /// <summary>Prep-service definitions within a job template item.</summary>
     public DbSet<JobTemplateItemPrepService> JobTemplateItemPrepServices { get; set; }
 
+    // Customer Intake Kiosk
+    /// <summary>Customer self-service intake sessions (walk-in tablet or remote email link); tenant-filtered with soft delete.</summary>
+    public DbSet<KioskSession> KioskSessions { get; set; }
+
     /// <summary>
     /// Platform-wide audit log capturing who changed what and when, across all tenants.
     /// No global query filter — SuperAdmin controllers query this directly.
@@ -526,10 +526,6 @@ 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 =>
             !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
         modelBuilder.Entity<Refund>().HasQueryFilter(e =>
@@ -746,6 +742,24 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
         modelBuilder.Entity<InAppNotification>().HasQueryFilter(e =>
             !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
 
+        // Customer intake kiosk sessions — tenant-filtered + soft delete.
+        // Anonymous intake routes must use ignoreQueryFilters:true when loading by SessionToken.
+        modelBuilder.Entity<KioskSession>().HasQueryFilter(e =>
+            !e.IsDeleted && (IsPlatformAdmin || e.CompanyId == CurrentCompanyId));
+        modelBuilder.Entity<KioskSession>()
+            .HasIndex(e => e.SessionToken)
+            .IsUnique();
+        modelBuilder.Entity<KioskSession>()
+            .HasOne(k => k.LinkedCustomer)
+            .WithMany()
+            .HasForeignKey(k => k.LinkedCustomerId)
+            .OnDelete(DeleteBehavior.SetNull);
+        modelBuilder.Entity<KioskSession>()
+            .HasOne(k => k.LinkedJob)
+            .WithMany()
+            .HasForeignKey(k => k.LinkedJobId)
+            .OnDelete(DeleteBehavior.SetNull);
+
         // Account self-referencing hierarchy
         modelBuilder.Entity<Account>()
             .HasOne(a => a.ParentAccount)
@@ -1292,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)
@@ -1371,9 +1380,6 @@ public class ApplicationDbContext : IdentityDbContext<ApplicationUser>, IDataPro
         modelBuilder.Entity<PricingTier>()
             .HasIndex(p => p.CompanyId);
 
-        modelBuilder.Entity<ShopWorker>()
-            .HasIndex(w => w.CompanyId);
-
 modelBuilder.Entity<CatalogCategory>()
             .HasIndex(c => c.CompanyId);
 
@@ -1409,11 +1415,6 @@ 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>()
             .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/Data/SeedData.cs

@@ -967,6 +967,17 @@ New accounts walk through an 18-step setup wizard to configure company informati
                 CreatedAt = DateTime.UtcNow
             },
             new NotificationTemplate
+            {
+                NotificationType = NotificationType.InvoiceSent,
+                Channel = NotificationChannel.Sms,
+                DisplayName = "Invoice Sent (SMS)",
+                Subject = null,
+                Body = "{{companyName}}: Invoice {{invoiceNumber}} for {{invoiceTotal}} is ready. View your invoice: {{viewUrl}} Reply STOP to opt out.",
+                IsActive = true,
+                CompanyId = companyId,
+                CreatedAt = DateTime.UtcNow
+            },
+            new NotificationTemplate
             {
                 NotificationType = NotificationType.PaymentReceived,
                 Channel = NotificationChannel.Email,

src/PowderCoating.Infrastructure/Migrations/20260513133925_SeedSalesDiscountsAccount.cs

@@ -0,0 +1,95 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class SeedSalesDiscountsAccount : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Insert the 4950 Sales Discounts contra-revenue account for every company that does
+            // not already have it. The account is credit-normal (AccountType=4 Revenue,
+            // AccountSubType=32 OtherIncome) and is debited when invoice discounts are applied so
+            // the GL balances (DR Sales Discounts / gap between CR Revenue and DR AR).
+            // Idempotent: the WHERE NOT EXISTS guard means re-running the migration is safe.
+            migrationBuilder.Sql(@"
+                INSERT INTO Accounts
+                    (AccountNumber, Name, AccountType, AccountSubType,
+                     IsSystem, IsActive, Description,
+                     CompanyId, CreatedAt, IsDeleted,
+                     CurrentBalance, OpeningBalance)
+                SELECT
+                    '4950',
+                    'Sales Discounts',
+                    4,   -- AccountType.Revenue
+                    32,  -- AccountSubType.OtherIncome
+                    1,   -- IsSystem = true
+                    1,   -- IsActive = true
+                    'Contra-revenue for invoice discounts granted to customers',
+                    c.Id,
+                    GETUTCDATE(),
+                    0,   -- IsDeleted = false
+                    0,   -- CurrentBalance
+                    0    -- OpeningBalance
+                FROM Companies c
+                WHERE c.IsDeleted = 0
+                  AND NOT EXISTS (
+                    SELECT 1 FROM Accounts a
+                    WHERE a.CompanyId = c.Id
+                      AND a.AccountNumber = '4950'
+                      AND a.IsDeleted = 0
+                  );
+            ");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 13, 39, 22, 61, DateTimeKind.Utc).AddTicks(8475));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 13, 39, 22, 61, DateTimeKind.Utc).AddTicks(8484));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 13, 39, 22, 61, DateTimeKind.Utc).AddTicks(8486));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 1, 34, 45, 450, DateTimeKind.Utc).AddTicks(8377));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 1, 34, 45, 450, DateTimeKind.Utc).AddTicks(8383));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 1, 34, 45, 450, DateTimeKind.Utc).AddTicks(8385));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260513142448_AccountingGapsPhase2.cs

@@ -0,0 +1,113 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AccountingGapsPhase2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "PostedDate",
+                table: "VendorCredits",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "DepositAccountId",
+                table: "Refunds",
+                type: "int",
+                nullable: true);
+
+            // Seed the Gift Certificate Liability account (2500) for every company that doesn't
+            // already have it. Credit-normal OtherCurrentLiability account; credited when a GC is
+            // issued and debited when redeemed or voided. Idempotent guard prevents double-seeding.
+            migrationBuilder.Sql(@"
+                INSERT INTO Accounts
+                    (AccountNumber, Name, AccountType, AccountSubType,
+                     IsSystem, IsActive, Description,
+                     CompanyId, CreatedAt, IsDeleted,
+                     CurrentBalance, OpeningBalance)
+                SELECT
+                    '2500',
+                    'Gift Certificate Liability',
+                    2,   -- AccountType.Liability
+                    12,  -- AccountSubType.OtherCurrentLiability
+                    1,   -- IsSystem = true
+                    1,   -- IsActive = true
+                    'Outstanding gift certificate obligations owed to certificate holders',
+                    c.Id,
+                    GETUTCDATE(),
+                    0,   -- IsDeleted = false
+                    0,   -- CurrentBalance
+                    0    -- OpeningBalance
+                FROM Companies c
+                WHERE c.IsDeleted = 0
+                  AND NOT EXISTS (
+                    SELECT 1 FROM Accounts a
+                    WHERE a.CompanyId = c.Id
+                      AND a.AccountNumber = '2500'
+                      AND a.IsDeleted = 0
+                  );
+            ");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 24, 44, 715, DateTimeKind.Utc).AddTicks(9166));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 24, 44, 715, DateTimeKind.Utc).AddTicks(9172));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 24, 44, 715, DateTimeKind.Utc).AddTicks(9174));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PostedDate",
+                table: "VendorCredits");
+
+            migrationBuilder.DropColumn(
+                name: "DepositAccountId",
+                table: "Refunds");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 13, 39, 22, 61, DateTimeKind.Utc).AddTicks(8475));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 13, 39, 22, 61, DateTimeKind.Utc).AddTicks(8484));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 13, 39, 22, 61, DateTimeKind.Utc).AddTicks(8486));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260513145734_AccountingDepositsGL.cs

@@ -0,0 +1,103 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AccountingDepositsGL : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "DepositAccountId",
+                table: "Deposits",
+                type: "int",
+                nullable: true);
+
+            // Seed account 2300 "Customer Deposits" (Liability / OtherCurrentLiability) for every
+            // company that doesn't already have it. Credited when a deposit is taken; debited when
+            // the deposit is applied to an invoice. Idempotent guard prevents double-seeding.
+            migrationBuilder.Sql(@"
+                INSERT INTO Accounts
+                    (AccountNumber, Name, AccountType, AccountSubType,
+                     IsSystem, IsActive, Description,
+                     CompanyId, CreatedAt, IsDeleted,
+                     CurrentBalance, OpeningBalance)
+                SELECT
+                    '2300',
+                    'Customer Deposits',
+                    2,   -- AccountType.Liability
+                    12,  -- AccountSubType.OtherCurrentLiability
+                    1,   -- IsSystem = true
+                    1,   -- IsActive = true
+                    'Deposits received from customers before an invoice is created; cleared when deposit is applied to invoice',
+                    c.Id,
+                    GETUTCDATE(),
+                    0,   -- IsDeleted = false
+                    0,   -- CurrentBalance
+                    0    -- OpeningBalance
+                FROM Companies c
+                WHERE c.IsDeleted = 0
+                  AND NOT EXISTS (
+                    SELECT 1 FROM Accounts a
+                    WHERE a.CompanyId = c.Id
+                      AND a.AccountNumber = '2300'
+                      AND a.IsDeleted = 0
+                  );
+            ");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 57, 30, 15, DateTimeKind.Utc).AddTicks(5641));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 57, 30, 15, DateTimeKind.Utc).AddTicks(5655));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 57, 30, 15, DateTimeKind.Utc).AddTicks(5656));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DepositAccountId",
+                table: "Deposits");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 24, 44, 715, DateTimeKind.Utc).AddTicks(9166));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 24, 44, 715, DateTimeKind.Utc).AddTicks(9172));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 24, 44, 715, DateTimeKind.Utc).AddTicks(9174));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260513184018_AddKioskIntakeSession.cs

@@ -0,0 +1,142 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddKioskIntakeSession : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "KioskActivationToken",
+                table: "Companies",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "KioskSessions",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SessionToken = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    SessionType = table.Column<int>(type: "int", nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    CustomerFirstName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CustomerLastName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CustomerPhone = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CustomerEmail = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    IsReturningCustomer = table.Column<bool>(type: "bit", nullable: false),
+                    JobDescription = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    HowDidYouHearAboutUs = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    AgreedToTerms = table.Column<bool>(type: "bit", nullable: false),
+                    AgreedToTermsAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    SmsOptIn = table.Column<bool>(type: "bit", nullable: false),
+                    SignatureDataBase64 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    LinkedCustomerId = table.Column<int>(type: "int", nullable: true),
+                    LinkedJobId = table.Column<int>(type: "int", nullable: true),
+                    SubmittedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    ExpiresAt = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    RemoteLinkEmail = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RemoteLinkSentAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CompanyId = table.Column<int>(type: "int", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CreatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    UpdatedBy = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
+                    DeletedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    DeletedBy = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_KioskSessions", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_KioskSessions_Customers_LinkedCustomerId",
+                        column: x => x.LinkedCustomerId,
+                        principalTable: "Customers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.SetNull);
+                    table.ForeignKey(
+                        name: "FK_KioskSessions_Jobs_LinkedJobId",
+                        column: x => x.LinkedJobId,
+                        principalTable: "Jobs",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.SetNull);
+                });
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 18, 40, 15, 633, DateTimeKind.Utc).AddTicks(8207));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 18, 40, 15, 633, DateTimeKind.Utc).AddTicks(8213));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 18, 40, 15, 633, DateTimeKind.Utc).AddTicks(8215));
+
+            migrationBuilder.CreateIndex(
+                name: "IX_KioskSessions_LinkedCustomerId",
+                table: "KioskSessions",
+                column: "LinkedCustomerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_KioskSessions_LinkedJobId",
+                table: "KioskSessions",
+                column: "LinkedJobId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_KioskSessions_SessionToken",
+                table: "KioskSessions",
+                column: "SessionToken",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "KioskSessions");
+
+            migrationBuilder.DropColumn(
+                name: "KioskActivationToken",
+                table: "Companies");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 57, 30, 15, DateTimeKind.Utc).AddTicks(5641));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 57, 30, 15, DateTimeKind.Utc).AddTicks(5655));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 14, 57, 30, 15, DateTimeKind.Utc).AddTicks(5656));
+        }
+    }
+}

src/PowderCoating.Infrastructure/Migrations/20260513192847_AddInvoicePublicViewToken.cs

@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PowderCoating.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddInvoicePublicViewToken : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "PublicViewToken",
+                table: "Invoices",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            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));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PublicViewToken",
+                table: "Invoices");
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 1,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 18, 40, 15, 633, DateTimeKind.Utc).AddTicks(8207));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 2,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 18, 40, 15, 633, DateTimeKind.Utc).AddTicks(8213));
+
+            migrationBuilder.UpdateData(
+                table: "PricingTiers",
+                keyColumn: "Id",
+                keyValue: 3,
+                column: "CreatedAt",
+                value: new DateTime(2026, 5, 13, 18, 40, 15, 633, DateTimeKind.Utc).AddTicks(8215));
+        }
+    }
+}

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");
 
@@ -1812,6 +1815,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
+                    b.Property<string>("KioskActivationToken")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("LogoContentType")
                         .HasColumnType("nvarchar(max)");
 
@@ -2072,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");
 
@@ -2250,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");
 
@@ -2892,6 +2905,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<string>("DeletedBy")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<int?>("DepositAccountId")
+                        .HasColumnType("int");
+
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("bit");
 
@@ -3280,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)");
@@ -3916,6 +3935,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<string>("PreparedById")
                         .HasColumnType("nvarchar(450)");
 
+                    b.Property<string>("PublicViewToken")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int?>("SalesTaxAccountId")
                         .HasColumnType("int");
 
@@ -4192,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");
 
@@ -4463,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");
 
@@ -5561,6 +5595,118 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.ToTable("JournalEntryLines");
                 });
 
+            modelBuilder.Entity("PowderCoating.Core.Entities.KioskSession", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AgreedToTerms")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime?>("AgreedToTermsAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreatedBy")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CustomerEmail")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CustomerFirstName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CustomerLastName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CustomerPhone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DeletedBy")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("HowDidYouHearAboutUs")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsReturningCustomer")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("JobDescription")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("LinkedCustomerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("LinkedJobId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("LinkedQuoteId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("RemoteLinkEmail")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime?>("RemoteLinkSentAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("SessionToken")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("SessionType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SignatureDataBase64")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("SmsOptIn")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("SubmittedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdatedBy")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LinkedCustomerId");
+
+                    b.HasIndex("LinkedJobId");
+
+                    b.HasIndex("SessionToken")
+                        .IsUnique();
+
+                    b.ToTable("KioskSessions");
+                });
+
             modelBuilder.Entity("PowderCoating.Core.Entities.MaintenanceRecord", b =>
                 {
                     b.Property<int>("Id")
@@ -6574,7 +6720,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 1,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 13, 1, 34, 45, 450, DateTimeKind.Utc).AddTicks(8377),
+                            CreatedAt = new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3131),
                             Description = "Standard pricing for regular customers",
                             DiscountPercent = 0m,
                             IsActive = true,
@@ -6585,7 +6731,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 2,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 13, 1, 34, 45, 450, DateTimeKind.Utc).AddTicks(8383),
+                            CreatedAt = new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3137),
                             Description = "5% discount for preferred customers",
                             DiscountPercent = 5m,
                             IsActive = true,
@@ -6596,7 +6742,7 @@ namespace PowderCoating.Infrastructure.Migrations
                         {
                             Id = 3,
                             CompanyId = 0,
-                            CreatedAt = new DateTime(2026, 5, 13, 1, 34, 45, 450, DateTimeKind.Utc).AddTicks(8385),
+                            CreatedAt = new DateTime(2026, 5, 15, 23, 44, 10, 471, DateTimeKind.Utc).AddTicks(3138),
                             Description = "10% discount for premium customers",
                             DiscountPercent = 10m,
                             IsActive = true,
@@ -6843,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");
 
@@ -6888,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)");
 
@@ -6927,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)");
@@ -6952,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)");
 
@@ -7654,6 +7821,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<string>("DeletedBy")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<int?>("DepositAccountId")
+                        .HasColumnType("int");
+
                     b.Property<int>("InvoiceId")
                         .HasColumnType("int");
 
@@ -8384,6 +8554,9 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Property<string>("Memo")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<DateTime?>("PostedDate")
+                        .HasColumnType("datetime2");
+
                     b.Property<decimal>("RemainingAmount")
                         .HasColumnType("decimal(18,2)");
 
@@ -9712,6 +9885,23 @@ namespace PowderCoating.Infrastructure.Migrations
                     b.Navigation("JournalEntry");
                 });
 
+            modelBuilder.Entity("PowderCoating.Core.Entities.KioskSession", b =>
+                {
+                    b.HasOne("PowderCoating.Core.Entities.Customer", "LinkedCustomer")
+                        .WithMany()
+                        .HasForeignKey("LinkedCustomerId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("PowderCoating.Core.Entities.Job", "LinkedJob")
+                        .WithMany()
+                        .HasForeignKey("LinkedJobId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("LinkedCustomer");
+
+                    b.Navigation("LinkedJob");
+                });
+
             modelBuilder.Entity("PowderCoating.Core.Entities.MaintenanceRecord", b =>
                 {
                     b.HasOne("PowderCoating.Core.Entities.ApplicationUser", "AssignedUser")

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;
@@ -121,6 +120,9 @@ public class UnitOfWork : IUnitOfWork
     private IRepository<GiftCertificate>? _giftCertificates;
     private IRepository<GiftCertificateRedemption>? _giftCertificateRedemptions;
 
+    // Customer Intake Kiosk
+    private IRepository<KioskSession>? _kioskSessions;
+
     // Purchase Orders
     private IPurchaseOrderRepository? _purchaseOrders;
     private IRepository<PurchaseOrderItem>? _purchaseOrderItems;
@@ -347,15 +349,6 @@ 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>
     private IRepository<ReworkRecord>? _reworkRecords;
     public IRepository<ReworkRecord> ReworkRecords =>
@@ -460,6 +453,10 @@ public class UnitOfWork : IUnitOfWork
     public IRepository<GiftCertificateRedemption> GiftCertificateRedemptions =>
         _giftCertificateRedemptions ??= new Repository<GiftCertificateRedemption>(_context);
 
+    /// <summary>Repository for <see cref="KioskSession"/> customer self-service intake sessions; tenant-filtered with soft delete.</summary>
+    public IRepository<KioskSession> KioskSessions =>
+        _kioskSessions ??= new Repository<KioskSession>(_context);
+
     // Job Templates
     /// <summary>Repository for <see cref="JobTemplate"/> reusable job blueprints; tenant-filtered with soft delete.</summary>
     public IJobTemplateRepository JobTemplates =>

src/PowderCoating.Infrastructure/Services/CompanyDataPurgeService.cs

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

src/PowderCoating.Infrastructure/Services/CompanyListService.cs

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

src/PowderCoating.Infrastructure/Services/CsvImportService.cs

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

src/PowderCoating.Infrastructure/Services/FinancialReportService.cs

@@ -79,6 +79,53 @@ public class FinancialReportService : IFinancialReportService
                 .SumAsync(ii => (decimal?)ii.TotalPrice) ?? 0;
             if (unlinkedRevenue > 0)
                 revenueLines.Add(new FinancialReportLine { AccountNumber = "—", AccountName = "Other Sales (unclassified)", Amount = unlinkedRevenue });
+
+            // Contra-revenue: discounts granted and credit memos applied reduce gross revenue.
+            var periodDiscounts = await _context.Invoices
+                .Where(i => i.Status != InvoiceStatus.Draft && i.Status != InvoiceStatus.Voided
+                         && i.DiscountAmount > 0 && i.InvoiceDate >= from && i.InvoiceDate <= toEnd)
+                .SumAsync(i => (decimal?)i.DiscountAmount) ?? 0m;
+            var periodCredits = await _context.CreditMemoApplications
+                .Where(a => a.AppliedDate >= from && a.AppliedDate <= toEnd
+                         && a.Invoice.Status != InvoiceStatus.Voided)
+                .SumAsync(a => (decimal?)a.AmountApplied) ?? 0m;
+            var totalDeductions = periodDiscounts + periodCredits;
+            if (totalDeductions > 0)
+                revenueLines.Add(new FinancialReportLine
+                {
+                    AccountNumber = "4950",
+                    AccountName   = "Less: Sales Discounts & Credits",
+                    Amount        = -totalDeductions
+                });
+
+            // GC sales are deferred to GC Liability at issuance; revenue is recognized on redemption.
+            var periodGcReclassified = await _context.InvoiceItems
+                .Where(ii => ii.IsGiftCertificate
+                          && ii.Invoice.Status != InvoiceStatus.Draft
+                          && ii.Invoice.Status != InvoiceStatus.Voided
+                          && ii.Invoice.InvoiceDate >= from && ii.Invoice.InvoiceDate <= toEnd)
+                .SumAsync(ii => (decimal?)ii.TotalPrice) ?? 0m;
+            if (periodGcReclassified > 0)
+                revenueLines.Add(new FinancialReportLine
+                {
+                    AccountNumber = "2500",
+                    AccountName   = "Less: Gift Certificates Issued (Deferred Revenue)",
+                    Amount        = -periodGcReclassified
+                });
+
+            // Voided GCs with remaining balance are breakage income (liability extinguished).
+            var periodGcBreakage = await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.Status == GiftCertificateStatus.Voided
+                          && gc.UpdatedAt >= from && gc.UpdatedAt <= toEnd
+                          && gc.OriginalAmount > gc.RedeemedAmount)
+                .SumAsync(gc => (decimal?)(gc.OriginalAmount - gc.RedeemedAmount)) ?? 0m;
+            if (periodGcBreakage > 0)
+                revenueLines.Add(new FinancialReportLine
+                {
+                    AccountNumber = "—",
+                    AccountName   = "Gift Certificate Breakage Income",
+                    Amount        = periodGcBreakage
+                });
         }
 
         // COGS & Expenses — cash basis: expenses paid in period; accrual: by bill/expense date
@@ -200,6 +247,13 @@ public class FinancialReportService : IFinancialReportService
             .Select(g => new { Id = g.Key, Amount = g.Sum(bp => bp.Amount) })
             .ToDictionaryAsync(g => g.Id, g => g.Amount);
 
+        // AP: vendor credit applications reduce AP (DR side) when matched against specific bills.
+        var vcByApAcctBs = await _context.VendorCreditApplications
+            .Where(vca => vca.AppliedDate <= asOfEnd)
+            .GroupBy(vca => vca.VendorCredit.APAccountId)
+            .Select(g => new { Id = g.Key, Amount = g.Sum(vca => vca.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amount);
+
         var taxByAcct = await _context.Invoices
             .Where(i => i.SalesTaxAccountId != null && i.TaxAmount > 0
                      && i.Status != InvoiceStatus.Draft && i.Status != InvoiceStatus.Voided
@@ -216,18 +270,131 @@ public class FinancialReportService : IFinancialReportService
                      && p.Invoice.Status != InvoiceStatus.Voided
                      && p.Invoice.Status != InvoiceStatus.WrittenOff)
             .SumAsync(p => (decimal?)p.Amount) ?? 0;
+        // Credit memo applications reduce open AR (CR AR when a credit is applied to an invoice).
+        arCredits += await _context.CreditMemoApplications
+            .Where(a => a.AppliedDate <= asOfEnd && a.Invoice.Status != InvoiceStatus.Voided)
+            .SumAsync(a => (decimal?)a.AmountApplied) ?? 0;
+        // Refunds reverse collected payments — they re-open AR so reduce net AR credits.
+        arCredits -= await _context.Refunds
+            .Where(r => r.RefundDate <= asOfEnd && !r.IsDeleted)
+            .SumAsync(r => (decimal?)r.Amount) ?? 0m;
 
-        // Retained earnings = net P&L from inception through asOf
+        // Refunds by bank account: money that left the account (CR to checking/bank).
+        var refundsByAcctBs = await _context.Refunds
+            .Where(r => r.RefundDate <= asOfEnd && !r.IsDeleted && r.DepositAccountId != null)
+            .GroupBy(r => r.DepositAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amount = g.Sum(r => r.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amount);
+
+        // Deposits by bank account: cash received at deposit recording time (DR bank).
+        var depositsByAcctDepBs = await _context.Deposits
+            .Where(d => !d.IsDeleted && d.DepositAccountId != null && d.ReceivedDate <= asOfEnd)
+            .GroupBy(d => d.DepositAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amount = g.Sum(d => d.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amount);
+
+        // Customer Deposits liability (2300): credits = all deposits taken; debits = deposits applied to invoices.
+        var custDepositsAcctIdBs = await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountNumber == "2300" && a.IsActive && !a.IsDeleted)
+            .Select(a => (int?)a.Id).FirstOrDefaultAsync();
+        var custDepositsCreditsBs = custDepositsAcctIdBs.HasValue
+            ? (await _context.Deposits
+                .Where(d => !d.IsDeleted && d.ReceivedDate <= asOfEnd)
+                .SumAsync(d => (decimal?)d.Amount) ?? 0m) : 0m;
+        var custDepositsDebitsBs = custDepositsAcctIdBs.HasValue
+            ? (await _context.Deposits
+                .Where(d => !d.IsDeleted && d.AppliedToInvoiceId != null && d.AppliedDate <= asOfEnd)
+                .SumAsync(d => (decimal?)d.Amount) ?? 0m) : 0m;
+
+        // Gift Certificate Liability (2500): balance driven by GC issuances, redemptions, and voids.
+        var gcLiabilityAcctIdBs = await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountNumber == "2500" && a.IsActive && !a.IsDeleted)
+            .Select(a => (int?)a.Id).FirstOrDefaultAsync();
+        var gcLiabilityCreditsBs = gcLiabilityAcctIdBs.HasValue
+            ? (await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.IssueDate <= asOfEnd)
+                .SumAsync(gc => (decimal?)gc.OriginalAmount) ?? 0m) : 0m;
+        var gcLiabilityDebitsBs = gcLiabilityAcctIdBs.HasValue
+            ? ((await _context.GiftCertificateRedemptions
+                .Where(r => !r.IsDeleted && r.RedeemedDate <= asOfEnd)
+                .SumAsync(r => (decimal?)r.AmountRedeemed) ?? 0m)
+             + (await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.Status == GiftCertificateStatus.Voided
+                          && gc.UpdatedAt <= asOfEnd && gc.OriginalAmount > gc.RedeemedAmount)
+                .SumAsync(gc => (decimal?)(gc.OriginalAmount - gc.RedeemedAmount)) ?? 0m)) : 0m;
+
+        // Retained earnings = net P&L from inception through asOf, covering four sources:
+        // (1) invoice revenue, (2) invoice discounts, (3) direct expenses, (4) vendor bill costs,
+        // plus (5) the net effect of any posted journal entries on revenue/expense/COGS accounts
+        // (accruals, depreciation, year-end closes, and other adjustments not in the tables above).
         var lifetimeRevenue   = await _context.InvoiceItems
             .Where(ii => ii.Invoice.Status != InvoiceStatus.Draft && ii.Invoice.Status != InvoiceStatus.Voided && ii.Invoice.InvoiceDate <= asOfEnd)
             .SumAsync(ii => (decimal?)ii.TotalPrice) ?? 0;
-        var lifetimeCogs      = await _context.Expenses
+        var lifetimeDiscounts = isCash ? 0m
+            : (await _context.Invoices
+                .Where(i => i.Status != InvoiceStatus.Draft && i.Status != InvoiceStatus.Voided
+                         && i.DiscountAmount > 0 && i.InvoiceDate <= asOfEnd)
+                .SumAsync(i => (decimal?)i.DiscountAmount) ?? 0m);
+        // Credit memos applied to invoices reduce net revenue (contra-revenue, same as discounts).
+        var lifetimeCreditMemos = isCash ? 0m
+            : (await _context.CreditMemoApplications
+                .Where(a => a.AppliedDate <= asOfEnd && a.Invoice.Status != InvoiceStatus.Voided)
+                .SumAsync(a => (decimal?)a.AmountApplied) ?? 0m);
+        var lifetimeDirectExp = await _context.Expenses
             .Where(e => e.Date <= asOfEnd)
             .SumAsync(e => (decimal?)e.Amount) ?? 0;
         var lifetimeBillCosts = await _context.BillLineItems
             .Where(bli => bli.Bill.Status != BillStatus.Draft && bli.Bill.Status != BillStatus.Voided && bli.Bill.BillDate <= asOfEnd)
             .SumAsync(bli => (decimal?)bli.Amount) ?? 0;
-        var retainedEarnings = lifetimeRevenue - lifetimeCogs - lifetimeBillCosts;
+
+        // JE net effect on revenue accounts (positive = additional revenue recognised via manual JE)
+        var revenueAcctIds = await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountType == AccountType.Revenue && !a.IsDeleted)
+            .Select(a => a.Id).ToListAsync();
+        var expCogsAcctIds = await _context.Accounts
+            .Where(a => a.CompanyId == companyId
+                     && (a.AccountType == AccountType.Expense || a.AccountType == AccountType.CostOfGoods)
+                     && !a.IsDeleted)
+            .Select(a => a.Id).ToListAsync();
+
+        var jeRevNet = revenueAcctIds.Count > 0
+            ? (await _context.JournalEntryLines
+                .Where(l => revenueAcctIds.Contains(l.AccountId)
+                         && l.JournalEntry.Status == JournalEntryStatus.Posted
+                         && l.JournalEntry.EntryDate <= asOfEnd)
+                .SumAsync(l => (decimal?)(l.CreditAmount - l.DebitAmount)) ?? 0m)
+            : 0m;
+
+        // JE net effect on expense/COGS accounts (positive = additional expense recognised via manual JE)
+        var jeExpNet = expCogsAcctIds.Count > 0
+            ? (await _context.JournalEntryLines
+                .Where(l => expCogsAcctIds.Contains(l.AccountId)
+                         && l.JournalEntry.Status == JournalEntryStatus.Posted
+                         && l.JournalEntry.EntryDate <= asOfEnd)
+                .SumAsync(l => (decimal?)(l.DebitAmount - l.CreditAmount)) ?? 0m)
+            : 0m;
+
+        // GC items sold via invoices are reclassified to GC Liability and not yet earned income.
+        var lifetimeGcReclassified = await _context.InvoiceItems
+            .Where(ii => ii.IsGiftCertificate
+                      && ii.Invoice.Status != InvoiceStatus.Draft
+                      && ii.Invoice.Status != InvoiceStatus.Voided
+                      && ii.Invoice.InvoiceDate <= asOfEnd)
+            .SumAsync(ii => (decimal?)ii.TotalPrice) ?? 0m;
+        // Voided GCs with remaining balance become breakage income (the liability is extinguished).
+        var lifetimeGcBreakage = await _context.GiftCertificates
+            .Where(gc => !gc.IsDeleted && gc.Status == GiftCertificateStatus.Voided
+                      && gc.UpdatedAt <= asOfEnd && gc.OriginalAmount > gc.RedeemedAmount)
+            .SumAsync(gc => (decimal?)(gc.OriginalAmount - gc.RedeemedAmount)) ?? 0m;
+
+        var retainedEarnings = lifetimeRevenue + jeRevNet
+                             - lifetimeDiscounts
+                             - lifetimeCreditMemos
+                             - lifetimeGcReclassified // deferred to GC Liability, not earned yet
+                             + lifetimeGcBreakage     // breakage income when GC voided with balance
+                             - lifetimeDirectExp
+                             - lifetimeBillCosts
+                             - jeExpNet;
 
         var accounts = await _context.Accounts
             .Where(a => a.IsActive)
@@ -248,6 +415,7 @@ public class FinancialReportService : IFinancialReportService
             {
                 credits  = billsByApAcct.GetValueOrDefault(a.Id);
                 debits   = bpByApAcct.GetValueOrDefault(a.Id);
+                debits  += vcByApAcctBs.GetValueOrDefault(a.Id); // vendor credit applications reduce AP
             }
             else
             {
@@ -255,6 +423,18 @@ public class FinancialReportService : IFinancialReportService
                 credits += expFromByAcct.GetValueOrDefault(a.Id);
                 credits += bpFromByAcct.GetValueOrDefault(a.Id);
                 credits += taxByAcct.GetValueOrDefault(a.Id);
+                credits += refundsByAcctBs.GetValueOrDefault(a.Id);      // refunds reduce bank balance
+                debits  += depositsByAcctDepBs.GetValueOrDefault(a.Id);  // deposits increase bank balance
+                if (gcLiabilityAcctIdBs.HasValue && a.Id == gcLiabilityAcctIdBs.Value)
+                {
+                    credits += gcLiabilityCreditsBs; // GC issued → CR liability
+                    debits  += gcLiabilityDebitsBs;  // redeemed/voided → DR liability
+                }
+                if (custDepositsAcctIdBs.HasValue && a.Id == custDepositsAcctIdBs.Value)
+                {
+                    credits += custDepositsCreditsBs; // deposits taken → CR liability
+                    debits  += custDepositsDebitsBs;  // deposits applied → DR liability
+                }
             }
 
             decimal opening = (a.OpeningBalanceDate == null || a.OpeningBalanceDate.Value.Date <= asOf)
@@ -652,20 +832,277 @@ public class FinancialReportService : IFinancialReportService
     }
 
     /// <inheritdoc/>
+    /// <remarks>
+    /// Balances are computed dynamically from transaction tables using the same pre-computed
+    /// dictionary approach as <see cref="GetBalanceSheetAsync"/>, so the <paramref name="asOf"/>
+    /// date is respected. This replaces the previous implementation that read the denormalised
+    /// <c>Account.CurrentBalance</c> field, which always reflected the current date regardless of
+    /// what date was selected.
+    /// </remarks>
     public async Task<TrialBalanceDto> GetTrialBalanceAsync(int companyId, DateTime asOf)
     {
+        var asOfEnd     = asOf.AddDays(1).AddTicks(-1);
         var companyName = await GetCompanyNameAsync(companyId);
 
+        // ── Pre-compute per-account contribution dictionaries (batch GROUP BY, no N+1) ──────
+
+        // Bank/cash: customer payments deposited here (DR)
+        var depositsByAcct = await _context.Payments
+            .Where(p => p.PaymentDate <= asOfEnd && p.DepositAccountId != null
+                     && p.Invoice.Status != InvoiceStatus.Voided
+                     && p.Invoice.Status != InvoiceStatus.WrittenOff)
+            .GroupBy(p => p.DepositAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(p => p.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // AP: vendor credit applications reduce AP (DR) — credits are applied when a vendor
+        // issues a credit note and it is matched against a specific bill.
+        var vcByApAcct = await _context.VendorCreditApplications
+            .Where(vca => vca.AppliedDate <= asOfEnd)
+            .GroupBy(vca => vca.VendorCredit.APAccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(vca => vca.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Bank/cash: expenses paid from here (CR)
+        var expFromByAcct = await _context.Expenses
+            .Where(e => e.Date <= asOfEnd)
+            .GroupBy(e => e.PaymentAccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(e => e.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Bank/cash: bill payments made from here (CR)
+        var bpFromByAcct = await _context.BillPayments
+            .Where(bp => bp.PaymentDate <= asOfEnd)
+            .GroupBy(bp => bp.BankAccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(bp => bp.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // AP: bills increase AP (CR)
+        var billsByApAcct = await _context.Bills
+            .Where(b => b.Status != BillStatus.Draft && b.Status != BillStatus.Voided && b.BillDate <= asOfEnd)
+            .GroupBy(b => b.APAccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(b => b.Total) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // AP: bill payments reduce AP (DR)
+        var bpByApAcct = await _context.BillPayments
+            .Where(bp => bp.PaymentDate <= asOfEnd)
+            .GroupBy(bp => bp.Bill.APAccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(bp => bp.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Tax liability: sales tax collected (CR)
+        var taxByAcct = await _context.Invoices
+            .Where(i => i.SalesTaxAccountId != null && i.TaxAmount > 0
+                     && i.Status != InvoiceStatus.Draft && i.Status != InvoiceStatus.Voided
+                     && i.InvoiceDate <= asOfEnd)
+            .GroupBy(i => i.SalesTaxAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(i => i.TaxAmount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Revenue accounts: invoice line items (CR)
+        var revenueByAcct = await _context.InvoiceItems
+            .Where(ii => ii.RevenueAccountId != null
+                      && ii.Invoice.Status != InvoiceStatus.Draft
+                      && ii.Invoice.Status != InvoiceStatus.Voided
+                      && ii.Invoice.InvoiceDate <= asOfEnd)
+            .GroupBy(ii => ii.RevenueAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(ii => ii.TotalPrice) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Expense accounts: direct expenses (DR)
+        var expenseByAcct = await _context.Expenses
+            .Where(e => e.Date <= asOfEnd)
+            .GroupBy(e => e.ExpenseAccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(e => e.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Expense/COGS accounts: vendor bill line items (DR)
+        var billLinesByAcct = await _context.BillLineItems
+            .Where(bli => bli.AccountId != null
+                       && bli.Bill.Status != BillStatus.Draft
+                       && bli.Bill.Status != BillStatus.Voided
+                       && bli.Bill.BillDate <= asOfEnd)
+            .GroupBy(bli => bli.AccountId!.Value)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(bli => bli.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Sales Discounts contra-revenue account: invoice discounts and credit memo applications (DR).
+        // Both reduce net revenue and are attributed to account 4950 as contra-revenue debits.
+        // Credit memo applications are also added to AR credits below so the double-entry balances.
+        var discountAcctId = await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountNumber == "4950" && a.IsActive && !a.IsDeleted)
+            .Select(a => (int?)a.Id)
+            .FirstOrDefaultAsync();
+        discountAcctId ??= await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountType == AccountType.Revenue
+                     && a.IsActive && !a.IsDeleted && a.Name.ToLower().Contains("discount"))
+            .Select(a => (int?)a.Id)
+            .FirstOrDefaultAsync();
+
+        var cmApplied = await _context.CreditMemoApplications
+            .Where(a => a.AppliedDate <= asOfEnd
+                     && a.Invoice.Status != InvoiceStatus.Voided)
+            .SumAsync(a => (decimal?)a.AmountApplied) ?? 0m;
+
+        var discountsByAcct = new Dictionary<int, decimal>();
+        if (discountAcctId.HasValue)
+        {
+            var totalDiscounts = await _context.Invoices
+                .Where(i => i.DiscountAmount > 0
+                         && i.Status != InvoiceStatus.Draft
+                         && i.Status != InvoiceStatus.Voided
+                         && i.InvoiceDate <= asOfEnd)
+                .SumAsync(i => (decimal?)i.DiscountAmount) ?? 0m;
+            if (totalDiscounts + cmApplied > 0)
+                discountsByAcct[discountAcctId.Value] = totalDiscounts + cmApplied;
+        }
+
+        // JE lines: posted entries debit/credit all account types
+        var jeDebitsByAcct = await _context.JournalEntryLines
+            .Where(l => l.JournalEntry.Status == JournalEntryStatus.Posted
+                     && l.JournalEntry.EntryDate <= asOfEnd)
+            .GroupBy(l => l.AccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(l => l.DebitAmount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        var jeCreditsByAcct = await _context.JournalEntryLines
+            .Where(l => l.JournalEntry.Status == JournalEntryStatus.Posted
+                     && l.JournalEntry.EntryDate <= asOfEnd)
+            .GroupBy(l => l.AccountId)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(l => l.CreditAmount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // AR totals (single AR account assumed per standard small-business chart of accounts).
+        // Credits include both cash payments and credit memo applications (which reduce open AR
+        // when a customer credit is applied against a specific invoice).
+        var arTotalDebits  = await _context.Invoices
+            .Where(i => i.Status != InvoiceStatus.Draft && i.Status != InvoiceStatus.Voided
+                     && i.InvoiceDate <= asOfEnd)
+            .SumAsync(i => (decimal?)i.Total) ?? 0m;
+        var arTotalCredits = await _context.Payments
+            .Where(p => p.PaymentDate <= asOfEnd
+                     && p.Invoice.Status != InvoiceStatus.Voided
+                     && p.Invoice.Status != InvoiceStatus.WrittenOff)
+            .SumAsync(p => (decimal?)p.Amount) ?? 0m;
+        arTotalCredits += cmApplied; // credit memo applications reduce AR balance
+
+        // Refunds reverse collected payments — reduce net AR credits (re-opens the receivable).
+        var refundTotal = await _context.Refunds
+            .Where(r => r.RefundDate <= asOfEnd && !r.IsDeleted)
+            .SumAsync(r => (decimal?)r.Amount) ?? 0m;
+        arTotalCredits -= refundTotal;
+
+        // Refunds by bank account: money leaving the account (CR to checking/bank).
+        var refundsByAcct = await _context.Refunds
+            .Where(r => r.RefundDate <= asOfEnd && !r.IsDeleted && r.DepositAccountId != null)
+            .GroupBy(r => r.DepositAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(r => r.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Deposits by bank account: cash received at deposit recording time (DR bank).
+        // Deposit-sourced Payments have DepositAccountId = null, so there is no double-count with depositsByAcct.
+        var depositsByAcctDep = await _context.Deposits
+            .Where(d => !d.IsDeleted && d.DepositAccountId != null && d.ReceivedDate <= asOfEnd)
+            .GroupBy(d => d.DepositAccountId!.Value)
+            .Select(g => new { Id = g.Key, Amt = g.Sum(d => d.Amount) })
+            .ToDictionaryAsync(g => g.Id, g => g.Amt);
+
+        // Customer Deposits liability (2300): credits = all deposits taken; debits = deposits applied to invoices.
+        var custDepositsAcctId = await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountNumber == "2300" && a.IsActive && !a.IsDeleted)
+            .Select(a => (int?)a.Id).FirstOrDefaultAsync();
+        var custDepositsCredits = custDepositsAcctId.HasValue
+            ? (await _context.Deposits
+                .Where(d => !d.IsDeleted && d.ReceivedDate <= asOfEnd)
+                .SumAsync(d => (decimal?)d.Amount) ?? 0m) : 0m;
+        var custDepositsDebits = custDepositsAcctId.HasValue
+            ? (await _context.Deposits
+                .Where(d => !d.IsDeleted && d.AppliedToInvoiceId != null && d.AppliedDate <= asOfEnd)
+                .SumAsync(d => (decimal?)d.Amount) ?? 0m) : 0m;
+
+        // Gift Certificate Liability (2500): balance driven by GC issuances, redemptions, and voids.
+        var gcLiabilityAcctId = await _context.Accounts
+            .Where(a => a.CompanyId == companyId && a.AccountNumber == "2500" && a.IsActive && !a.IsDeleted)
+            .Select(a => (int?)a.Id).FirstOrDefaultAsync();
+        var gcLiabilityCredits = gcLiabilityAcctId.HasValue
+            ? (await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.IssueDate <= asOfEnd)
+                .SumAsync(gc => (decimal?)gc.OriginalAmount) ?? 0m) : 0m;
+        var gcLiabilityDebits = gcLiabilityAcctId.HasValue
+            ? ((await _context.GiftCertificateRedemptions
+                .Where(r => !r.IsDeleted && r.RedeemedDate <= asOfEnd)
+                .SumAsync(r => (decimal?)r.AmountRedeemed) ?? 0m)
+             + (await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.Status == GiftCertificateStatus.Voided
+                          && gc.UpdatedAt <= asOfEnd && gc.OriginalAmount > gc.RedeemedAmount)
+                .SumAsync(gc => (decimal?)(gc.OriginalAmount - gc.RedeemedAmount)) ?? 0m)) : 0m;
+
+        // ── Per-account balance computation ─────────────────────────────────────────────────
+
         var accounts = await _context.Accounts
             .Where(a => a.CompanyId == companyId && a.IsActive)
             .OrderBy(a => a.AccountNumber)
             .ToListAsync();
 
-        var lines = new List<TrialBalanceLine>();
+        decimal ComputeAsOfBalance(Account a)
+        {
+            bool isDebitNormal = AccountingRules.IsNormalDebitBalance(a.AccountSubType);
+            decimal debits = 0m, credits = 0m;
 
+            if (a.AccountSubType == AccountSubType.AccountsReceivable)
+            {
+                debits  = arTotalDebits;
+                credits = arTotalCredits;
+            }
+            else if (a.AccountSubType == AccountSubType.AccountsPayable)
+            {
+                credits  = billsByApAcct.GetValueOrDefault(a.Id);
+                debits   = bpByApAcct.GetValueOrDefault(a.Id);
+                debits  += vcByApAcct.GetValueOrDefault(a.Id); // vendor credit applications reduce AP
+            }
+            else
+            {
+                // All other accounts: sum contributions from each transaction source that can
+                // post to this account. Dictionaries only contain entries for relevant account IDs,
+                // so GetValueOrDefault returns 0 for sources that do not apply to this account type.
+                debits  += depositsByAcct.GetValueOrDefault(a.Id);
+                credits += expFromByAcct.GetValueOrDefault(a.Id);
+                credits += bpFromByAcct.GetValueOrDefault(a.Id);
+                credits += taxByAcct.GetValueOrDefault(a.Id);
+                credits += revenueByAcct.GetValueOrDefault(a.Id);
+                debits  += expenseByAcct.GetValueOrDefault(a.Id);
+                debits  += billLinesByAcct.GetValueOrDefault(a.Id);
+                debits  += discountsByAcct.GetValueOrDefault(a.Id);
+                credits += refundsByAcct.GetValueOrDefault(a.Id);    // refunds reduce bank balance
+                debits  += depositsByAcctDep.GetValueOrDefault(a.Id); // deposits increase bank balance
+                if (gcLiabilityAcctId.HasValue && a.Id == gcLiabilityAcctId.Value)
+                {
+                    credits += gcLiabilityCredits; // GC issued → CR liability
+                    debits  += gcLiabilityDebits;  // redeemed/voided → DR liability
+                }
+                if (custDepositsAcctId.HasValue && a.Id == custDepositsAcctId.Value)
+                {
+                    credits += custDepositsCredits; // deposits taken → CR liability
+                    debits  += custDepositsDebits;  // deposits applied → DR liability
+                }
+            }
+
+            // Manual JEs apply to all account types (including AR/AP for unusual adjustments)
+            debits  += jeDebitsByAcct.GetValueOrDefault(a.Id);
+            credits += jeCreditsByAcct.GetValueOrDefault(a.Id);
+
+            decimal opening = (a.OpeningBalanceDate == null || a.OpeningBalanceDate.Value.Date <= asOf)
+                ? a.OpeningBalance : 0m;
+            decimal net = isDebitNormal ? debits - credits : credits - debits;
+            return opening + net;
+        }
+
+        var lines = new List<TrialBalanceLine>();
         foreach (var acct in accounts)
         {
-            if (acct.CurrentBalance == 0) continue;
+            var balance = ComputeAsOfBalance(acct);
+            if (balance == 0m) continue;
 
             var isDebitNormal = AccountingRules.IsNormalDebitBalance(acct.AccountSubType);
             var line = new TrialBalanceLine
@@ -679,14 +1116,14 @@ public class FinancialReportService : IFinancialReportService
             if (isDebitNormal)
             {
                 // Normal debit: positive balance → Debit column; negative → Credit column (abnormal)
-                if (acct.CurrentBalance >= 0) line.DebitBalance  = acct.CurrentBalance;
-                else                          line.CreditBalance = -acct.CurrentBalance;
+                if (balance >= 0m) line.DebitBalance  = balance;
+                else               line.CreditBalance = -balance;
             }
             else
             {
                 // Normal credit: positive balance → Credit column; negative → Debit column (abnormal)
-                if (acct.CurrentBalance >= 0) line.CreditBalance = acct.CurrentBalance;
-                else                          line.DebitBalance  = -acct.CurrentBalance;
+                if (balance >= 0m) line.CreditBalance = balance;
+                else               line.DebitBalance  = -balance;
             }
 
             lines.Add(line);

src/PowderCoating.Infrastructure/Services/LedgerService.cs

@@ -72,6 +72,45 @@ public class LedgerService : ILedgerService
                 LinkId = p.InvoiceId
             });
 
+        // Customer deposits recorded to this account (DEBIT — cash received at deposit time)
+        var depositedDeposits = await _context.Deposits
+            .Where(d => d.DepositAccountId == accountId
+                     && d.ReceivedDate >= fromDate && d.ReceivedDate <= toDate)
+            .ToListAsync();
+
+        foreach (var d in depositedDeposits)
+            entries.Add(new LedgerEntryDto
+            {
+                Date = d.ReceivedDate,
+                Reference = d.ReceiptNumber,
+                Source = "Customer Deposit",
+                Description = d.Notes ?? d.Reference,
+                Debit = d.Amount,
+                Credit = 0,
+                LinkController = "Jobs",
+                LinkId = d.JobId
+            });
+
+        // Refunds paid FROM this account (CREDIT — cash leaves)
+        var refundsPaidFrom = await _context.Refunds
+            .Include(r => r.Invoice)
+            .Where(r => r.DepositAccountId == accountId
+                     && r.RefundDate >= fromDate && r.RefundDate <= toDate)
+            .ToListAsync();
+
+        foreach (var r in refundsPaidFrom)
+            entries.Add(new LedgerEntryDto
+            {
+                Date = r.RefundDate,
+                Reference = r.Reference ?? $"REF-{r.Id}",
+                Source = "Refund",
+                Description = r.Reason,
+                Debit = 0,
+                Credit = r.Amount,
+                LinkController = "Invoices",
+                LinkId = r.InvoiceId
+            });
+
         // ── 2. Direct expenses paid FROM this account (CREDIT) ────────────────
         // e.g. Checking account used to pay an expense
         var expensesPaidFrom = await _context.Expenses
@@ -251,6 +290,46 @@ public class LedgerService : ILedgerService
                     LinkController = "Invoices",
                     LinkId = p.InvoiceId
                 });
+
+            // Credit memo applications reduce open AR (CREDIT)
+            var arCreditMemos = await _context.CreditMemoApplications
+                .Include(a => a.Invoice)
+                .Include(a => a.CreditMemo)
+                .Where(a => a.AppliedDate >= fromDate && a.AppliedDate <= toDate
+                         && a.Invoice.Status != InvoiceStatus.Voided)
+                .ToListAsync();
+
+            foreach (var cm in arCreditMemos)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = cm.AppliedDate,
+                    Reference = cm.CreditMemo?.MemoNumber ?? $"CM-{cm.Id}",
+                    Source = "Credit Memo",
+                    Description = $"Credit applied to {cm.Invoice?.InvoiceNumber}",
+                    Debit = 0,
+                    Credit = cm.AmountApplied,
+                    LinkController = "Invoices",
+                    LinkId = cm.InvoiceId
+                });
+
+            // Refunds re-open AR (DEBIT — customer owes again after refund)
+            var arRefunds = await _context.Refunds
+                .Include(r => r.Invoice)
+                .Where(r => r.RefundDate >= fromDate && r.RefundDate <= toDate && !r.IsDeleted)
+                .ToListAsync();
+
+            foreach (var r in arRefunds)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = r.RefundDate,
+                    Reference = r.Reference ?? $"REF-{r.Id}",
+                    Source = "Refund",
+                    Description = r.Reason,
+                    Debit = r.Amount,
+                    Credit = 0,
+                    LinkController = "Invoices",
+                    LinkId = r.InvoiceId
+                });
         }
 
         // ── 9. Accounts Payable ────────────────────────────────────────────────
@@ -296,6 +375,102 @@ public class LedgerService : ILedgerService
                     LinkController = "Bills",
                     LinkId = bp.BillId
                 });
+
+            // Vendor credit applications reduce AP (DEBIT — offset against what we owe)
+            var apVendorCredits = await _context.VendorCreditApplications
+                .Include(vca => vca.VendorCredit)
+                .Include(vca => vca.Bill)
+                .Where(vca => vca.VendorCredit.APAccountId == accountId
+                           && vca.AppliedDate >= fromDate && vca.AppliedDate <= toDate)
+                .ToListAsync();
+
+            foreach (var vca in apVendorCredits)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = vca.AppliedDate,
+                    Reference = vca.VendorCredit?.CreditNumber ?? $"VC-{vca.VendorCreditId}",
+                    Source = "Vendor Credit",
+                    Description = $"Credit applied to {vca.Bill?.BillNumber}",
+                    Debit = vca.Amount,
+                    Credit = 0,
+                    LinkController = "VendorCredits",
+                    LinkId = vca.VendorCreditId
+                });
+        }
+
+        // ── 11. Gift Certificate Liability (account 2500) ─────────────────────
+        // CR when GC is issued; DR when redeemed or voided with remaining balance.
+        if (account.AccountNumber == "2500")
+        {
+            var gcIssued = await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.IssueDate >= fromDate && gc.IssueDate <= toDate)
+                .ToListAsync();
+            foreach (var gc in gcIssued)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = gc.IssueDate, Reference = gc.CertificateCode,
+                    Source = "Gift Certificate", Description = "GC issued",
+                    Debit = 0, Credit = gc.OriginalAmount,
+                    LinkController = "GiftCertificates", LinkId = gc.Id
+                });
+
+            var gcRedemptions = await _context.GiftCertificateRedemptions
+                .Include(r => r.GiftCertificate)
+                .Where(r => !r.IsDeleted && r.RedeemedDate >= fromDate && r.RedeemedDate <= toDate)
+                .ToListAsync();
+            foreach (var r in gcRedemptions)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = r.RedeemedDate, Reference = r.GiftCertificate?.CertificateCode ?? $"GC-{r.GiftCertificateId}",
+                    Source = "GC Redemption", Description = "GC applied to invoice",
+                    Debit = r.AmountRedeemed, Credit = 0,
+                    LinkController = "GiftCertificates", LinkId = r.GiftCertificateId
+                });
+
+            var gcVoided = await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.Status == GiftCertificateStatus.Voided
+                          && gc.UpdatedAt >= fromDate && gc.UpdatedAt <= toDate
+                          && gc.OriginalAmount > gc.RedeemedAmount)
+                .ToListAsync();
+            foreach (var gc in gcVoided)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = gc.UpdatedAt.GetValueOrDefault(), Reference = gc.CertificateCode,
+                    Source = "GC Voided", Description = "Breakage income",
+                    Debit = gc.OriginalAmount - gc.RedeemedAmount, Credit = 0,
+                    LinkController = "GiftCertificates", LinkId = gc.Id
+                });
+        }
+
+        // ── 12. Customer Deposits liability (account 2300) ────────────────────
+        // CR when deposit is recorded; DR when deposit is applied to an invoice.
+        if (account.AccountNumber == "2300")
+        {
+            var depositsRecorded = await _context.Deposits
+                .Where(d => !d.IsDeleted && d.ReceivedDate >= fromDate && d.ReceivedDate <= toDate)
+                .ToListAsync();
+            foreach (var d in depositsRecorded)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = d.ReceivedDate, Reference = d.ReceiptNumber,
+                    Source = "Customer Deposit", Description = d.Notes ?? d.Reference,
+                    Debit = 0, Credit = d.Amount,
+                    LinkController = "Jobs", LinkId = d.JobId
+                });
+
+            var depositsApplied = await _context.Deposits
+                .Include(d => d.AppliedToInvoice)
+                .Where(d => !d.IsDeleted && d.AppliedToInvoiceId != null
+                         && d.AppliedDate >= fromDate && d.AppliedDate <= toDate)
+                .ToListAsync();
+            foreach (var d in depositsApplied)
+                entries.Add(new LedgerEntryDto
+                {
+                    Date = d.AppliedDate!.Value, Reference = d.AppliedToInvoice?.InvoiceNumber ?? d.ReceiptNumber,
+                    Source = "Deposit Applied", Description = $"Deposit {d.ReceiptNumber} applied to invoice",
+                    Debit = d.Amount, Credit = 0,
+                    LinkController = "Invoices", LinkId = d.AppliedToInvoiceId
+                });
         }
 
         // ── 10. Journal Entry lines touching this account ──────────────────
@@ -382,6 +557,16 @@ public class LedgerService : ILedgerService
             .Where(p => p.DepositAccountId == accountId && p.PaymentDate < beforeDate)
             .SumAsync(p => (decimal?)p.Amount) ?? 0;
 
+        // Customer deposits recorded to this account (DEBIT — cash received at deposit time)
+        debits += await _context.Deposits
+            .Where(d => !d.IsDeleted && d.DepositAccountId == accountId && d.ReceivedDate < beforeDate)
+            .SumAsync(d => (decimal?)d.Amount) ?? 0;
+
+        // Refunds paid FROM this account (CREDIT — cash leaves)
+        credits += await _context.Refunds
+            .Where(r => !r.IsDeleted && r.DepositAccountId == accountId && r.RefundDate < beforeDate)
+            .SumAsync(r => (decimal?)r.Amount) ?? 0;
+
         // 2. Direct expenses paid FROM this account (CREDIT)
         credits += await _context.Expenses
             .Where(e => e.PaymentAccountId == accountId && e.Date < beforeDate)
@@ -434,6 +619,14 @@ public class LedgerService : ILedgerService
             credits += await _context.Payments
                 .Where(p => p.PaymentDate < beforeDate)
                 .SumAsync(p => (decimal?)p.Amount) ?? 0;
+
+            credits += await _context.CreditMemoApplications
+                .Where(a => a.AppliedDate < beforeDate && a.Invoice.Status != InvoiceStatus.Voided)
+                .SumAsync(a => (decimal?)a.AmountApplied) ?? 0;
+
+            debits += await _context.Refunds
+                .Where(r => !r.IsDeleted && r.RefundDate < beforeDate)
+                .SumAsync(r => (decimal?)r.Amount) ?? 0;
         }
 
         // 9. Accounts Payable
@@ -449,6 +642,36 @@ public class LedgerService : ILedgerService
             debits += await _context.BillPayments
                 .Where(bp => bp.Bill.APAccountId == accountId && bp.PaymentDate < beforeDate)
                 .SumAsync(bp => (decimal?)bp.Amount) ?? 0;
+
+            debits += await _context.VendorCreditApplications
+                .Where(vca => vca.VendorCredit.APAccountId == accountId && vca.AppliedDate < beforeDate)
+                .SumAsync(vca => (decimal?)vca.Amount) ?? 0;
+        }
+
+        // 11. GC Liability (account 2500)
+        if (account.AccountNumber == "2500")
+        {
+            credits += await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.IssueDate < beforeDate)
+                .SumAsync(gc => (decimal?)gc.OriginalAmount) ?? 0;
+            debits += await _context.GiftCertificateRedemptions
+                .Where(r => !r.IsDeleted && r.RedeemedDate < beforeDate)
+                .SumAsync(r => (decimal?)r.AmountRedeemed) ?? 0;
+            debits += await _context.GiftCertificates
+                .Where(gc => !gc.IsDeleted && gc.Status == GiftCertificateStatus.Voided
+                          && gc.UpdatedAt < beforeDate && gc.OriginalAmount > gc.RedeemedAmount)
+                .SumAsync(gc => (decimal?)(gc.OriginalAmount - gc.RedeemedAmount)) ?? 0;
+        }
+
+        // 12. Customer Deposits liability (account 2300)
+        if (account.AccountNumber == "2300")
+        {
+            credits += await _context.Deposits
+                .Where(d => !d.IsDeleted && d.ReceivedDate < beforeDate)
+                .SumAsync(d => (decimal?)d.Amount) ?? 0;
+            debits += await _context.Deposits
+                .Where(d => !d.IsDeleted && d.AppliedToInvoiceId != null && d.AppliedDate < beforeDate)
+                .SumAsync(d => (decimal?)d.Amount) ?? 0;
         }
 
         // 10. Posted journal entry lines touching this account (prior to period)

src/PowderCoating.Infrastructure/Services/NotificationService.cs

@@ -621,7 +621,7 @@ public class NotificationService : INotificationService
     /// (the <paramref name="paymentUrl"/> parameter). Without a payment URL the email is a
     /// standard "here is your invoice" message with no payment CTA.
     /// </summary>
-    public async Task NotifyInvoiceSentAsync(Invoice invoice, byte[]? pdfAttachment = null, string? pdfFilename = null, string? paymentUrl = null, string? overrideEmail = null)
+    public async Task NotifyInvoiceSentAsync(Invoice invoice, byte[]? pdfAttachment = null, string? pdfFilename = null, string? paymentUrl = null, string? overrideEmail = null, bool sendSms = false, string? viewUrl = null)
     {
         try
         {
@@ -705,6 +705,50 @@ public class NotificationService : INotificationService
                 await WriteLog(SkippedLog(NotificationChannel.Email, NotificationType.InvoiceSent,
                     customerName, string.Join(", ", invoiceEmails), invoice.CompanyId, customerId: customer.Id, invoiceId: invoice.Id));
             }
+
+            // SMS — only when explicitly requested by staff (sendSms=true), customer has opted in,
+            // and the company's SMS is active. Uses viewUrl (permanent) so customer can see the full
+            // invoice; paymentUrl (expiring Stripe link) is surfaced on the view page itself.
+            if (sendSms)
+            {
+                var smsAllowed = await IsSmsAllowedForCompanyAsync(company);
+                var smsPhone = customer.MobilePhone ?? customer.Phone;
+                if (smsAllowed && customer.NotifyBySms && !string.IsNullOrWhiteSpace(smsPhone))
+                {
+                    var urlForSms = viewUrl ?? paymentUrl ?? string.Empty;
+                    var values = new Dictionary<string, string>
+                    {
+                        ["companyName"]    = companyName,
+                        ["invoiceNumber"]  = invoice.InvoiceNumber,
+                        ["invoiceTotal"]   = invoice.Total.ToString("C"),
+                        ["viewUrl"]        = urlForSms
+                    };
+
+                    var message = await GetRenderedSmsAsync(invoice.CompanyId, NotificationType.InvoiceSent, values,
+                        $"{companyName}: Invoice {invoice.InvoiceNumber} for {invoice.Total:C} is ready. View your invoice: {urlForSms} Reply STOP to opt out.");
+                    var (smsSent, smsError) = await _smsService.SendSmsAsync(smsPhone, message);
+
+                    await WriteLog(new NotificationLog
+                    {
+                        Channel = NotificationChannel.Sms,
+                        NotificationType = NotificationType.InvoiceSent,
+                        Status = smsSent ? NotificationStatus.Sent : NotificationStatus.Failed,
+                        RecipientName = customerName,
+                        Recipient = smsPhone,
+                        Message = message,
+                        ErrorMessage = smsError,
+                        SentAt = DateTime.UtcNow,
+                        CustomerId = customer.Id,
+                        InvoiceId = invoice.Id,
+                        CompanyId = invoice.CompanyId
+                    });
+                }
+                else if (!string.IsNullOrWhiteSpace(smsPhone))
+                {
+                    await WriteLog(SkippedLog(NotificationChannel.Sms, NotificationType.InvoiceSent,
+                        customerName, smsPhone, invoice.CompanyId, customerId: customer.Id, invoiceId: invoice.Id));
+                }
+            }
         }
         catch (Exception ex)
         {
@@ -1153,6 +1197,10 @@ public class NotificationService : INotificationService
                     "Invoice {{invoiceNumber}} from {{companyName}}",
                     "<p>Dear {{customerName}},</p><p>Please find your invoice <strong>{{invoiceNumber}}</strong> for <strong>{{invoiceTotal}}</strong> attached.{{invoiceDueDate}}</p><p>Thank you for your business with {{companyName}}.</p>"
                 ),
+                [(NotificationType.InvoiceSent, NotificationChannel.Sms)] = (
+                    null,
+                    "{{companyName}}: Invoice {{invoiceNumber}} for {{invoiceTotal}} is ready. View your invoice: {{viewUrl}} Reply STOP to opt out."
+                ),
                 [(NotificationType.PaymentReceived, NotificationChannel.Email)] = (
                     "Payment Received — Invoice {{invoiceNumber}}",
                     "<p>Dear {{customerName}},</p><p>We have received your payment of <strong>{{paymentAmount}}</strong> on {{paymentDate}} for invoice <strong>{{invoiceNumber}}</strong>.{{balanceDue}}</p><p>Thank you for your business with {{companyName}}.</p>"

src/PowderCoating.Infrastructure/Services/SeedDataService.Accounts.cs

@@ -70,6 +70,10 @@ public partial class SeedDataService
             new Account { AccountNumber = "4100", Name = "Sandblasting Revenue",      AccountType = AccountType.Revenue,    AccountSubType = AccountSubType.ServiceRevenue,      IsSystem = false, IsActive = true, Description = "Revenue from sandblasting services",         CompanyId = company.Id, CreatedAt = now },
             new Account { AccountNumber = "4200", Name = "Other Service Revenue",     AccountType = AccountType.Revenue,    AccountSubType = AccountSubType.ServiceRevenue,      IsSystem = false, IsActive = true, Description = "Revenue from other shop services",           CompanyId = company.Id, CreatedAt = now },
             new Account { AccountNumber = "4900", Name = "Other Income",              AccountType = AccountType.Revenue,    AccountSubType = AccountSubType.OtherIncome,         IsSystem = false, IsActive = true, Description = "Miscellaneous income",                       CompanyId = company.Id, CreatedAt = now },
+            // Contra-revenue: debited when invoice discounts are applied so the GL balances.
+            // A credit-normal account with a debit balance appears in the Trial Balance debit column,
+            // reducing net revenue to match the discounted AR amount that was posted.
+            new Account { AccountNumber = "4950", Name = "Sales Discounts",           AccountType = AccountType.Revenue,    AccountSubType = AccountSubType.OtherIncome,         IsSystem = true,  IsActive = true, Description = "Contra-revenue for invoice discounts granted to customers", CompanyId = company.Id, CreatedAt = now },
 
             // ── COST OF GOODS SOLD ────────────────────────────────────────────
             new Account { AccountNumber = "5000", Name = "Cost of Goods Sold",        AccountType = AccountType.CostOfGoods, AccountSubType = AccountSubType.CostOfGoodsSold,   IsSystem = false, IsActive = true, Description = "Direct cost of services delivered",          CompanyId = company.Id, CreatedAt = now },
@@ -96,4 +100,44 @@ public partial class SeedDataService
 
         return accounts.Count;
     }
+
+    /// <summary>
+    /// Ensures system accounts introduced after the initial chart-of-accounts seed exist for the
+    /// given company. Idempotent: each account is only inserted when absent, so this is safe to
+    /// call repeatedly from the "Seed Lookup Tables" flow.
+    /// Call this after <see cref="SeedDefaultChartOfAccountsAsync"/> so that newly onboarded
+    /// companies get all accounts in one pass while existing companies receive only the missing ones.
+    /// </summary>
+    /// <returns>Number of accounts inserted (0 if all are already present).</returns>
+    private async Task<int> EnsureSystemAccountsAsync(Company company)
+    {
+        var now = DateTime.UtcNow;
+        int added = 0;
+
+        // 4950 Sales Discounts — contra-revenue account introduced to balance the GL when
+        // invoice discounts are applied (DR Sales Discounts / CR Revenue gap fixed).
+        var has4950 = await _context.Set<Account>()
+            .IgnoreQueryFilters()
+            .AnyAsync(a => a.CompanyId == company.Id && a.AccountNumber == "4950" && !a.IsDeleted);
+
+        if (!has4950)
+        {
+            _context.Set<Account>().Add(new Account
+            {
+                AccountNumber  = "4950",
+                Name           = "Sales Discounts",
+                AccountType    = AccountType.Revenue,
+                AccountSubType = AccountSubType.OtherIncome,
+                IsSystem       = true,
+                IsActive       = true,
+                Description    = "Contra-revenue for invoice discounts granted to customers",
+                CompanyId      = company.Id,
+                CreatedAt      = now
+            });
+            await _context.SaveChangesAsync();
+            added++;
+        }
+
+        return added;
+    }
 }

src/PowderCoating.Infrastructure/Services/SeedDataService.cs

@@ -283,6 +283,14 @@ public partial class SeedDataService : ISeedDataService
                 result.ItemsSeeded += accountsSeeded;
             }
 
+            // Backfill any system accounts added after the initial seed (idempotent).
+            var systemAccountsAdded = await EnsureSystemAccountsAsync(company);
+            if (systemAccountsAdded > 0)
+            {
+                details.Add($"✓ {systemAccountsAdded} missing system account(s) added");
+                result.ItemsSeeded += systemAccountsAdded;
+            }
+
             result.Message = $"Lookup tables initialized for {company.CompanyName}";
             result.Details = details;
         }

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)
             {
@@ -2685,6 +2666,7 @@ public class CompanySettingsController : Controller
         {
             list.Add(("{{invoiceTotal}}", "Invoice total amount (formatted as currency)"));
             list.Add(("{{invoiceDueDate}}", "Due date phrase, e.g. \" Due by January 1, 2026.\" — blank if no due date is set"));
+            list.Add(("{{viewUrl}}", "Permanent link for the customer to view the invoice online (used in SMS)"));
         }
 
         if (type == NotificationType.PaymentReceived)
@@ -2709,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>
@@ -3045,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,26 +349,6 @@ 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}",
                     user.Email, User.Identity?.Name);
 
@@ -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,59 +610,6 @@ 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}",
                     user.Email, User.Identity?.Name);
 

src/PowderCoating.Web/Controllers/CreditMemosController.cs

@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using PowderCoating.Application.Interfaces;
 using PowderCoating.Core.Entities;
 using PowderCoating.Core.Enums;
 using PowderCoating.Core.Interfaces;
@@ -15,6 +16,9 @@ namespace PowderCoating.Web.Controllers;
 /// balance and can be issued standalone (goodwill, billing correction) or linked to an original
 /// invoice (price dispute, rework resolution). Applied portions reduce invoice BalanceDue and
 /// customer.CreditBalance atomically inside a transaction.
+/// GL entries on Apply: DR 4950 Sales Discounts (contra-revenue) / CR AR — mirrors the treatment
+/// of invoice discounts so the Trial Balance and Balance Sheet reflect the applied credit as both
+/// a revenue deduction and an AR reduction.
 /// </summary>
 [Authorize(Policy = AppConstants.Policies.CompanyAdminOnly)]
 public class CreditMemosController : Controller
@@ -23,17 +27,20 @@ public class CreditMemosController : Controller
     private readonly ITenantContext _tenantContext;
     private readonly UserManager<ApplicationUser> _userManager;
     private readonly ILogger<CreditMemosController> _logger;
+    private readonly IAccountBalanceService _accountBalanceService;
 
     public CreditMemosController(
         IUnitOfWork unitOfWork,
         ITenantContext tenantContext,
         UserManager<ApplicationUser> userManager,
-        ILogger<CreditMemosController> logger)
+        ILogger<CreditMemosController> logger,
+        IAccountBalanceService accountBalanceService)
     {
         _unitOfWork = unitOfWork;
         _tenantContext = tenantContext;
         _userManager = userManager;
         _logger = logger;
+        _accountBalanceService = accountBalanceService;
     }
 
     /// <summary>Lists all credit memos for the current company with optional status and text filters.</summary>
@@ -245,6 +252,20 @@ public class CreditMemosController : Controller
                     await _unitOfWork.Invoices.UpdateAsync(invoice);
                 }
 
+                // GL: DR 4950 Sales Discounts (contra-revenue) / CR AR.
+                // The dynamic report computation attributes credit memo applications to both
+                // accounts already; this call keeps Account.CurrentBalance in sync for
+                // RecalculateAllAsync and any tools that read it directly.
+                var arAcct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                    a => a.AccountSubType == AccountSubType.AccountsReceivable && a.IsActive);
+                var discountAcct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                    a => a.AccountNumber == "4950" && a.IsActive)
+                    ?? await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                        a => a.AccountType == AccountType.Revenue && a.IsActive
+                          && a.Name.ToLower().Contains("discount"));
+                await _accountBalanceService.DebitAsync(discountAcct?.Id, applyAmount);
+                await _accountBalanceService.CreditAsync(arAcct?.Id, applyAmount);
+
                 await _unitOfWork.CompleteAsync();
             });
 

src/PowderCoating.Web/Controllers/DashboardController.cs

@@ -368,6 +368,9 @@ public class DashboardController : Controller
 
                 ViewBag.GuidedActivationBanner = BuildGuidedActivationBanner(companyPrefs);
                 ViewBag.ShopProgressWidget = await BuildShopProgressWidgetAsync(currentCompanyId.Value, companyPrefs);
+
+                var companyForKiosk = await _unitOfWork.Companies.GetByIdAsync(currentCompanyId.Value);
+                ViewBag.KioskActivated = !string.IsNullOrEmpty(companyForKiosk?.KioskActivationToken);
             }
 
             return View(vm);

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

@@ -12,6 +12,7 @@ using PowderCoating.Shared.Constants;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
+using AccountSubTypeEnum = PowderCoating.Core.Enums.AccountSubType;
 
 namespace PowderCoating.Web.Controllers;
 
@@ -22,17 +23,20 @@ public class DepositsController : Controller
     private readonly UserManager<ApplicationUser> _userManager;
     private readonly ILogger<DepositsController> _logger;
     private readonly ICompanyLogoService _logoService;
+    private readonly IAccountBalanceService _accountBalanceService;
 
     public DepositsController(
         IUnitOfWork unitOfWork,
         UserManager<ApplicationUser> userManager,
         ILogger<DepositsController> logger,
-        ICompanyLogoService logoService)
+        ICompanyLogoService logoService,
+        IAccountBalanceService accountBalanceService)
     {
         _unitOfWork = unitOfWork;
         _userManager = userManager;
         _logger = logger;
         _logoService = logoService;
+        _accountBalanceService = accountBalanceService;
     }
 
     // -----------------------------------------------------------------------
@@ -76,6 +80,7 @@ public class DepositsController : Controller
             if (currentUser == null) return Unauthorized();
 
             var receiptNumber = await GenerateReceiptNumberAsync(currentUser.CompanyId);
+            var checkingAcctId = await GetCheckingAccountIdAsync(currentUser.CompanyId);
 
             var deposit = new Deposit
             {
@@ -88,6 +93,7 @@ public class DepositsController : Controller
                 ReceivedDate     = receivedDate,
                 Reference        = reference,
                 Notes            = notes,
+                DepositAccountId = checkingAcctId,
                 RecordedById     = currentUser.Id,
                 CompanyId        = currentUser.CompanyId,
                 CreatedAt        = DateTime.UtcNow,
@@ -97,6 +103,11 @@ public class DepositsController : Controller
             await _unitOfWork.Deposits.AddAsync(deposit);
             await _unitOfWork.CompleteAsync();
 
+            // GL: DR Checking (cash received) / CR Customer Deposits 2300 (liability until applied to invoice).
+            var custDepositsAcctId = await GetCustomerDepositsAccountIdAsync(currentUser.CompanyId);
+            await _accountBalanceService.DebitAsync(checkingAcctId, deposit.Amount);
+            await _accountBalanceService.CreditAsync(custDepositsAcctId, deposit.Amount);
+
             return Json(new
             {
                 success = true,
@@ -137,6 +148,11 @@ public class DepositsController : Controller
             if (deposit.AppliedToInvoiceId != null)
                 return Json(new { success = false, message = "This deposit has already been applied to an invoice and cannot be deleted." });
 
+            // Reverse the GL entry made at recording time: CR Checking / DR Customer Deposits 2300.
+            var custDepositsAcctId = await GetCustomerDepositsAccountIdAsync(deposit.CompanyId);
+            await _accountBalanceService.CreditAsync(deposit.DepositAccountId, deposit.Amount);
+            await _accountBalanceService.DebitAsync(custDepositsAcctId, deposit.Amount);
+
             await _unitOfWork.Deposits.SoftDeleteAsync(id);
             await _unitOfWork.CompleteAsync();
 
@@ -419,6 +435,24 @@ public class DepositsController : Controller
         return hex.StartsWith("#") ? hex : fallback;
     }
 
+    /// <summary>Returns the first active Checking or Cash account for the company, or null.</summary>
+    private async Task<int?> GetCheckingAccountIdAsync(int companyId)
+    {
+        var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.CompanyId == companyId && a.IsActive
+              && (a.AccountSubType == AccountSubTypeEnum.Checking
+               || a.AccountSubType == AccountSubTypeEnum.Cash));
+        return acct?.Id;
+    }
+
+    /// <summary>Returns account 2300 "Customer Deposits" liability for the company, or null.</summary>
+    private async Task<int?> GetCustomerDepositsAccountIdAsync(int companyId)
+    {
+        var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.CompanyId == companyId && a.IsActive && a.AccountNumber == "2300");
+        return acct?.Id;
+    }
+
     private async Task<(byte[]? LogoData, string? LogoContentType)> LoadCompanyLogoAsync(Company? company)
     {
         if (company == null) return (null, null);

src/PowderCoating.Web/Controllers/GiftCertificatesController.cs

@@ -10,6 +10,7 @@ using PowderCoating.Core.Enums;
 using PowderCoating.Core.Interfaces;
 using PowderCoating.Shared.Constants;
 using PowderCoating.Web.Helpers;
+using AccountSubTypeEnum = PowderCoating.Core.Enums.AccountSubType;
 
 namespace PowderCoating.Web.Controllers;
 
@@ -31,6 +32,7 @@ public class GiftCertificatesController : Controller
     private readonly UserManager<ApplicationUser> _userManager;
     private readonly IPdfService _pdfService;
     private readonly ICompanyLogoService _logoService;
+    private readonly IAccountBalanceService _accountBalanceService;
 
     public GiftCertificatesController(
         IUnitOfWork unitOfWork,
@@ -38,7 +40,8 @@ public class GiftCertificatesController : Controller
         ILogger<GiftCertificatesController> logger,
         UserManager<ApplicationUser> userManager,
         IPdfService pdfService,
-        ICompanyLogoService logoService)
+        ICompanyLogoService logoService,
+        IAccountBalanceService accountBalanceService)
     {
         _unitOfWork = unitOfWork;
         _mapper = mapper;
@@ -46,6 +49,7 @@ public class GiftCertificatesController : Controller
         _userManager = userManager;
         _pdfService = pdfService;
         _logoService = logoService;
+        _accountBalanceService = accountBalanceService;
     }
 
     /// <summary>
@@ -103,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();
 
@@ -240,6 +245,26 @@ public class GiftCertificatesController : Controller
             await _unitOfWork.GiftCertificates.AddAsync(cert);
             await _unitOfWork.CompleteAsync();
 
+            // GL: CR Gift Certificate Liability (2500) for the face value.
+            // Debit side varies by reason:
+            //   Sold   → DR Checking (received cash outside invoice flow)
+            //   Others → DR Sales Discounts 4950 (promotional/goodwill cost)
+            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(companyId);
+            await _accountBalanceService.CreditAsync(gcLiabilityAcctId, cert.OriginalAmount);
+            if (dto.IssuedReason == GiftCertificateIssuedReason.Sold)
+            {
+                var checkingAcctId = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                    a => a.IsActive && (a.AccountSubType == AccountSubTypeEnum.Checking
+                                     || a.AccountSubType == AccountSubTypeEnum.Cash));
+                await _accountBalanceService.DebitAsync(checkingAcctId?.Id, cert.OriginalAmount);
+            }
+            else
+            {
+                var discountAcctId = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                    a => a.IsActive && a.AccountNumber == "4950");
+                await _accountBalanceService.DebitAsync(discountAcctId?.Id, cert.OriginalAmount);
+            }
+
             TempData["Success"] = $"Gift certificate {code} for {dto.Amount:C} created successfully.";
             return RedirectToAction(nameof(Details), new { id = cert.Id });
         }
@@ -272,11 +297,24 @@ public class GiftCertificatesController : Controller
             return RedirectToAction(nameof(Details), new { id });
         }
 
+        var remaining = cert.RemainingBalance;
         cert.Status = GiftCertificateStatus.Voided;
         cert.UpdatedAt = DateTime.UtcNow;
         await _unitOfWork.GiftCertificates.UpdateAsync(cert);
         await _unitOfWork.CompleteAsync();
 
+        // GL: DR GC Liability / CR Other Income (breakage — the company keeps the unredeemed amount)
+        if (remaining > 0)
+        {
+            var currentUser = await _userManager.GetUserAsync(User);
+            var companyId   = currentUser?.CompanyId ?? 0;
+            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(companyId);
+            var otherIncomeAcctId = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+                a => a.IsActive && a.AccountSubType == AccountSubTypeEnum.OtherIncome);
+            await _accountBalanceService.DebitAsync(gcLiabilityAcctId, remaining);
+            await _accountBalanceService.CreditAsync(otherIncomeAcctId?.Id, remaining);
+        }
+
         TempData["Success"] = $"Gift certificate {cert.CertificateCode} has been voided.";
         return RedirectToAction(nameof(Index));
     }
@@ -395,6 +433,191 @@ public class GiftCertificatesController : Controller
         ViewBag.Customers = list;
     }
 
+    /// <summary>Returns the Gift Certificate Liability account ID (account 2500) for the company.</summary>
+    private async Task<int?> GetGcLiabilityAccountIdAsync(int companyId)
+    {
+        var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.IsActive && a.AccountNumber == "2500");
+        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 ||
+        // 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().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));
-        }
 
         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;
@@ -397,11 +399,13 @@ public class InvoicesController : Controller
                     dto.InvoiceItems.Add(new CreateInvoiceItemDto
                     {
                         SourceJobItemId  = item.Id,
+                        CatalogItemId    = item.CatalogItemId,
                         Description      = item.Description ?? "Powder Coating",
-                        Quantity = 1,
-                        UnitPrice = item.TotalPrice,
+                        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 +441,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;
 
@@ -460,15 +467,17 @@ public class InvoicesController : Controller
                 }
                 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.
+                    QuotePricingBreakdownDto? jobBreakdown = null;
+                    if (!string.IsNullOrEmpty(job.PricingBreakdownJson))
+                        jobBreakdown = JsonSerializer.Deserialize<QuotePricingBreakdownDto>(job.PricingBreakdownJson);
+
                     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 +486,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,6 +511,20 @@ 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
                         });
@@ -677,7 +714,9 @@ public class InvoicesController : Controller
 
             foreach (var deposit in pendingDeposits)
             {
-                // Create a Payment record for each deposit
+                // DepositAccountId is intentionally null: the bank account was already debited
+                // when the deposit was recorded (DR Checking / CR Customer Deposits 2300).
+                // Setting it here would double-count the bank debit in the Trial Balance.
                 var payment = new Payment
                 {
                     InvoiceId        = invoice.Id,
@@ -686,6 +725,7 @@ public class InvoicesController : Controller
                     PaymentMethod    = deposit.PaymentMethod,
                     Reference        = $"Deposit {deposit.ReceiptNumber}",
                     Notes            = deposit.Notes,
+                    DepositAccountId = null,
                     RecordedById     = currentUser.Id,
                     CompanyId        = currentUser.CompanyId,
                     CreatedAt        = DateTime.UtcNow,
@@ -719,13 +759,31 @@ public class InvoicesController : Controller
 
             await _unitOfWork.CompleteAsync();
 
-            // Update account balances: debit AR, credit revenue accounts + sales tax
+            // Update account balances: debit AR, credit revenue accounts + sales tax.
+            // Discount contra-entry: DR Sales Discounts so the GL balances.
+            // Without it, credits (revenue + tax) exceed the AR debit by the discount amount.
             var arAccountId = await GetArAccountIdAsync(currentUser.CompanyId);
             foreach (var item in invoice.InvoiceItems.Where(i => !i.IsDeleted))
                 await _accountBalanceService.CreditAsync(item.RevenueAccountId, item.TotalPrice);
             if (invoice.TaxAmount > 0)
                 await _accountBalanceService.CreditAsync(invoice.SalesTaxAccountId, invoice.TaxAmount);
             await _accountBalanceService.DebitAsync(arAccountId, invoice.Total);
+            if (invoice.DiscountAmount > 0)
+            {
+                var discountAccountId = await GetSalesDiscountAccountIdAsync(currentUser.CompanyId);
+                await _accountBalanceService.DebitAsync(discountAccountId, invoice.DiscountAmount);
+            }
+            // GL for auto-applied deposits: DR Customer Deposits 2300 (clears the liability) / CR AR.
+            // The bank was already debited when the deposit was recorded, so Checking is not touched here.
+            if (pendingDeposits.Any())
+            {
+                var custDepositsAcctId = await GetCustomerDepositsAccountIdAsync(currentUser.CompanyId);
+                foreach (var dep in pendingDeposits)
+                {
+                    await _accountBalanceService.DebitAsync(custDepositsAcctId, dep.Amount);
+                    await _accountBalanceService.CreditAsync(arAccountId, dep.Amount);
+                }
+            }
             await _unitOfWork.CompleteAsync();
 
             // Auto-generate gift certificates for any GC line items
@@ -873,8 +931,17 @@ public class InvoicesController : Controller
 
             var currentUser = await _userManager.GetUserAsync(User);
 
-            // Recalculate totals (tax is applied after discount, consistent with quotes)
+            // Capture GL state before any mutations so the reversal is exact.
             var oldTotal        = invoice.Total;
+            var oldTaxAmount    = invoice.TaxAmount;
+            var oldTaxAcctId    = invoice.SalesTaxAccountId;
+            var oldDiscountAmt  = invoice.DiscountAmount;
+            var oldItems        = invoice.InvoiceItems
+                .Where(i => !i.IsDeleted)
+                .Select(i => (RevAcctId: i.RevenueAccountId, Price: i.TotalPrice))
+                .ToList();
+
+            // Recalculate totals (tax is applied after discount, consistent with quotes)
             var subTotal = dto.InvoiceItems.Sum(i => i.TotalPrice);
             var taxableAmount = subTotal - dto.DiscountAmount;
             var taxAmount = Math.Round(taxableAmount * dto.TaxPercent / 100, 2);
@@ -940,6 +1007,31 @@ public class InvoicesController : Controller
             await _unitOfWork.Invoices.UpdateAsync(invoice);
             await _unitOfWork.CompleteAsync();
 
+            // Reverse old GL entries then re-post new ones so account balances stay accurate.
+            // Reversal is the mirror of the original Create double-entry: swap every Debit↔Credit.
+            var arAccountId = await GetArAccountIdAsync(invoice.CompanyId);
+            int? discAcctId = null;
+            if (oldDiscountAmt > 0 || invoice.DiscountAmount > 0)
+                discAcctId = await GetSalesDiscountAccountIdAsync(invoice.CompanyId);
+
+            await _accountBalanceService.CreditAsync(arAccountId, oldTotal);
+            foreach (var (revAcctId, price) in oldItems)
+                await _accountBalanceService.DebitAsync(revAcctId, price);
+            if (oldTaxAmount > 0)
+                await _accountBalanceService.DebitAsync(oldTaxAcctId, oldTaxAmount);
+            if (oldDiscountAmt > 0)
+                await _accountBalanceService.CreditAsync(discAcctId, oldDiscountAmt);
+
+            await _accountBalanceService.DebitAsync(arAccountId, invoice.Total);
+            foreach (var item in invoice.InvoiceItems.Where(i => !i.IsDeleted))
+                await _accountBalanceService.CreditAsync(item.RevenueAccountId, item.TotalPrice);
+            if (invoice.TaxAmount > 0)
+                await _accountBalanceService.CreditAsync(invoice.SalesTaxAccountId, invoice.TaxAmount);
+            if (invoice.DiscountAmount > 0)
+                await _accountBalanceService.DebitAsync(discAcctId, invoice.DiscountAmount);
+
+            await _unitOfWork.CompleteAsync();
+
             TempData["Success"] = "Invoice updated successfully.";
 
             // Optionally re-send the updated invoice PDF to the customer
@@ -948,11 +1040,18 @@ public class InvoicesController : Controller
                 try
                 {
                     var currentUserForPdf = await _userManager.GetUserAsync(User);
+                    if (string.IsNullOrEmpty(invoice.PublicViewToken))
+                    {
+                        invoice.PublicViewToken = Guid.NewGuid().ToString("N");
+                        await _unitOfWork.Invoices.UpdateAsync(invoice);
+                        await _unitOfWork.CompleteAsync();
+                    }
                     var pdfBytes = await BuildInvoicePdfAsync(invoice, invoice.CompanyId);
                     string? paymentUrl = null;
                     if (!string.IsNullOrEmpty(invoice.PaymentLinkToken))
                         paymentUrl = $"{Request.Scheme}://{Request.Host}/pay/{invoice.PaymentLinkToken}";
-                    await _notificationService.NotifyInvoiceSentAsync(invoice, pdfBytes, $"Invoice-{invoice.InvoiceNumber}.pdf", paymentUrl);
+                    var viewUrl = $"{Request.Scheme}://{Request.Host}/invoice/{invoice.PublicViewToken}";
+                    await _notificationService.NotifyInvoiceSentAsync(invoice, pdfBytes, $"Invoice-{invoice.InvoiceNumber}.pdf", paymentUrl, viewUrl: viewUrl);
                     var notifLog = await _unitOfWork.NotificationLogs.GetLatestForInvoiceAsync(id);
                     this.SetNotificationResultToast(notifLog);
                 }
@@ -978,13 +1077,13 @@ public class InvoicesController : Controller
     // -----------------------------------------------------------------------
     /// <summary>
     /// Marks a Draft invoice as Sent, optionally generates a Stripe online-payment link, and
-    /// fires the customer notification with a PDF attachment. Notification failure is caught
-    /// separately and logged as a warning — a failed email must not roll back the status change.
-    /// The payment URL is assembled from the generated token and the current request host so it
-    /// works identically in dev (localhost) and production without config changes.
+    /// fires the customer notification. Staff can choose email, SMS, or both via the modal.
+    /// PublicViewToken is always generated (permanent view link for SMS); PaymentLinkToken is
+    /// only generated when Stripe Connect is active (expiring pay link for email/view page).
+    /// Notification failure is caught separately — a failed send must not roll back the status change.
     /// </summary>
     [HttpPost, ValidateAntiForgeryToken]
-    public async Task<IActionResult> Send(int id, string? overrideEmail = null)
+    public async Task<IActionResult> Send(int id, string? overrideEmail = null, bool sendEmail = true, bool sendSms = false)
     {
         try
         {
@@ -1003,27 +1102,39 @@ public class InvoicesController : Controller
             invoice.UpdatedAt = DateTime.UtcNow;
             invoice.UpdatedBy = currentUser?.Email;
 
+            // Permanent view token — always generate so SMS always has a link
+            if (string.IsNullOrEmpty(invoice.PublicViewToken))
+                invoice.PublicViewToken = Guid.NewGuid().ToString("N");
+
             await TryGeneratePaymentTokenAsync(invoice);
 
             await _unitOfWork.Invoices.UpdateAsync(invoice);
             await _unitOfWork.CompleteAsync();
 
-            // Generate PDF and send notification
             string? paymentUrl = null;
             if (!string.IsNullOrEmpty(invoice.PaymentLinkToken))
                 paymentUrl = $"{Request.Scheme}://{Request.Host}/pay/{invoice.PaymentLinkToken}";
 
-            bool pdfAndNotifSucceeded = false;
+            var viewUrl = $"{Request.Scheme}://{Request.Host}/invoice/{invoice.PublicViewToken}";
+
+            bool notifSucceeded = false;
             try
             {
-                var pdfBytes = await BuildInvoicePdfAsync(invoice, currentUser!.CompanyId);
-                await _notificationService.NotifyInvoiceSentAsync(invoice, pdfBytes, $"Invoice-{invoice.InvoiceNumber}.pdf", paymentUrl, overrideEmail: overrideEmail?.Trim());
-                pdfAndNotifSucceeded = true;
+                byte[]? pdfBytes = null;
+                if (sendEmail)
+                    pdfBytes = await BuildInvoicePdfAsync(invoice, currentUser!.CompanyId);
+
+                await _notificationService.NotifyInvoiceSentAsync(
+                    invoice, pdfBytes, $"Invoice-{invoice.InvoiceNumber}.pdf",
+                    paymentUrl, overrideEmail: overrideEmail?.Trim(),
+                    sendSms: sendSms, viewUrl: viewUrl);
+
+                notifSucceeded = true;
             }
             catch (Exception notifyEx)
             {
                 _logger.LogError(notifyEx,
-                    "Invoice {InvoiceId} ({InvoiceNumber}): PDF generation or email dispatch failed. " +
+                    "Invoice {InvoiceId} ({InvoiceNumber}): notification failed. " +
                     "Inner: {InnerMessage}. Invoice status was already saved as Sent.",
                     id, invoice.InvoiceNumber, notifyEx.InnerException?.Message ?? "none");
             }
@@ -1032,8 +1143,8 @@ public class InvoicesController : Controller
             this.SetNotificationResultToast(notifLog);
 
             TempData["Success"] = $"Invoice {invoice.InvoiceNumber} marked as sent.";
-            if (!pdfAndNotifSucceeded)
-                TempData["WarningPermanent"] = "The invoice is marked as sent, but PDF generation or the customer email failed. Check the notification logs or your email configuration.";
+            if (!notifSucceeded)
+                TempData["WarningPermanent"] = "The invoice is marked as sent, but the notification failed. Check the notification logs or your configuration.";
             return RedirectToAction(nameof(Details), new { id });
         }
         catch (Exception ex)
@@ -1347,29 +1458,49 @@ public class InvoicesController : Controller
                 await _unitOfWork.Payments.SoftDeleteAsync(payment.Id);
             }
 
-            // Void any gift certificates that were generated from this invoice
-            var gcItemIds = invoice.InvoiceItems
-                .Where(i => !i.IsDeleted && i.IsGiftCertificate && i.GeneratedGiftCertificateId.HasValue)
-                .Select(i => i.GeneratedGiftCertificateId!.Value)
-                .ToList();
-            foreach (var gcId in gcItemIds)
+            // Void any gift certificates that were generated from this invoice.
+            // Capture each GC's remaining balance BEFORE voiding so the GL entries below can use it.
+            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(invoice.CompanyId);
+            var gcRemainingByItemId = new Dictionary<int, decimal>(); // invoiceItemId → remaining balance
+            foreach (var gcItem in invoice.InvoiceItems.Where(i => !i.IsDeleted && i.IsGiftCertificate && i.GeneratedGiftCertificateId.HasValue))
             {
-                var gc = await _unitOfWork.GiftCertificates.GetByIdAsync(gcId);
+                var gc = await _unitOfWork.GiftCertificates.GetByIdAsync(gcItem.GeneratedGiftCertificateId!.Value);
                 if (gc != null && gc.Status != GiftCertificateStatus.FullyRedeemed)
                 {
+                    gcRemainingByItemId[gcItem.Id] = gc.RemainingBalance;
                     gc.Status    = GiftCertificateStatus.Voided;
                     gc.UpdatedAt = DateTime.UtcNow;
                     await _unitOfWork.GiftCertificates.UpdateAsync(gc);
                 }
+                // FullyRedeemed GCs: not voided, nothing to reverse (GC Liability already at 0).
             }
 
-            // Reverse account balances: credit AR (open balance), debit revenue + sales tax
+            // Reverse account balances: credit AR (open balance), debit revenue + sales tax.
+            // Also reverse the discount contra-entry (credit Sales Discounts) to unwind the original debit.
+            // GC line items: instead of debiting revenue (which was already reclassified to GC Liability
+            // at creation), debit GC Liability for the unredeemed portion, netting the obligation to 0.
             var arAccountId = await GetArAccountIdAsync(invoice.CompanyId);
             await _accountBalanceService.CreditAsync(arAccountId, balanceDue);
             foreach (var item in invoice.InvoiceItems.Where(i => !i.IsDeleted))
+            {
+                if (item.IsGiftCertificate)
+                {
+                    // GC item: debit GC Liability for unredeemed portion; skip fully-redeemed items.
+                    if (gcLiabilityAcctId.HasValue && gcRemainingByItemId.TryGetValue(item.Id, out var remaining) && remaining > 0)
+                        await _accountBalanceService.DebitAsync(gcLiabilityAcctId, remaining);
+                }
+                else
+                {
                     await _accountBalanceService.DebitAsync(item.RevenueAccountId, item.TotalPrice);
+                }
+            }
             if (invoice.TaxAmount > 0)
                 await _accountBalanceService.DebitAsync(invoice.SalesTaxAccountId, invoice.TaxAmount);
+            if (invoice.DiscountAmount > 0)
+            {
+                var discountAccountId = await GetSalesDiscountAccountIdAsync(invoice.CompanyId);
+                await _accountBalanceService.CreditAsync(discountAccountId, invoice.DiscountAmount);
+            }
 
             invoice.Status = InvoiceStatus.Voided;
             invoice.UpdatedAt = DateTime.UtcNow;
@@ -1721,13 +1852,30 @@ public class InvoicesController : Controller
                 deposit.UpdatedAt = DateTime.UtcNow;
             }
 
-            // Reverse account balances (mirror of Create): credit AR, debit revenue + sales tax
+            // Reverse account balances (mirror of Create): credit AR, debit revenue + sales tax.
+            // Also reverse the discount contra-entry (credit Sales Discounts) to unwind the original debit.
             var arAccountId = await GetArAccountIdAsync(invoice.CompanyId);
+            // Reverse deposit-apply GL: DR AR / CR Customer Deposits 2300 for each previously applied
+            // deposit. The deposits are now unapplied and the liability is restored.
+            if (appliedDeposits.Any())
+            {
+                var custDepositsAcctId = await GetCustomerDepositsAccountIdAsync(invoice.CompanyId);
+                foreach (var dep in appliedDeposits)
+                {
+                    await _accountBalanceService.DebitAsync(arAccountId, dep.Amount);
+                    await _accountBalanceService.CreditAsync(custDepositsAcctId, dep.Amount);
+                }
+            }
             await _accountBalanceService.CreditAsync(arAccountId, invoice.Total);
             foreach (var item in invoiceItems)
                 await _accountBalanceService.DebitAsync(item.RevenueAccountId, item.TotalPrice);
             if (invoice.TaxAmount > 0)
                 await _accountBalanceService.DebitAsync(invoice.SalesTaxAccountId, invoice.TaxAmount);
+            if (invoice.DiscountAmount > 0)
+            {
+                var discountAccountId = await GetSalesDiscountAccountIdAsync(invoice.CompanyId);
+                await _accountBalanceService.CreditAsync(discountAccountId, invoice.DiscountAmount);
+            }
 
             // Clear the JobId FK before soft-deleting so the unique index slot is freed
             // and a new invoice can be created for the same job if needed.
@@ -1920,6 +2068,12 @@ public class InvoicesController : Controller
 
             item.GeneratedGiftCertificateId = cert.Id;
             await _unitOfWork.InvoiceItems.UpdateAsync(item);
+
+            // GL: DR Revenue (line item account) / CR Gift Certificate Liability (2500).
+            // Reclassifies the GC item's revenue as a deferred obligation until the cert is redeemed.
+            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(invoice.CompanyId);
+            await _accountBalanceService.DebitAsync(item.RevenueAccountId, item.TotalPrice);
+            await _accountBalanceService.CreditAsync(gcLiabilityAcctId, item.TotalPrice);
         }
         await _unitOfWork.CompleteAsync();
 
@@ -2083,6 +2237,24 @@ public class InvoicesController : Controller
             .ToList();
     }
 
+    /// <summary>Returns the primary Checking or Cash account ID for the company, used as the
+    /// deposit account when auto-applying deposits that were recorded without an explicit account.</summary>
+    private async Task<int?> GetCheckingAccountIdAsync(int companyId)
+    {
+        var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.IsActive && (a.AccountSubType == AccountSubType.Checking
+                             || a.AccountSubType == AccountSubType.Cash));
+        return acct?.Id;
+    }
+
+    /// <summary>Returns account 2300 "Customer Deposits" liability ID for the company, or null.</summary>
+    private async Task<int?> GetCustomerDepositsAccountIdAsync(int companyId)
+    {
+        var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.IsActive && a.AccountNumber == "2300");
+        return acct?.Id;
+    }
+
     /// <summary>Returns the AR account ID for the given company (first active AccountsReceivable account).</summary>
     private async Task<int?> GetArAccountIdAsync(int companyId)
     {
@@ -2135,6 +2307,28 @@ public class InvoicesController : Controller
         return taxAccount?.Id;
     }
 
+    /// <summary>
+    /// Looks up the "4950 Sales Discounts" contra-revenue account for this company, falling back
+    /// to any active Revenue account whose name contains "discount". Returns null only when no
+    /// such account exists (e.g. for companies whose chart of accounts predates the 4950 seed).
+    /// </summary>
+    private async Task<int?> GetSalesDiscountAccountIdAsync(int companyId)
+    {
+        var discountAccount = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.AccountNumber == "4950" && a.IsActive);
+        discountAccount ??= await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.AccountType == AccountType.Revenue && a.IsActive && a.Name.ToLower().Contains("discount"));
+        return discountAccount?.Id;
+    }
+
+    /// <summary>Returns the Gift Certificate Liability account ID (account 2500) for the company.</summary>
+    private async Task<int?> GetGcLiabilityAccountIdAsync(int companyId)
+    {
+        var acct = await _unitOfWork.Accounts.FirstOrDefaultAsync(
+            a => a.IsActive && a.AccountNumber == "2500");
+        return acct?.Id;
+    }
+
     public static string GetStatusColorClass(InvoiceStatus status) => status switch
     {
         InvoiceStatus.Draft          => "secondary",
@@ -2191,6 +2385,8 @@ public class InvoicesController : Controller
                 Amount = dto.Amount,
                 RefundDate = dto.RefundDate,
                 RefundMethod = dto.RefundMethod,
+                // DepositAccountId only applies to cash/card refunds; store-credit refunds have no bank movement.
+                DepositAccountId = isStoreCredit ? null : dto.DepositAccountId,
                 Reason = dto.Reason,
                 Reference = dto.Reference,
                 Notes = dto.Notes,
@@ -2249,6 +2445,14 @@ public class InvoicesController : Controller
                 }
 
                 await _unitOfWork.CompleteAsync();
+
+                // GL: DR AR (un-collects the payment) / CR Bank (cash leaves).
+                // Mirrors how FinancialReportService accounts for refunds:
+                // arTotalCredits -= refundTotal; refundsByAcct credits the bank account.
+                var arAccountId = await GetArAccountIdAsync(companyId);
+                await _accountBalanceService.DebitAsync(arAccountId, dto.Amount);
+                await _accountBalanceService.CreditAsync(dto.DepositAccountId, dto.Amount);
+
                 TempData["Success"] = $"Refund of {dto.Amount:C} recorded successfully. Please issue the refund manually.";
             }
         }
@@ -2323,6 +2527,11 @@ public class InvoicesController : Controller
                 customer.CurrentBalance += refund.Amount;
                 await _unitOfWork.Customers.UpdateAsync(customer);
             }
+
+            // GL reversal: CR AR / DR Bank — mirrors the DR AR / CR Bank posted in IssueRefund.
+            var arAccountId = await GetArAccountIdAsync(refund.Invoice.CompanyId);
+            await _accountBalanceService.CreditAsync(arAccountId, refund.Amount);
+            await _accountBalanceService.DebitAsync(refund.DepositAccountId, refund.Amount);
         }
 
         refund.Status = RefundStatus.Cancelled;
@@ -2469,6 +2678,12 @@ public class InvoicesController : Controller
                 await _unitOfWork.Invoices.UpdateAsync(invoice);
             }
 
+            // GL: DR Sales Discounts 4950 / CR AR — same as CreditMemosController.Apply.
+            var arAccountId = await GetArAccountIdAsync(invoice.CompanyId);
+            var discountAcctId = await GetSalesDiscountAccountIdAsync(invoice.CompanyId);
+            await _accountBalanceService.DebitAsync(discountAcctId, applyAmount);
+            await _accountBalanceService.CreditAsync(arAccountId, applyAmount);
+
             await _unitOfWork.CompleteAsync();
 
             }); // end ExecuteInTransactionAsync
@@ -2629,6 +2844,13 @@ public class InvoicesController : Controller
                 await _unitOfWork.Customers.UpdateAsync(customer);
             }
 
+            // GL: DR Gift Certificate Liability (2500) / CR AR.
+            // Discharges the deferred obligation and reduces the invoice's outstanding AR balance.
+            var gcLiabilityAcctId = await GetGcLiabilityAccountIdAsync(invoice.CompanyId);
+            var arAcctId          = await GetArAccountIdAsync(invoice.CompanyId);
+            await _accountBalanceService.DebitAsync(gcLiabilityAcctId, applyAmount);
+            await _accountBalanceService.CreditAsync(arAcctId, applyAmount);
+
             await _unitOfWork.CompleteAsync();
             TempData["Success"] = $"Gift certificate {cert.CertificateCode} — {applyAmount:C} applied to invoice.";
         }

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
+            // 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))
             {
-                    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
+                ViewBag.JobPricingBreakdown = JsonSerializer.Deserialize<QuotePricingBreakdownDto>(job.PricingBreakdownJson);
+            }
+            else if (job.FinalPrice > 0)
             {
-                        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())
-            {
-                var pr = await _pricingService.CalculateQuoteTotalsAsync(
-                    breakdownItems, job.CompanyId, job.CustomerId,
-                    wizardCosts?.TaxPercent ?? 0m,
-                    job.DiscountType.ToString(), job.DiscountValue, job.IsRushJob,
-                    job.OvenCostId, 1, null);
-
+                // 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,
@@ -1106,6 +1059,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 +1121,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 +1224,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 +1589,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);
+                    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
@@ -2926,6 +2897,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,
@@ -2958,7 +2930,10 @@ public class JobsController : Controller
             JobId            = job.Id,
             JobNumber        = job.JobNumber,
             CustomerId       = job.CustomerId,
-            TaxPercent = costs?.TaxPercent ?? 0m,
+            TaxPercent       = await GetEffectiveTaxPercentAsync(job.CustomerId, costs?.TaxPercent ?? 0m),
+            OvenCostId       = job.OvenCostId,
+            OvenBatches      = job.OvenBatches > 0 ? job.OvenBatches : 1,
+            OvenCycleMinutes = job.OvenCycleMinutes,
             JobItems         = existingItems
         };
 
@@ -2992,7 +2967,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 +3012,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.PricingBreakdownJson   = JsonSerializer.Serialize(BuildPricingSnapshotDto(totals));
             job.UpdatedAt  = DateTime.UtcNow;
             job.UpdatedBy  = currentUser.UserName;
             await _unitOfWork.Jobs.UpdateAsync(job);
@@ -3059,7 +3045,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 +3087,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);
+                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.OvenBatchCost          = 0;
             job.ShopSuppliesAmount     = 0;
             job.ShopSuppliesPercent    = 0;
+            job.PricingBreakdownJson   = null;
         }
 
         job.UpdatedAt = DateTime.UtcNow;
@@ -3234,6 +3237,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 +3368,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 +3822,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 +3847,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 +3870,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 +3882,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 +3972,7 @@ public class JobsController : Controller
                 grossMargin,
                 quotedMargin,
                 quotedPrice = Math.Round(job.QuotedPrice, 2),
-                fallbackLaborRate,
+                companyLaborCostRate,
                 powderLines,
                 laborLines,
                 hasPowderData = powderLines.Count > 0,