Skip to content

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.

Change type Dictionary to IDictionary

supportd9986e78d3bf
diff --git a/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
index 56a9102ca..f4513db56 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
@@ -2,7 +2,6 @@ using Grand.Business.Core.Enums.Checkout;
using Grand.Business.Core.Utilities.Checkout;
using Grand.Infrastructure.Plugins;
using Grand.Domain.Orders;
-using Microsoft.AspNetCore.Http;
using Grand.Domain.Payments;
namespace Grand.Business.Core.Interfaces.Checkout.Payments
@@ -92,14 +91,14 @@ namespace Grand.Business.Core.Interfaces.Checkout.Payments
/// </summary>
/// <param name="model">Dictionary</param>
/// <returns>List of validating errors</returns>
- Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model);
+ Task<IList<string>> ValidatePaymentForm(IDictionary<string, string> model);
/// <summary>
/// Get payment information
/// </summary>
/// <param name="model">Dictionary</param>
/// <returns>Payment info holder</returns>
- Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model);
+ Task<PaymentTransaction> SavePaymentInfo(IDictionary<string, string> model);
/// <summary>
/// Gets a route url for displaying plugin in public store ("payment info" checkout step)
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
index c0e86f6c7..4092f953a 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
@@ -53,7 +53,7 @@ namespace Payments.BrainTree
return await Task.FromResult<PaymentTransaction>(null);
}
- public async Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model)
+ public async Task<IList<string>> ValidatePaymentForm(IDictionary<string, string> model)
{
var warnings = new List<string>();
//validate
@@ -78,7 +78,7 @@ namespace Payments.BrainTree
return await Task.FromResult(warnings);
}
- public async Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model)
+ public async Task<PaymentTransaction> SavePaymentInfo(IDictionary<string, string> model)
{
if (model.TryGetValue("CardNonce", out var cardNonce) && !StringValues.IsNullOrEmpty(cardNonce))
_httpContextAccessor.HttpContext!.Session.SetString("CardNonce", cardNonce.ToString());
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
index d9d8eaf94..24c0d4b29 100644
--- a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
+++ b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
@@ -109,13 +109,13 @@ namespace Payments.CashOnDelivery
return result;
}
- public async Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model)
+ public async Task<IList<string>> ValidatePaymentForm(IDictionary<string, string> model)
{
var warnings = new List<string>();
return await Task.FromResult(warnings);
}
- public async Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model)
+ public async Task<PaymentTransaction> SavePaymentInfo(IDictionary<string, string> model)
{
return await Task.FromResult<PaymentTransaction>(null);
}
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
index 32a7179aa..b85151f6c 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -462,7 +462,7 @@ namespace Payments.PayPalStandard
/// </summary>
/// <param name="model"></param>
/// <returns>List of validating errors</returns>
- public async Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model)
+ public async Task<IList<string>> ValidatePaymentForm(IDictionary<string, string> model)
{
return await Task.FromResult(new List<string>());
}
@@ -472,7 +472,7 @@ namespace Payments.PayPalStandard
/// </summary>
/// <param name="model"></param>
/// <returns>Payment info holder</returns>
- public async Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model)
+ public async Task<PaymentTransaction> SavePaymentInfo(IDictionary<string, string> model)
{
return await Task.FromResult<PaymentTransaction>(null);
}
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index a66149e1f..3e9fdf72a 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -937,7 +937,7 @@ namespace Grand.Web.Controllers
}
}
- public virtual async Task<IActionResult> SavePaymentInfo(IFormCollection form)
+ public virtual async Task<IActionResult> SavePaymentInfo(IDictionary<string, string> model)
{
try
{
@@ -953,13 +953,13 @@ namespace Grand.Web.Controllers
if (paymentMethod == null)
throw new Exception("Payment method is not selected");
- var warnings = await paymentMethod.ValidatePaymentForm(form.ToDictionary(x=>x.Key, y=>y.Value.ToString()));
+ var warnings = await paymentMethod.ValidatePaymentForm(model);
foreach (var warning in warnings)
ModelState.AddModelError("", warning);
if (ModelState.IsValid)
{
//save payment info
- var paymentTransaction = await paymentMethod.SavePaymentInfo(form.ToDictionary(x=>x.Key, y=>y.Value.ToString()));
+ var paymentTransaction = await paymentMethod.SavePaymentInfo(model);
if (paymentTransaction != null)
{
//save