Merge pull request #77 from abpframework/gterdem/orderstatus_refactor

eShopOnAbp: Refactor OrderStatus (remove unused states)

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",

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",

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<OrderStatus> List() =>
-        new[] { Placed, AwaitingValidation, StockConfirmed, Paid, Shipped, Cancelled };
+        new[] {Placed, Paid, Shipped, Cancelled};
 
     public static OrderStatus FromName(string name)
     {