Merge dev into master for release v2026.05.19b

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

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

src/PowderCoating.Application/Services/QuotePricingAssemblyService.cs

@@ -264,6 +264,7 @@ public class QuotePricingAssemblyService : IQuotePricingAssemblyService
             TransferEfficiency = coatDto.TransferEfficiency,
             PowderCostPerLb = coatDto.PowderCostPerLb,
             PowderToOrder = coatDto.PowderToOrder,
+            NoExtraLayerCharge = coatDto.NoExtraLayerCharge,
             Notes = coatDto.Notes,
             CompanyId = companyId,
             CreatedAt = createdAtUtc

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

@@ -11,47 +11,32 @@ namespace PowderCoating.Infrastructure.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropForeignKey(
+            // Use IF EXISTS guards for all ShopWorker drops — prod and dev diverged on whether
-                name: "FK_Jobs_ShopWorkers_ShopWorkerId",
+            // these objects exist, so unconditional drops would fail on whichever DB is missing them.
-                table: "Jobs");
+            migrationBuilder.Sql(@"
-
+                IF EXISTS (SELECT 1 FROM sys.foreign_keys WHERE name = 'FK_Jobs_ShopWorkers_ShopWorkerId')
-            migrationBuilder.DropForeignKey(
+                    ALTER TABLE [Jobs] DROP CONSTRAINT [FK_Jobs_ShopWorkers_ShopWorkerId];
-                name: "FK_JobTimeEntries_ShopWorkers_ShopWorkerId",
+                IF EXISTS (SELECT 1 FROM sys.foreign_keys WHERE name = 'FK_JobTimeEntries_ShopWorkers_ShopWorkerId')
-                table: "JobTimeEntries");
+                    ALTER TABLE [JobTimeEntries] DROP CONSTRAINT [FK_JobTimeEntries_ShopWorkers_ShopWorkerId];
-
+                IF EXISTS (SELECT 1 FROM sys.foreign_keys WHERE name = 'FK_MaintenanceRecords_ShopWorkers_ShopWorkerId')
-            migrationBuilder.DropForeignKey(
+                    ALTER TABLE [MaintenanceRecords] DROP CONSTRAINT [FK_MaintenanceRecords_ShopWorkers_ShopWorkerId];
-                name: "FK_MaintenanceRecords_ShopWorkers_ShopWorkerId",
+                IF EXISTS (SELECT 1 FROM sys.tables WHERE name = 'ShopWorkerRoleCosts')
-                table: "MaintenanceRecords");
+                    DROP TABLE [ShopWorkerRoleCosts];
-
+                IF EXISTS (SELECT 1 FROM sys.tables WHERE name = 'ShopWorkers')
-            migrationBuilder.DropTable(
+                    DROP TABLE [ShopWorkers];
-                name: "ShopWorkerRoleCosts");
+                IF EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_MaintenanceRecords_ShopWorkerId' AND object_id = OBJECT_ID('MaintenanceRecords'))
-
+                    DROP INDEX [IX_MaintenanceRecords_ShopWorkerId] ON [MaintenanceRecords];
-            migrationBuilder.DropTable(
+                IF EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_JobTimeEntries_ShopWorkerId' AND object_id = OBJECT_ID('JobTimeEntries'))
-                name: "ShopWorkers");
+                    DROP INDEX [IX_JobTimeEntries_ShopWorkerId] ON [JobTimeEntries];
-
+                IF EXISTS (SELECT 1 FROM sys.indexes WHERE name = 'IX_Jobs_ShopWorkerId' AND object_id = OBJECT_ID('Jobs'))
-            migrationBuilder.DropIndex(
+                    DROP INDEX [IX_Jobs_ShopWorkerId] ON [Jobs];
-                name: "IX_MaintenanceRecords_ShopWorkerId",
+                IF EXISTS (SELECT 1 FROM sys.columns WHERE name = 'ShopWorkerId' AND object_id = OBJECT_ID('MaintenanceRecords'))
-                table: "MaintenanceRecords");
+                    ALTER TABLE [MaintenanceRecords] DROP COLUMN [ShopWorkerId];
-
+                IF EXISTS (SELECT 1 FROM sys.columns WHERE name = 'ShopWorkerId' AND object_id = OBJECT_ID('JobTimeEntries'))
-            migrationBuilder.DropIndex(
+                    ALTER TABLE [JobTimeEntries] DROP COLUMN [ShopWorkerId];
-                name: "IX_JobTimeEntries_ShopWorkerId",
+                IF EXISTS (SELECT 1 FROM sys.columns WHERE name = 'ShopWorkerId' AND object_id = OBJECT_ID('Jobs'))
-                table: "JobTimeEntries");
+                    ALTER TABLE [Jobs] DROP COLUMN [ShopWorkerId];
-
+            ");
-            migrationBuilder.DropIndex(
-                name: "IX_Jobs_ShopWorkerId",
-                table: "Jobs");
-
-            migrationBuilder.DropColumn(
-                name: "ShopWorkerId",
-                table: "MaintenanceRecords");
-
-            migrationBuilder.DropColumn(
-                name: "ShopWorkerId",
-                table: "JobTimeEntries");
-
-            migrationBuilder.DropColumn(
-                name: "ShopWorkerId",
-                table: "Jobs");
 
             migrationBuilder.AddColumn<DateTime>(
                 name: "ReminderSentAt",

src/PowderCoating.Web/Controllers/JobsController.cs

@@ -477,6 +477,7 @@ public class JobsController : Controller
                         transferEfficiency = c.TransferEfficiency,
                         powderCostPerLb    = c.PowderCostPerLb,
                         powderToOrder      = c.PowderToOrder,
+                        noExtraLayerCharge = c.NoExtraLayerCharge,
                         notes              = c.Notes
                     }),
                     prepServices = ji.PrepServices.Select(ps => new {
@@ -2946,6 +2947,7 @@ public class JobsController : Controller
                 TransferEfficiency = c.TransferEfficiency,
                 PowderCostPerLb    = c.PowderCostPerLb,
                 PowderToOrder      = c.PowderToOrder,
+                NoExtraLayerCharge = c.NoExtraLayerCharge,
                 Notes              = c.Notes
             }).ToList(),
             PrepServices = ji.PrepServices.Select(ps => new CreateQuoteItemPrepServiceDto
@@ -3126,7 +3128,8 @@ public class JobsController : Controller
                 InventoryItemId    = c.InventoryItemId,
                 CoverageSqFtPerLb  = c.CoverageSqFtPerLb,
                 TransferEfficiency = c.TransferEfficiency,
-                PowderCostPerLb    = c.PowderCostPerLb
+                PowderCostPerLb    = c.PowderCostPerLb,
+                NoExtraLayerCharge = c.NoExtraLayerCharge
             }).ToList()
         }).ToList();