From f3217ab270cb1c3ba84df637d16bb4b26c815e64 Mon Sep 17 00:00:00 2001 From: Ho Ngoc Hai Date: Wed, 25 Mar 2026 18:44:06 +0700 Subject: [PATCH] fix(dashboard): use ShopVerticalHelper for case-insensitive status checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace hardcoded s.Status == "active" with ShopVerticalHelper.IsActive() (handles "Active", "Published", "active" etc.) - Replace shop.Status != "active" with ShopVerticalHelper.IsSetup() to correctly show "Hoàn thành thiết lập" only for Draft shops - KPIs and shop card badges now reflect actual shop status correctly Co-Authored-By: Claude Opus 4.6 (1M context) --- .../WebClientTpos.Client/Pages/Admin/Dashboard.razor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Dashboard.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Dashboard.razor index 112953ae..9a70cd2d 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Dashboard.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Dashboard.razor @@ -56,7 +56,7 @@ -
@_shops.Count(s => s.Status == "active")
+
@_shops.Count(s => ShopVerticalHelper.IsActive(s.Status))
@L["Dashboard_KPI_Active"]
@@ -67,7 +67,7 @@ -
@_shops.Count(s => s.Status != "active")
+
@_shops.Count(s => !ShopVerticalHelper.IsActive(s.Status))
@L["Dashboard_KPI_Setup"]
@@ -128,7 +128,7 @@
- @if (shop.Status != "active") + @if (ShopVerticalHelper.IsSetup(shop.Status)) { } -
+
- @(shop.Status == "active" ? L["Dashboard_Status_Open"] : L["Dashboard_Status_Setup"]) + @(ShopVerticalHelper.IsActive(shop.Status) ? L["Dashboard_Status_Open"] : L["Dashboard_Status_Setup"])