Merge master into dev: quote stat cards Converted fix

2026-06-15 16:29:59 -04:00
parent 32a95052fa cbfd3e1bbd
commit 9bbe1e4e27
3 changed files with 28 additions and 7 deletions
@@ -248,7 +248,10 @@ public class QuotesController : Controller
            var approvedConvertedIds = quoteStatuses
                .Where(s => s.StatusCode == AppConstants.StatusCodes.Quote.Approved || s.StatusCode == AppConstants.StatusCodes.Quote.Converted)
                .Select(s => s.Id).ToList();
-            var indexStats = await _unitOfWork.Quotes.GetIndexStatsAsync(draftSentIds, approvedConvertedIds);
+            // Exclude Converted from the stat cards so they match the default list (which hides Converted).
+            var convertedStatusId = quoteStatuses
+                .FirstOrDefault(s => s.StatusCode == AppConstants.StatusCodes.Quote.Converted)?.Id;
+            var indexStats = await _unitOfWork.Quotes.GetIndexStatsAsync(companyId, draftSentIds, approvedConvertedIds, convertedStatusId);
            ViewBag.StatOpenCount     = indexStats.OpenCount;
            ViewBag.StatApprovedCount = indexStats.ApprovedConvertedCount;
            ViewBag.StatTotalValue    = indexStats.TotalValue;