From 6b4d0ec4ccd4c07f3ea47f51373455337cbf1ee5 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Mon, 15 Jun 2020 19:15:21 +0800 Subject: [PATCH 1/5] Remove list property initial code in entity's protected ctor method --- .../EasyAbp/EShop/Orders/Orders/Order.cs | 1 - .../EasyAbp/EShop/Products/Products/Product.cs | 3 +-- .../EasyAbp/EShop/Products/Products/ProductAttribute.cs | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs index 140bda53..3a026f55 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs @@ -53,7 +53,6 @@ namespace EasyAbp.EShop.Orders.Orders protected Order() { - OrderLines = new List(); } public Order( diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs index 204d3b8c..22787762 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/Product.cs @@ -37,8 +37,6 @@ namespace EasyAbp.EShop.Products.Products protected Product() { - ProductAttributes = new List(); - ProductSkus = new List(); } public Product( @@ -65,6 +63,7 @@ namespace EasyAbp.EShop.Products.Products IsHidden = isHidden; MediaResources = mediaResources; DisplayOrder = displayOrder; + ProductAttributes = new List(); ProductSkus = new List(); } diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs index f1cc2194..85b53282 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductAttribute.cs @@ -19,7 +19,6 @@ namespace EasyAbp.EShop.Products.Products protected ProductAttribute() { - ProductAttributeOptions = new List(); } public ProductAttribute( From f6d8fad7d04fd9b9704348daf94deb723573dd5f Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Mon, 15 Jun 2020 19:48:37 +0800 Subject: [PATCH 2/5] Close #33: Implement IProductDiscountManager --- .../Products/Products/Dtos/ProductDto.cs | 4 ++ .../Products/Products/Dtos/ProductSkuDto.cs | 16 ++++++ .../Products/Products/ProductAppService.cs | 51 ++++++++++++++----- .../ProductsApplicationAutoMapperProfile.cs | 8 ++- .../Products/IProductDiscountManager.cs | 11 ++++ .../Products/IProductDiscountProvider.cs | 10 ++++ .../Products/IProductPriceProvider.cs | 7 --- .../Products/ProductDiscountManager.cs | 22 ++++++++ 8 files changed, 107 insertions(+), 22 deletions(-) create mode 100644 modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountManager.cs create mode 100644 modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountProvider.cs delete mode 100644 modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductPriceProvider.cs create mode 100644 modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductDiscountManager.cs diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs index aefa7f8a..3a0289c3 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs @@ -28,6 +28,10 @@ namespace EasyAbp.EShop.Products.Products.Dtos public bool IsStatic { get; set; } public bool IsHidden { get; set; } + + public decimal? MinimumPrice { get; set; } + + public decimal? MaximumPrice { get; set; } public ICollection ProductAttributes { get; set; } diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs index 4b41d398..6ec293f5 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductSkuDto.cs @@ -13,10 +13,26 @@ namespace EasyAbp.EShop.Products.Products.Dtos public decimal? OriginalPrice { get; set; } + /// + /// Price property in the ProductSku entity. + /// public decimal Price { get; set; } + /// + /// Price from IProductDiscountManager + /// + public decimal DiscountedPrice { get; set; } + + /// + /// Inventory property in the ProductSku entity. + /// public int Inventory { get; set; } + /// + /// Inventory provider's inventory quantity (same as Inventory property if there is no provider). + /// + public int RealInventory { get; set; } + public int Sold { get; set; } public int OrderMinQuantity { get; set; } diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs index 84f2911c..10b1125f 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs @@ -25,6 +25,7 @@ namespace EasyAbp.EShop.Products.Products protected override string GetListPolicyName { get; set; } = null; private readonly IProductManager _productManager; + private readonly IProductDiscountManager _productDiscountManager; private readonly IProductInventoryProvider _productInventoryProvider; private readonly IAttributeOptionIdsSerializer _attributeOptionIdsSerializer; private readonly IProductStoreRepository _productStoreRepository; @@ -33,6 +34,7 @@ namespace EasyAbp.EShop.Products.Products public ProductAppService( IProductManager productManager, + IProductDiscountManager productDiscountManager, IProductInventoryProvider productInventoryProvider, IAttributeOptionIdsSerializer attributeOptionIdsSerializer, IProductStoreRepository productStoreRepository, @@ -40,6 +42,7 @@ namespace EasyAbp.EShop.Products.Products IProductRepository repository) : base(repository) { _productManager = productManager; + _productDiscountManager = productDiscountManager; _productInventoryProvider = productInventoryProvider; _attributeOptionIdsSerializer = attributeOptionIdsSerializer; _productStoreRepository = productStoreRepository; @@ -198,6 +201,7 @@ namespace EasyAbp.EShop.Products.Products } await LoadRealInventoriesAsync(product, dto, storeId); + await LoadPricesAsync(product, dto, storeId); dto.CategoryIds = (await _productCategoryRepository.GetListByProductIdAsync(dto.Id)) .Select(x => x.CategoryId).ToList(); @@ -226,18 +230,6 @@ namespace EasyAbp.EShop.Products.Products return dto; } - protected virtual async Task LoadRealInventoriesAsync(Product product, ProductDto productDto, Guid storeId) - { - var inventoryDict = await _productInventoryProvider.GetInventoryDictionaryAsync(product, storeId); - - foreach (var productSkuDto in productDto.ProductSkus) - { - productSkuDto.Inventory = inventoryDict[productSkuDto.Id]; - } - - return productDto; - } - public override async Task> GetListAsync(GetProductListDto input) { await CheckGetListPolicyAsync(); @@ -250,6 +242,7 @@ namespace EasyAbp.EShop.Products.Products throw new NotAllowedToGetProductListWithShowHiddenException(); } + // Todo: Products cache. var query = CreateFilteredQuery(input); if (!isCurrentUserStoreAdmin) @@ -268,11 +261,43 @@ namespace EasyAbp.EShop.Products.Products foreach (var product in products) { - items.Add(await LoadRealInventoriesAsync(product, MapToGetListOutputDto(product), input.StoreId)); + // Todo: How to get list with details if the queryable is customized? + var productDto = MapToGetListOutputDto(await _repository.GetAsync(product.Id)); + + await LoadRealInventoriesAsync(product, productDto, input.StoreId); + await LoadPricesAsync(product, productDto, input.StoreId); + + items.Add(productDto); } return new PagedResultDto(totalCount, items); } + + protected virtual async Task LoadRealInventoriesAsync(Product product, ProductDto productDto, Guid storeId) + { + var inventoryDict = await _productInventoryProvider.GetInventoryDictionaryAsync(product, storeId); + + foreach (var productSkuDto in productDto.ProductSkus) + { + productSkuDto.RealInventory = inventoryDict[productSkuDto.Id]; + } + + return productDto; + } + + protected virtual async Task LoadPricesAsync(Product product, ProductDto productDto, Guid storeId) + { + foreach (var productSkuDto in productDto.ProductSkus) + { + productSkuDto.DiscountedPrice = await _productDiscountManager.GetDiscountedPriceAsync(product, + product.ProductSkus.Single(sku => sku.Id == productSkuDto.Id), storeId); + } + + productDto.MinimumPrice = productDto.ProductSkus.Select(sku => sku.Price).Min(); + productDto.MaximumPrice = productDto.ProductSkus.Select(sku => sku.Price).Max(); + + return productDto; + } public async Task DeleteAsync(Guid id, Guid storeId) { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs index 5e734485..4775b03c 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs @@ -25,11 +25,15 @@ namespace EasyAbp.EShop.Products * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ CreateMap() - .Ignore(dto => dto.CategoryIds); + .Ignore(dto => dto.CategoryIds) + .Ignore(dto => dto.MinimumPrice) + .Ignore(dto => dto.MaximumPrice); CreateMap(); CreateMap(); CreateMap(); - CreateMap(); + CreateMap() + .Ignore(dto => dto.DiscountedPrice) + .Ignore(dto => dto.RealInventory); CreateMap(MemberList.Source) .ForSourceMember(dto => dto.StoreId, opt => opt.DoNotValidate()) .ForSourceMember(dto => dto.CategoryIds, opt => opt.DoNotValidate()) diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountManager.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountManager.cs new file mode 100644 index 00000000..89d1eb7c --- /dev/null +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountManager.cs @@ -0,0 +1,11 @@ +using System; +using System.Threading.Tasks; +using Volo.Abp.Domain.Services; + +namespace EasyAbp.EShop.Products.Products +{ + public interface IProductDiscountManager : IDomainService + { + Task GetDiscountedPriceAsync(Product product, ProductSku productSku, Guid storeId); + } +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountProvider.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountProvider.cs new file mode 100644 index 00000000..f5721a32 --- /dev/null +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductDiscountProvider.cs @@ -0,0 +1,10 @@ +using System; +using System.Threading.Tasks; + +namespace EasyAbp.EShop.Products.Products +{ + public interface IProductDiscountProvider + { + Task GetDiscountedPriceAsync(Product product, ProductSku productSku, Guid storeId, decimal currentPrice); + } +} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductPriceProvider.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductPriceProvider.cs deleted file mode 100644 index 58c519b4..00000000 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductPriceProvider.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace EasyAbp.EShop.Products.Products -{ - public interface IProductPriceProvider - { - - } -} \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductDiscountManager.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductDiscountManager.cs new file mode 100644 index 00000000..dc55954a --- /dev/null +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/ProductDiscountManager.cs @@ -0,0 +1,22 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Domain.Services; + +namespace EasyAbp.EShop.Products.Products +{ + public class ProductDiscountManager : DomainService, IProductDiscountManager + { + public async Task GetDiscountedPriceAsync(Product product, ProductSku productSku, Guid storeId) + { + var currentPrice = productSku.Price; + + foreach (var provider in ServiceProvider.GetServices()) + { + currentPrice = await provider.GetDiscountedPriceAsync(product, productSku, storeId, currentPrice); + } + + return currentPrice; + } + } +} \ No newline at end of file From 7ed72561bdefe2a2ca8fc991295e784f494dc9cf Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Tue, 16 Jun 2020 15:08:09 +0800 Subject: [PATCH 3/5] Add IProductRepository.WithDetails(...) methods --- .../Products/Products/ProductAppService.cs | 7 ++-- .../Products/Products/IProductRepository.cs | 4 ++ .../Products/Products/ProductRepository.cs | 41 +++++++++++++++---- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs index 10b1125f..47c77678 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs @@ -53,8 +53,8 @@ namespace EasyAbp.EShop.Products.Products protected override IQueryable CreateFilteredQuery(GetProductListDto input) { var query = input.CategoryId.HasValue - ? _repository.GetQueryable(input.StoreId, input.CategoryId.Value) - : _repository.GetQueryable(input.StoreId); + ? _repository.WithDetails(input.StoreId, input.CategoryId.Value) + : _repository.WithDetails(input.StoreId); return input.ShowHidden ? query : query.Where(x => !x.IsHidden); } @@ -261,8 +261,7 @@ namespace EasyAbp.EShop.Products.Products foreach (var product in products) { - // Todo: How to get list with details if the queryable is customized? - var productDto = MapToGetListOutputDto(await _repository.GetAsync(product.Id)); + var productDto = MapToGetListOutputDto(product); await LoadRealInventoriesAsync(product, productDto, input.StoreId); await LoadPricesAsync(product, productDto, input.StoreId); diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductRepository.cs index 3115a4b7..1e1ab030 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductRepository.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/IProductRepository.cs @@ -10,5 +10,9 @@ namespace EasyAbp.EShop.Products.Products IQueryable GetQueryable(Guid storeId); + IQueryable WithDetails(Guid storeId, Guid categoryId); + + IQueryable WithDetails(Guid storeId); + } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs index 0ffad2ac..470df422 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs @@ -22,19 +22,42 @@ namespace EasyAbp.EShop.Products.Products public IQueryable GetQueryable(Guid storeId, Guid categoryId) { - return from product in DbContext.Products - join productStore in DbContext.ProductStores on product.Id equals productStore.ProductId - join productCategory in DbContext.ProductCategories on product.Id equals productCategory.ProductId - where productStore.StoreId == storeId && productCategory.CategoryId == categoryId - select product; + return JoinProductCategories(GetQueryable(storeId), categoryId); } public IQueryable GetQueryable(Guid storeId) { - return from product in DbContext.Products - join productStore in DbContext.ProductStores on product.Id equals productStore.ProductId - where productStore.StoreId == storeId - select product; + return JoinProductStores(GetQueryable(), storeId); + } + + public IQueryable WithDetails(Guid storeId, Guid categoryId) + { + return JoinProductCategories(WithDetails(storeId), categoryId); + } + + public IQueryable WithDetails(Guid storeId) + { + return JoinProductStores(WithDetails(), storeId); + } + + protected virtual IQueryable JoinProductStores(IQueryable queryable, Guid storeId) + { + return queryable.Join( + DbContext.ProductStores.Where(productStore => productStore.StoreId == storeId), + product => product.Id, + productStore => productStore.ProductId, + (product, productStore) => product + ); + } + + protected virtual IQueryable JoinProductCategories(IQueryable queryable, Guid categoryId) + { + return queryable.Join( + DbContext.ProductCategories.Where(productCategory => productCategory.CategoryId == categoryId), + product => product.Id, + productCategory => productCategory.ProductId, + (product, productCategory) => product + ); } } } \ No newline at end of file From f3846e3abcdd27cd1b88942c84884306ca3fccd8 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Tue, 16 Jun 2020 16:12:05 +0800 Subject: [PATCH 4/5] Close #32: Improved menu item name --- .../src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs | 4 ++-- .../Pages/EShop/Orders/Orders/Order/Index.cshtml | 2 +- .../EasyAbp/EShop/Payments/Localization/Payments/cs.json | 4 ++-- .../EasyAbp/EShop/Payments/Localization/Payments/en.json | 4 ++-- .../EasyAbp/EShop/Payments/Localization/Payments/pl.json | 4 ++-- .../EShop/Payments/Localization/Payments/pt-BR.json | 4 ++-- .../EasyAbp/EShop/Payments/Localization/Payments/sl.json | 4 ++-- .../EasyAbp/EShop/Payments/Localization/Payments/tr.json | 4 ++-- .../EasyAbp/EShop/Payments/Localization/Payments/vi.json | 4 ++-- .../EShop/Payments/Localization/Payments/zh-Hans.json | 4 ++-- .../EShop/Payments/Localization/Payments/zh-Hant.json | 4 ++-- .../Pages/EShop/Payments/Payments/Payment/Index.cshtml | 2 +- .../Pages/EShop/Payments/Refunds/Refund/Index.cshtml | 2 +- .../EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs | 6 +++--- .../Pages/EShop/Products/Categories/Category/Index.cshtml | 2 +- .../EShop/Products/ProductTypes/ProductType/Index.cshtml | 2 +- .../Pages/EShop/Products/Products/Product/Index.cshtml | 2 +- .../Pages/EShop/Products/Products/ProductSku/Index.cshtml | 2 +- .../EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs | 8 ++++---- .../src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs | 4 ++-- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs index febf9cb4..3be700ae 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs @@ -24,7 +24,7 @@ namespace EasyAbp.EShop.Orders.Web { var l = context.GetLocalizer(); //Add main menu items. - var orderManagementMenuItem = new ApplicationMenuItem("OrderManagement", l["Menu:OrderManagement"]); + var orderManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopOrders", l["Menu:OrderManagement"]); if (await context.IsGrantedAsync(OrdersPermissions.Orders.Manage)) { @@ -33,7 +33,7 @@ namespace EasyAbp.EShop.Orders.Web var defaultStore = (await storeAppService.GetDefaultAsync())?.Id; orderManagementMenuItem.AddItem( - new ApplicationMenuItem("Order", l["Menu:Order"], "/EShop/Orders/Orders/Order?storeId=" + defaultStore) + new ApplicationMenuItem("EasyAbpEShopOrdersOrder", l["Menu:Order"], "/EShop/Orders/Orders/Order?storeId=" + defaultStore) ); } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/Index.cshtml b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/Index.cshtml index 7be7657b..9223169f 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/Index.cshtml +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/Index.cshtml @@ -7,7 +7,7 @@ @{ PageLayout.Content.Title = L["Order"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:Order"].Value); - PageLayout.Content.MenuItemName = "Order"; + PageLayout.Content.MenuItemName = "EasyAbpEShopOrdersOrder"; var cardTitle = @L["Order"].Value; diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json index 080c7226..5ee7b9e5 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/cs.json @@ -5,7 +5,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -21,7 +21,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json index bff3eefa..cf67a491 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/en.json @@ -6,7 +6,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -22,7 +22,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json index 58d0dcab..87cdb1b1 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pl.json @@ -5,7 +5,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -21,7 +21,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json index 9d42eaea..075df33f 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/pt-BR.json @@ -5,7 +5,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -21,7 +21,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json index 60155915..34bfa6c8 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/sl.json @@ -6,7 +6,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -22,7 +22,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json index 7c907e83..f8f9ff9b 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/tr.json @@ -6,7 +6,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -22,7 +22,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json index 1b2d8732..35af052d 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/vi.json @@ -5,7 +5,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -21,7 +21,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json index ea6dca33..5574d039 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hans.json @@ -6,7 +6,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -22,7 +22,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json index 31ad5344..289a6561 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp/EShop/Payments/Localization/Payments/zh-Hant.json @@ -6,7 +6,7 @@ "Permission:Create": "Create", "Permission:Update": "Update", "Permission:Delete": "Delete", - "Menu:Payments": "MenuPayments", + "Menu:Payment": "MenuPayments", "Payment": "Payment", "PaymentStoreId": "PaymentStoreId", "CreatePayment": "CreatePayment", @@ -22,7 +22,7 @@ "PaymentItemRefundAmount": "PaymentItemRefundAmount", "SuccessfullyDeleted": "Successfully deleted", "Permission:Refunds": "Refunds", - "Menu:Refunds": "MenuRefunds", + "Menu:Refund": "MenuRefunds", "Refund": "Refund", "RefundStoreId": "RefundStoreId", "CreateRefund": "CreateRefund", diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml index 9eb6a629..038bfeb5 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml @@ -10,7 +10,7 @@ @{ PageLayout.Content.Title = L["Payment"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:Payment"].Value); - PageLayout.Content.MenuItemName = "Payment"; + PageLayout.Content.MenuItemName = "EasyAbpEShopPaymentsPayment"; var cardTitle = @L["Payment"].Value; diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml index 18615621..df133784 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml @@ -10,7 +10,7 @@ @{ PageLayout.Content.Title = L["Refund"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:Refund"].Value); - PageLayout.Content.MenuItemName = "Refund"; + PageLayout.Content.MenuItemName = "EasyAbpEShopPaymentsRefund"; var cardTitle = @L["Refund"].Value; diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs index 84b3a3c7..5690ae78 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs @@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Payments.Web { var l = context.GetLocalizer(); //Add main menu items. - var paymentManagementMenuItem = new ApplicationMenuItem("PaymentManagement", l["Menu:PaymentManagement"]); + var paymentManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopPayments", l["Menu:PaymentManagement"]); var storeAppService = context.ServiceProvider.GetRequiredService(); @@ -44,13 +44,13 @@ namespace EasyAbp.EShop.Payments.Web if (await context.IsGrantedAsync(PaymentsPermissions.Payments.Manage)) { paymentManagementMenuItem.AddItem( - new ApplicationMenuItem("Payments", l["Menu:Payments"], "/EShop/Payments/Payments/Payment?storeId=" + defaultStore) + new ApplicationMenuItem("EasyAbpEShopPaymentsPayment", l["Menu:Payment"], "/EShop/Payments/Payments/Payment?storeId=" + defaultStore) ); } if (await context.IsGrantedAsync(PaymentsPermissions.Refunds.Manage)) { paymentManagementMenuItem.AddItem( - new ApplicationMenuItem("Refunds", l["Menu:Refunds"], "/EShop/Payments/Refunds/Refund?storeId=" + defaultStore) + new ApplicationMenuItem("EasyAbpEShopPaymentsRefund", l["Menu:Refund"], "/EShop/Payments/Refunds/Refund?storeId=" + defaultStore) ); } diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml index 514182b2..8fcb03da 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml @@ -7,7 +7,7 @@ @{ PageLayout.Content.Title = L["Category"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:Category"].Value); - PageLayout.Content.MenuItemName = "Category"; + PageLayout.Content.MenuItemName = "EasyAbpEShopProductsCategory"; } @section scripts diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml index dae018ba..2dbde511 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml @@ -7,7 +7,7 @@ @{ PageLayout.Content.Title = L["ProductType"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:ProductType"].Value); - PageLayout.Content.MenuItemName = "ProductType"; + PageLayout.Content.MenuItemName = "EasyAbpEShopProductsProductType"; } @section scripts diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/Index.cshtml b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/Index.cshtml index d95c897d..a1eb7b53 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/Index.cshtml +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/Index.cshtml @@ -7,7 +7,7 @@ @{ PageLayout.Content.Title = L["Product"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:Product"].Value); - PageLayout.Content.MenuItemName = "Product"; + PageLayout.Content.MenuItemName = "EasyAbpEShopProductsProduct"; } @section scripts diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/Index.cshtml b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/Index.cshtml index e9621c10..fb508910 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/Index.cshtml +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/Index.cshtml @@ -7,7 +7,7 @@ @{ PageLayout.Content.Title = L["ProductSku"].Value; PageLayout.Content.BreadCrumb.Add(L["Menu:Product"].Value); - PageLayout.Content.MenuItemName = "Product"; + PageLayout.Content.MenuItemName = "EasyAbpEShopProductsProduct"; } @section scripts diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs index 5aa32910..ca3a8b66 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs @@ -30,19 +30,19 @@ namespace EasyAbp.EShop.Products.Web { var l = context.GetLocalizer(); //Add main menu items. - var productManagementMenuItem = new ApplicationMenuItem("ProductManagement", l["Menu:ProductManagement"]); + var productManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopProducts", l["Menu:ProductManagement"]); if (await context.IsGrantedAsync(ProductsPermissions.ProductTypes.Default)) { productManagementMenuItem.AddItem( - new ApplicationMenuItem("ProductType", l["Menu:ProductType"], "/EShop/Products/ProductTypes/ProductType") + new ApplicationMenuItem("EasyAbpEShopProductsProductType", l["Menu:ProductType"], "/EShop/Products/ProductTypes/ProductType") ); } if (await context.IsGrantedAsync(ProductsPermissions.Categories.Default)) { productManagementMenuItem.AddItem( - new ApplicationMenuItem("Category", l["Menu:Category"], "/EShop/Products/Categories/Category") + new ApplicationMenuItem("EasyAbpEShopProductsCategory", l["Menu:Category"], "/EShop/Products/Categories/Category") ); } @@ -53,7 +53,7 @@ namespace EasyAbp.EShop.Products.Web var defaultStore = (await storeAppService.GetDefaultAsync())?.Id; productManagementMenuItem.AddItem( - new ApplicationMenuItem("Product", l["Menu:Product"], "/EShop/Products/Products/Product?storeId=" + defaultStore) + new ApplicationMenuItem("EasyAbpEShopProductsProduct", l["Menu:Product"], "/EShop/Products/Products/Product?storeId=" + defaultStore) ); } diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs index b6d49de7..7a1ecd65 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs @@ -23,12 +23,12 @@ namespace EasyAbp.EShop.Stores.Web { var l = context.GetLocalizer(); //Add main menu items. - var storeManagementMenuItem = new ApplicationMenuItem("StoreManagement", l["Menu:StoreManagement"]); + var storeManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopStores", l["Menu:StoreManagement"]); if (await context.IsGrantedAsync(StoresPermissions.Stores.Default)) { storeManagementMenuItem.AddItem( - new ApplicationMenuItem("Store", l["Menu:Store"], "/EShop/Stores/Stores/Store") + new ApplicationMenuItem("EasyAbpEShopStoresStore", l["Menu:Store"], "/EShop/Stores/Stores/Store") ); } From ebae6c881b3b6e1a9563d9bf796d4913dde6ea3f Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Tue, 16 Jun 2020 16:40:00 +0800 Subject: [PATCH 5/5] Upgrade PaymentService module to version 0.3.6 --- .../EasyAbp.EShop.Orders.Domain.csproj | 2 +- .../EasyAbp.EShop.Payments.Domain.csproj | 2 +- .../EShopSample.Application.Contracts.csproj | 4 ++-- .../EShopSample.Application/EShopSample.Application.csproj | 4 ++-- .../EShopSample.Domain.Shared.csproj | 4 ++-- .../src/EShopSample.Domain/EShopSample.Domain.csproj | 4 ++-- .../EShopSample.EntityFrameworkCore.csproj | 4 ++-- .../EShopSample.HttpApi.Client.csproj | 4 ++-- .../src/EShopSample.HttpApi/EShopSample.HttpApi.csproj | 4 ++-- .../aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj index 64feb422..d1f4a54e 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj index cb8a390d..796aeff1 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj index 93f83591..15ff483e 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj index 57684f88..dddd79a5 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj index cf0a2e82..bf8b09e7 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj index 5903dfbc..61dbb6ae 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj index 2f9666a7..133e744d 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj index 200cfaeb..e914f48b 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj index e5534854..c1f1ec2d 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj index 35ab17c7..3f3e0cd8 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj @@ -45,8 +45,8 @@ - - + +