Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Use EnumTranslationService for select list
KrzysztofPajak60cb90317a8a
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.csindex 21b2ee3a7..814ab41ff 100644--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs@@ -11,7 +11,7 @@ using Grand.Domain.Discounts;using Grand.Infrastructure;using Grand.Web.Common.Controllers;using Grand.Web.Common.DataSource;-using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;@@ -26,14 +26,16 @@ public class HasAllProductsController : BaseAdminPluginControllerprivate readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;+public HasAllProductsController(IDiscountService discountService,IPermissionService permissionService,IWorkContext workContext,ITranslationService translationService,IStoreService storeService,IVendorService vendorService,- IProductService productService)+ IProductService productService,+ IEnumTranslationService enumTranslationService){_discountService = discountService;_permissionService = permissionService;@@ -42,6 +44,7 @@ public class HasAllProductsController : BaseAdminPluginController_storeService = storeService;_vendorService = vendorService;_productService = productService;+ _enumTranslationService = enumTranslationService;}public async Task<IActionResult> Configure(string discountId, string discountRequirementId)@@ -136,7 +139,7 @@ public class HasAllProductsController : BaseAdminPluginControllermodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList(HttpContext, false).ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.csindex d28d7a19b..7e8aa857d 100644--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs@@ -12,6 +12,7 @@ using Grand.Infrastructure;using Grand.Web.Common.Controllers;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;@@ -26,6 +27,7 @@ public class HasOneProductController : BaseAdminPluginControllerprivate readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly IWorkContext _workContext;+ private readonly IEnumTranslationService _enumTranslationService;public HasOneProductController(IDiscountService discountService,IPermissionService permissionService,@@ -33,7 +35,8 @@ public class HasOneProductController : BaseAdminPluginControllerITranslationService translationService,IStoreService storeService,IVendorService vendorService,- IProductService productService)+ IProductService productService,+ IEnumTranslationService enumTranslationService){_discountService = discountService;_permissionService = permissionService;@@ -42,6 +45,7 @@ public class HasOneProductController : BaseAdminPluginController_storeService = storeService;_vendorService = vendorService;_productService = productService;+ _enumTranslationService = enumTranslationService;}public async Task<IActionResult> Configure(string discountId, string discountRequirementId)@@ -134,7 +138,7 @@ public class HasOneProductController : BaseAdminPluginControllermodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList(HttpContext, false).ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtmlindex 766a4f24f..93131b97f 100644--- a/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml@@ -1,4 +1,5 @@@model SlideModel+@inject IEnumTranslationService EnumTranslation<script>$(document).ready(function () {$("#@Html.IdFor(model => model.SliderTypeId)").change(toggleSliderType);@@ -111,7 +112,7 @@<div class="form-group"><admin-label asp-for="SliderTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="SliderTypeId" asp-items="((SliderType)Model.SliderTypeId).ToSelectList()"/>+ <admin-select asp-for="SliderTypeId" asp-items="@EnumTranslation.ToSelectList((SliderType)Model.SliderTypeId)"/><span asp-validation-for="SliderTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 95da73ebb..4270607f1 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -60,8 +60,7 @@<admin-label asp-for="AttributeControlTypeId"/><div class="col-md-9 col-sm-9">@{- var attributeControlTypes = ((AttributeControlType)Model.AttributeControlTypeId)- .ToSelectList(Context, valuesToExclude:+ var attributeControlTypes = EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude://custom address attributes don't support some attribute control types[(int)AttributeControlType.Hidden, (int)AttributeControlType.FileUpload, (int)AttributeControlType.Datepicker, (int)AttributeControlType.ColorSquares, (int)AttributeControlType.ImageSquares]);}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Affiliate/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Affiliate/Partials/CreateOrUpdate.cshtmlindex b3d7c3a78..3c118567c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Affiliate/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Affiliate/Partials/CreateOrUpdate.cshtml@@ -34,11 +34,11 @@model.AvailableOrderStatuses.Insert(0, new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "" });//payment statuses- model.AvailablePaymentStatuses = PaymentStatus.Pending.ToSelectList(Context, false).ToList();+ model.AvailablePaymentStatuses = EnumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.AvailablePaymentStatuses.Insert(0, new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "" });//shipping statuses- model.AvailableShippingStatuses = ShippingStatus.Pending.ToSelectList(Context, false).ToList();+ model.AvailableShippingStatuses = EnumTranslationService.ToSelectList(ShippingStatus.Pending, false).ToList();model.AvailableShippingStatuses.Insert(0, new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "" });<tabstrip-item text="@Loc["Admin.Affiliates.Customers"]" tab-index="1">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabConditions.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabConditions.cshtmlindex 694b1b745..b42203cbe 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabConditions.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabConditions.cshtml@@ -37,14 +37,14 @@<div class="form-group"><admin-label asp-for="CustomerHasOrders"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="CustomerHasOrders" asp-items="((CampaignCondition)Model.CustomerHasOrders).ToSelectList(Context)"/>+ <admin-select asp-for="CustomerHasOrders" asp-items="EnumTranslationService.ToSelectList((CampaignCondition)Model.CustomerHasOrders)"/><span asp-validation-for="CustomerHasOrders"></span></div></div><div class="form-group"><admin-label asp-for="CustomerHasShoppingCart"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="CustomerHasShoppingCart" asp-items="((CampaignCondition)Model.CustomerHasShoppingCart).ToSelectList(Context)"/>+ <admin-select asp-for="CustomerHasShoppingCart" asp-items="EnumTranslationService.ToSelectList((CampaignCondition)Model.CustomerHasShoppingCart)"/><span asp-validation-for="CustomerHasShoppingCart"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 58a09baf4..616399a6b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -147,8 +147,8 @@<admin-label asp-for="AttributeControlTypeId"/><div class="col-md-9 col-sm-9">@{- var attributeControlTypes = ((AttributeControlType)Model.AttributeControlTypeId).ToSelectList(Context, valuesToExclude:- [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);+ var attributeControlTypes =+ EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);}<admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/><span asp-validation-for="AttributeControlTypeId"></span>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex d68c01bb9..fdccbd31b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -108,8 +108,7 @@<admin-label asp-for="AttributeControlTypeId"/><div class="col-md-9 col-sm-9">@{- var attributeControlTypes = ((AttributeControlType)Model.AttributeControlTypeId).ToSelectList(Context, valuesToExclude:- [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);+ var attributeControlTypes = EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);}<admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/><span asp-validation-for="AttributeControlTypeId"></span>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Currency/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Currency/Partials/CreateOrUpdate.TabInfo.cshtmlindex f75abf441..2a5db1471 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Currency/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Currency/Partials/CreateOrUpdate.TabInfo.cshtml@@ -92,14 +92,14 @@<div class="form-group"><admin-label asp-for="RoundingTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="RoundingTypeId" asp-items="((RoundingType)Model.RoundingTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="RoundingTypeId" asp-items="EnumTranslationService.ToSelectList((RoundingType)Model.RoundingTypeId)"/><span asp-validation-for="RoundingTypeId"></span></div></div><div class="form-group"><admin-label asp-for="MidpointRoundId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="MidpointRoundId" asp-items="((MidpointRounding)Model.MidpointRoundId).ToSelectList(Context)"/>+ <admin-select asp-for="MidpointRoundId" asp-items="EnumTranslationService.ToSelectList((MidpointRounding)Model.MidpointRoundId)"/><span asp-validation-for="MidpointRoundId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 6c5d6f8d1..c96e862cc 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -83,9 +83,9 @@<admin-label asp-for="AttributeControlTypeId"/><div class="col-md-9 col-sm-9">@{- var attributeControlTypes = ((AttributeControlType)Model.AttributeControlTypeId)- .ToSelectList(Context, valuesToExclude:- //custom customer attributes don't support some attribute control types+ var attributeControlTypes =+ EnumTranslationService.ToSelectList(+ ((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: //custom customer attributes don't support some attribute control types[(int)AttributeControlType.FileUpload, (int)AttributeControlType.Datepicker, (int)AttributeControlType.ColorSquares, (int)AttributeControlType.ImageSquares, (int)AttributeControlType.ReadonlyCheckboxes]);}<admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtmlindex a62e79169..cc1d0d443 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml@@ -139,7 +139,7 @@<div class="form-group"><admin-label asp-for="DiscountTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="DiscountTypeId" asp-items="((DiscountType)Model.DiscountTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="DiscountTypeId" asp-items="EnumTranslationService.ToSelectList((DiscountType)Model.DiscountTypeId)"/><span asp-validation-for="DiscountTypeId"></span></div></div>@@ -252,7 +252,7 @@<div class="form-group"><admin-label asp-for="DiscountLimitationId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="DiscountLimitationId" asp-items="((DiscountLimitationType)Model.DiscountLimitationId).ToSelectList(Context)"/>+ <admin-select asp-for="DiscountLimitationId" asp-items="EnumTranslationService.ToSelectList((DiscountLimitationType)Model.DiscountLimitationId)"/><span asp-validation-for="DiscountLimitationId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtmlindex 4ddf11bea..2d856e1de 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml@@ -5,7 +5,7 @@@{//page titleViewBag.Title = Loc["Admin.Documents.Document.Manage"];- var selectedList = DocumentStatus.Open.ToSelectList(Context, false).ToList();+ var selectedList = EnumTranslationService.ToSelectList(DocumentStatus.Open, false).ToList();selectedList.Insert(0, new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "-1", Selected = true });}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/Partials/CreateOrUpdateDocument.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/Partials/CreateOrUpdateDocument.TabInfo.cshtmlindex ee6fef744..d6cc96a7b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/Partials/CreateOrUpdateDocument.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/Partials/CreateOrUpdateDocument.TabInfo.cshtml@@ -56,13 +56,13 @@<div class="form-group"><admin-label asp-for="StatusId"/><div class="col-md-4 col-sm-6">- <admin-select asp-for="StatusId" asp-items="((DocumentStatus)Model.StatusId).ToSelectList(Context)"/>+ <admin-select asp-for="StatusId" asp-items="EnumTranslationService.ToSelectList((DocumentStatus)Model.StatusId)"/></div></div><div class="form-group"><admin-label asp-for="ReferenceId"/><div class="col-md-4 col-sm-6">- <admin-select asp-for="ReferenceId" asp-items="((Reference)Model.ReferenceId).ToSelectList(Context)"/>+ <admin-select asp-for="ReferenceId" asp-items="EnumTranslationService.ToSelectList((Reference)Model.ReferenceId)"/></div></div><div class="form-group object-reference">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/Partials/CreateOrUpdate.cshtmlindex 848584a30..aa1a85a72 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/Partials/CreateOrUpdate.cshtml@@ -65,7 +65,7 @@<div class="form-group"><admin-label asp-for="SecureSocketOptionsId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="SecureSocketOptionsId" asp-items="((SecureSocketOptions)Model.SecureSocketOptionsId).ToSelectList(Context)"/>+ <admin-select asp-for="SecureSocketOptionsId" asp-items="EnumTranslationService.ToSelectList((SecureSocketOptions)Model.SecureSocketOptionsId)"/></div></div>@if (!string.IsNullOrEmpty(Model.Id))diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/Partials/CreateOrUpdate.TabInfo.cshtmlindex 36959f574..b77d4d125 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/GiftVoucher/Partials/CreateOrUpdate.TabInfo.cshtml@@ -25,7 +25,7 @@<div class="form-group"><admin-label asp-for="GiftVoucherTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="GiftVoucherTypeId" asp-items="((GiftVoucherType)Model.GiftVoucherTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="GiftVoucherTypeId" asp-items="EnumTranslationService.ToSelectList((GiftVoucherType)Model.GiftVoucherTypeId)"/><span asp-validation-for="GiftVoucherTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Language/Partials/CreateOrUpdate.TabResources.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Language/Partials/CreateOrUpdate.TabResources.cshtmlindex 6e42dc312..1efa53a47 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Language/Partials/CreateOrUpdate.TabResources.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Language/Partials/CreateOrUpdate.TabResources.cshtml@@ -42,7 +42,7 @@{<script>@{- var areas = TranslationResourceArea.Common.ToSelectList(Context);+ var areas = EnumTranslationService.ToSelectList(TranslationResourceArea.Common);}var allArea = [@foreach (var method in areas)diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtmlindex 262f836c7..123394514 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml@@ -32,7 +32,7 @@<div class="form-group"><admin-label asp-for="MerchandiseReturnStatusId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="MerchandiseReturnStatusId" asp-items="((MerchandiseReturnStatus)Model.MerchandiseReturnStatusId).ToSelectList(Context)"/>+ <admin-select asp-for="MerchandiseReturnStatusId" asp-items="EnumTranslationService.ToSelectList((MerchandiseReturnStatus)Model.MerchandiseReturnStatusId)"/><span asp-validation-for="MerchandiseReturnStatusId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtmlindex 327588c60..19f5f646a 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml@@ -146,7 +146,7 @@<span asp-validation-for="DelayBeforeSend"></span></div><div class="col-md-3 col-sm-3">- <admin-select asp-for="DelayPeriodId" asp-items="((MessageDelayPeriod)Model.DelayPeriodId).ToSelectList(Context)"/>+ <admin-select asp-for="DelayPeriodId" asp-items="EnumTranslationService.ToSelectList((MessageDelayPeriod)Model.DelayPeriodId)"/><span asp-validation-for="DelayPeriodId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BulkEdit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BulkEdit.cshtmlindex 9a6a1110c..a60287c10 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BulkEdit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BulkEdit.cshtml@@ -87,7 +87,7 @@<script>@{- var methods = ManageInventoryMethod.DontManageStock.ToSelectList(Context);+ var methods = EnumTranslationService.ToSelectList(ManageInventoryMethod.DontManageStock);}var allInventoryMethod = [@foreach (var method in methods)diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Additional.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Additional.cshtmlindex 0f48cd161..4e74e29ea 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Additional.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Additional.cshtml@@ -53,7 +53,7 @@<div class="form-group" id="pnlGiftVoucherType"><admin-label asp-for="GiftVoucherTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="GiftVoucherTypeId" asp-items="((GiftVoucherType)Model.GiftVoucherTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="GiftVoucherTypeId" asp-items="EnumTranslationService.ToSelectList((GiftVoucherType)Model.GiftVoucherTypeId)"/><span asp-validation-for="GiftVoucherTypeId"></span></div></div>@@ -113,7 +113,7 @@<div class="form-group" id="pnlDownloadActivationType"><admin-label asp-for="DownloadActivationTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="DownloadActivationTypeId" asp-items="((DownloadActivationType)Model.DownloadActivationTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="DownloadActivationTypeId" asp-items="EnumTranslationService.ToSelectList((DownloadActivationType)Model.DownloadActivationTypeId)"/><span asp-validation-for="DownloadActivationTypeId"></span></div></div>@@ -175,7 +175,7 @@<div class="form-group" id="pnlCyclePeriod"><admin-label asp-for="RecurringCyclePeriodId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="RecurringCyclePeriodId" asp-items="((RecurringCyclePeriod)Model.RecurringCyclePeriodId).ToSelectList(Context)"/>+ <admin-select asp-for="RecurringCyclePeriodId" asp-items="EnumTranslationService.ToSelectList((RecurringCyclePeriod)Model.RecurringCyclePeriodId)"/><span asp-validation-for="RecurringCyclePeriodId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmlindex 60a039bda..d1aa6cae8 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml@@ -50,7 +50,7 @@<span id="pnlInterval"><admin-input asp-for="CalendarModel.Interval"/></span>- <admin-select asp-for="CalendarModel.IntervalUnit" asp-items="((IntervalUnit)Model.CalendarModel.IntervalUnit).ToSelectList(Context)" class="form-control input-xsmall" style="height: 30px;padding: 0px; margin-bottom: 3px; margin-top: 3px; "/>+ <admin-select asp-for="CalendarModel.IntervalUnit" asp-items="EnumTranslationService.ToSelectList((IntervalUnit)Model.CalendarModel.IntervalUnit)" class="form-control input-xsmall" style="height: 30px;padding: 0px; margin-bottom: 3px; margin-top: 3px; "/></div></div><div class="form-group" id="pnlQuantity">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtmlindex 91508d2d0..113f4389f 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml@@ -491,7 +491,7 @@<div class="form-group"><admin-label asp-for="ProductTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="ProductTypeId" asp-items="((ProductType)Model.ProductTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="ProductTypeId" asp-items="EnumTranslationService.ToSelectList((ProductType)Model.ProductTypeId)"/><span asp-validation-for="ProductTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Inventory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Inventory.cshtmlindex 97fc02bb9..fc89e14d6 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Inventory.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Inventory.cshtml@@ -5,7 +5,7 @@<div class="form-group"><admin-label asp-for="ManageInventoryMethodId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="ManageInventoryMethodId" asp-items="((ManageInventoryMethod)Model.ManageInventoryMethodId).ToSelectList(Context)"/>+ <admin-select asp-for="ManageInventoryMethodId" asp-items="EnumTranslationService.ToSelectList((ManageInventoryMethod)Model.ManageInventoryMethodId)"/><span asp-validation-for="ManageInventoryMethodId"></span></div></div>@@ -138,7 +138,7 @@<div class="form-group" id="pnlLowStockActivity"><admin-label asp-for="LowStockActivityId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="LowStockActivityId" asp-items="((LowStockActivity)Model.LowStockActivityId).ToSelectList(Context)"/>+ <admin-select asp-for="LowStockActivityId" asp-items="EnumTranslationService.ToSelectList((LowStockActivity)Model.LowStockActivityId)"/><span asp-validation-for="LowStockActivityId"></span></div></div>@@ -152,7 +152,7 @@<div class="form-group" id="pnlBackorders"><admin-label asp-for="BackorderModeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="BackorderModeId" asp-items="((BackorderMode)Model.BackorderModeId).ToSelectList(Context)"/>+ <admin-select asp-for="BackorderModeId" asp-items="EnumTranslationService.ToSelectList((BackorderMode)Model.BackorderModeId)"/><span asp-validation-for="BackorderModeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtmlindex 9cca6f3ae..4bca2da0f 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml@@ -66,7 +66,7 @@<div class="form-group"><admin-label asp-for="AttributeValueTypeId" class="col-sm-3 control-label"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="AttributeValueTypeId" asp-items="Model.AttributeValueTypeId.ToSelectList(Context)"/>+ <admin-select asp-for="AttributeValueTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeValueTypeId)"/><span asp-validation-for="AttributeValueTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtmlindex 9d61ba0e3..bb8e716dd 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml@@ -71,7 +71,7 @@<div class="form-group"><admin-label asp-for="AttributeControlType"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="AttributeControlTypeId" asp-items="Model.AttributeControlTypeId.ToSelectList(Context, valuesToExclude: [(int)AttributeControlType.Hidden])"/>+ <admin-select asp-for="AttributeControlTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeControlTypeId, valuesToExclude: [(int)AttributeControlType.Hidden])"/><span asp-validation-for="AttributeControlTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtmlindex b18e4a198..6090f67ae 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml@@ -34,7 +34,7 @@<div class="form-group"><admin-label asp-for="AttributeTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="AttributeTypeId" asp-items="Model.AttributeTypeId.ToSelectList(Context)"/>+ <admin-select asp-for="AttributeTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeTypeId)"/><span asp-validation-for="AttributeTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtmlindex 651c7d9d1..1d6321c51 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSecurity.cshtml@@ -36,7 +36,7 @@<admin-label asp-for="CustomerSettings.TwoFactorAuthenticationType" class="control-label"/></div><div class="col-4 col-md-8 col-sm-8">- <admin-select asp-for="CustomerSettings.TwoFactorAuthenticationType" asp-items="((TwoFactorAuthenticationType)Model.CustomerSettings.TwoFactorAuthenticationType).ToSelectList(Context)"/>+ <admin-select asp-for="CustomerSettings.TwoFactorAuthenticationType" asp-items="EnumTranslationService.ToSelectList((TwoFactorAuthenticationType)Model.CustomerSettings.TwoFactorAuthenticationType)"/><span asp-validation-for="CustomerSettings.TwoFactorAuthenticationType"></span></div></div>@@ -45,7 +45,7 @@<admin-label asp-for="CustomerSettings.DefaultPasswordFormat" class="control-label"/></div><div class="col-4 col-md-8 col-sm-8">- <admin-select asp-for="CustomerSettings.DefaultPasswordFormat" asp-items="((PasswordFormat)Model.CustomerSettings.DefaultPasswordFormat).ToSelectList(Context)"/>+ <admin-select asp-for="CustomerSettings.DefaultPasswordFormat" asp-items="EnumTranslationService.ToSelectList((PasswordFormat)Model.CustomerSettings.DefaultPasswordFormat)"/><span asp-validation-for="CustomerSettings.DefaultPasswordFormat"></span></div></div>@@ -54,7 +54,7 @@<admin-label asp-for="CustomerSettings.HashedPasswordFormat" class="control-label"/></div><div class="col-4 col-md-8 col-sm-8">- <admin-select asp-for="CustomerSettings.HashedPasswordFormat" asp-items="Model.CustomerSettings.HashedPasswordFormat.ToSelectList(Context)"/>+ <admin-select asp-for="CustomerSettings.HashedPasswordFormat" asp-items="EnumTranslationService.ToSelectList(Model.CustomerSettings.HashedPasswordFormat)"/><span asp-validation-for="CustomerSettings.HashedPasswordFormat"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSettings.cshtmlindex 36515d584..6bd6facfa 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSettings.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/Customer.TabCustomerSettings.cshtml@@ -26,7 +26,7 @@<admin-label asp-for="CustomerSettings.UserRegistrationType" class="control-label"/></div><div class="col-6 col-md-6 col-sm-6">- <admin-select asp-for="CustomerSettings.UserRegistrationType" asp-items="((UserRegistrationType)Model.CustomerSettings.UserRegistrationType).ToSelectList(Context)"/>+ <admin-select asp-for="CustomerSettings.UserRegistrationType" asp-items="EnumTranslationService.ToSelectList((UserRegistrationType)Model.CustomerSettings.UserRegistrationType)"/><span asp-validation-for="CustomerSettings.UserRegistrationType"></span></div></div>@@ -217,7 +217,7 @@<admin-label asp-for="CustomerSettings.CustomerNameFormat" class="control-label"/></div><div class="col-6 col-md-6 col-sm-6">- <admin-select asp-for="CustomerSettings.CustomerNameFormat" asp-items="((CustomerNameFormat)Model.CustomerSettings.CustomerNameFormat).ToSelectList(Context)"/>+ <admin-select asp-for="CustomerSettings.CustomerNameFormat" asp-items="EnumTranslationService.ToSelectList((CustomerNameFormat)Model.CustomerSettings.CustomerNameFormat)"/><span asp-validation-for="CustomerSettings.CustomerNameFormat"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtmlindex c2972bdf6..09bb7683e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml@@ -209,7 +209,7 @@<div class="form-group"><admin-label asp-for="AddressType"/><div class="col-md-9 col-sm-9">- <select asp-for="AddressType" asp-items="@AddressType.Any.ToSelectList(Context, false).ToList()" class="form-control custom-select"></select>+ <select asp-for="AddressType" asp-items="EnumTranslationService.ToSelectList(AddressType.Any, false).ToList()" class="form-control custom-select"></select><span asp-validation-for="AddressType"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Tax/Settings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Tax/Settings.cshtmlindex 74e2f2220..1a0176cc9 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Tax/Settings.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Tax/Settings.cshtml@@ -349,7 +349,7 @@<admin-label asp-for="MidpointRounding" class="control-label"/></div><div class="col-4 col-md-8 col-sm-8">- <admin-select asp-for="MidpointRounding" asp-items="MidpointRounding.ToEven.ToSelectList(Context)"/>+ <admin-select asp-for="MidpointRounding" asp-items="EnumTranslationService.ToSelectList(MidpointRounding.ToEven)"/><span asp-validation-for="MidpointRounding"></span></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtmlindex 1d38285e2..0a6a036fd 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml@@ -1,7 +1,6 @@@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers@addTagHelper *, Grand.Web.Common@addTagHelper *, Grand.Web.Admin-@addTagHelper *, Grand.Web@using System.Globalization@using Microsoft.AspNetCore.Http.Extensions@@ -56,4 +55,5 @@@using Grand.Web.Admin.Models.Knowledgebase@using Grand.Web.Admin.Models.Permissions@using Grand.Web.Common.Localization-@inject LocService Loc\ No newline at end of file+@inject LocService Loc+@inject IEnumTranslationService EnumTranslationService\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.csindex dd6b200d0..b42809cac 100644--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs@@ -1,5 +1,4 @@using Grand.Business.Core.Commands.Checkout.Orders;-using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Checkout.Payments;using Grand.Business.Core.Interfaces.Common.Directory;@@ -11,7 +10,7 @@ using Grand.Infrastructure;using Grand.SharedKernel;using Grand.Web.Admin.Models.Orders;using Grand.Web.Common.DataSource;-using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using MediatR;using Microsoft.AspNetCore.Mvc;@@ -31,8 +30,8 @@ public class PaymentTransactionController : BaseAdminControllerIWorkContext workContext,IGroupService groupService,IDateTimeService dateTimeService,- IMediator mediator- )+ IMediator mediator,+ IEnumTranslationService enumTranslationService){_translationService = translationService;_paymentTransactionService = paymentTransactionService;@@ -41,6 +40,7 @@ public class PaymentTransactionController : BaseAdminController_groupService = groupService;_dateTimeService = dateTimeService;_mediator = mediator;+ _enumTranslationService = enumTranslationService;}#endregion@@ -54,7 +54,8 @@ public class PaymentTransactionController : BaseAdminControllerprivate readonly IGroupService _groupService;private readonly IDateTimeService _dateTimeService;private readonly IMediator _mediator;-+ private readonly IEnumTranslationService _enumTranslationService;+#endregion Fields#region Methods@@ -68,7 +69,7 @@ public class PaymentTransactionController : BaseAdminControllerpublic IActionResult List(){var model = new PaymentTransactionListModel {- PaymentTransactionStatus = TransactionStatus.Pending.ToSelectList(_translationService, _workContext, false)+ PaymentTransactionStatus = _enumTranslationService.ToSelectList(TransactionStatus.Pending, false).ToList()};model.PaymentTransactionStatus.Insert(0,@@ -129,7 +130,7 @@ public class PaymentTransactionController : BaseAdminControllerOrderNumber = order?.OrderNumber,CreatedOn = _dateTimeService.ConvertToUserTime(item.CreatedOnUtc, DateTimeKind.Utc),TransactionStatus = item.TransactionStatus,- Status = item.TransactionStatus.GetTranslationEnum(_translationService, _workContext)+ Status = _enumTranslationService.GetTranslationEnum(item.TransactionStatus)};dataModel.Add(trmodel);}@@ -198,7 +199,7 @@ public class PaymentTransactionController : BaseAdminControllerOrderNumber = order?.OrderNumber,CreatedOn = _dateTimeService.ConvertToUserTime(paymentTransaction.CreatedOnUtc, DateTimeKind.Utc),TransactionStatus = paymentTransaction.TransactionStatus,- Status = paymentTransaction.TransactionStatus.GetTranslationEnum(_translationService, _workContext),+ Status = _enumTranslationService.GetTranslationEnum(paymentTransaction.TransactionStatus),IPAddress = paymentTransaction.IPAddress,Description = paymentTransaction.Description,AdditionalInfo = paymentTransaction.AdditionalInfo,diff --git a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs b/src/Web/Grand.Web.Admin/Controllers/PluginController.csindex 516ebea50..455b64ef1 100644--- a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs@@ -9,6 +9,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Models.Plugins;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;@@ -26,6 +27,7 @@ public class PluginController(IHostApplicationLifetime applicationLifetime,IWorkContext workContext,IServiceProvider serviceProvider,+ IEnumTranslationService enumTranslationService,ExtensionsConfig extConfig): BaseAdminController{@@ -109,7 +111,7 @@ public class PluginController({var model = new PluginListModel {//load modes- AvailableLoadModes = LoadPluginsStatus.All.ToSelectList(HttpContext, false).ToList()+ AvailableLoadModes = enumTranslationService.ToSelectList(LoadPluginsStatus.All, false).ToList()};return View(model);diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.csindex a83186d7d..07209ff6d 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs@@ -19,6 +19,7 @@ using Grand.Web.Admin.Models.Orders;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;@@ -43,7 +44,8 @@ public class ProductController : BaseAdminControllerIProductReservationService productReservationService,IAuctionService auctionService,IDateTimeService dateTimeService,- IPermissionService permissionService)+ IPermissionService permissionService,+ IEnumTranslationService enumTranslationService){_productViewModelService = productViewModelService;_productService = productService;@@ -56,6 +58,7 @@ public class ProductController : BaseAdminController_auctionService = auctionService;_dateTimeService = dateTimeService;_permissionService = permissionService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -73,7 +76,8 @@ public class ProductController : BaseAdminControllerprivate readonly IAuctionService _auctionService;private readonly IDateTimeService _dateTimeService;private readonly IPermissionService _permissionService;-+ private readonly IEnumTranslationService _enumTranslationService;+#endregion#region Methods@@ -2600,9 +2604,7 @@ public class ProductController : BaseAdminControllerProductId = productId,Resource = model.Resource,Parameter = model.Parameter,- Duration = model.Interval + " " +- ((IntervalUnit)model.IntervalUnit).GetTranslationEnum(_translationService,- _workContext)+ Duration = model.Interval + " " + _enumTranslationService.GetTranslationEnum((IntervalUnit)model.IntervalUnit)});}}diff --git a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.csindex 0e8e0515a..cbfc4c52a 100644--- a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs@@ -1,16 +1,15 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Messages;using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain;using Grand.Domain.Messages;-using Grand.Infrastructure;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Models.Messages;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;@@ -23,19 +22,19 @@ public class QueuedEmailController : BaseAdminControllerprivate readonly IEmailAccountService _emailAccountService;private readonly IQueuedEmailService _queuedEmailService;private readonly ITranslationService _translationService;- private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;+public QueuedEmailController(IQueuedEmailService queuedEmailService,IEmailAccountService emailAccountService,IDateTimeService dateTimeService,ITranslationService translationService,- IWorkContext workContext)+ IEnumTranslationService enumTranslationService){_queuedEmailService = queuedEmailService;_emailAccountService = emailAccountService;_dateTimeService = dateTimeService;_translationService = translationService;- _workContext = workContext;+ _enumTranslationService = enumTranslationService;}private DataSourceResult PrepareDataSource(IPagedList<QueuedEmail> queuedEmails)@@ -44,7 +43,7 @@ public class QueuedEmailController : BaseAdminControllerData = queuedEmails.Select((Func<QueuedEmail, QueuedEmailModel>)(x =>{var m = x.ToModel();- m.PriorityName = x.PriorityId.GetTranslationEnum(_translationService, _workContext);+ m.PriorityName = _enumTranslationService.GetTranslationEnum(x.PriorityId);m.CreatedOn = _dateTimeService.ConvertToUserTime(x.CreatedOnUtc, DateTimeKind.Utc);if (x.DontSendBeforeDateUtc.HasValue)m.DontSendBeforeDate =@@ -119,7 +118,7 @@ public class QueuedEmailController : BaseAdminControllerreturn RedirectToAction("List");var model = email.ToModel();- model.PriorityName = email.PriorityId.GetTranslationEnum(_translationService, _workContext);+ model.PriorityName = _enumTranslationService.GetTranslationEnum(email.PriorityId);model.CreatedOn = _dateTimeService.ConvertToUserTime(email.CreatedOnUtc, DateTimeKind.Utc);model.EmailAccountName = (await _emailAccountService.GetEmailAccountById(email.EmailAccountId)).DisplayName;if (email.SentOnUtc.HasValue)@@ -156,7 +155,7 @@ public class QueuedEmailController : BaseAdminController}//If we got this far, something failed, redisplay form- model.PriorityName = email.PriorityId.GetTranslationEnum(_translationService, _workContext);+ model.PriorityName = _enumTranslationService.GetTranslationEnum(email.PriorityId);model.CreatedOn = _dateTimeService.ConvertToUserTime(email.CreatedOnUtc, DateTimeKind.Utc);if (email.SentOnUtc.HasValue)model.SentOn = _dateTimeService.ConvertToUserTime(email.SentOnUtc.Value, DateTimeKind.Utc);diff --git a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs b/src/Web/Grand.Web.Admin/Controllers/ReportsController.csindex b60ada84f..ec633c533 100644--- a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs@@ -23,6 +23,7 @@ using Grand.Web.Admin.Models.Customers;using Grand.Web.Admin.Models.Orders;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;@@ -52,7 +53,7 @@ public class ReportsController : BaseAdminControllerprivate readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;public ReportsController(IOrderService orderService,IOrderReportService orderReportService,IProductsReportService productsReportService,@@ -72,7 +73,8 @@ public class ReportsController : BaseAdminControllerISearchTermService searchTermService,IGroupService groupService,IOrderStatusService orderStatusService,- ICurrencyService currencyService)+ ICurrencyService currencyService,+ IEnumTranslationService enumTranslationService){_orderService = orderService;_orderReportService = orderReportService;@@ -94,6 +96,7 @@ public class ReportsController : BaseAdminController_groupService = groupService;_orderStatusService = orderStatusService;_currencyService = currencyService;+ _enumTranslationService = enumTranslationService;}[NonAction]@@ -219,7 +222,7 @@ public class ReportsController : BaseAdminControllernew SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });//payment statuses- model.AvailablePaymentStatuses = PaymentStatus.Pending.ToSelectList(HttpContext, false).ToList();+ model.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });@@ -434,8 +437,8 @@ public class ReportsController : BaseAdminControllerOrderTotal =_priceFormatter.FormatPrice(x.OrderTotal, await _currencyService.GetPrimaryStoreCurrency()),OrderStatus = statuses.FirstOrDefault(y => y.StatusId == x.OrderStatusId)?.Name,- PaymentStatus = x.PaymentStatusId.GetTranslationEnum(_translationService, _workContext),- ShippingStatus = x.ShippingStatusId.GetTranslationEnum(_translationService, _workContext),+ PaymentStatus = _enumTranslationService.GetTranslationEnum(x.PaymentStatusId),+ ShippingStatus = _enumTranslationService.GetTranslationEnum(x.ShippingStatusId),CustomerEmail = x.BillingAddress.Email,CustomerFullName = $"{x.BillingAddress.FirstName} {x.BillingAddress.LastName}",CreatedOn = _dateTimeService.ConvertToUserTime(x.CreatedOnUtc, DateTimeKind.Utc)@@ -518,7 +521,7 @@ public class ReportsController : BaseAdminControllernew SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });//payment statuses- model.AvailablePaymentStatuses = PaymentStatus.Pending.ToSelectList(HttpContext, false).ToList();+ model.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });@@ -609,9 +612,7 @@ public class ReportsController : BaseAdminControllervar lowStockModel = new LowStockProductModel {Id = product.Id,Name = product.Name,- ManageInventoryMethod =- product.ManageInventoryMethodId.GetTranslationEnum(_translationService,- _workContext.WorkingLanguage.Id),+ ManageInventoryMethod = _enumTranslationService.GetTranslationEnum(product.ManageInventoryMethodId),StockQuantity = _stockQuantityService.GetTotalStockQuantity(product, total: true),Published = product.Published};@@ -627,9 +628,7 @@ public class ReportsController : BaseAdminControllerName = product.Name,Attributes = await _productAttributeFormatter.FormatAttributes(product, combination.Attributes,_workContext.CurrentCustomer, "<br />", true, true, true, false),- ManageInventoryMethod =- product.ManageInventoryMethodId.GetTranslationEnum(_translationService,- _workContext.WorkingLanguage.Id),+ ManageInventoryMethod = _enumTranslationService.GetTranslationEnum(product.ManageInventoryMethodId),StockQuantity = combination.StockQuantity,Published = product.Published};diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex cf83bc52f..6e4b50bf6 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -23,7 +23,6 @@ using Grand.Domain.Security;using Grand.Domain.Seo;using Grand.Domain.Stores;using Grand.Domain.Vendors;-using Grand.Infrastructure;using Grand.Infrastructure.Caching;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions.Mapping;@@ -32,6 +31,7 @@ using Grand.Web.Admin.Models.Settings;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Grand.Web.Common.Security.Captcha;using Grand.Web.Common.Themes;@@ -49,22 +49,14 @@ public class SettingController(IPictureService pictureService,ITranslationService translationService,IDateTimeService dateTimeService,- IWorkContext workContext,IMediator mediator,IMerchandiseReturnService merchandiseReturnService,ILanguageService languageService,IOrderStatusService orderStatusService,- ICacheBase cacheBase)+ ICacheBase cacheBase,+ IEnumTranslationService enumTranslationService): BaseAdminController{- #region Fields-- #endregion-- #region Constructors-- #endregion-#region Utilitiesprotected async Task ClearCache()@@ -189,7 +181,7 @@ public class SettingController(foreach (int option in Enum.GetValues(typeof(ProductSortingEnum)))model.Add(new SortOptionModel {Id = option,- Name = ((ProductSortingEnum)option).GetTranslationEnum(translationService, workContext),+ Name = enumTranslationService.GetTranslationEnum((ProductSortingEnum)option),IsActive = !catalogSettings.ProductSortingEnumDisabled.Contains(option),DisplayOrder = catalogSettings.ProductSortingEnumDisplayOrder.TryGetValue(option, out var value)? value@@ -658,8 +650,7 @@ public class SettingController(model.SecuritySettings.AdminAreaAllowedIpAddresses += ",";}- model.SecuritySettings.AvailableReCaptchaVersions =- GoogleReCaptchaVersion.V2.ToSelectList(HttpContext, false).ToList();+ model.SecuritySettings.AvailableReCaptchaVersions = enumTranslationService.ToSelectList(GoogleReCaptchaVersion.V2, false).ToList();//PDF settingsvar pdfSettings = settingService.LoadSetting<PdfSettings>(storeScope);diff --git a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs b/src/Web/Grand.Web.Admin/Controllers/TaxController.csindex eeeb11b1f..3829b3dfd 100644--- a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs@@ -13,6 +13,7 @@ using Grand.Web.Admin.Models.Common;using Grand.Web.Admin.Models.Tax;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;@@ -30,7 +31,8 @@ public class TaxController : BaseAdminControllerIServiceProvider serviceProvider,ICacheBase cacheBase,ITranslationService translationService,- ICountryService countryService)+ ICountryService countryService,+ IEnumTranslationService enumTranslationService){_taxService = taxService;_taxCategoryService = taxCategoryService;@@ -39,6 +41,7 @@ public class TaxController : BaseAdminController_cacheBase = cacheBase;_translationService = translationService;_countryService = countryService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -52,7 +55,8 @@ public class TaxController : BaseAdminControllerprivate readonly ICacheBase _cacheBase;private readonly ITranslationService _translationService;private readonly ICountryService _countryService;-+ private readonly IEnumTranslationService _enumTranslationService;+#endregion#region Tax Providers@@ -130,8 +134,8 @@ public class TaxController : BaseAdminControllervar model = taxSettings.ToModel();model.ActiveStore = storeScope;- model.TaxBasedOnValues = taxSettings.TaxBasedOn.ToSelectList(HttpContext);- model.TaxDisplayTypeValues = taxSettings.TaxDisplayType.ToSelectList(HttpContext);+ model.TaxBasedOnValues = _enumTranslationService.ToSelectList(taxSettings.TaxBasedOn);+ model.TaxDisplayTypeValues = _enumTranslationService.ToSelectList(taxSettings.TaxDisplayType);//tax categoriesvar taxCategories = await _taxCategoryService.GetAllTaxCategories();diff --git a/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.csindex 8655f883a..be8dfde8e 100644--- a/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs@@ -1,37 +1,25 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Addresses;-using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Addresses;using Grand.Domain.Common;-using Grand.Infrastructure;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Common;+using Grand.Web.Common.Localization;namespace Grand.Web.Admin.Services;-public class AddressAttributeViewModelService : IAddressAttributeViewModelService+public class AddressAttributeViewModelService(+ IAddressAttributeService addressAttributeService,+ IEnumTranslationService enumTranslationService)+ : IAddressAttributeViewModelService{- private readonly IAddressAttributeService _addressAttributeService;- private readonly ITranslationService _translationService;- private readonly IWorkContext _workContext;-- public AddressAttributeViewModelService(IAddressAttributeService addressAttributeService,- ITranslationService translationService, IWorkContext workContext)- {- _addressAttributeService = addressAttributeService;- _translationService = translationService;- _workContext = workContext;- }-public virtual async Task<(IEnumerable<AddressAttributeModel> addressAttributes, int totalCount)>PrepareAddressAttributes(){- var addressAttributes = await _addressAttributeService.GetAllAddressAttributes();+ var addressAttributes = await addressAttributeService.GetAllAddressAttributes();return (addressAttributes.Select(x =>{var attributeModel = x.ToModel();- attributeModel.AttributeControlTypeName =- x.AttributeControlType.GetTranslationEnum(_translationService, _workContext);+ attributeModel.AttributeControlTypeName = enumTranslationService.GetTranslationEnum(x.AttributeControlType);return attributeModel;}), addressAttributes.Count);}@@ -51,7 +39,7 @@ public class AddressAttributeViewModelService : IAddressAttributeViewModelServicpublic virtual async Task<AddressAttribute> InsertAddressAttributeModel(AddressAttributeModel model){var addressAttribute = model.ToEntity();- await _addressAttributeService.InsertAddressAttribute(addressAttribute);+ await addressAttributeService.InsertAddressAttribute(addressAttribute);return addressAttribute;}@@ -60,14 +48,14 @@ public class AddressAttributeViewModelService : IAddressAttributeViewModelServicAddressAttribute addressAttribute){addressAttribute = model.ToEntity(addressAttribute);- await _addressAttributeService.UpdateAddressAttribute(addressAttribute);+ await addressAttributeService.UpdateAddressAttribute(addressAttribute);return addressAttribute;}public virtual async Task<(IEnumerable<AddressAttributeValueModel> addressAttributeValues, int totalCount)>PrepareAddressAttributeValues(string addressAttributeId){- var values = (await _addressAttributeService.GetAddressAttributeById(addressAttributeId))+ var values = (await addressAttributeService.GetAddressAttributeById(addressAttributeId)).AddressAttributeValues;return (values.Select(x => x.ToModel()), values.Count);}@@ -83,7 +71,7 @@ public class AddressAttributeViewModelService : IAddressAttributeViewModelServicpublic virtual async Task<AddressAttributeValue> InsertAddressAttributeValueModel(AddressAttributeValueModel model){var addressAttributeValue = model.ToEntity();- await _addressAttributeService.InsertAddressAttributeValue(addressAttributeValue);+ await addressAttributeService.InsertAddressAttributeValue(addressAttributeValue);return addressAttributeValue;}@@ -98,7 +86,7 @@ public class AddressAttributeViewModelService : IAddressAttributeViewModelServicAddressAttributeValue addressAttributeValue){addressAttributeValue = model.ToEntity(addressAttributeValue);- await _addressAttributeService.UpdateAddressAttributeValue(addressAttributeValue);+ await addressAttributeService.UpdateAddressAttributeValue(addressAttributeValue);return addressAttributeValue;}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.csindex 94cd03749..f2d9792f5 100644--- a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs@@ -14,6 +14,7 @@ using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Affiliates;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -31,13 +32,13 @@ public class AffiliateViewModelService : IAffiliateViewModelServiceprivate readonly SeoSettings _seoSettings;private readonly ITranslationService _translationService;private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;public AffiliateViewModelService(IWorkContext workContext, ICountryService countryService,IPriceFormatter priceFormatter, IAffiliateService affiliateService,ICustomerService customerService, IOrderService orderService, ITranslationService translationService,IDateTimeService dateTimeService,IOrderStatusService orderStatusService,- SeoSettings seoSettings, ICurrencyService currencyService)+ SeoSettings seoSettings, ICurrencyService currencyService, IEnumTranslationService enumTranslationService){_workContext = workContext;_countryService = countryService;@@ -50,6 +51,7 @@ public class AffiliateViewModelService : IAffiliateViewModelService_orderStatusService = orderStatusService;_seoSettings = seoSettings;_currencyService = currencyService;+ _enumTranslationService = enumTranslationService;}public virtual async Task PrepareAffiliateModel(AffiliateModel model, Affiliate affiliate, bool excludeProperties,@@ -202,8 +204,8 @@ public class AffiliateViewModelService : IAffiliateViewModelServiceOrderNumber = order.OrderNumber,OrderCode = order.Code,OrderStatus = statuses.FirstOrDefault(y => y.StatusId == order.OrderStatusId)?.Name,- PaymentStatus = order.PaymentStatusId.GetTranslationEnum(_translationService, _workContext),- ShippingStatus = order.ShippingStatusId.GetTranslationEnum(_translationService, _workContext),+ PaymentStatus = _enumTranslationService.GetTranslationEnum(order.PaymentStatusId),+ ShippingStatus = _enumTranslationService.GetTranslationEnum(order.ShippingStatusId),OrderTotal = _priceFormatter.FormatPrice(order.OrderTotal,await _currencyService.GetCurrencyByCode(order.CustomerCurrencyCode)),CreatedOn = _dateTimeService.ConvertToUserTime(order.CreatedOnUtc, DateTimeKind.Utc)diff --git a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.csindex 232724a28..2ded73f22 100644--- a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs@@ -16,6 +16,7 @@ using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Blogs;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -32,6 +33,7 @@ public class BlogViewModelService : IBlogViewModelServiceprivate readonly IVendorService _vendorService;private readonly IWorkContext _workContext;private readonly ISeNameService _seNameService;+ private readonly IEnumTranslationService _enumTranslationService;public BlogViewModelService(IBlogService blogService,@@ -43,7 +45,8 @@ public class BlogViewModelService : IBlogViewModelServiceIProductService productService,IVendorService vendorService,IWorkContext workContext,- ISeNameService seNameService)+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService){_blogService = blogService;_dateTimeService = dateTimeService;@@ -55,6 +58,7 @@ public class BlogViewModelService : IBlogViewModelService_vendorService = vendorService;_workContext = workContext;_seNameService = seNameService;+ _enumTranslationService = enumTranslationService;}public virtual async Task<(IEnumerable<BlogPostModel> blogPosts, int totalCount)> PrepareBlogPostsModel(@@ -195,7 +199,7 @@ public class BlogViewModelService : IBlogViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList().ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });diff --git a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.csindex d39d4bc21..2bfd2fc4c 100644--- a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs@@ -11,6 +11,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -27,6 +28,7 @@ public class BrandViewModelService : IBrandViewModelServiceprivate readonly IDateTimeService _dateTimeService;private readonly IWorkContext _workContext;private readonly ISeNameService _seNameService;+ private readonly IEnumTranslationService _enumTranslationService;#endregion@@ -39,7 +41,8 @@ public class BrandViewModelService : IBrandViewModelServiceIDiscountService discountService,IDateTimeService dateTimeService,IWorkContext workContext,- ISeNameService seNameService)+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService){_brandLayoutService = brandLayoutService;_brandService = brandService;@@ -48,6 +51,7 @@ public class BrandViewModelService : IBrandViewModelService_dateTimeService = dateTimeService;_workContext = workContext;_seNameService = seNameService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -56,7 +60,7 @@ public class BrandViewModelService : IBrandViewModelService{ArgumentNullException.ThrowIfNull(model);- model.AvailableSortOptions = ProductSortingEnum.Position.ToSelectList().ToList();+ model.AvailableSortOptions = _enumTranslationService.ToSelectList(ProductSortingEnum.Position).ToList();model.AvailableSortOptions.Insert(0, new SelectListItem { Text = "None", Value = "-1" });}diff --git a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.csindex 1a5eef464..35f551e8c 100644--- a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs@@ -13,6 +13,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -30,7 +31,8 @@ public class CategoryViewModelService : ICategoryViewModelServiceprivate readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly ISeNameService _seNameService;-+ private readonly IEnumTranslationService _enumTranslationService;+public CategoryViewModelService(ICategoryService categoryService,IProductCategoryService productCategoryService,@@ -42,7 +44,8 @@ public class CategoryViewModelService : ICategoryViewModelServiceIProductService productService,IVendorService vendorService,CatalogSettings catalogSettings,- ISeNameService seNameService)+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService){_categoryService = categoryService;_productCategoryService = productCategoryService;@@ -55,6 +58,7 @@ public class CategoryViewModelService : ICategoryViewModelService_vendorService = vendorService;_catalogSettings = catalogSettings;_seNameService = seNameService;+ _enumTranslationService = enumTranslationService;}public virtual async Task<CategoryListModel> PrepareCategoryListModel(string storeId)@@ -254,7 +258,7 @@ public class CategoryViewModelService : ICategoryViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList().ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "0" });return model;@@ -314,7 +318,7 @@ public class CategoryViewModelService : ICategoryViewModelService{ArgumentNullException.ThrowIfNull(model);- model.AvailableSortOptions = ProductSortingEnum.Position.ToSelectList().ToList();+ model.AvailableSortOptions = _enumTranslationService.ToSelectList(ProductSortingEnum.Position).ToList();model.AvailableSortOptions.Insert(0, new SelectListItem { Text = "None", Value = "-1" });}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.csindex 6fe10da8f..1ac4dc0a2 100644--- a/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs@@ -1,5 +1,4 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Directory;+using Grand.Business.Core.Interfaces.Catalog.Directory;using Grand.Business.Core.Interfaces.Catalog.Tax;using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;using Grand.Business.Core.Interfaces.Common.Directory;@@ -8,10 +7,10 @@ using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Directory;using Grand.Domain.Orders;-using Grand.Infrastructure;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Orders;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -21,11 +20,11 @@ public class CheckoutAttributeViewModelService(ICheckoutAttributeParser checkoutAttributeParser,ITranslationService translationService,ITaxCategoryService taxCategoryService,- IWorkContext workContext,ICurrencyService currencyService,CurrencySettings currencySettings,IMeasureService measureService,- MeasureSettings measureSettings)+ MeasureSettings measureSettings,+ IEnumTranslationService enumTranslationService): ICheckoutAttributeViewModelService{public virtual async Task<IEnumerable<CheckoutAttributeModel>> PrepareCheckoutAttributeListModel()@@ -34,8 +33,7 @@ public class CheckoutAttributeViewModelService(return checkoutAttributes.Select((Func<CheckoutAttribute, CheckoutAttributeModel>)(x =>{var attributeModel = x.ToModel();- attributeModel.AttributeControlTypeName =- x.AttributeControlTypeId.GetTranslationEnum(translationService, workContext);+ attributeModel.AttributeControlTypeName = enumTranslationService.GetTranslationEnum(x.AttributeControlTypeId);return attributeModel;}));}diff --git a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.csindex b79ff2064..87d207b0e 100644--- a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs@@ -14,6 +14,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -34,6 +35,7 @@ public class CollectionViewModelService : ICollectionViewModelServiceprivate readonly IVendorService _vendorService;private readonly IWorkContext _workContext;private readonly ISeNameService _seNameService;+ private readonly IEnumTranslationService _enumTranslationService;#endregion@@ -50,7 +52,8 @@ public class CollectionViewModelService : ICollectionViewModelServiceIDiscountService discountService,IVendorService vendorService,IWorkContext workContext,- ISeNameService seNameService)+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService){_collectionLayoutService = collectionLayoutService;_collectionService = collectionService;@@ -63,6 +66,7 @@ public class CollectionViewModelService : ICollectionViewModelService_vendorService = vendorService;_workContext = workContext;_seNameService = seNameService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -71,7 +75,7 @@ public class CollectionViewModelService : ICollectionViewModelService{ArgumentNullException.ThrowIfNull(model);- model.AvailableSortOptions = ProductSortingEnum.Position.ToSelectList().ToList();+ model.AvailableSortOptions = _enumTranslationService.ToSelectList(ProductSortingEnum.Position).ToList();model.AvailableSortOptions.Insert(0, new SelectListItem { Text = "None", Value = "-1" });}@@ -194,8 +198,7 @@ public class CollectionViewModelService : ICollectionViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes =- ProductType.SimpleProduct.ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "0" });return model;diff --git a/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.csindex f819cfc0e..ffc036ea6 100644--- a/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs@@ -1,6 +1,4 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Marketing.Contacts;+using Grand.Business.Core.Interfaces.Marketing.Contacts;using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Messages;@@ -8,6 +6,7 @@ using Grand.Infrastructure;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Messages;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -15,8 +14,8 @@ namespace Grand.Web.Admin.Services;public class ContactAttributeViewModelService(IContactAttributeService contactAttributeService,IContactAttributeParser contactAttributeParser,- ITranslationService translationService,- IWorkContext workContext)+ IWorkContext workContext,+ IEnumTranslationService enumTranslationService): IContactAttributeViewModelService{public virtual async Task<IEnumerable<ContactAttributeModel>> PrepareContactAttributeListModel()@@ -26,8 +25,7 @@ public class ContactAttributeViewModelService(return contactAttributes.Select(x =>{var attributeModel = x.ToModel();- attributeModel.AttributeControlTypeName =- x.AttributeControlType.GetTranslationEnum(translationService, workContext);+ attributeModel.AttributeControlTypeName = enumTranslationService.GetTranslationEnum(x.AttributeControlType);return attributeModel;});}diff --git a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.csindex 78959e269..a74bd69bf 100644--- a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs@@ -13,6 +13,7 @@ using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Courses;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -29,7 +30,8 @@ public class CourseViewModelService(IProductService productService,IStoreService storeService,IVendorService vendorService,- ISeNameService seNameService)+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService): ICourseViewModelService{public virtual async Task<CourseModel> PrepareCourseModel(CourseModel model = null)@@ -207,7 +209,7 @@ public class CourseViewModelService(model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList().ToList();+ model.AvailableProductTypes = enumTranslationService.ToSelectList(ProductType.SimpleProduct).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = " " });return model;diff --git a/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.csindex 514612f01..04814349f 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs@@ -1,27 +1,22 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Customers;+using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Customers;-using Grand.Infrastructure;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Customers;+using Grand.Web.Common.Localization;namespace Grand.Web.Admin.Services;public class CustomerAttributeViewModelService : ICustomerAttributeViewModelService{private readonly ICustomerAttributeService _customerAttributeService;- private readonly ITranslationService _translationService;- private readonly IWorkContext _workContext;+ private readonly IEnumTranslationService _enumTranslationService;public CustomerAttributeViewModelService(ICustomerAttributeService customerAttributeService,- ITranslationService translationService,- IWorkContext workContext)+ IEnumTranslationService enumTranslationService){_customerAttributeService = customerAttributeService;- _translationService = translationService;- _workContext = workContext;+ _enumTranslationService = enumTranslationService;}public virtual async Task<CustomerAttribute> InsertCustomerAttributeModel(CustomerAttributeModel model)@@ -61,8 +56,7 @@ public class CustomerAttributeViewModelService : ICustomerAttributeViewModelServreturn customerAttributes.Select((Func<CustomerAttribute, CustomerAttributeModel>)(x =>{var attributeModel = x.ToModel();- attributeModel.AttributeControlTypeName =- x.AttributeControlTypeId.GetTranslationEnum(_translationService, _workContext);+ attributeModel.AttributeControlTypeName = _enumTranslationService.GetTranslationEnum(x.AttributeControlTypeId);return attributeModel;}));}diff --git a/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.csindex c3a4a16b5..0a5de861c 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs@@ -10,6 +10,7 @@ using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Customers;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -22,7 +23,8 @@ public class CustomerGroupViewModelService : ICustomerGroupViewModelServiceprivate readonly IStoreService _storeService;private readonly ITranslationService _translationService;private readonly IVendorService _vendorService;-+ private readonly IEnumTranslationService _enumTranslationService;+#region Constructorspublic CustomerGroupViewModelService(@@ -31,7 +33,8 @@ public class CustomerGroupViewModelService : ICustomerGroupViewModelServiceITranslationService translationService,IProductService productService,IStoreService storeService,- IVendorService vendorService)+ IVendorService vendorService,+ IEnumTranslationService enumTranslationService){_groupService = groupService;_customerGroupProductService = customerGroupProductService;@@ -39,6 +42,7 @@ public class CustomerGroupViewModelService : ICustomerGroupViewModelService_productService = productService;_storeService = storeService;_vendorService = vendorService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -115,7 +119,7 @@ public class CustomerGroupViewModelService : ICustomerGroupViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList().ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });return model;diff --git a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.csindex 74c5c6d3b..ead65a4f4 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs@@ -10,6 +10,7 @@ using Grand.Infrastructure;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Customers;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -24,12 +25,13 @@ public class CustomerReportViewModelService : ICustomerReportViewModelServiceprivate readonly IPriceFormatter _priceFormatter;private readonly ITranslationService _translationService;private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;+public CustomerReportViewModelService(IWorkContext workContext,ICustomerService customerService,ITranslationService translationService, ICustomerReportService customerReportService,IDateTimeService dateTimeService, IPriceFormatter priceFormatter,- IOrderStatusService orderStatusService, ICurrencyService currencyService)+ IOrderStatusService orderStatusService, ICurrencyService currencyService, IEnumTranslationService enumTranslationService){_workContext = workContext;_customerService = customerService;@@ -39,6 +41,7 @@ public class CustomerReportViewModelService : ICustomerReportViewModelService_priceFormatter = priceFormatter;_orderStatusService = orderStatusService;_currencyService = currencyService;+ _enumTranslationService = enumTranslationService;}public virtual async Task<CustomerReportsModel> PrepareCustomerReportsModel()@@ -54,12 +57,10 @@ public class CustomerReportViewModelService : ICustomerReportViewModelServicemodel.BestCustomersByNumberOfOrders.AvailableOrderStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });- model.BestCustomersByNumberOfOrders.AvailablePaymentStatuses =- PaymentStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();+ model.BestCustomersByNumberOfOrders.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.BestCustomersByNumberOfOrders.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });- model.BestCustomersByNumberOfOrders.AvailableShippingStatuses = ShippingStatus.Pending- .ToSelectList(_translationService, _workContext, false).ToList();+ model.BestCustomersByNumberOfOrders.AvailableShippingStatuses = _enumTranslationService.ToSelectList(ShippingStatus.Pending, false).ToList();model.BestCustomersByNumberOfOrders.AvailableShippingStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });@@ -70,12 +71,10 @@ public class CustomerReportViewModelService : ICustomerReportViewModelService};model.BestCustomersByOrderTotal.AvailableOrderStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });- model.BestCustomersByOrderTotal.AvailablePaymentStatuses =- PaymentStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();+ model.BestCustomersByOrderTotal.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.BestCustomersByOrderTotal.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });- model.BestCustomersByOrderTotal.AvailableShippingStatuses = ShippingStatus.Pending- .ToSelectList(_translationService, _workContext, false).ToList();+ model.BestCustomersByOrderTotal.AvailableShippingStatuses = _enumTranslationService.ToSelectList(ShippingStatus.Pending, false).ToList();model.BestCustomersByOrderTotal.AvailableShippingStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });diff --git a/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.csindex f2abeec07..f272740d4 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs@@ -10,6 +10,7 @@ using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Customers;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;@@ -21,19 +22,22 @@ public class CustomerTagViewModelService : ICustomerTagViewModelServiceprivate readonly IStoreService _storeService;private readonly ITranslationService _translationService;private readonly IVendorService _vendorService;+ private readonly IEnumTranslationService _enumTranslationService;public CustomerTagViewModelService(ITranslationService translationService,IProductService productService,IStoreService storeService,IVendorService vendorService,- ICustomerTagService customerTagService)+ ICustomerTagService customerTagService,+ IEnumTranslationService enumTranslationService){_translationService = translationService;_productService = productService;_storeService = storeService;_vendorService = vendorService;_customerTagService = customerTagService;+ _enumTranslationService = enumTranslationService;}public virtual CustomerModel PrepareCustomerModelForList(Customer customer)@@ -93,7 +97,7 @@ public class CustomerTagViewModelService : ICustomerTagViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList().ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });return model;diff --git a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.csindex 2d5035c7a..af22f5e05 100644--- a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs@@ -31,6 +31,7 @@ using Grand.Web.Admin.Models.Customers;using Grand.Web.Admin.Models.Messages;using Grand.Web.Admin.Models.ShoppingCart;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Common.Models;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc.Rendering;@@ -69,7 +70,8 @@ public class CustomerViewModelService : ICustomerViewModelServiceprivate readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;+public CustomerViewModelService(ICustomerService customerService,IGroupService groupService,@@ -97,7 +99,8 @@ public class CustomerViewModelService : ICustomerViewModelServiceTaxSettings taxSettings,LoyaltyPointsSettings loyaltyPointsSettings,AddressSettings addressSettings,- CommonSettings commonSettings)+ CommonSettings commonSettings,+ IEnumTranslationService enumTranslationService){_customerService = customerService;_groupService = groupService;@@ -111,6 +114,7 @@ public class CustomerViewModelService : ICustomerViewModelService_countryService = countryService;_customerSettings = customerSettings;_commonSettings = commonSettings;+ _enumTranslationService = enumTranslationService;_workContext = workContext;_vendorService = vendorService;_addressSettings = addressSettings;@@ -212,9 +216,7 @@ public class CustomerViewModelService : ICustomerViewModelService}model.VatNumber = customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.VatNumber);- model.VatNumberStatusNote =- ((VatNumberStatus)customer.GetUserFieldFromEntity<int>(SystemCustomerFieldNames.VatNumberStatusId))- .GetTranslationEnum(_translationService, _workContext);+ model.VatNumberStatusNote = _enumTranslationService.GetTranslationEnum((VatNumberStatus)customer.GetUserFieldFromEntity<int>(SystemCustomerFieldNames.VatNumberStatusId));model.CreatedOn = _dateTimeService.ConvertToUserTime(customer.CreatedOnUtc, DateTimeKind.Utc);model.LastActivityDate =_dateTimeService.ConvertToUserTime(customer.LastActivityDateUtc, DateTimeKind.Utc);@@ -958,10 +960,8 @@ public class CustomerViewModelService : ICustomerViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes =- ProductType.SimpleProduct.ToSelectList(_translationService, _workContext, false).ToList();- model.AvailableProductTypes.Insert(0,- new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();+ model.AvailableProductTypes.Insert(0, new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });return model;}diff --git a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.csindex 9a67a0ad8..5f50406b6 100644--- a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs@@ -20,6 +20,7 @@ using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Discounts;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using MediatR;using Microsoft.AspNetCore.Mvc.Rendering;@@ -43,7 +44,8 @@ public class DiscountViewModelService : IDiscountViewModelServiceIPriceFormatter priceFormatter,IDateTimeService dateTimeService,IDiscountProviderLoader discountProviderLoader,- IMediator mediator)+ IMediator mediator,+ IEnumTranslationService enumTranslationService){_discountService = discountService;_translationService = translationService;@@ -60,15 +62,36 @@ public class DiscountViewModelService : IDiscountViewModelService_dateTimeService = dateTimeService;_discountProviderLoader = discountProviderLoader;_mediator = mediator;+ _enumTranslationService = enumTranslationService;}#endregion+ #region Fields++ private readonly IDiscountService _discountService;+ private readonly ITranslationService _translationService;+ private readonly ICurrencyService _currencyService;+ private readonly ICategoryService _categoryService;+ private readonly IProductService _productService;+ private readonly IWorkContext _workContext;+ private readonly IBrandService _brandService;+ private readonly ICollectionService _collectionService;+ private readonly IStoreService _storeService;+ private readonly IVendorService _vendorService;+ private readonly IOrderService _orderService;+ private readonly IPriceFormatter _priceFormatter;+ private readonly IDateTimeService _dateTimeService;+ private readonly IDiscountProviderLoader _discountProviderLoader;+ private readonly IMediator _mediator;+ private readonly IEnumTranslationService _enumTranslationService;++ #endregion+public virtual DiscountListModel PrepareDiscountListModel(){var model = new DiscountListModel {- AvailableDiscountTypes = DiscountType.AssignedToOrderTotal- .ToSelectList(_translationService, _workContext, false).ToList()+ AvailableDiscountTypes = _enumTranslationService.ToSelectList(DiscountType.AssignedToOrderTotal, false).ToList()};model.AvailableDiscountTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });@@ -90,7 +113,7 @@ public class DiscountViewModelService : IDiscountViewModelServiceforeach (var x in discounts.Skip((pageIndex - 1) * pageSize).Take(pageSize)){var discountModel = x.ToModel(_dateTimeService);- discountModel.DiscountTypeName = x.DiscountTypeId.GetTranslationEnum(_translationService, _workContext);+ discountModel.DiscountTypeName = _enumTranslationService.GetTranslationEnum(x.DiscountTypeId);discountModel.TimesUsed =(await _mediator.Send(new GetDiscountUsageHistoryQuery { DiscountId = x.Id, PageSize = 1 })).TotalCount;items.Add(discountModel);@@ -257,7 +280,7 @@ public class DiscountViewModelService : IDiscountViewModelServicemodel.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct.ToSelectList().ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });return model;@@ -419,24 +442,4 @@ public class DiscountViewModelService : IDiscountViewModelServicereturn (items, duh.TotalCount);}-- #region Fields-- private readonly IDiscountService _discountService;- private readonly ITranslationService _translationService;- private readonly ICurrencyService _currencyService;- private readonly ICategoryService _categoryService;- private readonly IProductService _productService;- private readonly IWorkContext _workContext;- private readonly IBrandService _brandService;- private readonly ICollectionService _collectionService;- private readonly IStoreService _storeService;- private readonly IVendorService _vendorService;- private readonly IOrderService _orderService;- private readonly IPriceFormatter _priceFormatter;- private readonly IDateTimeService _dateTimeService;- private readonly IDiscountProviderLoader _discountProviderLoader;- private readonly IMediator _mediator;-- #endregion}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.csindex c06be9175..c20bc83cc 100644--- a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs@@ -16,14 +16,13 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Common;using Grand.Web.Admin.Models.Orders;-using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;namespace Grand.Web.Admin.Services;public class MerchandiseReturnViewModelService(IOrderService orderService,- IWorkContext workContext,IProductService productService,ICustomerService customerService,IDateTimeService dateTimeService,@@ -37,7 +36,8 @@ public class MerchandiseReturnViewModelService(IAddressAttributeService addressAttributeService,IAddressAttributeParser addressAttributeParser,IDownloadService downloadService,- OrderSettings orderSettings)+ OrderSettings orderSettings,+ IEnumTranslationService enumTranslationService): IMerchandiseReturnViewModelService{public virtual async Task<MerchandiseReturnModel> PrepareMerchandiseReturnModel(MerchandiseReturnModel model,@@ -195,8 +195,7 @@ public class MerchandiseReturnViewModelService({var model = new MerchandiseReturnListModel {//Merchandise return status- MerchandiseReturnStatus = MerchandiseReturnStatus.Pending- .ToSelectList(translationService, workContext, false).ToList()+ MerchandiseReturnStatus = enumTranslationService.ToSelectList(MerchandiseReturnStatus.Pending, false).ToList()};model.MerchandiseReturnStatus.Insert(0,new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "-1" });diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.csindex 0dd3a3bc4..c0ab1858f 100644--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs@@ -29,6 +29,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Orders;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using MediatR;using Microsoft.AspNetCore.Mvc.Rendering;using System.Net;@@ -76,6 +77,7 @@ public class OrderViewModelService : IOrderViewModelServiceprivate readonly IOrderTagService _orderTagService;private readonly IOrderStatusService _orderStatusService;private readonly IMediator _mediator;+ private readonly IEnumTranslationService _enumTranslationService;#endregion@@ -115,7 +117,7 @@ public class OrderViewModelService : IOrderViewModelServiceIOrderTagService orderTagService,IOrderStatusService orderStatusService,IMediator mediator,- IProductAttributeFormatter productAttributeFormatter)+ IProductAttributeFormatter productAttributeFormatter, IEnumTranslationService enumTranslationService){_orderService = orderService;_pricingService = priceCalculationService;@@ -152,6 +154,7 @@ public class OrderViewModelService : IOrderViewModelService_orderStatusService = orderStatusService;_mediator = mediator;_productAttributeFormatter = productAttributeFormatter;+ _enumTranslationService = enumTranslationService;}#endregion@@ -182,8 +185,7 @@ public class OrderViewModelService : IOrderViewModelService}//payment statuses- model.AvailablePaymentStatuses =- PaymentStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });if (paymentStatusId.HasValue)@@ -202,8 +204,7 @@ public class OrderViewModelService : IOrderViewModelServicemodel.AvailableOrderTags.Add(new SelectListItem { Text = s.Name, Value = s.Id });//shipping statuses- model.AvailableShippingStatuses =- ShippingStatus.ShippingNotRequired.ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailableShippingStatuses = _enumTranslationService.ToSelectList(ShippingStatus.ShippingNotRequired, false).ToList();model.AvailableShippingStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = " " });@@ -325,8 +326,8 @@ public class OrderViewModelService : IOrderViewModelServiceCurrencyCode = x.CustomerCurrencyCode,OrderStatus = status.FirstOrDefault(y => y.StatusId == x.OrderStatusId)?.Name,OrderStatusId = x.OrderStatusId,- PaymentStatus = x.PaymentStatusId.GetTranslationEnum(_translationService, _workContext),- ShippingStatus = x.ShippingStatusId.GetTranslationEnum(_translationService, _workContext),+ PaymentStatus = _enumTranslationService.GetTranslationEnum(x.PaymentStatusId),+ ShippingStatus = _enumTranslationService.GetTranslationEnum(x.ShippingStatusId),CustomerEmail = x.BillingAddress?.Email,CustomerId = x.CustomerId,CustomerFullName = $"{x.BillingAddress?.FirstName} {x.BillingAddress?.LastName}",@@ -575,7 +576,7 @@ public class OrderViewModelService : IOrderViewModelService//payment method infovar pm = _paymentService.LoadPaymentMethodBySystemName(order.PaymentMethodSystemName);model.PaymentMethod = pm != null ? pm.FriendlyName : order.PaymentMethodSystemName;- model.PaymentStatus = order.PaymentStatusId.GetTranslationEnum(_translationService, _workContext);+ model.PaymentStatus = _enumTranslationService.GetTranslationEnum(order.PaymentStatusId);model.PaymentStatusEnum = order.PaymentStatusId;var pt = await _paymentTransactionService.GetOrderByGuid(order.OrderGuid);if (pt != null)@@ -619,7 +620,7 @@ public class OrderViewModelService : IOrderViewModelServicemodel.BillingAddress.FaxRequired = _addressSettings.FaxRequired;model.BillingAddress.NoteEnabled = _addressSettings.NoteEnabled;- model.ShippingStatus = order.ShippingStatusId.GetTranslationEnum(_translationService, _workContext);+ model.ShippingStatus = _enumTranslationService.GetTranslationEnum(order.ShippingStatusId);if (order.ShippingStatusId != ShippingStatus.ShippingNotRequired){model.IsShippable = true;@@ -783,7 +784,7 @@ public class OrderViewModelService : IOrderViewModelServiceorderItemModel.RecurringInfo = string.Format(_translationService.GetResource("Admin.Orders.Products.RecurringPeriod"),product.RecurringCycleLength,- product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, _workContext),+ _enumTranslationService.GetTranslationEnum(product.RecurringCyclePeriodId),product.RecurringTotalCycles);//merchandise returns@@ -809,8 +810,7 @@ public class OrderViewModelService : IOrderViewModelServiceOrderId = order.Id,OrderNumber = order.OrderNumber,//product types- AvailableProductTypes = ProductType.SimpleProduct.ToSelectList(_translationService, _workContext, false)- .ToList()+ AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList()};model.AvailableProductTypes.Insert(0,diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.csindex 0dbcfc1f8..c24853660 100644--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs@@ -28,6 +28,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc.Rendering;using System.Net;using ProductExtensions = Grand.Domain.Catalog.ProductExtensions;@@ -70,7 +71,8 @@ public class ProductViewModelService(SeoSettings seoSettings,IAuctionService auctionService,IPriceFormatter priceFormatter,- ISeNameService seNameService)+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService): IProductViewModelService{public virtual async Task PrepareAddProductAttributeCombinationModel(ProductAttributeCombinationModel model,@@ -539,8 +541,7 @@ public class ProductViewModelService(model.AvailableWarehouses.Add(new SelectListItem { Text = wh.Name, Value = wh.Id });//product types- model.AvailableProductTypes =- ProductType.SimpleProduct.ToSelectList(translationService, workContext, false).ToList();+ model.AvailableProductTypes = enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "0" });@@ -635,7 +636,7 @@ public class ProductViewModelService(var defaultProductPicture = x.ProductPictures.FirstOrDefault() ?? new ProductPicture();productModel.PictureThumbnailUrl = await pictureService.GetPictureUrl(defaultProductPicture.PictureId, 100);//product type- productModel.ProductTypeName = x.ProductTypeId.GetTranslationEnum(translationService, workContext);+ productModel.ProductTypeName = enumTranslationService.GetTranslationEnum(x.ProductTypeId);//friendly stock quantity//if a simple product AND "manage inventory" is "Track inventory", then displayif (x.ProductTypeId == ProductType.SimpleProduct &&@@ -1230,11 +1231,10 @@ public class ProductViewModelService({var model = new BulkEditListModel();- var storeId = string.Empty;+ string storeId;//product types- model.AvailableProductTypes =- ProductType.SimpleProduct.ToSelectList(translationService, workContext, false).ToList();+ model.AvailableProductTypes = enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "0" });@@ -1288,8 +1288,7 @@ public class ProductViewModelService(OldPrice = x.OldPrice,Price = x.Price,ManageInventoryMethodId = (int)x.ManageInventoryMethodId,- ManageInventoryMethod =- x.ManageInventoryMethodId.GetTranslationEnum(translationService, workContext.WorkingLanguage.Id),+ ManageInventoryMethod = enumTranslationService.GetTranslationEnum(x.ManageInventoryMethodId),StockQuantity = x.StockQuantity,Published = x.Published};@@ -1470,7 +1469,7 @@ public class ProductViewModelService(TextPrompt = x.TextPrompt,IsRequired = x.IsRequired,ShowOnCatalogPage = x.ShowOnCatalogPage,- AttributeControlType = x.AttributeControlTypeId.GetTranslationEnum(translationService, workContext),+ AttributeControlType = enumTranslationService.GetTranslationEnum(x.AttributeControlTypeId),AttributeControlTypeId = x.AttributeControlTypeId,DisplayOrder = x.DisplayOrder,Combination = x.Combination@@ -1823,7 +1822,7 @@ public class ProductViewModelService(Id = x.Id,ProductAttributeMappingId = productAttributeMapping.Id, //TODO - check x.ProductAttributeMappingId,AttributeValueTypeId = x.AttributeValueTypeId,- AttributeValueTypeName = x.AttributeValueTypeId.GetTranslationEnum(translationService, workContext),+ AttributeValueTypeName = enumTranslationService.GetTranslationEnum(x.AttributeValueTypeId),AssociatedProductId = x.AssociatedProductId,AssociatedProductName = associatedProduct != null ? associatedProduct.Name : "",Name = productAttributeMapping.AttributeControlTypeId != AttributeControlType.ColorSquares@@ -1860,7 +1859,7 @@ public class ProductViewModelService(var model = new ProductModel.ProductAttributeValueModel {ProductAttributeMappingId = pa.Id, //TODO - check pav.ProductAttributeMappingId,AttributeValueTypeId = pav.AttributeValueTypeId,- AttributeValueTypeName = pav.AttributeValueTypeId.GetTranslationEnum(translationService, workContext),+ AttributeValueTypeName = enumTranslationService.GetTranslationEnum(pav.AttributeValueTypeId),AssociatedProductId = pav.AssociatedProductId,AssociatedProductName = associatedProduct != null ? associatedProduct.Name : "",Name = pav.Name,@@ -2450,7 +2449,7 @@ public class ProductViewModelService(AttributeTypeId = (int)x.AttributeTypeId,AttributeId = x.SpecificationAttributeId,ProductId = product.Id,- AttributeTypeName = x.AttributeTypeId.GetTranslationEnum(translationService, workContext),+ AttributeTypeName = enumTranslationService.GetTranslationEnum(x.AttributeTypeId),AllowFiltering = x.AllowFiltering,ShowOnProductPage = x.ShowOnProductPage,DisplayOrder = x.DisplayOrder,@@ -2627,8 +2626,7 @@ public class ProductViewModelService(model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id });//product types- model.AvailableProductTypes =- ProductType.SimpleProduct.ToSelectList(translationService, workContext, false).ToList();+ model.AvailableProductTypes = enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = translationService.GetResource("Admin.Common.All"), Value = "0" });diff --git a/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs b/src/Web/Grand.Web.Common/Extensions/CommonExtensions.csindex 2bbd2db5b..a8305325a 100644--- a/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs+++ b/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs@@ -1,11 +1,4 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Infrastructure;-using Grand.Web.Common.DataSource;-using Microsoft.AspNetCore.Http;-using Microsoft.AspNetCore.Mvc.Rendering;-using Microsoft.Extensions.DependencyInjection;-using System.Reflection;+using Grand.Web.Common.DataSource;namespace Grand.Web.Common.Extensions;@@ -23,37 +16,4 @@ public static class CommonExtensions{return current.Skip((pageIndex - 1) * pageSize).Take(pageSize);}-- public static SelectList ToSelectList<TEnum>(this TEnum enumObj, HttpContext httpContext,- bool markCurrentAsSelected = true, int[] valuesToExclude = null) where TEnum : struct- {- if (!typeof(TEnum).GetTypeInfo().IsEnum)- throw new ArgumentException("Enumeration type is required.");-- var translationService = httpContext.RequestServices.GetRequiredService<ITranslationService>();- var workContext = httpContext.RequestServices.GetRequiredService<IWorkContext>();-- return ToSelectList(enumObj, translationService, workContext, markCurrentAsSelected, valuesToExclude);- }-- public static SelectList ToSelectList<TEnum>(this TEnum enumObj, ITranslationService translationService = null,- IWorkContext workContext = null, bool markCurrentAsSelected = true, int[] valuesToExclude = null)- where TEnum : struct- {- if (!typeof(TEnum).GetTypeInfo().IsEnum)- throw new ArgumentException("Enumeration type is required.");-- var values = from TEnum enumValue in Enum.GetValues(typeof(TEnum))- where valuesToExclude == null || !valuesToExclude.Contains(Convert.ToInt32(enumValue))- select new {- ID = Convert.ToInt32(enumValue),- Name = translationService != null && workContext != null- ? enumValue.GetTranslationEnum(translationService, workContext)- : enumValue.ToString()- };- object selectedValue = null;- if (markCurrentAsSelected)- selectedValue = Convert.ToInt32(enumObj);- return new SelectList(values, "ID", "Name", selectedValue);- }}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Localization/IEnumTranslationService.cs b/src/Web/Grand.Web.Common/Localization/IEnumTranslationService.csnew file mode 100644index 000000000..5a3da4827--- /dev/null+++ b/src/Web/Grand.Web.Common/Localization/IEnumTranslationService.cs@@ -0,0 +1,52 @@+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Infrastructure;+using Grand.SharedKernel.Extensions;+using Microsoft.AspNetCore.Mvc.Rendering;+using System.Reflection;++namespace Grand.Web.Common.Localization;++public interface IEnumTranslationService+{+ SelectList ToSelectList<TEnum>(TEnum enumObj, bool markCurrentAsSelected = true, int[] valuesToExclude = null) where TEnum : struct;+ string GetTranslationEnum<T>(T enumValue) where T : struct;+}++public class EnumTranslationService(ITranslationService translationService, IWorkContext workContext) : IEnumTranslationService+{+ public SelectList ToSelectList<TEnum>(TEnum enumObj, bool markCurrentAsSelected = true, int[] valuesToExclude = null)+ where TEnum : struct+ {+ if (!typeof(TEnum).GetTypeInfo().IsEnum)+ throw new ArgumentException("Enumeration type is required.");++ var values = from TEnum enumValue in Enum.GetValues(typeof(TEnum))+ where valuesToExclude == null || !valuesToExclude.Contains(Convert.ToInt32(enumValue))+ select new+ {+ ID = Convert.ToInt32(enumValue),+ Name = GetTranslationEnum(enumValue)+ };++ object selectedValue = null;+ if (markCurrentAsSelected)+ selectedValue = Convert.ToInt32(enumObj);++ return new SelectList(values, "ID", "Name", selectedValue);+ }++ public string GetTranslationEnum<T>(T enumValue) where T : struct+ {+ if (!typeof(T).GetTypeInfo().IsEnum) throw new ArgumentException("T must be enum type");++ //Translation value+ var resourceName = $"Enums.{typeof(T)}.{enumValue.ToString()}";+ var result = translationService.GetResource(resourceName, workContext.WorkingLanguage.Id, "", true);++ //set default value if required+ if (string.IsNullOrEmpty(result))+ result = CommonHelper.ConvertEnum(enumValue);++ return result;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.csindex 90dc4fad1..2b2a025da 100644--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs@@ -110,6 +110,7 @@ public class StartupApplication : IStartupApplicationserviceCollection.AddScoped<IValidatorFactory, ValidatorFactory>();+ serviceCollection.AddScoped<IEnumTranslationService, EnumTranslationService>();if (DataSettingsManager.DatabaseIsInstalled()){serviceCollection.AddScoped<LocService>();diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtmlindex 5483669bc..c7fdc693d 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/MerchandiseReturn/Partials/CreateOrUpdate.TabInfo.cshtml@@ -34,7 +34,7 @@<div class="form-group"><admin-label asp-for="MerchandiseReturnStatusId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="MerchandiseReturnStatusId" asp-items="((MerchandiseReturnStatus)Model.MerchandiseReturnStatusId).ToSelectList(Context)"/>+ <admin-select asp-for="MerchandiseReturnStatusId" asp-items="EnumTranslationService.ToSelectList((MerchandiseReturnStatus)Model.MerchandiseReturnStatusId)"/><span asp-validation-for="MerchandiseReturnStatusId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BulkEdit.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BulkEdit.cshtmlindex a182a4a8f..66f0ee2a6 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BulkEdit.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/BulkEdit.cshtml@@ -81,7 +81,7 @@<script>@{- var methods = ManageInventoryMethod.DontManageStock.ToSelectList(Context);+ var methods = EnumTranslationService.ToSelectList(ManageInventoryMethod.DontManageStock);}var allInventoryMethod = [@foreach (var method in methods)diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Additional.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Additional.cshtmlindex c9b236134..0216a0c32 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Additional.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Additional.cshtml@@ -53,7 +53,7 @@<div class="form-group" id="pnlGiftVoucherType"><admin-label asp-for="GiftVoucherTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="GiftVoucherTypeId" asp-items="((GiftVoucherType)Model.GiftVoucherTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="GiftVoucherTypeId" asp-items="EnumTranslationService.ToSelectList((GiftVoucherType)Model.GiftVoucherTypeId)"/><span asp-validation-for="GiftVoucherTypeId"></span></div></div>@@ -88,7 +88,7 @@<div class="form-group" id="pnlCyclePeriod"><admin-label asp-for="RecurringCyclePeriodId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="RecurringCyclePeriodId" asp-items="((RecurringCyclePeriod)Model.RecurringCyclePeriodId).ToSelectList(Context)"/>+ <admin-select asp-for="RecurringCyclePeriodId" asp-items="EnumTranslationService.ToSelectList((RecurringCyclePeriod)Model.RecurringCyclePeriodId)"/><span asp-validation-for="RecurringCyclePeriodId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmlindex 09d954ee2..b5fc4df0d 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml@@ -50,7 +50,7 @@<span id="pnlInterval"><admin-input asp-for="CalendarModel.Interval"/></span>- <admin-select asp-for="CalendarModel.IntervalUnit" asp-items="((IntervalUnit)Model.CalendarModel.IntervalUnit).ToSelectList(Context)" class="form-control input-xsmall" style="height: 30px;padding: 0px; margin-bottom: 3px; margin-top: 3px; "/>+ <admin-select asp-for="CalendarModel.IntervalUnit" asp-items="EnumTranslationService.ToSelectList((IntervalUnit)Model.CalendarModel.IntervalUnit)" class="form-control input-xsmall" style="height: 30px;padding: 0px; margin-bottom: 3px; margin-top: 3px; "/></div></div><div class="form-group" id="pnlQuantity">diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Info.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Info.cshtmlindex d367cc5d4..3b49970e0 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Info.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Info.cshtml@@ -386,7 +386,7 @@<div class="form-group"><admin-label asp-for="ProductTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="ProductTypeId" asp-items="((ProductType)Model.ProductTypeId).ToSelectList(Context)"/>+ <admin-select asp-for="ProductTypeId" asp-items="EnumTranslationService.ToSelectList((ProductType)Model.ProductTypeId)"/><span asp-validation-for="ProductTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Inventory.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Inventory.cshtmlindex a94d7dff6..37a5f2909 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Inventory.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Inventory.cshtml@@ -5,7 +5,7 @@<div class="form-group"><admin-label asp-for="ManageInventoryMethodId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="ManageInventoryMethodId" asp-items="((ManageInventoryMethod)Model.ManageInventoryMethodId).ToSelectList(Context)"/>+ <admin-select asp-for="ManageInventoryMethodId" asp-items="EnumTranslationService.ToSelectList((ManageInventoryMethod)Model.ManageInventoryMethodId)"/><span asp-validation-for="ManageInventoryMethodId"></span></div></div>@@ -138,7 +138,7 @@<div class="form-group" id="pnlLowStockActivity"><admin-label asp-for="LowStockActivityId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="LowStockActivityId" asp-items="((LowStockActivity)Model.LowStockActivityId).ToSelectList(Context)"/>+ <admin-select asp-for="LowStockActivityId" asp-items="EnumTranslationService.ToSelectList((LowStockActivity)Model.LowStockActivityId)"/><span asp-validation-for="LowStockActivityId"></span></div></div>@@ -152,7 +152,7 @@<div class="form-group" id="pnlBackorders"><admin-label asp-for="BackorderModeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="BackorderModeId" asp-items="((BackorderMode)Model.BackorderModeId).ToSelectList(Context)"/>+ <admin-select asp-for="BackorderModeId" asp-items="EnumTranslationService.ToSelectList((BackorderMode)Model.BackorderModeId)"/><span asp-validation-for="BackorderModeId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtmlindex 85eea658f..72fc8f6e5 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml@@ -66,7 +66,7 @@<div class="form-group"><admin-label asp-for="AttributeValueTypeId" class="col-sm-3 control-label"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="AttributeValueTypeId" asp-items="Model.AttributeValueTypeId.ToSelectList(Context)"/>+ <admin-select asp-for="AttributeValueTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeValueTypeId)"/><span asp-validation-for="AttributeValueTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtmlindex a759a5af3..8e934ac1c 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductAttributeMappingPopup.cshtml@@ -71,7 +71,7 @@<div class="form-group"><admin-label asp-for="AttributeControlType"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="AttributeControlTypeId" asp-items="Model.AttributeControlTypeId.ToSelectList(Context, valuesToExclude: [(int)AttributeControlType.Hidden])"/>+ <admin-select asp-for="AttributeControlTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeControlTypeId, valuesToExclude: [(int)AttributeControlType.Hidden])"/><span asp-validation-for="AttributeControlTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtmlindex 8991d1e74..8b9ca94f1 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductSpecAttrPopup.cshtml@@ -34,7 +34,7 @@<div class="form-group"><admin-label asp-for="AttributeTypeId"/><div class="col-md-9 col-sm-9">- <admin-select asp-for="AttributeTypeId" asp-items="Model.AttributeTypeId.ToSelectList(Context)"/>+ <admin-select asp-for="AttributeTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeTypeId)"/><span asp-validation-for="AttributeTypeId"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Address.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Address.cshtmlindex c2972bdf6..43881fcb6 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Address.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Address.cshtml@@ -209,7 +209,7 @@<div class="form-group"><admin-label asp-for="AddressType"/><div class="col-md-9 col-sm-9">- <select asp-for="AddressType" asp-items="@AddressType.Any.ToSelectList(Context, false).ToList()" class="form-control custom-select"></select>+ <select asp-for="AddressType" asp-items="EnumTranslationService.ToSelectList(AddressType.Any, false)" class="form-control custom-select"></select><span asp-validation-for="AddressType"></span></div></div>diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtmlindex a6eb511ef..38ef91d93 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml@@ -1,7 +1,6 @@@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers@addTagHelper *, Grand.Web.Common@addTagHelper *, Grand.Web.Vendor-@addTagHelper *, Grand.Web@using System.Globalization@using Microsoft.AspNetCore.Http.Extensions@@ -34,4 +33,5 @@@using Grand.Web.Vendor.Models.Vendor;@using Grand.Web.Vendor.Models.VendorReview;@using Grand.Web.Vendor.Models.Report;-@inject LocService Loc\ No newline at end of file+@inject LocService Loc+@inject IEnumTranslationService EnumTranslationService\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs b/src/Web/Grand.Web.Vendor/Controllers/ProductController.csindex 90e92be25..b1cbddb0f 100644--- a/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs@@ -13,6 +13,7 @@ using Grand.Infrastructure;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Grand.Web.Vendor.Extensions;using Grand.Web.Vendor.Interfaces;@@ -39,7 +40,8 @@ public class ProductController : BaseVendorControllerIProductReservationService productReservationService,IAuctionService auctionService,IDateTimeService dateTimeService,- IPermissionService permissionService)+ IPermissionService permissionService,+ IEnumTranslationService enumTranslationService){_productViewModelService = productViewModelService;_productService = productService;@@ -51,6 +53,7 @@ public class ProductController : BaseVendorController_auctionService = auctionService;_dateTimeService = dateTimeService;_permissionService = permissionService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -67,6 +70,7 @@ public class ProductController : BaseVendorControllerprivate readonly IAuctionService _auctionService;private readonly IDateTimeService _dateTimeService;private readonly IPermissionService _permissionService;+ private readonly IEnumTranslationService _enumTranslationService;#endregion@@ -2472,9 +2476,7 @@ public class ProductController : BaseVendorControllerProductId = model.ProductId,Resource = model.Resource,Parameter = model.Parameter,- Duration = model.Interval + " " +- ((IntervalUnit)model.IntervalUnit).GetTranslationEnum(_translationService,- _workContext)+ Duration = model.Interval + " " + _enumTranslationService.GetTranslationEnum((IntervalUnit)model.IntervalUnit)});}}diff --git a/src/Web/Grand.Web.Vendor/Controllers/ReportsController.cs b/src/Web/Grand.Web.Vendor/Controllers/ReportsController.csindex b80898884..d4f1b827e 100644--- a/src/Web/Grand.Web.Vendor/Controllers/ReportsController.cs+++ b/src/Web/Grand.Web.Vendor/Controllers/ReportsController.cs@@ -1,5 +1,4 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Prices;+using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Directory;@@ -11,6 +10,7 @@ using Grand.Domain.Payments;using Grand.Infrastructure;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Grand.Web.Vendor.Models.Report;using Microsoft.AspNetCore.Mvc;@@ -35,7 +35,7 @@ public class ReportsController : BaseVendorControllerprivate readonly IStockQuantityService _stockQuantityService;private readonly ITranslationService _translationService;private readonly IWorkContext _workContext;-+ private readonly IEnumTranslationService _enumTranslationService;public ReportsController(IOrderReportService orderReportService,IProductsReportService productsReportService,ICustomerReportService customerReportService,@@ -49,7 +49,8 @@ public class ReportsController : BaseVendorControllerIDateTimeService dateTimeService,IOrderStatusService orderStatusService,ICurrencyService currencyService,- ICustomerService customerService)+ ICustomerService customerService,+ IEnumTranslationService enumTranslationService){_orderReportService = orderReportService;_productsReportService = productsReportService;@@ -65,6 +66,7 @@ public class ReportsController : BaseVendorController_orderStatusService = orderStatusService;_currencyService = currencyService;_customerService = customerService;+ _enumTranslationService = enumTranslationService;}[NonAction]@@ -121,7 +123,7 @@ public class ReportsController : BaseVendorController{var model = new BestsellersReportModel {//payment statuses- AvailablePaymentStatuses = PaymentStatus.Pending.ToSelectList(HttpContext, false).ToList()+ AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList()};model.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Vendor.Common.All"), Value = "" });@@ -228,7 +230,7 @@ public class ReportsController : BaseVendorController{var model = new CountryReportModel {//payment statuses- AvailablePaymentStatuses = PaymentStatus.Pending.ToSelectList(HttpContext, false).ToList()+ AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList()};model.AvailablePaymentStatuses.Insert(0,@@ -294,9 +296,7 @@ public class ReportsController : BaseVendorControllervar lowStockModel = new LowStockProductModel {Id = product.Id,Name = product.Name,- ManageInventoryMethod =- product.ManageInventoryMethodId.GetTranslationEnum(_translationService,- _workContext.WorkingLanguage.Id),+ ManageInventoryMethod = _enumTranslationService.GetTranslationEnum(product.ManageInventoryMethodId),StockQuantity = _stockQuantityService.GetTotalStockQuantity(product, total: true),Published = product.Published};@@ -312,9 +312,7 @@ public class ReportsController : BaseVendorControllerName = product.Name,Attributes = await _productAttributeFormatter.FormatAttributes(product, combination.Attributes,_workContext.CurrentCustomer, "<br />", true, true, true, false),- ManageInventoryMethod =- product.ManageInventoryMethodId.GetTranslationEnum(_translationService,- _workContext.WorkingLanguage.Id),+ ManageInventoryMethod = _enumTranslationService.GetTranslationEnum(product.ManageInventoryMethodId),StockQuantity = combination.StockQuantity,Published = product.Published};@@ -338,8 +336,7 @@ public class ReportsController : BaseVendorControllervar model = new CustomerReportsModel();var status = await _orderStatusService.GetAll();- model.AvailablePaymentStatuses =- PaymentStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Vendor.Common.All"), Value = "" });diff --git a/src/Web/Grand.Web.Vendor/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/MerchandiseReturnViewModelService.csindex d4793e4ce..4e3cf49ce 100644--- a/src/Web/Grand.Web.Vendor/Services/MerchandiseReturnViewModelService.cs+++ b/src/Web/Grand.Web.Vendor/Services/MerchandiseReturnViewModelService.cs@@ -12,6 +12,7 @@ using Grand.Domain.Localization;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Vendor.Extensions;using Grand.Web.Vendor.Interfaces;using Grand.Web.Vendor.Models.Common;@@ -22,6 +23,28 @@ namespace Grand.Web.Vendor.Services;public class MerchandiseReturnViewModelService : IMerchandiseReturnViewModelService{++ #region Fields++ private readonly IOrderService _orderService;+ private readonly IWorkContext _workContext;+ private readonly IProductService _productService;+ private readonly IDateTimeService _dateTimeService;+ private readonly ICustomerService _customerService;+ private readonly ITranslationService _translationService;+ private readonly IMessageProviderService _messageProviderService;+ private readonly LanguageSettings _languageSettings;+ private readonly IMerchandiseReturnService _merchandiseReturnService;+ private readonly IPriceFormatter _priceFormatter;+ private readonly AddressSettings _addressSettings;+ private readonly OrderSettings _orderSettings;+ private readonly ICountryService _countryService;+ private readonly IAddressAttributeService _addressAttributeService;+ private readonly IAddressAttributeParser _addressAttributeParser;+ private readonly IEnumTranslationService _enumTranslationService;++ #endregion Fields+#region Constructorspublic MerchandiseReturnViewModelService(@@ -39,7 +62,8 @@ public class MerchandiseReturnViewModelService : IMerchandiseReturnViewModelServICountryService countryService,IAddressAttributeService addressAttributeService,IAddressAttributeParser addressAttributeParser,- OrderSettings orderSettings)+ OrderSettings orderSettings,+ IEnumTranslationService enumTranslationService){_orderService = orderService;_workContext = workContext;@@ -56,6 +80,7 @@ public class MerchandiseReturnViewModelService : IMerchandiseReturnViewModelServ_addressAttributeService = addressAttributeService;_addressAttributeParser = addressAttributeParser;_orderSettings = orderSettings;+ _enumTranslationService = enumTranslationService;}#endregion@@ -151,8 +176,7 @@ public class MerchandiseReturnViewModelService : IMerchandiseReturnViewModelServ{var model = new MerchandiseReturnListModel {//Merchandise return status- MerchandiseReturnStatus = MerchandiseReturnStatus.Pending- .ToSelectList(_translationService, _workContext, false).ToList()+ MerchandiseReturnStatus = _enumTranslationService.ToSelectList(MerchandiseReturnStatus.Pending, false).ToList()};model.MerchandiseReturnStatus.Insert(0,new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "-1" });@@ -325,24 +349,4 @@ public class MerchandiseReturnViewModelService : IMerchandiseReturnViewModelServawait _messageProviderService.SendMerchandiseReturnStatusChangedCustomerMessage(merchandiseReturn, order,_languageSettings.DefaultAdminLanguageId);}-- #region Fields-- private readonly IOrderService _orderService;- private readonly IWorkContext _workContext;- private readonly IProductService _productService;- private readonly IDateTimeService _dateTimeService;- private readonly ICustomerService _customerService;- private readonly ITranslationService _translationService;- private readonly IMessageProviderService _messageProviderService;- private readonly LanguageSettings _languageSettings;- private readonly IMerchandiseReturnService _merchandiseReturnService;- private readonly IPriceFormatter _priceFormatter;- private readonly AddressSettings _addressSettings;- private readonly OrderSettings _orderSettings;- private readonly ICountryService _countryService;- private readonly IAddressAttributeService _addressAttributeService;- private readonly IAddressAttributeParser _addressAttributeParser;-- #endregion Fields}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.csindex 9d4f9312c..f7068db54 100644--- a/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs+++ b/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs@@ -21,6 +21,7 @@ using Grand.Domain.Shipping;using Grand.Domain.Tax;using Grand.Infrastructure;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Vendor.Extensions;using Grand.Web.Vendor.Interfaces;using Grand.Web.Vendor.Models.Orders;@@ -56,7 +57,8 @@ public class OrderViewModelService : IOrderViewModelServiceprivate readonly AddressSettings _addressSettings;private readonly IOrderTagService _orderTagService;private readonly IOrderStatusService _orderStatusService;-+ private readonly IEnumTranslationService _enumTranslationService;+#endregion#region Ctor@@ -83,7 +85,7 @@ public class OrderViewModelService : IOrderViewModelServiceTaxSettings taxSettings,AddressSettings addressSettings,IOrderTagService orderTagService,- IOrderStatusService orderStatusService)+ IOrderStatusService orderStatusService, IEnumTranslationService enumTranslationService){_orderService = orderService;_dateTimeService = dateTimeService;@@ -108,6 +110,7 @@ public class OrderViewModelService : IOrderViewModelService_customerService = customerService;_orderTagService = orderTagService;_orderStatusService = orderStatusService;+ _enumTranslationService = enumTranslationService;}#endregion@@ -136,8 +139,7 @@ public class OrderViewModelService : IOrderViewModelService}//payment statuses- model.AvailablePaymentStatuses =- PaymentStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailablePaymentStatuses = _enumTranslationService.ToSelectList(PaymentStatus.Pending, false).ToList();model.AvailablePaymentStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Vendor.Common.All"), Value = " " });if (paymentStatusId.HasValue)@@ -156,8 +158,7 @@ public class OrderViewModelService : IOrderViewModelServicemodel.AvailableOrderTags.Add(new SelectListItem { Text = s.Name, Value = s.Id });//shipping statuses- model.AvailableShippingStatuses =- ShippingStatus.Pending.ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailableShippingStatuses = _enumTranslationService.ToSelectList(ShippingStatus.Pending, false).ToList();model.AvailableShippingStatuses.Insert(0,new SelectListItem { Text = _translationService.GetResource("Vendor.Common.All"), Value = " " });if (shippingStatusId.HasValue)@@ -251,7 +252,7 @@ public class OrderViewModelService : IOrderViewModelServiceCurrencyCode = x.CustomerCurrencyCode,OrderStatus = status.FirstOrDefault(y => y.StatusId == x.OrderStatusId)?.Name,OrderStatusId = x.OrderStatusId,- PaymentStatus = x.PaymentStatusId.GetTranslationEnum(_translationService, _workContext),+ PaymentStatus = _enumTranslationService.GetTranslationEnum(x.PaymentStatusId),CustomerEmail = x.BillingAddress?.Email,CustomerFullName = $"{x.BillingAddress?.FirstName} {x.BillingAddress?.LastName}",CreatedOn = _dateTimeService.ConvertToUserTime(x.CreatedOnUtc, DateTimeKind.Utc)@@ -311,7 +312,7 @@ public class OrderViewModelService : IOrderViewModelService//payment method infovar pm = _paymentService.LoadPaymentMethodBySystemName(order.PaymentMethodSystemName);model.PaymentMethod = pm != null ? pm.FriendlyName : order.PaymentMethodSystemName;- model.PaymentStatus = order.PaymentStatusId.GetTranslationEnum(_translationService, _workContext);+ model.PaymentStatus = _enumTranslationService.GetTranslationEnum(order.PaymentStatusId);model.PaymentStatusEnum = order.PaymentStatusId;#endregion@@ -515,7 +516,7 @@ public class OrderViewModelService : IOrderViewModelServiceorderItemModel.RecurringInfo = string.Format(_translationService.GetResource("Vendor.Orders.Products.RecurringPeriod"),product.RecurringCycleLength,- product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, _workContext),+ _enumTranslationService.GetTranslationEnum(product.RecurringCyclePeriodId),product.RecurringTotalCycles);//merchandise returnsdiff --git a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.csindex bcb40aab0..6eeb92d53 100644--- a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs@@ -21,6 +21,7 @@ using Grand.Domain.Tax;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;using Grand.Web.Common.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Vendor.Extensions;using Grand.Web.Vendor.Interfaces;using Grand.Web.Vendor.Models.Catalog;@@ -62,6 +63,8 @@ public class ProductViewModelService : IProductViewModelServiceprivate readonly IWarehouseService _warehouseService;private readonly IWorkContext _workContext;private readonly ISeNameService _seNameService;+ private readonly IEnumTranslationService _enumTranslationService;+public ProductViewModelService(IProductService productService,IInventoryManageService inventoryManageService,@@ -91,8 +94,9 @@ public class ProductViewModelService : IProductViewModelServiceIPriceFormatter priceFormatter,CurrencySettings currencySettings,MeasureSettings measureSettings,- TaxSettings taxSettings,- ISeNameService seNameService)+ TaxSettings taxSettings,+ ISeNameService seNameService,+ IEnumTranslationService enumTranslationService){_productService = productService;_inventoryManageService = inventoryManageService;@@ -124,6 +128,7 @@ public class ProductViewModelService : IProductViewModelService_measureSettings = measureSettings;_taxSettings = taxSettings;_seNameService = seNameService;+ _enumTranslationService = enumTranslationService;}public virtual async Task PrepareAddProductAttributeCombinationModel(ProductAttributeCombinationModel model,@@ -550,8 +555,7 @@ public class ProductViewModelService : IProductViewModelServicemodel.AvailableWarehouses.Add(new SelectListItem { Text = wh.Name, Value = wh.Id });//product types- model.AvailableProductTypes = ProductType.SimpleProduct- .ToSelectList(_translationService, _workContext, false).ToList();+ model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList();model.AvailableProductTypes.Insert(0,new SelectListItem { Text = _translationService.GetResource("Vendor.Common.All"), Value = "0" });@@ -634,7 +638,7 @@ public class ProductViewModelService : IProductViewModelServiceproductModel.PictureThumbnailUrl =await _pictureService.GetPictureUrl(defaultProductPicture.PictureId, 100);//product type- productModel.ProductTypeName = x.ProductTypeId.GetTranslationEnum(_translationService, _workContext);+ productModel.ProductTypeName = _enumTranslationService.GetTranslationEnum(x.ProductTypeId);//friendly stock quantity//if a simple product AND "manage inventory" is "Track inventory", then displayif (x.ProductTypeId == ProductType.SimpleProduct &&@@ -686,7 +690,7 @@ public class ProductViewModelService : IProductViewModelService//productvar product = model.ToEntity(_dateTimeService);product.VendorId = _workContext.CurrentVendor?.Id;-+product.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, product, x => x.Name);product.SeName = await _seNameService.ValidateSeName(product, model.SeName, product.Name, true);@@ -694,7 +698,7 @@ public class ProductViewModelService : IProductViewModelService//search engine nameawait _seNameService.SaveSeName(product);-+//warehousesawait SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);@@ -712,18 +716,18 @@ public class ProductViewModelService : IProductViewModelService//productproduct = model.ToEntity(product, _dateTimeService);product.AutoAddRequiredProducts = model.AutoAddRequiredProducts;-+product.Locales = await _seNameService.TranslationSeNameProperties(model.Locales, product, x => x.Name);product.SeName = await _seNameService.ValidateSeName(product, model.SeName, product.Name, true);await _productService.UpdateProduct(product);-+//search engine nameawait _seNameService.SaveSeName(product);-+//warehousesawait SaveProductWarehouseInventory(product, model.ProductWarehouseInventoryModels);-+//picture seo namesawait UpdatePictureSeoNames(product);@@ -1129,8 +1133,7 @@ public class ProductViewModelService : IProductViewModelService{var model = new BulkEditListModel {//product types- AvailableProductTypes = ProductType.SimpleProduct- .ToSelectList(_translationService, _workContext, false).ToList()+ AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList()};model.AvailableProductTypes.Insert(0,@@ -1165,9 +1168,7 @@ public class ProductViewModelService : IProductViewModelServiceOldPrice = x.OldPrice,Price = x.Price,ManageInventoryMethodId = (int)x.ManageInventoryMethodId,- ManageInventoryMethod =- x.ManageInventoryMethodId.GetTranslationEnum(_translationService,- _workContext.WorkingLanguage.Id),+ ManageInventoryMethod = _enumTranslationService.GetTranslationEnum(x.ManageInventoryMethodId),StockQuantity = x.StockQuantity,Published = x.Published};@@ -1315,8 +1316,7 @@ public class ProductViewModelService : IProductViewModelServiceTextPrompt = x.TextPrompt,IsRequired = x.IsRequired,ShowOnCatalogPage = x.ShowOnCatalogPage,- AttributeControlType =- x.AttributeControlTypeId.GetTranslationEnum(_translationService, _workContext),+ AttributeControlType = _enumTranslationService.GetTranslationEnum(x.AttributeControlTypeId),AttributeControlTypeId = x.AttributeControlTypeId,DisplayOrder = x.DisplayOrder,Combination = x.Combination@@ -1660,8 +1660,7 @@ public class ProductViewModelService : IProductViewModelServiceId = x.Id,ProductAttributeMappingId = productAttributeMapping.Id, //TODO - check x.ProductAttributeMappingId,AttributeValueTypeId = x.AttributeValueTypeId,- AttributeValueTypeName =- x.AttributeValueTypeId.GetTranslationEnum(_translationService, _workContext),+ AttributeValueTypeName = _enumTranslationService.GetTranslationEnum(x.AttributeValueTypeId),AssociatedProductId = x.AssociatedProductId,AssociatedProductName = associatedProduct != null ? associatedProduct.Name : "",Name = productAttributeMapping.AttributeControlTypeId != AttributeControlType.ColorSquares@@ -1699,7 +1698,7 @@ public class ProductViewModelService : IProductViewModelServicevar model = new ProductModel.ProductAttributeValueModel {ProductAttributeMappingId = pa.Id, //TODO - check pav.ProductAttributeMappingId,AttributeValueTypeId = pav.AttributeValueTypeId,- AttributeValueTypeName = pav.AttributeValueTypeId.GetTranslationEnum(_translationService, _workContext),+ AttributeValueTypeName = _enumTranslationService.GetTranslationEnum(pav.AttributeValueTypeId),AssociatedProductId = pav.AssociatedProductId,AssociatedProductName = associatedProduct != null ? associatedProduct.Name : "",Name = pav.Name,@@ -2273,7 +2272,7 @@ public class ProductViewModelService : IProductViewModelServiceAttributeTypeId = (int)x.AttributeTypeId,AttributeId = x.SpecificationAttributeId,ProductId = product.Id,- AttributeTypeName = x.AttributeTypeId.GetTranslationEnum(_translationService, _workContext),+ AttributeTypeName = _enumTranslationService.GetTranslationEnum(x.AttributeTypeId),AllowFiltering = x.AllowFiltering,ShowOnProductPage = x.ShowOnProductPage,DisplayOrder = x.DisplayOrder,@@ -2372,8 +2371,7 @@ public class ProductViewModelService : IProductViewModelService{var model = new T {//product types- AvailableProductTypes = ProductType.SimpleProduct- .ToSelectList(_translationService, _workContext, false).ToList()+ AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList()};model.AvailableProductTypes.Insert(0,diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.csindex 800795a1e..47b41c60e 100644--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs@@ -1,7 +1,7 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Catalog;using Grand.Infrastructure.Extensions;+using Grand.Web.Common.Localization;using Grand.Web.Features.Models.Catalog;using Grand.Web.Models.Catalog;using MediatR;@@ -17,13 +17,14 @@ public class GetViewSortSizeOptionsHandler : IRequestHandler<GetViewSortSizeOptiprivate readonly CatalogSettings _catalogSettings;private readonly IHttpContextAccessor _httpContextAccessor;private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;public GetViewSortSizeOptionsHandler(ITranslationService translationService, CatalogSettings catalogSettings,- IHttpContextAccessor httpContextAccessor)+ IHttpContextAccessor httpContextAccessor, IEnumTranslationService enumTranslationService){_translationService = translationService;_catalogSettings = catalogSettings;_httpContextAccessor = httpContextAccessor;+ _enumTranslationService = enumTranslationService;}public async Task<(CatalogPagingFilteringModel pagingFilteringModel, CatalogPagingFilteringModel command)>@@ -63,8 +64,7 @@ public class GetViewSortSizeOptionsHandler : IRequestHandler<GetViewSortSizeOptivar currentPageUrl = _httpContextAccessor.HttpContext?.Request.GetDisplayUrl();var sortUrl = CommonExtensions.ModifyQueryString(currentPageUrl, "orderby", option.Key.ToString());- var sortValue =- ((ProductSortingEnum)option.Key).GetTranslationEnum(_translationService, request.Language.Id);+ var sortValue = _enumTranslationService.GetTranslationEnum((ProductSortingEnum)option.Key);request.PagingFilteringModel.AvailableSortOptions.Add(new SelectListItem {Text = sortValue,Value = sortUrl,diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.csindex 625d84176..213323871 100644--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs@@ -1,7 +1,6 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Business.Core.Interfaces.Marketing.Documents;+using Grand.Business.Core.Interfaces.Marketing.Documents;using Grand.Domain.Documents;+using Grand.Web.Common.Localization;using Grand.Web.Features.Models.Customers;using Grand.Web.Models.Customer;using MediatR;@@ -14,17 +13,17 @@ public class GetDocumentsHandler : IRequestHandler<GetDocuments, DocumentsModel>private readonly IDocumentService _documentService;private readonly DocumentSettings _documentSettings;private readonly IDocumentTypeService _documentTypeService;- private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;+public GetDocumentsHandler(IDocumentService documentService,IDocumentTypeService documentTypeService,- ITranslationService translationService,- DocumentSettings documentSettings)+ DocumentSettings documentSettings,+ IEnumTranslationService enumTranslationService){_documentService = documentService;_documentTypeService = documentTypeService;- _translationService = translationService;_documentSettings = documentSettings;+ _enumTranslationService = enumTranslationService;}public async Task<DocumentsModel> Handle(GetDocuments request, CancellationToken cancellationToken)@@ -49,7 +48,7 @@ public class GetDocumentsHandler : IRequestHandler<GetDocuments, DocumentsModel>Name = item.Name,Number = item.Number,Quantity = item.Quantity,- Status = item.StatusId.GetTranslationEnum(_translationService, request.Language.Id),+ Status = _enumTranslationService.GetTranslationEnum(item.StatusId),Description = item.Description,DocDate = item.DocDate,DueDate = item.DueDate,diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.csindex a1e02d9db..5fecc406f 100644--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs@@ -6,6 +6,7 @@ using Grand.Business.Core.Interfaces.Marketing.Newsletters;using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Tax;+using Grand.Web.Common.Localization;using Grand.Web.Features.Models.Customers;using Grand.Web.Models.Customer;using Grand.Web.Models.Newsletter;@@ -24,7 +25,8 @@ public class GetInfoHandler : IRequestHandler<GetInfo, CustomerInfoModel>private readonly INewsLetterSubscriptionService _newsLetterSubscriptionService;private readonly TaxSettings _taxSettings;private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;+public GetInfoHandler(INewsLetterSubscriptionService newsLetterSubscriptionService,INewsletterCategoryService newsletterCategoryService,@@ -33,7 +35,8 @@ public class GetInfoHandler : IRequestHandler<GetInfo, CustomerInfoModel>IExternalAuthenticationService externalAuthenticationService,IMediator mediator,CustomerSettings customerSettings,- TaxSettings taxSettings)+ TaxSettings taxSettings,+ IEnumTranslationService enumTranslationService){_newsLetterSubscriptionService = newsLetterSubscriptionService;_newsletterCategoryService = newsletterCategoryService;@@ -43,6 +46,7 @@ public class GetInfoHandler : IRequestHandler<GetInfo, CustomerInfoModel>_mediator = mediator;_customerSettings = customerSettings;_taxSettings = taxSettings;+ _enumTranslationService = enumTranslationService;}public async Task<CustomerInfoModel> Handle(GetInfo request, CancellationToken cancellationToken)@@ -161,9 +165,7 @@ public class GetInfoHandler : IRequestHandler<GetInfo, CustomerInfoModel>}model.DisplayVatNumber = _taxSettings.EuVatEnabled;- model.VatNumberStatusNote =- ((VatNumberStatus)request.Customer.GetUserFieldFromEntity<int>(SystemCustomerFieldNames.VatNumberStatusId))- .GetTranslationEnum(_translationService, request.Language.Id);+ model.VatNumberStatusNote = _enumTranslationService.GetTranslationEnum((VatNumberStatus)request.Customer.GetUserFieldFromEntity<int>(SystemCustomerFieldNames.VatNumberStatusId));model.GenderEnabled = _customerSettings.GenderEnabled;model.DateOfBirthEnabled = _customerSettings.DateOfBirthEnabled;model.DateOfBirthRequired = _customerSettings.DateOfBirthRequired;diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.csindex 2ad7018e7..bbbe7d7c2 100644--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs@@ -1,10 +1,9 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Prices;+using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain.Orders;+using Grand.Web.Common.Localization;using Grand.Web.Features.Models.Orders;using Grand.Web.Models.Orders;using MediatR;@@ -21,26 +20,26 @@ public class GetCustomerOrderListHandler : IRequestHandler<GetCustomerOrderList,private readonly OrderSettings _orderSettings;private readonly IOrderStatusService _orderStatusService;private readonly IPriceFormatter _priceFormatter;- private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;+public GetCustomerOrderListHandler(IDateTimeService dateTimeService,- ITranslationService translationService,IGroupService groupService,IMediator mediator,IPriceFormatter priceFormatter,IOrderStatusService orderStatusService,IOrderService orderService,ICurrencyService currencyService,- OrderSettings orderSettings)+ OrderSettings orderSettings,+ IEnumTranslationService enumTranslationService){_dateTimeService = dateTimeService;- _translationService = translationService;_groupService = groupService;_priceFormatter = priceFormatter;_orderStatusService = orderStatusService;_orderService = orderService;_orderSettings = orderSettings;+ _enumTranslationService = enumTranslationService;_currencyService = currencyService;_mediator = mediator;}@@ -88,8 +87,8 @@ public class GetCustomerOrderListHandler : IRequestHandler<GetCustomerOrderList,CreatedOn = _dateTimeService.ConvertToUserTime(order.CreatedOnUtc, DateTimeKind.Utc),OrderStatusId = order.OrderStatusId,OrderStatus = status?.Name,- PaymentStatus = order.PaymentStatusId.GetTranslationEnum(_translationService, request.Language.Id),- ShippingStatus = order.ShippingStatusId.GetTranslationEnum(_translationService, request.Language.Id),+ PaymentStatus = _enumTranslationService.GetTranslationEnum(order.PaymentStatusId),+ ShippingStatus = _enumTranslationService.GetTranslationEnum(order.ShippingStatusId),IsMerchandiseReturnAllowed =await _mediator.Send(new IsMerchandiseReturnAllowedQuery { Order = order }),OrderTotal = _priceFormatter.FormatPrice(order.OrderTotal,diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.csindex 81ddb3561..d6e5bc143 100644--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs@@ -1,10 +1,9 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Prices;+using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Checkout.Orders;using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Domain.Tax;+using Grand.Web.Common.Localization;using Grand.Web.Features.Models.Orders;using Grand.Web.Models.Orders;using MediatR;@@ -18,22 +17,22 @@ public class GetMerchandiseReturnsHandler : IRequestHandler<GetMerchandiseReturnprivate readonly IMediator _mediator;private readonly IOrderService _orderService;private readonly IPriceFormatter _priceFormatter;- private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;+public GetMerchandiseReturnsHandler(IOrderService orderService,- ITranslationService translationService,IDateTimeService dateTimeService,IPriceFormatter priceFormatter,IGroupService groupService,- IMediator mediator)+ IMediator mediator,+ IEnumTranslationService enumTranslationService){_orderService = orderService;_groupService = groupService;- _translationService = translationService;_dateTimeService = dateTimeService;_priceFormatter = priceFormatter;_mediator = mediator;+ _enumTranslationService = enumTranslationService;}public async Task<CustomerMerchandiseReturnsModel> Handle(GetMerchandiseReturns request,@@ -71,9 +70,7 @@ public class GetMerchandiseReturnsHandler : IRequestHandler<GetMerchandiseReturnvar itemModel = new CustomerMerchandiseReturnsModel.MerchandiseReturnModel {Id = merchandiseReturn.Id,ReturnNumber = merchandiseReturn.ReturnNumber,- MerchandiseReturnStatus =- merchandiseReturn.MerchandiseReturnStatus.GetTranslationEnum(_translationService,- request.Language.Id),+ MerchandiseReturnStatus = _enumTranslationService.GetTranslationEnum(merchandiseReturn.MerchandiseReturnStatus),CreatedOn = _dateTimeService.ConvertToUserTime(merchandiseReturn.CreatedOnUtc, DateTimeKind.Utc),ProductsCount = merchandiseReturn.MerchandiseReturnItems.Sum(x => x.Quantity),ReturnTotal = _priceFormatter.FormatPrice(total)diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.csindex b131fae3c..121f59741 100644--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs@@ -16,6 +16,7 @@ using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Domain.Shipping;using Grand.Domain.Tax;+using Grand.Web.Common.Localization;using Grand.Web.Extensions;using Grand.Web.Features.Models.Common;using Grand.Web.Features.Models.Orders;@@ -44,7 +45,8 @@ public class GetOrderDetailsHandler : IRequestHandler<GetOrderDetails, OrderDetaprivate readonly IShipmentService _shipmentService;private readonly TaxSettings _taxSettings;private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;+private Currency _orderCurrency;public GetOrderDetailsHandler(@@ -64,7 +66,8 @@ public class GetOrderDetailsHandler : IRequestHandler<GetOrderDetails, OrderDetaCatalogSettings catalogSettings,OrderSettings orderSettings,PdfSettings pdfSettings,- TaxSettings taxSettings)+ TaxSettings taxSettings,+ IEnumTranslationService enumTranslationService){_dateTimeService = dateTimeService;_productService = productService;@@ -83,6 +86,7 @@ public class GetOrderDetailsHandler : IRequestHandler<GetOrderDetails, OrderDeta_catalogSettings = catalogSettings;_pdfSettings = pdfSettings;_taxSettings = taxSettings;+ _enumTranslationService = enumTranslationService;}public async Task<OrderDetailsModel> Handle(GetOrderDetails request, CancellationToken cancellationToken)@@ -156,8 +160,7 @@ public class GetOrderDetailsHandler : IRequestHandler<GetOrderDetails, OrderDetaprivate async Task PrepareShippingInfo(GetOrderDetails request, OrderDetailsModel model){- model.ShippingStatus =- request.Order.ShippingStatusId.GetTranslationEnum(_translationService, request.Language.Id);+ model.ShippingStatus = _enumTranslationService.GetTranslationEnum(request.Order.ShippingStatusId);if (request.Order.ShippingStatusId != ShippingStatus.ShippingNotRequired){model.IsShippable = true;@@ -209,8 +212,7 @@ public class GetOrderDetailsHandler : IRequestHandler<GetOrderDetails, OrderDetavar paymentMethod = _paymentService.LoadPaymentMethodBySystemName(request.Order.PaymentMethodSystemName);model.PaymentMethod =paymentMethod != null ? paymentMethod.FriendlyName : request.Order.PaymentMethodSystemName;- model.PaymentMethodStatus =- request.Order.PaymentStatusId.GetTranslationEnum(_translationService, request.Language.Id);+ model.PaymentMethodStatus = _enumTranslationService.GetTranslationEnum(request.Order.PaymentStatusId);var paymentTransaction = await _paymentTransactionService.GetOrderByGuid(request.Order.OrderGuid);model.CanRePostProcessPayment = paymentTransaction != null &&await _paymentService.CanRePostRedirectPayment(paymentTransaction);diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.csindex 9b493f11e..8e76c7eba 100644--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs@@ -19,6 +19,7 @@ using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Media;using Grand.Domain.Orders;+using Grand.Web.Common.Localization;using Grand.Web.Extensions;using Grand.Web.Features.Models.ShoppingCart;using Grand.Web.Models.Media;@@ -58,7 +59,7 @@ public class GetShoppingCartHandler : IRequestHandler<GetShoppingCart, ShoppingCprivate readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly IWarehouseService _warehouseService;-+ private readonly IEnumTranslationService _enumTranslationService;public GetShoppingCartHandler(IProductService productService,IPictureService pictureService,@@ -86,7 +87,8 @@ public class GetShoppingCartHandler : IRequestHandler<GetShoppingCart, ShoppingCOrderSettings orderSettings,ShoppingCartSettings shoppingCartSettings,CatalogSettings catalogSettings,- CommonSettings commonSettings)+ CommonSettings commonSettings,+ IEnumTranslationService enumTranslationService){_productService = productService;_pictureService = pictureService;@@ -115,6 +117,7 @@ public class GetShoppingCartHandler : IRequestHandler<GetShoppingCart, ShoppingC_shoppingCartSettings = shoppingCartSettings;_catalogSettings = catalogSettings;_commonSettings = commonSettings;+ _enumTranslationService = enumTranslationService;}public async Task<ShoppingCartModel> Handle(GetShoppingCart request, CancellationToken cancellationToken)@@ -385,7 +388,7 @@ public class GetShoppingCartHandler : IRequestHandler<GetShoppingCart, ShoppingCcartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"),product.RecurringCycleLength,- product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id),+ _enumTranslationService.GetTranslationEnum(product.RecurringCyclePeriodId),product.RecurringTotalCycles);//reservation infodiff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.csindex 1118eaf9d..7ab9513fe 100644--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs@@ -1,4 +1,5 @@-using Grand.Business.Core.Extensions;+using Grand.Api.Validators.Common;+using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Prices;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Catalog.Tax;@@ -13,6 +14,7 @@ using Grand.Domain.Common;using Grand.Domain.Customers;using Grand.Domain.Media;using Grand.Domain.Orders;+using Grand.Web.Common.Localization;using Grand.Web.Extensions;using Grand.Web.Features.Models.ShoppingCart;using Grand.Web.Models.Media;@@ -38,7 +40,7 @@ public class GetWishlistHandler : IRequestHandler<GetWishlist, WishlistModel>private readonly IShoppingCartValidator _shoppingCartValidator;private readonly ITaxService _taxService;private readonly ITranslationService _translationService;-+ private readonly IEnumTranslationService _enumTranslationService;public GetWishlistHandler(IPermissionService permissionService,IProductService productService,@@ -52,7 +54,8 @@ public class GetWishlistHandler : IRequestHandler<GetWishlist, WishlistModel>LinkGenerator linkGenerator,ShoppingCartSettings shoppingCartSettings,CatalogSettings catalogSettings,- MediaSettings mediaSettings)+ MediaSettings mediaSettings,+ IEnumTranslationService enumTranslationService){_permissionService = permissionService;_productService = productService;@@ -67,6 +70,7 @@ public class GetWishlistHandler : IRequestHandler<GetWishlist, WishlistModel>_shoppingCartSettings = shoppingCartSettings;_catalogSettings = catalogSettings;_mediaSettings = mediaSettings;+ _enumTranslationService = enumTranslationService;}public async Task<WishlistModel> Handle(GetWishlist request, CancellationToken cancellationToken)@@ -129,7 +133,7 @@ public class GetWishlistHandler : IRequestHandler<GetWishlist, WishlistModel>cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"),product.RecurringCycleLength,- product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id),+ _enumTranslationService.GetTranslationEnum(product.RecurringCyclePeriodId),product.RecurringTotalCycles);//unit pricesdiff --git a/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtmlindex 17ecf67f2..c592f7f1b 100644--- a/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml+++ b/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml@@ -1,4 +1,5 @@-@model AddressModel+@inject IEnumTranslationService EnumTranslationService;+@model AddressModel@{var prefix = ViewData.TemplateInfo.HtmlFieldPrefix;}@@ -265,7 +266,7 @@{<div class="form-group col-sm-12 col-md-6"><label asp-for="AddressTypeId" class="col-form-label">@Loc["Address.Fields.AddressType"]:</label>- <select asp-for="AddressTypeId" asp-items="@AddressType.Any.ToSelectList(Context, false).ToList()" class="form-control custom-select"></select>+ <select asp-for="AddressTypeId" asp-items="@EnumTranslationService.ToSelectList(AddressType.Any, false).ToList()" class="form-control custom-select"></select></div>}@if (Model.CustomAddressAttributes.Any())