Browse Source

Improve Name properties in many entities.

pull/87/head v0.6.0
gdlcf88 6 years ago
parent
commit
d0202b8561
  1. 2
      common.props
  2. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderDto.cs
  3. 10
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs
  4. 6
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/NewOrderGenerator.cs
  5. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/cs.json
  6. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json
  7. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pl.json
  8. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pt-BR.json
  9. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/sl.json
  10. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/tr.json
  11. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/vi.json
  12. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json
  13. 14
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json
  14. 8
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrderLine.cs
  15. 6
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs
  16. 8
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs
  17. 24
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs
  18. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Categories/Dtos/CategoryDto.cs
  19. 5
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Categories/Dtos/CreateUpdateCategoryDto.cs
  20. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductTypes/Dtos/ProductTypeDto.cs
  21. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs
  22. 10
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
  23. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs
  24. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/cs.json
  25. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/en.json
  26. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pl.json
  27. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pt-BR.json
  28. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/sl.json
  29. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/tr.json
  30. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/vi.json
  31. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hans.json
  32. 4
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hant.json
  33. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Categories/Category.cs
  34. 6
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductTypes/ProductType.cs
  35. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/EntityFrameworkCore/ProductsDbContextModelCreatingExtensions.cs
  36. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml
  37. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/index.js
  38. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml
  39. 2
      modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/index.js
  40. 6
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/BasketItemDto.cs
  41. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs
  42. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/cs.json
  43. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/en.json
  44. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pl-PL.json
  45. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pt-BR.json
  46. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/sl.json
  47. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/tr.json
  48. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/vi.json
  49. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hans.json
  50. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hant.json
  51. 14
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItem.cs
  52. 6
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/IProductData.cs
  53. 6
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/ProductDataModel.cs
  54. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/Index.cshtml
  55. 4
      plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.js
  56. 3
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/appsettings.json
  57. 3848
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710153132_RenamedNameToUniqueNameInCategory.Designer.cs
  58. 43
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710153132_RenamedNameToUniqueNameInCategory.cs
  59. 3854
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710160345_RenamedNameToUniqueName.Designer.cs
  60. 107
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710160345_RenamedNameToUniqueName.cs
  61. 3860
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710163538_AddedSkuName.Designer.cs
  62. 31
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710163538_AddedSkuName.cs
  63. 38
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs

2
common.props

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>0.5.2</Version>
<Version>0.6.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors>

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderDto.cs

