From 89bd8232a8395faf53715ceae547aa4392796b1c Mon Sep 17 00:00:00 2001 From: Ho Ngoc Hai Date: Wed, 4 Mar 2026 11:35:41 +0700 Subject: [PATCH] feat: Implement Blazor lifecycle improvements, enhance navigation with browser history, and update EF Core entity configurations for backing fields --- .../Pages/Pos/Cafe/CafeDesktop.razor | 4 +- .../Pages/Pos/Cafe/CafeMobile.razor | 12 +++-- .../Pages/Pos/Cafe/CafeTablet.razor | 12 +++-- .../Pos/Cafe/Workflow/MenuManagement.razor | 2 + .../Pages/Pos/Karaoke/KaraokeDesktop.razor | 2 + .../Pages/Pos/Karaoke/KaraokeMobile.razor | 2 + .../Pages/Pos/Karaoke/KaraokeTablet.razor | 2 + .../Pages/Pos/Karaoke/Workflow/OrderFnb.razor | 2 + .../Pages/Pos/Karaoke/Workflow/RoomMap.razor | 2 + .../Pos/Karaoke/Workflow/RoomSelect.razor | 2 + .../Pos/Karaoke/Workflow/RoomSession.razor | 2 + .../Pos/Karaoke/Workflow/ServiceDisplay.razor | 2 + .../Pos/Restaurant/RestaurantDesktop.razor | 2 + .../Pos/Restaurant/RestaurantMobile.razor | 2 + .../Pos/Restaurant/RestaurantTablet.razor | 2 + .../Restaurant/Workflow/KitchenDisplay.razor | 2 + .../Restaurant/Workflow/OrderHistory.razor | 2 + .../Workflow/RestaurantMenuManagement.razor | 2 + .../Pos/Restaurant/Workflow/TableMap.razor | 2 + .../Restaurant/Workflow/TableMergeSplit.razor | 2 + .../Pos/Restaurant/Workflow/TableSelect.razor | 2 + .../Pos/Restaurant/Workflow/WaiterPad.razor | 2 + .../Pages/Pos/Retail/RetailDesktop.razor | 4 +- .../Pages/Pos/Retail/RetailMobile.razor | 4 +- .../Pages/Pos/Retail/RetailTablet.razor | 4 +- .../Pos/Retail/Workflow/ProductSearch.razor | 2 + .../Pos/Shared/Dialogs/OrderCancel.razor | 9 ++-- .../Pages/Pos/Shared/Dialogs/OrderEdit.razor | 7 +-- .../Pages/Pos/Shared/Dialogs/PriceCheck.razor | 5 +- .../Pages/Pos/Shared/Dialogs/SplitBill.razor | 7 +-- .../Pages/Pos/Shared/Dialogs/StockIn.razor | 7 +-- .../Pages/Pos/Shared/Dialogs/StockOut.razor | 7 +-- .../Pos/Shared/Dialogs/StockTransfer.razor | 7 +-- .../Pages/Pos/Shared/Dialogs/VoidRefund.razor | 9 ++-- .../Pos/Shared/Operations/ClockInOut.razor | 19 ++++++-- .../Pos/Shared/Operations/PendingOrders.razor | 3 +- .../Pos/Shared/Operations/QuickSale.razor | 8 ++-- .../Shared/Operations/ShiftManagement.razor | 3 +- .../Pos/Shared/Payment/MethodSelect.razor | 3 +- .../Pos/Shared/Payment/PaymentSuccess.razor | 3 +- .../Pages/Pos/Shared/Payment/QrPayment.razor | 40 ++++++++++++++-- .../Pages/Pos/Shared/Payment/Receipt.razor | 19 ++++---- .../Pages/Pos/Spa/SpaDesktop.razor | 2 + .../Pages/Pos/Spa/SpaMobile.razor | 2 + .../Pages/Pos/Spa/SpaTablet.razor | 2 + .../Pos/Spa/Workflow/AppointmentBook.razor | 2 + .../Pos/Spa/Workflow/ServicePackage.razor | 2 + .../Controllers/OrderController.cs | 2 +- .../AppointmentEntityTypeConfiguration.cs | 47 +++++++++---------- .../ResourceEntityTypeConfiguration.cs | 29 +++++------- .../StaffScheduleEntityTypeConfiguration.cs | 27 +++++------ .../Controllers/CategoriesController.cs | 21 +++++++++ .../Controllers/ProductsController.cs | 27 +++++++++++ .../TableEntityTypeConfiguration.cs | 39 ++++++++------- .../Application/DTOs/OrderDtos.cs | 23 ++++----- .../Application/Queries/GetOrderStatsQuery.cs | 4 +- .../Queries/GetPosDashboardQuery.cs | 8 ++-- 57 files changed, 317 insertions(+), 156 deletions(-) diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeDesktop.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeDesktop.razor index c25f9fea..0fe33a2a 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeDesktop.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeDesktop.razor @@ -466,9 +466,7 @@ protected override async Task OnInitializedAsync() { - // EN: Restore auth session from localStorage so API calls have JWT token - // VI: Khôi phục session auth từ localStorage để API calls có JWT token - await AuthService.TryRestoreSessionAsync(); + await base.OnInitializedAsync(); try { diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeMobile.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeMobile.razor index c2aeec2d..126580a8 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeMobile.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeMobile.razor @@ -129,6 +129,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var productsTask = DataService.GetProductsAsync(ShopId); @@ -139,6 +141,7 @@ var apiCategories = await categoriesTask; _products = apiProducts.Select(p => new Product( + p.Id, p.Name, p.Price, p.Category ?? "Khác" @@ -165,9 +168,9 @@ private void AddToCart(Product product) { - var existing = _cartItems.FirstOrDefault(i => i.Name == product.Name); + var existing = _cartItems.FirstOrDefault(i => i.ProductId == product.Id); if (existing != null) existing.Qty++; - else _cartItems.Add(new CartItem(product.Name, product.Price)); + else _cartItems.Add(new CartItem(product.Id, product.Name, product.Price)); } private void ChangeQty(CartItem item, int delta) @@ -178,9 +181,10 @@ private void Checkout() => NavigateTo("cafe/order-customize"); - private record Product(string Name, decimal Price, string Category); - private class CartItem(string name, decimal price) + private record Product(Guid Id, string Name, decimal Price, string Category); + private class CartItem(Guid productId, string name, decimal price) { + public Guid ProductId { get; set; } = productId; public string Name { get; set; } = name; public decimal Price { get; set; } = price; public int Qty { get; set; } = 1; diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeTablet.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeTablet.razor index 4833afbe..5d580985 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeTablet.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/CafeTablet.razor @@ -108,6 +108,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var productsTask = DataService.GetProductsAsync(ShopId); @@ -118,6 +120,7 @@ var apiCategories = await categoriesTask; _products = apiProducts.Select(p => new Product( + p.Id, p.Name, p.Price, p.Category ?? "Khác" @@ -144,9 +147,9 @@ private void AddToCart(Product product) { - var existing = _cartItems.FirstOrDefault(i => i.Name == product.Name); + var existing = _cartItems.FirstOrDefault(i => i.ProductId == product.Id); if (existing != null) existing.Qty++; - else _cartItems.Add(new CartItem(product.Name, product.Price)); + else _cartItems.Add(new CartItem(product.Id, product.Name, product.Price)); } private void ChangeQty(CartItem item, int delta) @@ -157,9 +160,10 @@ private void Checkout() => NavigateTo("cafe/order-customize"); - private record Product(string Name, decimal Price, string Category); - private class CartItem(string name, decimal price) + private record Product(Guid Id, string Name, decimal Price, string Category); + private class CartItem(Guid productId, string name, decimal price) { + public Guid ProductId { get; set; } = productId; public string Name { get; set; } = name; public decimal Price { get; set; } = price; public int Qty { get; set; } = 1; diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/Workflow/MenuManagement.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/Workflow/MenuManagement.razor index df24858f..3e177214 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/Workflow/MenuManagement.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Cafe/Workflow/MenuManagement.razor @@ -128,6 +128,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var productsTask = DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeDesktop.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeDesktop.razor index 4d4ef3a0..19613efb 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeDesktop.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeDesktop.razor @@ -177,6 +177,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var tables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeMobile.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeMobile.razor index 51cd6d04..ab2c03eb 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeMobile.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeMobile.razor @@ -115,6 +115,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var tables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeTablet.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeTablet.razor index aff83a10..6f8c5c9d 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeTablet.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/KaraokeTablet.razor @@ -164,6 +164,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var tables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/OrderFnb.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/OrderFnb.razor index 88899b29..75cb0a7a 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/OrderFnb.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/OrderFnb.razor @@ -133,6 +133,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var productsTask = DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomMap.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomMap.razor index 74468cc2..9f1dcdd3 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomMap.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomMap.razor @@ -124,6 +124,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var tables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSelect.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSelect.razor index 4191949a..2b682eed 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSelect.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSelect.razor @@ -185,6 +185,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var tables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSession.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSession.razor index 269b0a66..6b750043 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSession.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/RoomSession.razor @@ -175,6 +175,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var products = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/ServiceDisplay.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/ServiceDisplay.razor index a948cf4e..74850661 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/ServiceDisplay.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Karaoke/Workflow/ServiceDisplay.razor @@ -166,6 +166,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var tables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantDesktop.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantDesktop.razor index 7e221b72..53c3021a 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantDesktop.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantDesktop.razor @@ -129,6 +129,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiTables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantMobile.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantMobile.razor index b1f455e4..31953449 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantMobile.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantMobile.razor @@ -109,6 +109,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiTables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantTablet.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantTablet.razor index 901bc17d..ecc762a9 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantTablet.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/RestaurantTablet.razor @@ -128,6 +128,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiTables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/KitchenDisplay.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/KitchenDisplay.razor index ab2049b0..e2b50cdc 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/KitchenDisplay.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/KitchenDisplay.razor @@ -133,6 +133,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { // EN: Preload tables for reference — kitchen_tickets API not yet available diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/OrderHistory.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/OrderHistory.razor index 271ceec0..e98e078c 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/OrderHistory.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/OrderHistory.razor @@ -142,6 +142,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { // EN: Preload tables for reference — orders API not yet available diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/RestaurantMenuManagement.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/RestaurantMenuManagement.razor index dee3824a..2675a583 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/RestaurantMenuManagement.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/RestaurantMenuManagement.razor @@ -138,6 +138,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var products = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMap.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMap.razor index 2f6a70c1..038ff3e2 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMap.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMap.razor @@ -105,6 +105,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiTables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMergeSplit.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMergeSplit.razor index 8ad6828a..1c6fd01a 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMergeSplit.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableMergeSplit.razor @@ -186,6 +186,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiTables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableSelect.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableSelect.razor index ab4d6bb2..279cd832 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableSelect.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/TableSelect.razor @@ -151,6 +151,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiTables = await DataService.GetTablesAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/WaiterPad.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/WaiterPad.razor index 70a37fd1..70b720c6 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/WaiterPad.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Restaurant/Workflow/WaiterPad.razor @@ -121,6 +121,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var products = await DataService.GetProductsAsync(ShopId); 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 549cf79d..d6dd62f9 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 @@ -134,6 +134,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); @@ -179,7 +181,7 @@ _barcodeInput = ""; } - private void Checkout() { } + private void Checkout() => NavigateTo("payment-method-select"); private static string GetCategoryIcon(string category) => category switch { diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailMobile.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailMobile.razor index 95ff6af2..d3efb4a0 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailMobile.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailMobile.razor @@ -138,6 +138,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); @@ -176,7 +178,7 @@ if (item.Qty <= 0) _cartItems.Remove(item); } - private void Checkout() { } + private void Checkout() => NavigateTo("payment-method-select"); private static string GetCategoryIcon(string category) => category switch { diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailTablet.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailTablet.razor index 7e218a39..af23a8be 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailTablet.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/RetailTablet.razor @@ -132,6 +132,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); @@ -170,7 +172,7 @@ if (item.Qty <= 0) _cartItems.Remove(item); } - private void Checkout() { } + private void Checkout() => NavigateTo("payment-method-select"); private static string GetCategoryIcon(string category) => category switch { diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/Workflow/ProductSearch.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/Workflow/ProductSearch.razor index 804491e2..7bed2813 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/Workflow/ProductSearch.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Retail/Workflow/ProductSearch.razor @@ -141,6 +141,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderCancel.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderCancel.razor index bb6f11bb..95502707 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderCancel.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderCancel.razor @@ -6,6 +6,7 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@inject IJSRuntime JS
Đơn #DH2024-0589
@@ -91,7 +92,7 @@
@@ -132,9 +133,9 @@ new("Nước mía", 20_000, 3), }; - private void CancelOrder() + private async Task CancelOrder() { - NavigateTo(""); + await JS.InvokeVoidAsync("history.back"); } private record CancelItem(string Name, decimal Price, int Qty); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderEdit.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderEdit.razor index a9f1c992..2a2fc91a 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderEdit.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/OrderEdit.razor @@ -6,6 +6,7 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@inject IJSRuntime JS
Bàn 5 · 15:20 · Đang phục vụ
@@ -137,7 +138,7 @@
@@ -125,7 +126,7 @@
diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/SplitBill.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/SplitBill.razor index d621e6cf..820af16a 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/SplitBill.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Dialogs/SplitBill.razor @@ -6,6 +6,7 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@inject IJSRuntime JS
Tổng: @FormatPrice(_billTotal) · Bàn 3 · 6 khách
@@ -174,7 +175,7 @@
@@ -138,7 +139,7 @@
@@ -118,7 +119,7 @@
@@ -139,7 +140,7 @@
@@ -147,7 +148,7 @@
Chấm công @@ -32,7 +34,7 @@
-
@_staffName
+
@StaffName
@_staffRole
_clockEntries = new() @@ -105,11 +107,22 @@ new("13:30", "in"), }; + protected override void OnInitialized() + { + _clockTimer = new Timer(_ => + { + _currentTime = DateTime.Now; + InvokeAsync(StateHasChanged); + }, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1)); + } + private void ToggleClock() { _isClockedIn = !_isClockedIn; _clockEntries.Add(new(DateTime.Now.ToString("HH:mm"), _isClockedIn ? "in" : "out")); } + public void Dispose() => _clockTimer?.Dispose(); + private record ClockEntry(string Time, string Type); } diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/PendingOrders.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/PendingOrders.razor index 2a37c615..2601eb49 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/PendingOrders.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/PendingOrders.razor @@ -7,11 +7,12 @@ @inherits PosBase @using WebClientTpos.Client.Services @inject PosDataService DataService +@inject IJSRuntime JS
@* ═══ HEADER ═══ *@
- Đơn hàng đang chờ diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/QuickSale.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/QuickSale.razor index c7dda4c4..c994e581 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/QuickSale.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Operations/QuickSale.razor @@ -6,11 +6,12 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@inject IJSRuntime JS
@* ═══ HEADER ═══ *@
- Bán nhanh @@ -23,7 +24,7 @@
Số tiền
- @FormatPrice(decimal.Parse(_amountStr == "" ? "0" : _amountStr)) + @FormatPrice(ParsedAmount)
@@ -101,7 +102,7 @@
Tổng cộng - @FormatPrice(decimal.Parse(_amountStr == "" ? "0" : _amountStr)) + @FormatPrice(ParsedAmount)
Quản lý ca diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/MethodSelect.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/MethodSelect.razor index a3db185a..80069eaa 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/MethodSelect.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/MethodSelect.razor @@ -6,6 +6,7 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@inject IJSRuntime JS
@* ═══ ORDER TOTAL ═══ *@ @@ -56,7 +57,7 @@ }; private void SelectMethod(string route) => NavigateTo(route); - private void GoBack() => NavigateTo("cafe"); + private async Task GoBack() => await JS.InvokeVoidAsync("history.back"); private record PaymentMethod(string Icon, string Label, string Description, string Route); } diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/PaymentSuccess.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/PaymentSuccess.razor index b91ea5c8..5d3348d4 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/PaymentSuccess.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/PaymentSuccess.razor @@ -6,6 +6,7 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@inject IJSRuntime JS
@* ═══ SUCCESS ANIMATION ═══ *@ @@ -85,5 +86,5 @@ private string _transactionId = "TXN-20240215-001"; private void PrintReceipt() => NavigateTo("payment/receipt"); - private void NewOrder() => NavigateTo("cafe"); + private async Task NewOrder() => await JS.InvokeVoidAsync("history.back"); } diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/QrPayment.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/QrPayment.razor index adba34af..eb606bf1 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/QrPayment.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/QrPayment.razor @@ -6,6 +6,7 @@ @layout PosLayout @inherits PosBase @using WebClientTpos.Client.Services +@implements IDisposable
@* ═══ ORDER TOTAL ═══ *@ @@ -41,10 +42,20 @@
@* ═══ STATUS ═══ *@ -
-
- Chờ xác nhận thanh toán... -
+ @if (_timerSeconds > 0) + { +
+
+ Chờ xác nhận thanh toán... +
+ } + else + { +
+
+ Mã QR đã hết hạn. Nhấn "Làm mới" để tạo mã mới. +
+ } @* ═══ ACTIONS ═══ *@
@@ -75,10 +86,29 @@ private string _selectedProvider = "VietQR"; private int _timerSeconds = 300; private string _timerDisplay => $"{_timerSeconds / 60}:{(_timerSeconds % 60):D2}"; + private Timer? _countdownTimer; // EN: QR providers / VI: Nhà cung cấp QR private readonly string[] _providers = { "VietQR", "MoMo", "ZaloPay" }; - private void Refresh() => _timerSeconds = 300; + protected override void OnInitialized() + { + _countdownTimer = new Timer(_ => + { + if (_timerSeconds > 0) + { + _timerSeconds--; + InvokeAsync(StateHasChanged); + } + }, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1)); + } + + private void Refresh() + { + _timerSeconds = 300; + } + private void Cancel() => NavigateTo("payment/method-select"); + + public void Dispose() => _countdownTimer?.Dispose(); } diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/Receipt.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/Receipt.razor index 24d1fc35..7e7bf7d3 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/Receipt.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Shared/Payment/Receipt.razor @@ -25,7 +25,7 @@ Đơn #@_orderNumber @_orderDate
-
NV: @_staffName
+
NV: @StaffName
@@ -34,7 +34,7 @@ {
@item.Qty x @item.Name - @FormatReceiptPrice(item.Price * item.Qty) + @FormatPrice(item.Price * item.Qty)
} @@ -44,15 +44,15 @@
Tạm tính - @FormatReceiptPrice(_subtotal) + @FormatPrice(_subtotal)
Phí dịch vụ (5%) - @FormatReceiptPrice(_serviceCharge) + @FormatPrice(_serviceCharge)
VAT (8%) - @FormatReceiptPrice(_vat) + @FormatPrice(_vat)
@@ -60,7 +60,7 @@
TỔNG CỘNG - @FormatReceiptPrice(_total) + @FormatPrice(_total)
@@ -73,11 +73,11 @@
Khách đưa - @FormatReceiptPrice(_amountPaid) + @FormatPrice(_amountPaid)
Tiền thối - @FormatReceiptPrice(_changeAmount) + @FormatPrice(_changeAmount)
@@ -125,7 +125,6 @@ private string _orderNumber = "1042"; private string _orderDate = "15/02/2024"; private string _orderTime = "14:35:22"; - private string _staffName = "Nguyễn Thị Mai"; private readonly List _items = new() { @@ -145,8 +144,6 @@ private decimal _changeAmount => _amountPaid - _total; private string _transactionId = "TXN-20240215-001"; - private static string FormatReceiptPrice(decimal price) => price.ToString("N0") + "₫"; - private void Print() { // EN: Trigger browser print / VI: Kích hoạt in từ trình duyệt diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaDesktop.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaDesktop.razor index afb45a37..0422197d 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaDesktop.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaDesktop.razor @@ -151,6 +151,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaMobile.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaMobile.razor index 39ad8bca..bfe32be3 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaMobile.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaMobile.razor @@ -134,6 +134,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaTablet.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaTablet.razor index be383364..1a056280 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaTablet.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/SpaTablet.razor @@ -121,6 +121,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/AppointmentBook.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/AppointmentBook.razor index aa8dee01..164a5ec9 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/AppointmentBook.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/AppointmentBook.razor @@ -188,6 +188,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var appointments = await DataService.GetAppointmentsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/ServicePackage.razor b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/ServicePackage.razor index 3c56abec..e00f1742 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/ServicePackage.razor +++ b/apps/web-client-tpos-net/src/WebClientTpos.Client/Pages/Pos/Spa/Workflow/ServicePackage.razor @@ -145,6 +145,8 @@ protected override async Task OnInitializedAsync() { + await base.OnInitializedAsync(); + try { var apiProducts = await DataService.GetProductsAsync(ShopId); diff --git a/apps/web-client-tpos-net/src/WebClientTpos.Server/Controllers/OrderController.cs b/apps/web-client-tpos-net/src/WebClientTpos.Server/Controllers/OrderController.cs index 59a782f7..80ac4db9 100644 --- a/apps/web-client-tpos-net/src/WebClientTpos.Server/Controllers/OrderController.cs +++ b/apps/web-client-tpos-net/src/WebClientTpos.Server/Controllers/OrderController.cs @@ -67,6 +67,6 @@ public class OrderController : ControllerBase public Task GetPosDashboard([FromQuery] Guid? shopId = null) { var qs = shopId.HasValue ? $"?shopId={shopId}" : ""; - return _order.GetAsync($"/api/v1/pos/dashboard{qs}").ProxyAsync(); + return _order.GetAsync($"/api/v1/orders/dashboard{qs}").ProxyAsync(); } } diff --git a/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/AppointmentEntityTypeConfiguration.cs b/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/AppointmentEntityTypeConfiguration.cs index 62e28aea..866bd204 100644 --- a/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/AppointmentEntityTypeConfiguration.cs +++ b/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/AppointmentEntityTypeConfiguration.cs @@ -22,63 +22,60 @@ public class AppointmentEntityTypeConfiguration : IEntityTypeConfiguration("_shopId") + builder.Property(a => a.ShopId) + .HasField("_shopId") .HasColumnName("shop_id") .IsRequired(); - builder.Property("_customerId") + builder.Property(a => a.CustomerId) + .HasField("_customerId") .HasColumnName("customer_id"); - builder.Property("_staffId") + builder.Property(a => a.StaffId) + .HasField("_staffId") .HasColumnName("staff_id"); - builder.Property("_resourceId") + builder.Property(a => a.ResourceId) + .HasField("_resourceId") .HasColumnName("resource_id"); - builder.Property("_serviceId") + builder.Property(a => a.ServiceId) + .HasField("_serviceId") .HasColumnName("service_id") .IsRequired(); - builder.Property("_startTime") + builder.Property(a => a.StartTime) + .HasField("_startTime") .HasColumnName("start_time") .IsRequired(); - builder.Property("_endTime") + builder.Property(a => a.EndTime) + .HasField("_endTime") .HasColumnName("end_time") .IsRequired(); - builder.Property("_status") + builder.Property(a => a.Status) + .HasField("_status") .HasColumnName("status") .HasMaxLength(50) .IsRequired(); - builder.Property("_createdAt") + builder.Property(a => a.CreatedAt) + .HasField("_createdAt") .HasColumnName("created_at") .IsRequired(); // EN: Indexes / VI: Indexes - builder.HasIndex("_shopId") + builder.HasIndex(a => a.ShopId) .HasDatabaseName("ix_appointments_shop_id"); - builder.HasIndex("_customerId") + builder.HasIndex(a => a.CustomerId) .HasDatabaseName("ix_appointments_customer_id"); - builder.HasIndex("_staffId") + builder.HasIndex(a => a.StaffId) .HasDatabaseName("ix_appointments_staff_id"); - builder.HasIndex("_startTime") + builder.HasIndex(a => a.StartTime) .HasDatabaseName("ix_appointments_start_time"); - - // EN: Ignore public properties (mapped via backing fields) - // VI: Bỏ qua các properties công khai (đã map qua backing fields) - builder.Ignore(a => a.ShopId); - builder.Ignore(a => a.CustomerId); - builder.Ignore(a => a.StaffId); - builder.Ignore(a => a.ResourceId); - builder.Ignore(a => a.ServiceId); - builder.Ignore(a => a.StartTime); - builder.Ignore(a => a.EndTime); - builder.Ignore(a => a.Status); - builder.Ignore(a => a.CreatedAt); } } diff --git a/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/ResourceEntityTypeConfiguration.cs b/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/ResourceEntityTypeConfiguration.cs index 60161e69..45c3822c 100644 --- a/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/ResourceEntityTypeConfiguration.cs +++ b/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/ResourceEntityTypeConfiguration.cs @@ -22,43 +22,40 @@ public class ResourceEntityTypeConfiguration : IEntityTypeConfiguration("_shopId") + builder.Property(r => r.ShopId) + .HasField("_shopId") .HasColumnName("shop_id") .IsRequired(); - builder.Property("_name") + builder.Property(r => r.Name) + .HasField("_name") .HasColumnName("name") .HasMaxLength(200) .IsRequired(); - builder.Property("_resourceType") + builder.Property(r => r.ResourceType) + .HasField("_resourceType") .HasColumnName("resource_type") .HasMaxLength(50) .IsRequired(); - builder.Property("_capacity") + builder.Property(r => r.Capacity) + .HasField("_capacity") .HasColumnName("capacity") .IsRequired(); - builder.Property("_isActive") + builder.Property(r => r.IsActive) + .HasField("_isActive") .HasColumnName("is_active") .IsRequired(); - builder.Property("_createdAt") + builder.Property(r => r.CreatedAt) + .HasField("_createdAt") .HasColumnName("created_at") .IsRequired(); // EN: Indexes / VI: Indexes - builder.HasIndex("_shopId") + builder.HasIndex(r => r.ShopId) .HasDatabaseName("ix_resources_shop_id"); - - // EN: Ignore public properties (mapped via backing fields) - // VI: Bỏ qua các properties công khai (đã map qua backing fields) - builder.Ignore(r => r.ShopId); - builder.Ignore(r => r.Name); - builder.Ignore(r => r.ResourceType); - builder.Ignore(r => r.Capacity); - builder.Ignore(r => r.IsActive); - builder.Ignore(r => r.CreatedAt); } } diff --git a/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/StaffScheduleEntityTypeConfiguration.cs b/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/StaffScheduleEntityTypeConfiguration.cs index 55a8cdf9..9376e5c1 100644 --- a/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/StaffScheduleEntityTypeConfiguration.cs +++ b/services/booking-service-net/src/BookingService.Infrastructure/EntityConfigurations/StaffScheduleEntityTypeConfiguration.cs @@ -22,39 +22,36 @@ public class StaffScheduleEntityTypeConfiguration : IEntityTypeConfiguration("_staffId") + builder.Property(s => s.StaffId) + .HasField("_staffId") .HasColumnName("staff_id") .IsRequired(); - builder.Property("_shopId") + builder.Property(s => s.ShopId) + .HasField("_shopId") .HasColumnName("shop_id") .IsRequired(); - builder.Property("_dayOfWeek") + builder.Property(s => s.DayOfWeek) + .HasField("_dayOfWeek") .HasColumnName("day_of_week") .IsRequired(); - builder.Property("_startTime") + builder.Property(s => s.StartTime) + .HasField("_startTime") .HasColumnName("start_time") .IsRequired(); - builder.Property("_endTime") + builder.Property(s => s.EndTime) + .HasField("_endTime") .HasColumnName("end_time") .IsRequired(); // EN: Indexes / VI: Indexes - builder.HasIndex("_staffId", "_dayOfWeek") + builder.HasIndex(s => new { s.StaffId, s.DayOfWeek }) .HasDatabaseName("ix_staff_schedules_staff_day"); - builder.HasIndex("_shopId") + builder.HasIndex(s => s.ShopId) .HasDatabaseName("ix_staff_schedules_shop_id"); - - // EN: Ignore public properties (mapped via backing fields) - // VI: Bỏ qua các properties công khai (đã map qua backing fields) - builder.Ignore(s => s.StaffId); - builder.Ignore(s => s.ShopId); - builder.Ignore(s => s.DayOfWeek); - builder.Ignore(s => s.StartTime); - builder.Ignore(s => s.EndTime); } } diff --git a/services/catalog-service-net/src/CatalogService.API/Controllers/CategoriesController.cs b/services/catalog-service-net/src/CatalogService.API/Controllers/CategoriesController.cs index de630ee4..1c75a13f 100644 --- a/services/catalog-service-net/src/CatalogService.API/Controllers/CategoriesController.cs +++ b/services/catalog-service-net/src/CatalogService.API/Controllers/CategoriesController.cs @@ -51,6 +51,27 @@ public class CategoriesController : ControllerBase return Ok(result); } + /// + /// EN: Get categories for a specific shop (RESTful path). + /// VI: Lấy danh mục của một shop cụ thể (đường dẫn RESTful). + /// + [HttpGet("~/api/v{version:apiVersion}/shops/{shopId}/categories")] + [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] + public async Task>> GetShopCategories( + Guid shopId, + [FromQuery] Guid? parentId = null, + CancellationToken cancellationToken = default) + { + var query = new GetCategoriesQuery + { + ShopId = shopId, + ParentId = parentId + }; + + var result = await _mediator.Send(query, cancellationToken); + return Ok(result); + } + /// /// EN: Create a new category. /// VI: Tạo danh mục mới. diff --git a/services/catalog-service-net/src/CatalogService.API/Controllers/ProductsController.cs b/services/catalog-service-net/src/CatalogService.API/Controllers/ProductsController.cs index 2cde640e..fa335319 100644 --- a/services/catalog-service-net/src/CatalogService.API/Controllers/ProductsController.cs +++ b/services/catalog-service-net/src/CatalogService.API/Controllers/ProductsController.cs @@ -57,6 +57,33 @@ public class ProductsController : ControllerBase return Ok(result); } + /// + /// EN: Get products for a specific shop (RESTful path). + /// VI: Lấy sản phẩm của một shop cụ thể (đường dẫn RESTful). + /// + [HttpGet("~/api/v{version:apiVersion}/shops/{shopId}/products")] + [ProducesResponseType(typeof(PagedResult), StatusCodes.Status200OK)] + public async Task>> GetShopProducts( + Guid shopId, + [FromQuery] bool? isActive = null, + [FromQuery] string? type = null, + [FromQuery] int page = 1, + [FromQuery] int pageSize = 20, + CancellationToken cancellationToken = default) + { + var query = new GetProductsQuery + { + ShopId = shopId, + IsActive = isActive, + Type = type, + Page = page, + PageSize = pageSize + }; + + var result = await _mediator.Send(query, cancellationToken); + return Ok(result); + } + /// /// EN: Get product by ID. /// VI: Lấy sản phẩm theo ID. diff --git a/services/fnb-engine-net/src/FnbEngine.Infrastructure/EntityConfigurations/TableEntityTypeConfiguration.cs b/services/fnb-engine-net/src/FnbEngine.Infrastructure/EntityConfigurations/TableEntityTypeConfiguration.cs index 563b0175..31049586 100644 --- a/services/fnb-engine-net/src/FnbEngine.Infrastructure/EntityConfigurations/TableEntityTypeConfiguration.cs +++ b/services/fnb-engine-net/src/FnbEngine.Infrastructure/EntityConfigurations/TableEntityTypeConfiguration.cs @@ -9,27 +9,35 @@ public class TableEntityTypeConfiguration : IEntityTypeConfiguration public void Configure(EntityTypeBuilder
builder) { builder.ToTable("tables"); - + builder.HasKey(t => t.Id); - + builder.Property(t => t.Id) .HasColumnName("id") .IsRequired(); - builder.Property("_shopId") + // EN: Map read-only public properties to their backing fields + // so EF Core can translate LINQ queries (e.g. t.ShopId == value). + // VI: Map các property public chỉ đọc sang backing field tương ứng + // để EF Core có thể dịch LINQ query (ví dụ: t.ShopId == value). + builder.Property(t => t.ShopId) + .HasField("_shopId") .HasColumnName("shop_id") .IsRequired(); - builder.Property("_tableNumber") + builder.Property(t => t.TableNumber) + .HasField("_tableNumber") .HasColumnName("table_number") .HasMaxLength(20) .IsRequired(); - builder.Property("_capacity") + builder.Property(t => t.Capacity) + .HasField("_capacity") .HasColumnName("capacity") .IsRequired(); - builder.Property("_zone") + builder.Property(t => t.Zone) + .HasField("_zone") .HasColumnName("zone") .HasMaxLength(100); @@ -37,28 +45,25 @@ public class TableEntityTypeConfiguration : IEntityTypeConfiguration
.HasColumnName("status_id") .IsRequired(); - builder.Property("_createdAt") + builder.Property(t => t.CreatedAt) + .HasField("_createdAt") .HasColumnName("created_at") .IsRequired(); - builder.Property("_updatedAt") + builder.Property(t => t.UpdatedAt) + .HasField("_updatedAt") .HasColumnName("updated_at"); // EN: Indexes / VI: Các index - builder.HasIndex("_shopId") + builder.HasIndex(t => t.ShopId) .HasDatabaseName("ix_tables_shop_id"); - builder.HasIndex("_shopId", "_tableNumber") + builder.HasIndex(t => new { t.ShopId, t.TableNumber }) .HasDatabaseName("ix_tables_shop_table_number") .IsUnique(); - // EN: Ignore navigation properties / VI: Bỏ qua các navigation properties - builder.Ignore(t => t.ShopId); - builder.Ignore(t => t.TableNumber); - builder.Ignore(t => t.Capacity); - builder.Ignore(t => t.Zone); + // EN: Ignore the Status navigation (enumeration loaded via StatusId) + // VI: Bỏ qua navigation Status (enumeration được load qua StatusId) builder.Ignore(t => t.Status); - builder.Ignore(t => t.CreatedAt); - builder.Ignore(t => t.UpdatedAt); } } diff --git a/services/order-service-net/src/OrderService.API/Application/DTOs/OrderDtos.cs b/services/order-service-net/src/OrderService.API/Application/DTOs/OrderDtos.cs index 94edfe47..c55ea85c 100644 --- a/services/order-service-net/src/OrderService.API/Application/DTOs/OrderDtos.cs +++ b/services/order-service-net/src/OrderService.API/Application/DTOs/OrderDtos.cs @@ -34,18 +34,19 @@ public record OrderItemDto( ); /// -/// EN: Order summary for list views. -/// VI: Tóm tắt order cho danh sách. +/// EN: Order summary for list views (property-based for Dapper materialization). +/// VI: Tóm tắt order cho danh sách (dựa trên property để Dapper materialize). /// -public record OrderSummaryDto( - Guid Id, - Guid ShopId, - Guid? CustomerId, - string Status, - decimal TotalAmount, - int ItemCount, - DateTime CreatedAt -); +public record OrderSummaryDto +{ + public Guid Id { get; init; } + public Guid ShopId { get; init; } + public Guid? CustomerId { get; init; } + public string Status { get; init; } = string.Empty; + public decimal TotalAmount { get; init; } + public long ItemCount { get; init; } + public DateTime CreatedAt { get; init; } +} /// /// EN: Paged result wrapper. diff --git a/services/order-service-net/src/OrderService.API/Application/Queries/GetOrderStatsQuery.cs b/services/order-service-net/src/OrderService.API/Application/Queries/GetOrderStatsQuery.cs index 6a09e2f8..78b4c64a 100644 --- a/services/order-service-net/src/OrderService.API/Application/Queries/GetOrderStatsQuery.cs +++ b/services/order-service-net/src/OrderService.API/Application/Queries/GetOrderStatsQuery.cs @@ -69,7 +69,7 @@ public class GetOrderStatsQueryHandler : IRequestHandler row.Status, row => row.Total, StringComparer.OrdinalIgnoreCase); return new OrderStatsDto( - aggregate.TotalOrders, + (int)aggregate.TotalOrders, aggregate.TotalRevenue, aggregate.AverageOrderValue, byStatus); @@ -108,6 +108,6 @@ public class GetOrderStatsQueryHandler : IRequestHandler