diff --git a/apps/angular/projects/ordering/config/src/enums/policy-names.ts b/apps/angular/projects/ordering/config/src/enums/policy-names.ts index 6ddc7800..28b6edd3 100644 --- a/apps/angular/projects/ordering/config/src/enums/policy-names.ts +++ b/apps/angular/projects/ordering/config/src/enums/policy-names.ts @@ -1,7 +1,6 @@ export const enum eOrderingPolicyNames { - Ordering = 'CatalogService.Products', - - ProductManagementCreate = 'CatalogService.Products.Create', - ProductManagementUpdate = 'CatalogService.Products.Update', - ProductManagementDelete = 'CatalogService.Products.Delete', + ordering = 'OrderingService.Orders', + detail = 'OrderingService.Orders.Orders', + setAsShipped = 'OrderingService.Orders.SetAsShipped', + setAsCancelled = 'OrderingService.Products.SetAsCancelled', } diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissionDefinitionProvider.cs b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissionDefinitionProvider.cs index f06acec2..ff8aca27 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissionDefinitionProvider.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissionDefinitionProvider.cs @@ -9,10 +9,12 @@ namespace EShopOnAbp.OrderingService.Permissions public override void Define(IPermissionDefinitionContext context) { var orderManagmentGroup = context.AddGroup(OrderingServicePermissions.GroupName, L("Permission:OrderingService")); + var oders = orderManagmentGroup.AddPermission(OrderingServicePermissions.Orders.Default, L("Permission:Orders")); oders.AddChild(OrderingServicePermissions.Orders.SetAsCancelled, L("Permission:Orders.SetAsCancelled")); oders.AddChild(OrderingServicePermissions.Orders.SetAsShipped, L("Permission:Orders.SetAsShipped")); + orderManagmentGroup.AddPermission(OrderingServicePermissions.Orders.Dashboard, L("Permission:Dashboard")); } private static LocalizableString L(string name) diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissions.cs b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissions.cs index 30005b60..52b55b9e 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissions.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Permissions/OrderingServicePermissions.cs @@ -11,6 +11,7 @@ namespace EShopOnAbp.OrderingService.Permissions public const string Default = GroupName + ".Orders"; public const string SetAsCancelled = GroupName + ".SetAsCancelled"; public const string SetAsShipped = GroupName + ".SetAsShipped"; + public const string Dashboard = GroupName + ".Dashboard"; } public static string[] GetAll() diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Application/Orders/OrderAppService.cs b/services/ordering/src/EShopOnAbp.OrderingService.Application/Orders/OrderAppService.cs index a5b50d1a..107821f2 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Application/Orders/OrderAppService.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.Application/Orders/OrderAppService.cs @@ -71,7 +71,7 @@ public class OrderAppService : ApplicationService, IOrderAppService ); } - + [Authorize(OrderingServicePermissions.Orders.Dashboard)] public async Task GetDashboardAsync(DashboardInput input) { return new DashboardDto() @@ -80,7 +80,6 @@ public class OrderAppService : ApplicationService, IOrderAppService OrderStatusDto = await GetCountOfTotalOrderStatusAsync(input.Filter), Payments = await GetPercentOfTotalPaymentAsync(input.Filter) }; - } private async Task> GetTopSellingAsync(string filter) { 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..4956c0b4 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 @@ -13,6 +13,7 @@ "Menu:Orders": "Orders", "Menu:OrderManagement": "Ordering Service", "Permission:Orders.SetAsCancelled": "Set As Cancelled", - "Permission:Orders.SetAsShipped": "Set As Shipped" + "Permission:Orders.SetAsShipped": "Set As Shipped", + "Permission:Dashboard": "Dashboard" } } \ No newline at end of file diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json index b618ca81..e6dca913 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json @@ -13,6 +13,7 @@ "Menu:Orders": "Siparişler", "Menu:OrderManagement": "Sipariş Yönetimi", "Permission:Orders.SetAsCancelled": "İptal Edildi Olarak İşaretle", - "Permission:Orders.SetAsShipped": "Sevk Edildi Olarak İşaretle" + "Permission:Orders.SetAsShipped": "Sevk Edildi Olarak İşaretle", + "Permission:Dashboard": "Gösterge Paneli" } } \ No newline at end of file diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/zh-Hans.json b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/zh-Hans.json index 2aaafa54..53d85c07 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/zh-Hans.json +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/zh-Hans.json @@ -14,6 +14,7 @@ "Menu:Orders": "命令", "Menu:OrderManagement": "订单管理", "Permission:Orders.SetAsCancelled": "设置为取消", - "Permission:Orders.SetAsShipped": "设置为发货" + "Permission:Orders.SetAsShipped": "设置为发货", + "Permission:Dashboard": "仪表板" } } \ No newline at end of file