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 6dc09b1f..01d05b2e 100644 --- a/apps/angular/projects/ordering/config/src/enums/route-names.ts +++ b/apps/angular/projects/ordering/config/src/enums/route-names.ts @@ -1,3 +1,5 @@ export const enum eOrderingRouteNames { - ordering = 'OrderingService::Menu:OrderManagement' + ordering = 'OrderingService::Menu:OrderManagement', + dashboard = 'OrderingService::Menu:Dashboard', + orders = 'OrderingService::Menu:Orders', } diff --git a/apps/angular/projects/ordering/config/src/providers/route.provider.ts b/apps/angular/projects/ordering/config/src/providers/route.provider.ts index be624bc5..770d6536 100644 --- a/apps/angular/projects/ordering/config/src/providers/route.provider.ts +++ b/apps/angular/projects/ordering/config/src/providers/route.provider.ts @@ -18,6 +18,20 @@ export function configureRoutes(routesService: RoutesService) { parentName: null, iconClass: 'bi bi-collection-fill', }, + { + path: '/ordering', + name: eOrderingRouteNames.dashboard, + parentName: eOrderingRouteNames.ordering, + order: 1, + requiredPolicy: eOrderingPolicyNames.ordering, + }, + { + path: '/ordering/orders', + name: eOrderingRouteNames.orders, + parentName: eOrderingRouteNames.ordering, + order: 2, + requiredPolicy: eOrderingPolicyNames.ordering, + }, ]); }; } 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 f12ce7ac..dd4ed65e 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 @@ -12,9 +12,8 @@ "Permission:OrderingService": "Ordering Service", "Menu:Orders": "Orders", "Menu:OrderManagement": "Order Management", - + "Menu:Dashboard": "Dashboard", "ModalTitle":"Order Detail", - "DisplayName:OrderNo": "Order No", "DisplayName:OrderDate": "Order Date", "DisplayName:OrderTotal": "Order Total", @@ -31,10 +30,8 @@ "DisplayName:Address": "Address", "DisplayName:PaymentMethod": "Payment Method", "DisplayName:Total": "Total", - "Permission:Orders.SetAsCancelled": "Set As Cancelled", "Permission:Orders.SetAsShipped": "Set As Shipped", - "Enum:OrderStatus:0":"Placed", "Enum:OrderStatus:1":"Paid", "Enum:OrderStatus:2":"Shipped",