diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml index eaf32853..0569ed16 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml @@ -19,15 +19,20 @@ @{ string lastYearString = $"y{DateTime.Today.Year - 1}"; string filter = ""; + int lastYearCounter = 2; var selectList = new List { - new(@L["Last30Days"], "last30", selected: true), - new(@L["LastMonth"], "m1"), - new(@L["Last3Months"], "m3"), - new(@L["LastYear"], lastYearString), - new("2020", "y2020"), - new("2019", "y2019") + new(@L["MyOrders:Last30Days"], "last30", selected: true), + new(@L["MyOrders:LastMonth"], "m1"), + new(@L["MyOrders:Last3Months"], "m3"), + new(@L["MyOrders:LastYear"], lastYearString) }; + for (int i = 0; i < lastYearCounter; i++) + { + selectList.Add( + new((DateTime.Today.Year - 2 - i).ToString(), $"y{DateTime.Today.Year - 2 - i}") + ); + } }
diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json index fe4c73e6..4d787a49 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json @@ -32,6 +32,10 @@ "OrderReceived:LinkToMyOrders": "Go to my orders.", "OrderReceived:OrderNo": "Order No", "OrderReceived:DeliveryAddress": "Delivery Address", - "OrderReceived:PaidTotal": "Paid Total" + "OrderReceived:PaidTotal": "Paid Total", + "MyOrders:Last30Days": "Last 30 days", + "MyOrders:LastMonth": "Last month", + "MyOrders:Last3Months": "Last 3 months", + "MyOrders:LastYear": "Last year" } } diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json index d3fe21c3..cc0f3edf 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json @@ -32,6 +32,10 @@ "OrderReceived:LinkToMyOrders": "Siparişlerime git.", "OrderReceived:OrderNo": "Sipariş Numarası", "OrderReceived:DeliveryAddress": "Teslimat Adresi", - "OrderReceived:PaidTotal": "Ödenen Tutar" + "OrderReceived:PaidTotal": "Ödenen Tutar", + "MyOrders:Last30Days": "Son 30 gün", + "MyOrders:LastMonth": "Geçen ay", + "MyOrders:Last3Months": "Son 3 ay", + "MyOrders:LastYear": "Geçen yıl" } }