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
Replace IServiceProvider with IHttpContextAccessor in Plugins
supportf2149b294562
diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.csindex f3e7d36ec..ff19ec0a1 100644--- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs+++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs@@ -4,6 +4,7 @@ using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Utilities.Catalog;using Grand.Domain.Orders;using Grand.Infrastructure;+using Microsoft.AspNetCore.Http;using Microsoft.Extensions.DependencyInjection;namespace DiscountRules.Standard.Providers@@ -12,18 +13,18 @@ namespace DiscountRules.Standard.Providers{private readonly IWorkContext _workContext;private readonly IProductService _productService;- private readonly IServiceProvider _serviceProvider;+ private readonly IHttpContextAccessor _httpContextAccessor;private readonly ShoppingCartSettings _shoppingCartSettings;public ShoppingCartDiscountRule(IWorkContext workContext,IProductService productService,- IServiceProvider serviceProvider,+ IHttpContextAccessor httpContextAccessor,ShoppingCartSettings shoppingCartSettings){_workContext = workContext;_productService = productService;- _serviceProvider = serviceProvider;+ _httpContextAccessor = httpContextAccessor;_shoppingCartSettings = shoppingCartSettings;}@@ -59,7 +60,7 @@ namespace DiscountRules.Standard.Providers}double spentAmount = 0;- var priceCalculationService = _serviceProvider.GetRequiredService<IPricingService>();+ var priceCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IPricingService>();foreach (var ca in cart){diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.csindex 393783cca..1c3c38d6b 100644--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs@@ -21,20 +21,17 @@ namespace Payments.BrainTree{private readonly ITranslationService _translationService;private readonly ICustomerService _customerService;- private readonly IServiceProvider _serviceProvider;private readonly IHttpContextAccessor _httpContextAccessor;private readonly BrainTreePaymentSettings _brainTreePaymentSettings;public BrainTreePaymentProvider(ITranslationService translationService,ICustomerService customerService,- IServiceProvider serviceProvider,IHttpContextAccessor httpContextAccessor,BrainTreePaymentSettings brainTreePaymentSettings){_translationService = translationService;_customerService = customerService;- _serviceProvider = serviceProvider;_httpContextAccessor = httpContextAccessor;_brainTreePaymentSettings = brainTreePaymentSettings;}@@ -228,7 +225,7 @@ namespace Payments.BrainTreeif (_brainTreePaymentSettings.AdditionalFeePercentage){//percentage- var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();+ var orderTotalCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderCalculationService>();var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);result = (float)subtotal.subTotalWithDiscount *(float)_brainTreePaymentSettings.AdditionalFee / 100f;@@ -240,8 +237,8 @@ namespace Payments.BrainTree}if (!(result > 0)) return await Task.FromResult(result);- var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();- var workContext = _serviceProvider.GetRequiredService<IWorkContext>();+ var currencyService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<ICurrencyService>();+ var workContext = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IWorkContext>();result = await currencyService.ConvertFromPrimaryStoreCurrency(result, workContext.WorkingCurrency);//return result;diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.csindex 6e6cd43c6..87c4c493e 100644--- a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs+++ b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs@@ -7,6 +7,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Infrastructure;+using Microsoft.AspNetCore.Http;using Microsoft.Extensions.DependencyInjection;namespace Payments.CashOnDelivery@@ -14,18 +15,17 @@ namespace Payments.CashOnDeliverypublic class CashOnDeliveryPaymentProvider : IPaymentProvider{private readonly ITranslationService _translationService;- private readonly IServiceProvider _serviceProvider;+ private readonly IHttpContextAccessor _httpContextAccessor;private readonly CashOnDeliveryPaymentSettings _cashOnDeliveryPaymentSettings;public CashOnDeliveryPaymentProvider(ITranslationService translationService,- IServiceProvider serviceProvider,- CashOnDeliveryPaymentSettings cashOnDeliveryPaymentSettings- )+ IHttpContextAccessor httpContextAccessor,+ CashOnDeliveryPaymentSettings cashOnDeliveryPaymentSettings){_translationService = translationService;- _serviceProvider = serviceProvider;+ _httpContextAccessor = httpContextAccessor;_cashOnDeliveryPaymentSettings = cashOnDeliveryPaymentSettings;}@@ -88,7 +88,7 @@ namespace Payments.CashOnDeliveryif (_cashOnDeliveryPaymentSettings.AdditionalFeePercentage){//percentage- var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();+ var orderTotalCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderCalculationService>();var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);result = (float)subtotal.subTotalWithDiscount * (float)_cashOnDeliveryPaymentSettings.AdditionalFee / 100f;}@@ -99,8 +99,8 @@ namespace Payments.CashOnDelivery}if (!(result > 0)) return result;- var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();- var workContext = _serviceProvider.GetRequiredService<IWorkContext>();+ var currencyService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<ICurrencyService>();+ var workContext = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IWorkContext>();result = await currencyService.ConvertFromPrimaryStoreCurrency(result, workContext.WorkingCurrency);//return result;@@ -159,7 +159,7 @@ namespace Payments.CashOnDelivery/// <returns>Result</returns>public async Task CancelPayment(PaymentTransaction paymentTransaction){- var paymentTransactionService = _serviceProvider.GetRequiredService<IPaymentTransactionService>();+ var paymentTransactionService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IPaymentTransactionService>();paymentTransaction.TransactionStatus = TransactionStatus.Canceled;await paymentTransactionService.UpdatePaymentTransaction(paymentTransaction);}diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.csindex bf7ca7bac..323dd40bd 100644--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs@@ -30,10 +30,10 @@ namespace Payments.PayPalStandardprivate readonly IHttpContextAccessor _httpContextAccessor;private readonly ITaxService _taxService;private readonly IProductService _productService;- private readonly IServiceProvider _serviceProvider;private readonly IWorkContext _workContext;private readonly IOrderService _orderService;-+ private readonly ICountryService _countryService;+ private readonly ICurrencyService _currencyService;#region Ctorpublic PayPalStandardPaymentProvider(@@ -43,9 +43,10 @@ namespace Payments.PayPalStandardITranslationService translationService,ITaxService taxService,IProductService productService,- IServiceProvider serviceProvider,IWorkContext workContext,IOrderService orderService,+ ICountryService countryService,+ ICurrencyService currencyService,PayPalStandardPaymentSettings paypalStandardPaymentSettings){_checkoutAttributeParser = checkoutAttributeParser;@@ -54,9 +55,10 @@ namespace Payments.PayPalStandard_translationService = translationService;_taxService = taxService;_productService = productService;- _serviceProvider = serviceProvider;_workContext = workContext;_orderService = orderService;+ _countryService = countryService;+ _currencyService = currencyService;_paypalStandardPaymentSettings = paypalStandardPaymentSettings;}@@ -101,15 +103,14 @@ namespace Payments.PayPalStandardvar countryCode = "";if (!string.IsNullOrEmpty(order.ShippingAddress?.StateProvinceId)){- var countryService = _serviceProvider.GetRequiredService<ICountryService>();- var country = await countryService.GetCountryById(order.ShippingAddress?.CountryId);+ var country = await _countryService.GetCountryById(order.ShippingAddress?.CountryId);var state = country?.StateProvinces.FirstOrDefault(x => x.Id == order.ShippingAddress?.StateProvinceId);if (state != null)stateProvince = state.Abbreviation;}if (!string.IsNullOrEmpty(order.ShippingAddress?.CountryId)){- var country = await _serviceProvider.GetRequiredService<ICountryService>().GetCountryById(order.ShippingAddress?.CountryId);+ var country = await _countryService.GetCountryById(order.ShippingAddress?.CountryId);if (country != null)countryCode = country.TwoLetterIsoCode;}@@ -188,15 +189,12 @@ namespace Payments.PayPalStandard//add checkout attributes as order itemsvar checkoutAttributeValues = await _checkoutAttributeParser.ParseCheckoutAttributeValue(order.CheckoutAttributes);- var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();- var workContext = _serviceProvider.GetRequiredService<IWorkContext>();- var customer = await _serviceProvider.GetRequiredService<ICustomerService>().GetCustomerById(order.CustomerId);foreach (var attributeValue in checkoutAttributeValues){- var attributePrice = await _taxService.GetCheckoutAttributePrice(attributeValue.ca, attributeValue.cav, false, customer);+ var attributePrice = await _taxService.GetCheckoutAttributePrice(attributeValue.ca, attributeValue.cav, false, _workContext.CurrentCustomer);if (attributePrice.checkoutPrice > 0){- var roundedAttributePrice = Math.Round(await currencyService.ConvertFromPrimaryStoreCurrency(attributePrice.checkoutPrice, workContext.WorkingCurrency), 2);+ var roundedAttributePrice = Math.Round(await _currencyService.ConvertFromPrimaryStoreCurrency(attributePrice.checkoutPrice, _workContext.WorkingCurrency), 2);//add query parametersif (attributeValue.ca != null){@@ -378,7 +376,7 @@ namespace Payments.PayPalStandardif (_paypalStandardPaymentSettings.AdditionalFeePercentage){//percentage- var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();+ var orderTotalCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderCalculationService>();var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);result = (float)subtotal.subTotalWithDiscount * (float)_paypalStandardPaymentSettings.AdditionalFee / 100f;}@@ -389,8 +387,7 @@ namespace Payments.PayPalStandard}if (!(result > 0)) return await Task.FromResult(result);- var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();- result = await currencyService.ConvertFromPrimaryStoreCurrency(result, _workContext.WorkingCurrency);+ result = await _currencyService.ConvertFromPrimaryStoreCurrency(result, _workContext.WorkingCurrency);//return result;return await Task.FromResult(result);}diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.csindex 575781c67..72fe6f76d 100644--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs@@ -13,6 +13,7 @@ using Grand.Domain.Customers;using Grand.Domain.Orders;using Grand.Domain.Shipping;using Grand.Infrastructure;+using Microsoft.AspNetCore.Http;using Microsoft.Extensions.DependencyInjection;using Shipping.ByWeight.Services;@@ -24,11 +25,11 @@ namespace Shipping.ByWeightprivate readonly IShippingMethodService _shippingMethodService;private readonly IWorkContext _workContext;- private readonly IServiceProvider _serviceProvider;private readonly ITranslationService _translationService;private readonly IProductService _productService;private readonly ICheckoutAttributeParser _checkoutAttributeParser;private readonly ICurrencyService _currencyService;+ private readonly IHttpContextAccessor _httpContextAccessor;private readonly ByWeightShippingSettings _byWeightShippingSettings;#endregion@@ -39,18 +40,18 @@ namespace Shipping.ByWeightIWorkContext workContext,ITranslationService translationService,IProductService productService,- IServiceProvider serviceProvider,ICheckoutAttributeParser checkoutAttributeParser,ICurrencyService currencyService,+ IHttpContextAccessor httpContextAccessor,ByWeightShippingSettings byWeightShippingSettings){_shippingMethodService = shippingMethodService;_workContext = workContext;_translationService = translationService;_productService = productService;- _serviceProvider = serviceProvider;_checkoutAttributeParser = checkoutAttributeParser;_currencyService = currencyService;+ _httpContextAccessor = httpContextAccessor;_byWeightShippingSettings = byWeightShippingSettings;}#endregion@@ -61,14 +62,13 @@ namespace Shipping.ByWeightstring storeId, string warehouseId, string countryId, string stateProvinceId, string zip){- var shippingByWeightService = _serviceProvider.GetRequiredService<IShippingByWeightService>();- var shippingByWeightSettings = _serviceProvider.GetRequiredService<ByWeightShippingSettings>();+ var shippingByWeightService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IShippingByWeightService>();var shippingByWeightRecord = await shippingByWeightService.FindRecord(shippingMethodId,storeId, warehouseId, countryId, stateProvinceId, zip, weight);if (shippingByWeightRecord == null){- if (shippingByWeightSettings.LimitMethodsToCreated)+ if (_byWeightShippingSettings.LimitMethodsToCreated)return null;return 0;@@ -211,7 +211,7 @@ namespace Shipping.ByWeightvar zip = getShippingOptionRequest.ShippingAddress.ZipPostalCode;double subTotal = 0;- var priceCalculationService = _serviceProvider.GetRequiredService<IPricingService>();+ var priceCalculationService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IPricingService>();foreach (var packageItem in getShippingOptionRequest.Items){diff --git a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.csindex f91cc3d2d..c5aaf19c9 100644--- a/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs+++ b/src/Plugins/Tax.CountryStateZip/Infrastructure/Cache/ModelCacheEventConsumer.cs@@ -23,12 +23,11 @@ namespace Tax.CountryStateZip.Infrastructure.Cacheprivate readonly ICacheBase _cacheBase;- public ModelCacheEventConsumer(IServiceProvider serviceProvider)+ public ModelCacheEventConsumer(ICacheBase cacheBase){- //TODO inject static cache manager using constructor- this._cacheBase = serviceProvider.GetRequiredService<ICacheBase>();+ this._cacheBase = cacheBase;}-+//tax ratespublic async Task Handle(EntityInserted<TaxRate> eventMessage, CancellationToken cancellationToken){diff --git a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.csindex d6f1ef9bb..7c0479869 100644--- a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs+++ b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs@@ -5,6 +5,7 @@ using Grand.Business.Core.Interfaces.Cms;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Domain.Orders;using Grand.Infrastructure;+using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Logging;@@ -19,20 +20,19 @@ namespace Widgets.GoogleAnalytics.Componentsprivate readonly ILogger<WidgetsGoogleAnalyticsViewComponent> _logger;private readonly GoogleAnalyticsEcommerceSettings _googleAnalyticsEcommerceSettings;private readonly ICookiePreference _cookiePreference;- private readonly IServiceProvider _serviceProvider;+ private readonly IHttpContextAccessor _httpContextAccessor;public WidgetsGoogleAnalyticsViewComponent(IWorkContext workContext,ILogger<WidgetsGoogleAnalyticsViewComponent> logger,GoogleAnalyticsEcommerceSettings googleAnalyticsEcommerceSettings,ICookiePreference cookiePreference,- IServiceProvider serviceProvider- )+ IHttpContextAccessor httpContextAccessor){_workContext = workContext;_logger = logger;_googleAnalyticsEcommerceSettings = googleAnalyticsEcommerceSettings;_cookiePreference = cookiePreference;- _serviceProvider = serviceProvider;+ _httpContextAccessor = httpContextAccessor;}public async Task<IViewComponentResult> InvokeAsync(string widgetZone, object additionalData = null)@@ -76,7 +76,7 @@ namespace Widgets.GoogleAnalytics.Componentsprivate async Task<Order> GetLastOrder(){- var orderService = _serviceProvider.GetRequiredService<IOrderService>();+ var orderService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IOrderService>();var order = (await orderService.SearchOrders(storeId: _workContext.CurrentStore.Id,customerId: _workContext.CurrentCustomer.Id, pageSize: 1)).FirstOrDefault();return order;@@ -98,7 +98,7 @@ namespace Widgets.GoogleAnalytics.Componentsif (order != null){- var countryService = _serviceProvider.GetRequiredService<ICountryService>();+ var countryService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<ICountryService>();var country = await countryService.GetCountryById(order.BillingAddress?.CountryId);var state = country?.StateProvinces.FirstOrDefault(x => x.Id == order.BillingAddress?.StateProvinceId);@@ -116,8 +116,8 @@ namespace Widgets.GoogleAnalytics.Componentsvar sb = new StringBuilder();- var productService = _serviceProvider.GetRequiredService<IProductService>();- var categoryService = _serviceProvider.GetRequiredService<ICategoryService>();+ var productService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IProductService>();+ var categoryService = _httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<ICategoryService>();foreach (var item in order.OrderItems){