diff --git a/apps/angular/projects/ordering/config/src/enums/route-names.ts b/apps/angular/projects/ordering/config/src/enums/route-names.ts index 4a594fc3..4d3606c8 100644 --- a/apps/angular/projects/ordering/config/src/enums/route-names.ts +++ b/apps/angular/projects/ordering/config/src/enums/route-names.ts @@ -1,4 +1,3 @@ export const enum eOrderingRouteNames { - Ordering = 'OrderingService::Menu:Orders', - Orders = 'CatalogService::Menu:Products', + Ordering = 'OrderingService::Menu:OrderManagement' } diff --git a/apps/angular/projects/ordering/src/pages/orders/orders.component.html b/apps/angular/projects/ordering/src/pages/orders/orders.component.html index f747ef32..56eb9405 100644 --- a/apps/angular/projects/ordering/src/pages/orders/orders.component.html +++ b/apps/angular/projects/ordering/src/pages/orders/orders.component.html @@ -28,37 +28,37 @@ class="dropdown-item" (click)='openModal(row)' > - {{ 'AbpOrdering::Detail' | abpLocalization }} + {{ 'AbpUi::Edit' | abpLocalization }} - - + + {{ value | date }} - + {{ value | currency }} - + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json index e6d127d4..57abdfc2 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json @@ -11,7 +11,12 @@ "Permission:Orders": "Orders", "Permission:OrderingService": "Ordering Service", "Menu:Orders": "Orders", - "Menu:OrderManagement": "Ordering Service", + "Menu:OrderManagement": "Order Management", + + "DisplayName:OrderNo": "Order No", + "DisplayName:OrderDate": "Order Date", + "DisplayName:OrderTotal": "Total", + "DisplayName:OrderStatus": "Order Status", "Permission:Orders.SetAsCancelled": "Set As Cancelled", "Permission:Orders.SetAsShipped": "Set As Shipped" }