diff --git a/src/PowderCoating.Web/Controllers/QuotesController.cs b/src/PowderCoating.Web/Controllers/QuotesController.cs index 610fff7..17e5d17 100644 --- a/src/PowderCoating.Web/Controllers/QuotesController.cs +++ b/src/PowderCoating.Web/Controllers/QuotesController.cs @@ -365,33 +365,30 @@ public class QuotesController : Controller } // Build pricing breakdown from stored snapshot values — never recalculate on load - if (quote.Total > 0) + quoteDto.PricingBreakdown = new QuotePricingBreakdownDto { - quoteDto.PricingBreakdown = new QuotePricingBreakdownDto - { - MaterialCosts = quote.MaterialCosts, - LaborCosts = quote.LaborCosts, - EquipmentCosts = quote.EquipmentCosts, - ItemsSubtotal = quote.ItemsSubtotal, - OvenBatchCost = quote.OvenBatchCost, - OvenBatches = quote.OvenBatches, - OvenCycleMinutes = quote.OvenCycleMinutes ?? 0, - ShopSuppliesAmount = quote.ShopSuppliesAmount, - ShopSuppliesPercent = quote.ShopSuppliesPercent, - OverheadCosts = quote.OverheadAmount, - OverheadPercent = quote.OverheadPercent, - ProfitMargin = quote.ProfitMargin, - ProfitPercent = quote.ProfitPercent, - SubtotalBeforeDiscount = quote.SubTotal, - DiscountAmount = quote.DiscountAmount, - DiscountPercent = quote.DiscountPercent, - SubtotalAfterDiscount = quote.SubTotal - quote.DiscountAmount, - RushFee = quote.RushFee, - TaxPercent = quote.TaxPercent, - TaxAmount = quote.TaxAmount, - Total = quote.Total - }; - } + MaterialCosts = quote.MaterialCosts, + LaborCosts = quote.LaborCosts, + EquipmentCosts = quote.EquipmentCosts, + ItemsSubtotal = quote.ItemsSubtotal, + OvenBatchCost = quote.OvenBatchCost, + OvenBatches = quote.OvenBatches, + OvenCycleMinutes = quote.OvenCycleMinutes ?? 0, + ShopSuppliesAmount = quote.ShopSuppliesAmount, + ShopSuppliesPercent = quote.ShopSuppliesPercent, + OverheadCosts = quote.OverheadAmount, + OverheadPercent = quote.OverheadPercent, + ProfitMargin = quote.ProfitMargin, + ProfitPercent = quote.ProfitPercent, + SubtotalBeforeDiscount = quote.SubTotal, + DiscountAmount = quote.DiscountAmount, + DiscountPercent = quote.DiscountPercent, + SubtotalAfterDiscount = quote.SubTotal - quote.DiscountAmount, + RushFee = quote.RushFee, + TaxPercent = quote.TaxPercent, + TaxAmount = quote.TaxAmount, + Total = quote.Total + }; // Load change history var changeHistories = await _unitOfWork.Quotes.GetChangeHistoryAsync(id.Value); @@ -544,33 +541,30 @@ public class QuotesController : Controller var currentUser = await _userManager.GetUserAsync(User); // Populate pricing breakdown from stored snapshot values — never recalculate on load - if (quote.Total > 0) + quoteDto.PricingBreakdown = new QuotePricingBreakdownDto { - quoteDto.PricingBreakdown = new QuotePricingBreakdownDto - { - MaterialCosts = quote.MaterialCosts, - LaborCosts = quote.LaborCosts, - EquipmentCosts = quote.EquipmentCosts, - ItemsSubtotal = quote.ItemsSubtotal, - OvenBatchCost = quote.OvenBatchCost, - OvenBatches = quote.OvenBatches, - OvenCycleMinutes = quote.OvenCycleMinutes ?? 0, - ShopSuppliesAmount = quote.ShopSuppliesAmount, - ShopSuppliesPercent = quote.ShopSuppliesPercent, - OverheadCosts = quote.OverheadAmount, - OverheadPercent = quote.OverheadPercent, - ProfitMargin = quote.ProfitMargin, - ProfitPercent = quote.ProfitPercent, - SubtotalBeforeDiscount = quote.SubTotal, - DiscountAmount = quote.DiscountAmount, - DiscountPercent = quote.DiscountPercent, - SubtotalAfterDiscount = quote.SubTotal - quote.DiscountAmount, - RushFee = quote.RushFee, - TaxPercent = quote.TaxPercent, - TaxAmount = quote.TaxAmount, - Total = quote.Total - }; - } + MaterialCosts = quote.MaterialCosts, + LaborCosts = quote.LaborCosts, + EquipmentCosts = quote.EquipmentCosts, + ItemsSubtotal = quote.ItemsSubtotal, + OvenBatchCost = quote.OvenBatchCost, + OvenBatches = quote.OvenBatches, + OvenCycleMinutes = quote.OvenCycleMinutes ?? 0, + ShopSuppliesAmount = quote.ShopSuppliesAmount, + ShopSuppliesPercent = quote.ShopSuppliesPercent, + OverheadCosts = quote.OverheadAmount, + OverheadPercent = quote.OverheadPercent, + ProfitMargin = quote.ProfitMargin, + ProfitPercent = quote.ProfitPercent, + SubtotalBeforeDiscount = quote.SubTotal, + DiscountAmount = quote.DiscountAmount, + DiscountPercent = quote.DiscountPercent, + SubtotalAfterDiscount = quote.SubTotal - quote.DiscountAmount, + RushFee = quote.RushFee, + TaxPercent = quote.TaxPercent, + TaxAmount = quote.TaxAmount, + Total = quote.Total + }; if (currentUser?.CompanyId == null) { TempData["Error"] = "Company information not found.";