@ -4,7 +4,7 @@ using Volo.Abp.Application.Dtos;
namespace EasyAbp.EShop.Orders.Orders.Dtos
{
public class OrderDto : ExtensibleFullAuditedEntityDto<Guid>
public class OrderDto : ExtensibleFullAuditedEntityDto<Guid>, IOrder
{
public Guid StoreId { get; set; }

10
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderLineDto.cs

@ -3,7 +3,7 @@ using Volo.Abp.Application.Dtos;
namespace EasyAbp.EShop.Orders.Orders.Dtos
{
public class OrderLineDto : FullAuditedEntityDto<Guid>
public class OrderLineDto : FullAuditedEntityDto<Guid>, IOrderLine
{
public Guid ProductId { get; set; }
@ -13,9 +13,13 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos
public DateTime ProductDetailModificationTime { get; set; }
public string ProductTypeName { get; set; }
public string ProductTypeUniqueName { get; set; }
public string ProductName { get; set; }
public string ProductUniqueName { get; set; }
public string ProductDisplayName { get; set; }
public string SkuName { get; set; }
public string SkuDescription { get; set; }

6
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/NewOrderGenerator.cs

@ -89,8 +89,10 @@ namespace EasyAbp.EShop.Orders.Orders
productSkuId: productSku.Id,
productModificationTime: product.LastModificationTime ?? product.CreationTime,
productDetailModificationTime: productSku.LastModificationTime ?? productSku.CreationTime,
productTypeName: product.ProductTypeName,
productName: product.DisplayName,
productTypeUniqueName: product.ProductTypeUniqueName,
productUniqueName: product.UniqueName,
productDisplayName: product.DisplayName,
skuName: productSku.Name,
skuDescription: await _productSkuDescriptionProvider.GenerateAsync(product, productSku),
mediaResources: product.MediaResources,
currency: productSku.Currency,

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/cs.json

@ -17,9 +17,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json

@ -18,9 +18,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pl.json

@ -17,9 +17,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pt-BR.json

@ -17,9 +17,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/sl.json

@ -18,9 +18,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/tr.json

@ -18,9 +18,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/vi.json

@ -17,9 +17,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json

@ -18,9 +18,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

14
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json

@ -18,9 +18,23 @@
"OrderPaidTime": "OrderPaidTime",
"OrderCompletionTime": "OrderCompletionTime",
"OrderCanceledTime": "OrderCanceledTime",
"OrderReducedInventoryAfterPlacingTime": "OrderReducedInventoryAfterPlacingTime",
"OrderReducedInventoryAfterPaymentTime": "OrderReducedInventoryAfterPaymentTime",
"OrderLine": "OrderLine",
"OrderLineProductId": "OrderLineProductId",
"OrderLineProductSkuId": "OrderLineProductSkuId",
"OrderLineProductModificationTime": "OrderLineProductModificationTime",
"OrderLineProductDetailModificationTime": "OrderLineProductDetailModificationTime",
"OrderLineProductTypeUniqueName": "OrderLineProductTypeUniqueName",
"OrderLineProductUniqueName": "OrderLineProductUniqueName",
"OrderLineProductDisplayName": "OrderLineProductDisplayName",
"OrderLineSkuName": "OrderLineSkuName",
"OrderLineSkuDescription": "OrderLineSkuDescription",
"OrderLineMediaResources": "OrderLineMediaResources",
"OrderLineCurrency": "OrderLineCurrency",
"OrderLineUnitPrice": "OrderLineUnitPrice",
"OrderLineTotalPrice": "OrderLineTotalPrice",
"OrderLineTotalDiscount": "OrderLineTotalDiscount",
"OrderLineQuantity": "OrderLineQuantity",
"CreateOrder": "CreateOrder",
"EditOrder": "EditOrder",

8
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/IOrderLine.cs

@ -12,9 +12,13 @@ namespace EasyAbp.EShop.Orders.Orders
DateTime ProductDetailModificationTime { get; }
string ProductTypeName { get; }
string ProductTypeUniqueName { get; }
string ProductName { get; }
string ProductUniqueName { get; }
string ProductDisplayName { get; }
string SkuName { get; }
string SkuDescription { get; }

6
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs

@ -33,7 +33,7 @@ namespace EasyAbp.EShop.Orders.Orders
public string StaffRemark { get; set; }
public Guid? PaymentId { get; }
public Guid? PaymentId { get; set; }
public DateTime? PaidTime { get; set; }
@ -41,9 +41,9 @@ namespace EasyAbp.EShop.Orders.Orders
public DateTime? CanceledTime { get; set; }
public DateTime? ReducedInventoryAfterPlacingTime { get; }
public DateTime? ReducedInventoryAfterPlacingTime { get; set; }
public DateTime? ReducedInventoryAfterPaymentTime { get; }
public DateTime? ReducedInventoryAfterPaymentTime { get; set; }
public List<OrderLineEto> OrderLines { get; set; }
}

8
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderLineEto.cs

@ -15,10 +15,14 @@ namespace EasyAbp.EShop.Orders.Orders
public DateTime ProductDetailModificationTime { get; set; }
public string ProductTypeName { get; set; }
public string ProductTypeUniqueName { get; set; }
public string ProductUniqueName { get; set; }
public string ProductName { get; set; }
public string ProductDisplayName { get; set; }
public string SkuName { get; set; }
public string SkuDescription { get; set; }
public string MediaResources { get; set; }

24
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderLine.cs

@ -13,12 +13,18 @@ namespace EasyAbp.EShop.Orders.Orders
public virtual DateTime ProductModificationTime { get; protected set; }
public virtual DateTime ProductDetailModificationTime { get; protected set; }
[NotNull]
public virtual string ProductTypeName { get; protected set; }
public virtual string ProductTypeUniqueName { get; protected set; }
[CanBeNull]
public virtual string ProductUniqueName { get; protected set; }
[NotNull]
public virtual string ProductName { get; protected set; }
public virtual string ProductDisplayName { get; protected set; }
[CanBeNull]
public virtual string SkuName { get; protected set; }
[CanBeNull]
public virtual string SkuDescription { get; protected set; }
@ -45,8 +51,10 @@ namespace EasyAbp.EShop.Orders.Orders
Guid productSkuId,
DateTime productModificationTime,
DateTime productDetailModificationTime,
[NotNull] string productTypeName,
[NotNull] string productName,
[NotNull] string productTypeUniqueName,
[CanBeNull] string productUniqueName,
[NotNull] string productDisplayName,
[CanBeNull] string skuName,
[CanBeNull] string skuDescription,
[CanBeNull] string mediaResources,
[NotNull] string currency,
@ -59,8 +67,10 @@ namespace EasyAbp.EShop.Orders.Orders
ProductSkuId = productSkuId;
ProductModificationTime = productModificationTime;
ProductDetailModificationTime = productDetailModificationTime;
ProductTypeName = productTypeName;
ProductName = productName;
ProductTypeUniqueName = productTypeUniqueName;
ProductUniqueName = productUniqueName;
ProductDisplayName = productDisplayName;
SkuName = skuName;
SkuDescription = skuDescription;
MediaResources = mediaResources;
Currency = currency;

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Categories/Dtos/CategoryDto.cs

@ -7,7 +7,7 @@ namespace EasyAbp.EShop.Products.Categories.Dtos
{
public class CategoryDto : FullAuditedEntityDto<Guid>
{
public string Name { get; set; }
public string UniqueName { get; set; }
public string DisplayName { get; set; }

5
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Categories/Dtos/CreateUpdateCategoryDto.cs

@ -6,9 +6,8 @@ namespace EasyAbp.EShop.Products.Categories.Dtos
{
public class CreateUpdateCategoryDto
{
[Required]
[DisplayName("CategoryName")]
public string Name { get; set; }
[DisplayName("CategoryUniqueName")]
public string UniqueName { get; set; }
[Required]
[DisplayName("CategoryDisplayName")]

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductTypes/Dtos/ProductTypeDto.cs

@ -6,7 +6,7 @@ namespace EasyAbp.EShop.Products.ProductTypes.Dtos
{
public class ProductTypeDto : FullAuditedEntityDto<Guid>
{
public string Name { get; set; }
public string UniqueName { get; set; }
public string DisplayName { get; set; }

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs

@ -10,7 +10,7 @@ namespace EasyAbp.EShop.Products.Products.Dtos
{
public Guid ProductTypeId { get; set; }
public string ProductTypeName { get; set; }
public string ProductTypeUniqueName { get; set; }
public Guid ProductDetailId { get; set; }

10
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs

@ -205,18 +205,18 @@ namespace EasyAbp.EShop.Products.Products
await LoadDtoInventoryDataAsync(product, dto, storeId);
await LoadDtoPriceAsync(product, dto, storeId);
await LoadDtosProductTypeNameAsync(new[] {dto});
await LoadDtosProductTypeUniqueNameAsync(new[] {dto});
return dto;
}
protected virtual async Task LoadDtosProductTypeNameAsync(IEnumerable<ProductDto> dtos)
protected virtual async Task LoadDtosProductTypeUniqueNameAsync(IEnumerable<ProductDto> dtos)
{
var dict = (await _productTypeRepository.GetListAsync()).ToDictionary(x => x.Id, x => x.Name);
var dict = (await _productTypeRepository.GetListAsync()).ToDictionary(x => x.Id, x => x.UniqueName);
foreach (var dto in dtos)
{
dto.ProductTypeName = dict[dto.ProductTypeId];
dto.ProductTypeUniqueName = dict[dto.ProductTypeId];
}
}
@ -277,7 +277,7 @@ namespace EasyAbp.EShop.Products.Products
items.Add(productDto);
}
await LoadDtosProductTypeNameAsync(items);
await LoadDtosProductTypeUniqueNameAsync(items);
return new PagedResultDto<ProductDto>(totalCount, items);
}

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs

@ -29,7 +29,7 @@ namespace EasyAbp.EShop.Products
* Alternatively, you can split your mapping configurations
* into multiple profile classes for a better organization. */
CreateMap<Product, ProductDto>()
.Ignore(dto => dto.ProductTypeName)
.Ignore(dto => dto.ProductTypeUniqueName)
.Ignore(dto => dto.Sold)
.Ignore(dto => dto.MinimumPrice)
.Ignore(dto => dto.MaximumPrice);

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/cs.json

@ -54,7 +54,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -63,7 +63,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/en.json

@ -55,7 +55,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -64,7 +64,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pl.json

@ -54,7 +54,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -63,7 +63,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pt-BR.json

@ -54,7 +54,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -63,7 +63,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/sl.json

@ -55,7 +55,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -64,7 +64,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/tr.json

@ -55,7 +55,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -64,7 +64,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/vi.json

@ -54,7 +54,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -63,7 +63,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hans.json

@ -55,7 +55,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -64,7 +64,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

4
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hant.json

@ -55,7 +55,7 @@
"Menu:Category": "MenuCategory",
"Category": "Category",
"CategoryTenantId": "CategoryTenantId",
"CategoryName": "CategoryName",
"CategoryUniqueName": "CategoryUniqueName",
"CategoryDisplayName": "CategoryDisplayName",
"CategoryDescription": "CategoryDescription",
"CategoryMediaResources": "CategoryMediaResources",
@ -64,7 +64,7 @@
"CategoryDeletionConfirmationMessage": "Are you sure to delete the category {0}?",
"Menu:ProductType": "MenuProductType",
"ProductType": "ProductType",
"ProductTypeName": "ProductTypeName",
"ProductTypeUniqueName": "ProductTypeUniqueName",
"ProductTypeDisplayName": "ProductTypeDisplayName",
"ProductTypeDescription": "ProductTypeDescription",
"ProductTypeMultiTenancySide": "ProductTypeMultiTenancySide",

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Categories/Category.cs

@ -12,7 +12,7 @@ namespace EasyAbp.EShop.Products.Categories
public virtual Guid? TenantId { get; protected set; }
[CanBeNull]
public virtual string Name { get; protected set; }
public virtual string UniqueName { get; protected set; }
[CanBeNull]
public virtual string Description { get; protected set; }
@ -47,7 +47,7 @@ namespace EasyAbp.EShop.Products.Categories
public Category(
Guid id,
Guid? tenantId,
string name,
string uniqueName,
string displayName,
string description,
string mediaResources,
@ -55,7 +55,7 @@ namespace EasyAbp.EShop.Products.Categories
) :base(id)
{
TenantId = tenantId;
Name = name;
UniqueName = uniqueName;
DisplayName = displayName;
Description = description;
MediaResources = mediaResources;

6
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductTypes/ProductType.cs

@ -7,7 +7,7 @@ namespace EasyAbp.EShop.Products.ProductTypes
{
public class ProductType : FullAuditedAggregateRoot<Guid>
{
public virtual string Name { get; protected set; }
public virtual string UniqueName { get; protected set; }
[NotNull]
public virtual string DisplayName { get; protected set; }
@ -23,13 +23,13 @@ namespace EasyAbp.EShop.Products.ProductTypes
public ProductType(
Guid id,
string name,
string uniqueName,
string displayName,
string description,
MultiTenancySides multiTenancySide
) :base(id)
{
Name = name;
UniqueName = uniqueName;
DisplayName = displayName;
Description = description;
MultiTenancySide = multiTenancySide;

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/EntityFrameworkCore/ProductsDbContextModelCreatingExtensions.cs

@ -93,6 +93,8 @@ namespace EasyAbp.EShop.Products.EntityFrameworkCore
b.ToTable(options.TablePrefix + "Categories", options.Schema);
b.ConfigureByConvention();
/* Configure more properties here */
b.HasIndex(x => x.UniqueName).IsUnique();
});
builder.Entity<ProductType>(b =>

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml

@ -41,7 +41,7 @@
<thead>
<tr>
<th>@L["Actions"]</th>
<th>@L["CategoryName"]</th>
<th>@L["CategoryUniqueName"]</th>
<th>@L["CategoryDisplayName"]</th>
<th>@L["CategoryDescription"]</th>
<th>@L["CategoryMediaResources"]</th>

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/index.js

@ -50,7 +50,7 @@ $(function () {
]
}
},
{ data: "name" },
{ data: "uniqueName" },
{ data: "displayName" },
{ data: "description" },
{ data: "mediaResources" },

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml

@ -34,7 +34,7 @@
<abp-table striped-rows="true" id="ProductTypeTable" class="nowrap">
<thead>
<tr>
<th>@L["ProductTypeName"]</th>
<th>@L["ProductTypeUniqueName"]</th>
<th>@L["ProductTypeDisplayName"]</th>
<th>@L["ProductTypeDescription"]</th>
<th>@L["ProductTypeMultiTenancySide"]</th>

2
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/index.js

@ -14,7 +14,7 @@ $(function () {
order: [[1, "asc"]],
ajax: abp.libs.datatables.createAjax(service.getList),
columnDefs: [
{ data: "name" },
{ data: "uniqueName" },
{ data: "displayName" },
{ data: "description" },
{ data: "multiTenancySide" },

6
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/BasketItemDto.cs

@ -20,8 +20,12 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems.Dtos
public string MediaResources { get; set; }
public string ProductName { get; set; }
public string ProductUniqueName { get; set; }
public string ProductDisplayName { get; set; }
public string SkuName { get; set; }
public string SkuDescription { get; set; }
public string Currency { get; set; }

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs

@ -154,7 +154,9 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems
item.UpdateProductData(quantity, new ProductDataModel
{
MediaResources = productSkuDto.MediaResources ?? productDto.MediaResources,
ProductName = productDto.DisplayName,
ProductUniqueName = productDto.UniqueName,
ProductDisplayName = productDto.DisplayName,
SkuName = productSkuDto.Name,
SkuDescription = await _productSkuDescriptionProvider.GenerateAsync(productDto, productSkuDto),
Currency = productSkuDto.Currency,
UnitPrice = productSkuDto.DiscountedPrice,

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/cs.json

@ -15,7 +15,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/en.json

@ -16,7 +16,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pl-PL.json

@ -14,7 +14,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/pt-BR.json

@ -14,7 +14,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/sl.json

@ -15,7 +15,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/tr.json

@ -16,7 +16,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/vi.json

@ -14,7 +14,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hans.json

@ -15,7 +15,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain.Shared/EasyAbp/EShop/Plugins/Baskets/Localization/zh-Hant.json

@ -15,7 +15,9 @@
"BasketItemProductSkuId": "BasketItemProductSkuId",
"BasketItemQuantity": "BasketItemQuantity",
"BasketItemMediaResources": "BasketItemMediaResources",
"BasketItemProductName": "BasketItemProductName",
"BasketItemProductUniqueName": "BasketItemProductUniqueName",
"BasketItemProductDisplayName": "BasketItemProductDisplayName",
"BasketItemSkuName": "BasketItemSkuName",
"BasketItemSkuDescription": "BasketItemSkuDescription",
"BasketItemCurrency": "BasketItemCurrency",
"BasketItemUnitPrice": "BasketItemUnitPrice",

14
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItem.cs

@ -25,9 +25,15 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems
[CanBeNull]
public virtual string MediaResources { get; protected set; }
[NotNull]
public virtual string ProductName { get; protected set; }
[CanBeNull]
public virtual string ProductUniqueName { get; protected set; }
[NotNull]
public virtual string ProductDisplayName { get; protected set; }
[CanBeNull]
public virtual string SkuName { get; protected set; }
[NotNull]
public virtual string SkuDescription { get; protected set; }
@ -70,7 +76,9 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems
Quantity = quantity;
MediaResources = productData.MediaResources;
ProductName = productData.ProductName;
ProductUniqueName = productData.ProductUniqueName;
ProductDisplayName = productData.ProductDisplayName;
SkuName = productData.SkuName;
SkuDescription = productData.SkuDescription;
Currency = productData.Currency;
UnitPrice = productData.UnitPrice;

6
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/IProductData.cs

@ -4,7 +4,11 @@
{
string MediaResources { get; }
string ProductName { get; }
string ProductUniqueName { get; }
string ProductDisplayName { get; }
string SkuName { get; }
string SkuDescription { get; }

6
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Domain/EasyAbp/EShop/Plugins/Baskets/BasketItems/ProductDataModel.cs

@ -4,7 +4,11 @@
{
public string MediaResources { get; set; }
public string ProductName { get; set; }
public string ProductUniqueName { get; set; }
public string ProductDisplayName { get; set; }
public string SkuName { get; set; }
public string SkuDescription { get; set; }

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/Index.cshtml

@ -58,7 +58,9 @@
<th>@L["BasketItemProductSkuId"]</th>
<th>@L["BasketItemQuantity"]</th>
<th>@L["BasketItemMediaResources"]</th>
<th>@L["BasketItemProductName"]</th>
<th>@L["BasketItemProductUniqueName"]</th>
<th>@L["BasketItemProductDisplayName"]</th>
<th>@L["BasketItemSkuName"]</th>
<th>@L["BasketItemSkuDescription"]</th>
<th>@L["BasketItemCurrency"]</th>
<th>@L["BasketItemUnitPrice"]</th>

4
plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/index.js

@ -53,7 +53,9 @@ $(function () {
{ data: "productSkuId" },
{ data: "quantity" },
{ data: "mediaResources" },
{ data: "productName" },
{ data: "productUniqueName" },
{ data: "productDisplayName" },
{ data: "skuName" },
{ data: "skuDescription" },
{ data: "currency" },
{ data: "unitPrice" },

3
samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/appsettings.json

@ -1,7 +1,6 @@
{
"ConnectionStrings": {
"Default": "Server=60.208.32.153;Database=fenghui01test;User Id=fenghui01test;Password=WYSytJdMORYnhTYmvf;Trusted_Connection=True;Integrated Security=false"
"Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=EShopSample;Trusted_Connection=True;MultipleActiveResultSets=true"
},
"IdentityServer": {
"Clients": {

3848
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710153132_RenamedNameToUniqueNameInCategory.Designer.cs

File diff suppressed because it is too large

43
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710153132_RenamedNameToUniqueNameInCategory.cs

@ -0,0 +1,43 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EShopSample.Migrations
{
public partial class RenamedNameToUniqueNameInCategory : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Name",
table: "EShopProductsCategories");
migrationBuilder.AddColumn<string>(
name: "UniqueName",
table: "EShopProductsCategories",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_EShopProductsCategories_UniqueName",
table: "EShopProductsCategories",
column: "UniqueName",
unique: true,
filter: "[UniqueName] IS NOT NULL");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_EShopProductsCategories_UniqueName",
table: "EShopProductsCategories");
migrationBuilder.DropColumn(
name: "UniqueName",
table: "EShopProductsCategories");
migrationBuilder.AddColumn<string>(
name: "Name",
table: "EShopProductsCategories",
type: "nvarchar(max)",
nullable: true);
}
}
}

3854
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710160345_RenamedNameToUniqueName.Designer.cs

File diff suppressed because it is too large

107
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710160345_RenamedNameToUniqueName.cs

@ -0,0 +1,107 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EShopSample.Migrations
{
public partial class RenamedNameToUniqueName : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Name",
table: "EShopProductsProductTypes");
migrationBuilder.DropColumn(
name: "ProductName",
table: "EShopPluginsBasketsBasketItems");
migrationBuilder.DropColumn(
name: "ProductName",
table: "EShopOrdersOrderLines");
migrationBuilder.DropColumn(
name: "ProductTypeName",
table: "EShopOrdersOrderLines");
migrationBuilder.AddColumn<string>(
name: "UniqueName",
table: "EShopProductsProductTypes",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductDisplayName",
table: "EShopPluginsBasketsBasketItems",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductUniqueName",
table: "EShopPluginsBasketsBasketItems",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductDisplayName",
table: "EShopOrdersOrderLines",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductTypeUniqueName",
table: "EShopOrdersOrderLines",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductUniqueName",
table: "EShopOrdersOrderLines",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UniqueName",
table: "EShopProductsProductTypes");
migrationBuilder.DropColumn(
name: "ProductDisplayName",
table: "EShopPluginsBasketsBasketItems");
migrationBuilder.DropColumn(
name: "ProductUniqueName",
table: "EShopPluginsBasketsBasketItems");
migrationBuilder.DropColumn(
name: "ProductDisplayName",
table: "EShopOrdersOrderLines");
migrationBuilder.DropColumn(
name: "ProductTypeUniqueName",
table: "EShopOrdersOrderLines");
migrationBuilder.DropColumn(
name: "ProductUniqueName",
table: "EShopOrdersOrderLines");
migrationBuilder.AddColumn<string>(
name: "Name",
table: "EShopProductsProductTypes",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductName",
table: "EShopPluginsBasketsBasketItems",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductName",
table: "EShopOrdersOrderLines",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ProductTypeName",
table: "EShopOrdersOrderLines",
type: "nvarchar(max)",
nullable: true);
}
}
}

3860
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710163538_AddedSkuName.Designer.cs

File diff suppressed because it is too large

31
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200710163538_AddedSkuName.cs

@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EShopSample.Migrations
{
public partial class AddedSkuName : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "SkuName",
table: "EShopPluginsBasketsBasketItems",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "SkuName",
table: "EShopOrdersOrderLines",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "SkuName",
table: "EShopPluginsBasketsBasketItems");
migrationBuilder.DropColumn(
name: "SkuName",
table: "EShopOrdersOrderLines");
}
}
}

38
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs

@ -179,19 +179,22 @@ namespace EShopSample.Migrations
b.Property<DateTime>("ProductDetailModificationTime")
.HasColumnType("datetime2");
b.Property<string>("ProductDisplayName")
.HasColumnType("nvarchar(max)");
b.Property<Guid>("ProductId")
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("ProductModificationTime")
.HasColumnType("datetime2");
b.Property<string>("ProductName")
.HasColumnType("nvarchar(max)");
b.Property<Guid>("ProductSkuId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductTypeName")
b.Property<string>("ProductTypeUniqueName")
.HasColumnType("nvarchar(max)");
b.Property<string>("ProductUniqueName")
.HasColumnType("nvarchar(max)");
b.Property<int>("Quantity")
@ -200,6 +203,9 @@ namespace EShopSample.Migrations
b.Property<string>("SkuDescription")
.HasColumnType("nvarchar(max)");
b.Property<string>("SkuName")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("TotalDiscount")
.HasColumnType("decimal(20,8)");
@ -514,21 +520,27 @@ namespace EShopSample.Migrations
b.Property<string>("MediaResources")
.HasColumnType("nvarchar(max)");
b.Property<string>("ProductDisplayName")
.HasColumnType("nvarchar(max)");
b.Property<Guid>("ProductId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductName")
.HasColumnType("nvarchar(max)");
b.Property<Guid>("ProductSkuId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductUniqueName")
.HasColumnType("nvarchar(max)");
b.Property<int>("Quantity")
.HasColumnType("int");
b.Property<string>("SkuDescription")
.HasColumnType("nvarchar(max)");
b.Property<string>("SkuName")
.HasColumnType("nvarchar(max)");
b.Property<Guid>("StoreId")
.HasColumnType("uniqueidentifier");
@ -675,9 +687,6 @@ namespace EShopSample.Migrations
b.Property<string>("MediaResources")
.HasColumnType("nvarchar(max)");
b.Property<string>("Name")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("ParentId")
.HasColumnType("uniqueidentifier");
@ -685,10 +694,17 @@ namespace EShopSample.Migrations
.HasColumnName("TenantId")
.HasColumnType("uniqueidentifier");
b.Property<string>("UniqueName")
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("ParentId");
b.HasIndex("UniqueName")
.IsUnique()
.HasFilter("[UniqueName] IS NOT NULL");
b.ToTable("EShopProductsCategories");
});
@ -1048,7 +1064,7 @@ namespace EShopSample.Migrations
b.Property<int>("MultiTenancySide")
.HasColumnType("int");
b.Property<string>("Name")
b.Property<string>("UniqueName")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");

Loading…
Cancel
Save