diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Reports/StaffPerformance.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Reports/StaffPerformance.razor
index 31610c76..50c2dec2 100644
--- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Reports/StaffPerformance.razor
+++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Reports/StaffPerformance.razor
@@ -168,10 +168,10 @@
                                 <span style="font-weight:600;">@context.StaffName</span>
                             </div>
                         </MudTd>
-                        <MudTd Style="text-align:right;font-weight:600;@GetRowStyle(context)">@context.OrdersHandled</MudTd>
-                        <MudTd Style="text-align:right;font-weight:700;color:var(--admin-orange-primary);@GetRowStyle(context)">@FormatVND(context.TotalRevenue)</MudTd>
-                        <MudTd Style="text-align:right;@GetRowStyle(context)">@FormatVND(context.AverageOrderValue)</MudTd>
-                        <MudTd Style="text-align:right;@GetRowStyle(context)">
+                        <MudTd Style="@($"text-align:right;font-weight:600;{GetRowStyle(context)}")">@context.OrdersHandled</MudTd>
+                        <MudTd Style="@($"text-align:right;font-weight:700;color:var(--admin-orange-primary);{GetRowStyle(context)}")">@FormatVND(context.TotalRevenue)</MudTd>
+                        <MudTd Style="@($"text-align:right;{GetRowStyle(context)}")">@FormatVND(context.AverageOrderValue)</MudTd>
+                        <MudTd Style="@($"text-align:right;{GetRowStyle(context)}")">
                             <MudChip T="string"
                                      Size="Size.Small"
                                      Color="@(context.CompletionRate >= 90 ? Color.Success : context.CompletionRate >= 70 ? Color.Warning : Color.Error)"
@@ -179,7 +179,7 @@
                                 @context.CompletionRate.ToString("F1")%
                             </MudChip>
                         </MudTd>
-                        <MudTd Style="text-align:right;@GetRowStyle(context)">@context.AverageHandlingTimeMinutes.ToString("F1") phut</MudTd>
+                        <MudTd Style="@($"text-align:right;{GetRowStyle(context)}")">@context.AverageHandlingTimeMinutes.ToString("F1") phut</MudTd>
                     </RowTemplate>
                     <FooterContent>
                         <MudTh Style="font-weight:700;color:var(--admin-text-secondary);">Trung binh cua hang</MudTh>
diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Spa/AppointmentCalendar.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Spa/AppointmentCalendar.razor
index b11fca76..5abea838 100644
--- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Spa/AppointmentCalendar.razor
+++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Admin/Spa/AppointmentCalendar.razor
@@ -22,13 +22,13 @@
     </div>
     <div class="admin-topbar__right" style="display:flex;align-items:center;gap:12px;">
         <MudDatePicker @bind-Date="_selectedDate"
+                       @bind-Date:after="OnDateChanged"
                        Label="Ngay"
                        Variant="Variant.Outlined"
                        DateFormat="dd/MM/yyyy"
                        Style="max-width:180px;"
                        Color="Color.Primary"
-                       Class="mud-input-dark"
-                       DateChanged="OnDateChanged" />
+                       Class="mud-input-dark" />
         <MudButton Variant="Variant.Filled"
                    Color="Color.Primary"
                    OnClick="LoadAppointmentsAsync"
@@ -401,9 +401,8 @@
         await LoadDataAsync();
     }
 
-    private async Task OnDateChanged(DateTime? newDate)
+    private async Task OnDateChanged()
     {
-        _selectedDate = newDate;
         await LoadDataAsync();
     }
 
diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailDesktop.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailDesktop.razor
index c8f160b4..e01c3294 100644
--- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailDesktop.razor
+++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailDesktop.razor
@@ -7,7 +7,8 @@
 @page "/pos/{ShopId:guid}/retail"
 @layout PosLayout
 @inherits PosBase
-@inject WebClientTpos.Client.Services.PosDataService DataService
+@using WebClientTpos.Client.Services
+@inject PosDataService DataService
 @inject ISnackbar Snackbar
 
 @* ═══ PRODUCT PANEL ═══ *@
diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/ReturnDialog.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/ReturnDialog.razor
index 8411f3ce..ded05d0a 100644
--- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/ReturnDialog.razor
+++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/ReturnDialog.razor
@@ -6,7 +6,8 @@
         Tim don goc, chon san pham tra, chon che do tra hoac doi,
         quet san pham moi de doi, tinh hoan tien/chenh lech.
 *@
-@inject WebClientTpos.Client.Services.PosDataService DataService
+@using WebClientTpos.Client.Services
+@inject PosDataService DataService
 @inject ISnackbar Snackbar
 
 <MudDialog>