From 9b7b4d99d38bf7215760c72e15fc4b1c551b76d4 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Fri, 4 Feb 2022 15:07:35 +0300 Subject: [PATCH 1/2] removed unused order status --- .../Orders/OrderStatus.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain/Orders/OrderStatus.cs b/services/ordering/src/EShopOnAbp.OrderingService.Domain/Orders/OrderStatus.cs index d6536fbd..dcd06c06 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain/Orders/OrderStatus.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain/Orders/OrderStatus.cs @@ -5,22 +5,19 @@ using Volo.Abp; namespace EShopOnAbp.OrderingService.Orders; -public class OrderStatus: Enumeration +public class OrderStatus : Enumeration { public static OrderStatus Placed = new OrderStatus(1, nameof(Placed).ToLowerInvariant()); - public static OrderStatus AwaitingValidation = new OrderStatus(2, nameof(AwaitingValidation).ToLowerInvariant()); - public static OrderStatus StockConfirmed = new OrderStatus(3, nameof(StockConfirmed).ToLowerInvariant()); - public static OrderStatus Paid = new OrderStatus(4, nameof(Paid).ToLowerInvariant()); - public static OrderStatus Shipped = new OrderStatus(5, nameof(Shipped).ToLowerInvariant()); - public static OrderStatus Cancelled = new OrderStatus(6, nameof(Cancelled).ToLowerInvariant()); - - public OrderStatus(int id, string name) - : base(id, name) + public static OrderStatus Paid = new OrderStatus(2, nameof(Paid).ToLowerInvariant()); + public static OrderStatus Shipped = new OrderStatus(3, nameof(Shipped).ToLowerInvariant()); + public static OrderStatus Cancelled = new OrderStatus(4, nameof(Cancelled).ToLowerInvariant()); + + public OrderStatus(int id, string name) : base(id, name) { } public static IEnumerable List() => - new[] { Placed, AwaitingValidation, StockConfirmed, Paid, Shipped, Cancelled }; + new[] {Placed, Paid, Shipped, Cancelled}; public static OrderStatus FromName(string name) { From 10e407bbc8e85bcb7581155d23da1f1b0f9ef28f Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Fri, 4 Feb 2022 15:07:54 +0300 Subject: [PATCH 2/2] removed unused localization --- .../Localization/OrderingService/en.json | 3 +-- .../Localization/OrderingService/tr.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json index c37a8dab..14797854 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json @@ -3,8 +3,7 @@ "texts": { "MyAccount": "My account", "SamplePageMessage": "A sample page for the OrderingService module", - "Ordering:00001": "Possible values for Order status: {0}", - "Ordering:00011": "Possible values for Payment types: {0}", + "Ordering:00001": "Possible values for Order status: {OrderStatus}", "Ordering:00002": "Invalid number of units", "Ordering:00003": "Invalid discount", "Ordering:00004": "The total of order item is lower than applied discount", diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json index 8c6099ad..23ae9a65 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json +++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/tr.json @@ -3,8 +3,7 @@ "texts": { "MyAccount": "Hesabım", "SamplePageMessage": "OrderingService modulünden örnek bir sayfa", - "Ordering:00001": "Muhtemel Sipariş durum değerleri: {0}", - "Ordering:00011": "Muhtemel Ödeme türleri: {0}", + "Ordering:00001": "Muhtemel Sipariş durum değerleri: {OrderStatus}", "Ordering:00002": "Ürün adedi negatif olamaz", "Ordering:00003": "Geçersiz indirim", "Ordering:00004": "Ürünlerin toplam bedeli, uygulanan indirimden daha az olamaz",