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.

Payment plugins/Shipping plugins - Move with IFormCollection to Dictionary

supportb13e5beaf45e
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 1d0a358ef..56a9102ca 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
@@ -90,16 +90,16 @@ namespace Grand.Business.Core.Interfaces.Checkout.Payments
/// <summary>
/// Validate payment form
/// </summary>
- /// <param name="form">The parsed form values</param>
+ /// <param name="model">Dictionary</param>
/// <returns>List of validating errors</returns>
- Task<IList<string>> ValidatePaymentForm(IFormCollection form);
+ Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model);
/// <summary>
/// Get payment information
/// </summary>
- /// <param name="form">The parsed form values</param>
+ /// <param name="model">Dictionary</param>
/// <returns>Payment info holder</returns>
- Task<PaymentTransaction> SavePaymentInfo(IFormCollection form);
+ Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model);
/// <summary>
/// Gets a route url for displaying plugin in public store ("payment info" checkout step)
diff --git a/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs
index ecaa8ebcc..7ddbbf877 100644
--- a/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs
@@ -43,7 +43,7 @@ namespace Grand.Business.Core.Interfaces.Checkout.Shipping
IShipmentTracker ShipmentTracker { get; }
- Task<IList<string>> ValidateShippingForm(IFormCollection form);
+ Task<IList<string>> ValidateShippingForm(Dictionary<string, string> model);
/// <summary>
/// Gets a route name for displaying plugin ("shipping" checkout step)
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
index 89201cc21..c0e86f6c7 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
@@ -53,50 +53,51 @@ namespace Payments.BrainTree
return await Task.FromResult<PaymentTransaction>(null);
}
- public async Task<IList<string>> ValidatePaymentForm(IFormCollection form)
+ public async Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model)
{
var warnings = new List<string>();
-
//validate
var validator = new PaymentInfoValidator(_brainTreePaymentSettings, _translationService);
- var model = new PaymentInfoModel
- {
- CardholderName = form["CardholderName"],
- CardNumber = form["CardNumber"],
- CardCode = form["CardCode"],
- ExpireMonth = form["ExpireMonth"],
- ExpireYear = form["ExpireYear"],
- CardNonce = form["CardNonce"]
- };
- var validationResult = validator.Validate(model);
- if (!validationResult.IsValid)
- foreach (var error in validationResult.Errors)
- {
- warnings.Add(error.ErrorMessage);
- }
+ var paymentInfoModel = new PaymentInfoModel();
+ if (model.TryGetValue("CardholderName", out var cardholderName))
+ paymentInfoModel.CardholderName = cardholderName;
+ if (model.TryGetValue("CardNumber", out var cardNumber))
+ paymentInfoModel.CardNumber = cardNumber;
+ if (model.TryGetValue("CardCode", out var cardCode))
+ paymentInfoModel.CardCode = cardCode;
+ if (model.TryGetValue("ExpireMonth", out var expireMonth))
+ paymentInfoModel.ExpireMonth = expireMonth;
+ if (model.TryGetValue("ExpireYear", out var expireYear))
+ paymentInfoModel.ExpireYear = expireYear;
+ if (model.TryGetValue("CardNonce", out var cardNonce))
+ paymentInfoModel.CardNonce = cardNonce;
+
+ var validationResult = await validator.ValidateAsync(paymentInfoModel);
+ if (validationResult.IsValid) return await Task.FromResult(warnings);
+ warnings.AddRange(validationResult.Errors.Select(error => error.ErrorMessage));
return await Task.FromResult(warnings);
}
- public async Task<PaymentTransaction> SavePaymentInfo(IFormCollection form)
+ public async Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model)
{
+ if (model.TryGetValue("CardNonce", out var cardNonce) && !StringValues.IsNullOrEmpty(cardNonce))
+ _httpContextAccessor.HttpContext!.Session.SetString("CardNonce", cardNonce.ToString());
- if (form.TryGetValue("CardNonce", out var cardNonce) && !StringValues.IsNullOrEmpty(cardNonce))
- _httpContextAccessor.HttpContext.Session.SetString("CardNonce", cardNonce.ToString());
-
- if (form.TryGetValue("CardholderName", out var cardholderName) && !StringValues.IsNullOrEmpty(cardholderName))
- _httpContextAccessor.HttpContext.Session.SetString("CardholderName", cardholderName.ToString());
+ if (model.TryGetValue("CardholderName", out var cardholderName) &&
+ !StringValues.IsNullOrEmpty(cardholderName))
+ _httpContextAccessor.HttpContext!.Session.SetString("CardholderName", cardholderName.ToString());
- if (form.TryGetValue("CardNumber", out var cardNumber) && !StringValues.IsNullOrEmpty(cardNumber))
- _httpContextAccessor.HttpContext.Session.SetString("CardNumber", cardNumber.ToString());
+ if (model.TryGetValue("CardNumber", out var cardNumber) && !StringValues.IsNullOrEmpty(cardNumber))
+ _httpContextAccessor.HttpContext!.Session.SetString("CardNumber", cardNumber.ToString());
- if (form.TryGetValue("ExpireMonth", out var expireMonth) && !StringValues.IsNullOrEmpty(expireMonth))
- _httpContextAccessor.HttpContext.Session.SetString("ExpireMonth", expireMonth.ToString());
+ if (model.TryGetValue("ExpireMonth", out var expireMonth) && !StringValues.IsNullOrEmpty(expireMonth))
+ _httpContextAccessor.HttpContext!.Session.SetString("ExpireMonth", expireMonth.ToString());
- if (form.TryGetValue("ExpireYear", out var expireYear) && !StringValues.IsNullOrEmpty(expireYear))
- _httpContextAccessor.HttpContext.Session.SetString("ExpireYear", expireYear.ToString());
+ if (model.TryGetValue("ExpireYear", out var expireYear) && !StringValues.IsNullOrEmpty(expireYear))
+ _httpContextAccessor.HttpContext!.Session.SetString("ExpireYear", expireYear.ToString());
- if (form.TryGetValue("CardCode", out var creditCardCvv2) && !StringValues.IsNullOrEmpty(creditCardCvv2))
- _httpContextAccessor.HttpContext.Session.SetString("CardCode", creditCardCvv2.ToString());
+ if (model.TryGetValue("CardCode", out var creditCardCvv2) && !StringValues.IsNullOrEmpty(creditCardCvv2))
+ _httpContextAccessor.HttpContext!.Session.SetString("CardCode", creditCardCvv2.ToString());
return await Task.FromResult<PaymentTransaction>(null);
}
@@ -119,8 +120,7 @@ namespace Payments.BrainTree
var privateKey = _brainTreePaymentSettings.PrivateKey;
//new gateway
- var gateway = new BraintreeGateway
- {
+ var gateway = new BraintreeGateway {
Environment = useSandBox ? Braintree.Environment.SANDBOX : Braintree.Environment.PRODUCTION,
MerchantId = merchantId,
PublicKey = publicKey,
@@ -128,30 +128,29 @@ namespace Payments.BrainTree
};
//new transaction request
- var transactionRequest = new TransactionRequest
- {
+ var transactionRequest = new TransactionRequest {
Amount = Convert.ToDecimal(paymentTransaction.TransactionAmount),
};
if (_brainTreePaymentSettings.Use3DS)
{
- transactionRequest.PaymentMethodNonce = _httpContextAccessor.HttpContext.Session.GetString("CardNonce").ToString();
+ transactionRequest.PaymentMethodNonce =
+ _httpContextAccessor.HttpContext!.Session.GetString("CardNonce")!;
}
else
{
//transaction credit card request
- var transactionCreditCardRequest = new TransactionCreditCardRequest
- {
- Number = _httpContextAccessor.HttpContext.Session.GetString("CardNumber").ToString(),
- CVV = _httpContextAccessor.HttpContext.Session.GetString("CardCode").ToString(),
- ExpirationDate = _httpContextAccessor.HttpContext.Session.GetString("ExpireMonth").ToString() + "/" + _httpContextAccessor.HttpContext.Session.GetString("ExpireYear").ToString()
+ var transactionCreditCardRequest = new TransactionCreditCardRequest {
+ Number = _httpContextAccessor.HttpContext!.Session.GetString("CardNumber")!,
+ CVV = _httpContextAccessor.HttpContext.Session.GetString("CardCode")!,
+ ExpirationDate = _httpContextAccessor.HttpContext.Session.GetString("ExpireMonth")! + "/" +
+ _httpContextAccessor.HttpContext.Session.GetString("ExpireYear")!
};
transactionRequest.CreditCard = transactionCreditCardRequest;
}
//address request
- var addressRequest = new AddressRequest
- {
+ var addressRequest = new AddressRequest {
FirstName = customer.BillingAddress.FirstName,
LastName = customer.BillingAddress.LastName,
StreetAddress = customer.BillingAddress.Address1,
@@ -160,14 +159,13 @@ namespace Payments.BrainTree
transactionRequest.BillingAddress = addressRequest;
//transaction options request
- var transactionOptionsRequest = new TransactionOptionsRequest
- {
+ var transactionOptionsRequest = new TransactionOptionsRequest {
SubmitForSettlement = true
};
transactionRequest.Options = transactionOptionsRequest;
//sending a request
- var result = gateway.Transaction.Sale(transactionRequest);
+ var result = await gateway.Transaction.SaleAsync(transactionRequest);
//result
if (result.IsSuccess())
@@ -197,10 +195,11 @@ namespace Payments.BrainTree
/// </summary>
/// <param name="paymentTransaction">Payment transaction</param>
public Task PostRedirectPayment(PaymentTransaction paymentTransaction)
- {
+ {
//nothing
return Task.CompletedTask;
}
+
/// <summary>
/// Returns a value indicating whether payment method should be hidden during checkout
/// </summary>
@@ -231,19 +230,22 @@ namespace Payments.BrainTree
//percentage
var orderTotalCalculationService = _serviceProvider.GetRequiredService<IOrderCalculationService>();
var subtotal = await orderTotalCalculationService.GetShoppingCartSubTotal(cart, true);
- result = (double)((((float)subtotal.subTotalWithDiscount) * ((float)_brainTreePaymentSettings.AdditionalFee)) / 100f);
+ result = (double)((((float)subtotal.subTotalWithDiscount) *
+ ((float)_brainTreePaymentSettings.AdditionalFee)) / 100f);
}
else
{
//fixed value
result = _brainTreePaymentSettings.AdditionalFee;
}
+
if (result > 0)
{
var currencyService = _serviceProvider.GetRequiredService<ICurrencyService>();
var workContext = _serviceProvider.GetRequiredService<IWorkContext>();
result = await currencyService.ConvertFromPrimaryStoreCurrency(result, workContext.WorkingCurrency);
}
+
//return result;
return await Task.FromResult(result);
}
@@ -294,7 +296,7 @@ namespace Payments.BrainTree
/// <summary>
/// Gets a value indicating whether customers can complete a payment after order is placed but not completed (for redirection payment methods)
/// </summary>
- /// <param name="order">Order</param>
+ /// <param name="paymentTransaction"></param>
/// <returns>Result</returns>
public async Task<bool> CanRePostRedirectPayment(PaymentTransaction paymentTransaction)
{
@@ -306,7 +308,6 @@ namespace Payments.BrainTree
}
-
/// <summary>
/// Gets a value indicating whether capture is supported
/// </summary>
@@ -342,10 +343,8 @@ namespace Payments.BrainTree
/// <summary>
/// Gets a payment method type
/// </summary>
- public PaymentMethodType PaymentMethodType
- {
- get
- {
+ public PaymentMethodType PaymentMethodType {
+ get {
return PaymentMethodType.Standard;
}
}
@@ -375,10 +374,10 @@ namespace Payments.BrainTree
/// </summary>
public async Task<string> Description()
{
- return await Task.FromResult(_translationService.GetResource("Plugins.Payments.BrainTree.PaymentMethodDescription"));
+ return await Task.FromResult(
+ _translationService.GetResource("Plugins.Payments.BrainTree.PaymentMethodDescription"));
}
public string LogoURL => "/Plugins/Payments.BrainTree/logo.jpg";
-
}
-}
+}
\ No newline at end of file
diff --git a/src/Plugins/Payments.BrainTree/Manifest.cs b/src/Plugins/Payments.BrainTree/Manifest.cs
index 80dd923b2..686cf9bf3 100644
--- a/src/Plugins/Payments.BrainTree/Manifest.cs
+++ b/src/Plugins/Payments.BrainTree/Manifest.cs
@@ -8,5 +8,5 @@ using Payments.BrainTree;
SystemName = BrainTreeDefaults.ProviderSystemName,
SupportedVersion = GrandVersion.SupportedPluginVersion,
Author = "grandnode team",
- Version = "1.01"
+ Version = "2.00"
)]
\ No newline at end of file
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
index 4680f1b56..d9d8eaf94 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(IFormCollection form)
+ public async Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model)
{
var warnings = new List<string>();
return await Task.FromResult(warnings);
}
- public async Task<PaymentTransaction> SavePaymentInfo(IFormCollection form)
+ public async Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model)
{
return await Task.FromResult<PaymentTransaction>(null);
}
diff --git a/src/Plugins/Payments.CashOnDelivery/Manifest.cs b/src/Plugins/Payments.CashOnDelivery/Manifest.cs
index ae4cdc3ec..4183604b0 100644
--- a/src/Plugins/Payments.CashOnDelivery/Manifest.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Manifest.cs
@@ -8,5 +8,5 @@ using Payments.CashOnDelivery;
SystemName = CashOnDeliveryPaymentDefaults.ProviderSystemName,
SupportedVersion = GrandVersion.SupportedPluginVersion,
Author = "grandnode team",
- Version = "1.02"
+ Version = "2.00"
)]
\ No newline at end of file
diff --git a/src/Plugins/Payments.PayPalStandard/Manifest.cs b/src/Plugins/Payments.PayPalStandard/Manifest.cs
index 79297edb8..329a28e82 100644
--- a/src/Plugins/Payments.PayPalStandard/Manifest.cs
+++ b/src/Plugins/Payments.PayPalStandard/Manifest.cs
@@ -8,5 +8,5 @@ using Payments.PayPalStandard;
SystemName = PayPalStandardPaymentDefaults.ProviderSystemName,
SupportedVersion = GrandVersion.SupportedPluginVersion,
Author = "grandnode team",
- Version = "1.01"
+ Version = "2.00"
)]
\ No newline at end of file
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
index 0e56a7931..32a7179aa 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -460,9 +460,9 @@ namespace Payments.PayPalStandard
/// <summary>
/// Validate payment form
/// </summary>
- /// <param name="form">The parsed form values</param>
+ /// <param name="model"></param>
/// <returns>List of validating errors</returns>
- public async Task<IList<string>> ValidatePaymentForm(IFormCollection form)
+ public async Task<IList<string>> ValidatePaymentForm(Dictionary<string, string> model)
{
return await Task.FromResult(new List<string>());
}
@@ -470,9 +470,9 @@ namespace Payments.PayPalStandard
/// <summary>
/// Get payment information
/// </summary>
- /// <param name="form">The parsed form values</param>
+ /// <param name="model"></param>
/// <returns>Payment info holder</returns>
- public async Task<PaymentTransaction> SavePaymentInfo(IFormCollection form)
+ public async Task<PaymentTransaction> SavePaymentInfo(Dictionary<string, string> model)
{
return await Task.FromResult<PaymentTransaction>(null);
}
diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
index 4cecb7659..abc5e5e18 100644
--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
@@ -305,7 +305,7 @@ namespace Shipping.ByWeight
public IList<string> LimitedToGroups => new List<string>();
- public async Task<IList<string>> ValidateShippingForm(IFormCollection form)
+ public async Task<IList<string>> ValidateShippingForm(Dictionary<string, string> model)
{
//you can implement here any validation logic
return await Task.FromResult(new List<string>());
diff --git a/src/Plugins/Shipping.ByWeight/Manifest.cs b/src/Plugins/Shipping.ByWeight/Manifest.cs
index d247c14a3..8e1d49f1c 100644
--- a/src/Plugins/Shipping.ByWeight/Manifest.cs
+++ b/src/Plugins/Shipping.ByWeight/Manifest.cs
@@ -8,5 +8,5 @@ using Shipping.ByWeight;
SystemName = ByWeightShippingDefaults.ProviderSystemName,
SupportedVersion = GrandVersion.SupportedPluginVersion,
Author = "grandnode team",
- Version = "1.00"
+ Version = "2.00"
)]
\ No newline at end of file
diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
index 333a120f4..8341c7d69 100644
--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
@@ -118,7 +118,7 @@ namespace Shipping.FixedRateShipping
public IShipmentTracker ShipmentTracker => null;
- public async Task<IList<string>> ValidateShippingForm(IFormCollection form)
+ public async Task<IList<string>> ValidateShippingForm(Dictionary<string, string> model)
{
return await Task.FromResult(new List<string>());
}
diff --git a/src/Plugins/Shipping.FixedRateShipping/Manifest.cs b/src/Plugins/Shipping.FixedRateShipping/Manifest.cs
index 9d7a9e84d..595676bf3 100644
--- a/src/Plugins/Shipping.FixedRateShipping/Manifest.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/Manifest.cs
@@ -8,5 +8,5 @@ using Shipping.FixedRateShipping;
SystemName = FixedRateShippingDefaults.ProviderSystemName,
SupportedVersion = GrandVersion.SupportedPluginVersion,
Author = "grandnode team",
- Version = "1.00"
+ Version = "2.00"
)]
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ShippingPoint/Manifest.cs b/src/Plugins/Shipping.ShippingPoint/Manifest.cs
index 27c4a8a13..72f764079 100644
--- a/src/Plugins/Shipping.ShippingPoint/Manifest.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Manifest.cs
@@ -8,5 +8,5 @@ using Shipping.ShippingPoint;
SystemName = ShippingPointRateDefaults.ProviderSystemName,
SupportedVersion = GrandVersion.SupportedPluginVersion,
Author = "grandnode team",
- Version = "1.02"
+ Version = "2.00"
)]
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs b/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
index 243c23e7c..c744ed2da 100644
--- a/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
+++ b/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
@@ -91,10 +91,12 @@ namespace Shipping.ShippingPoint
return await Task.FromResult(false);
}
- public async Task<IList<string>> ValidateShippingForm(IFormCollection form)
+ public async Task<IList<string>> ValidateShippingForm(Dictionary<string, string> model)
{
- var shippingMethodName = form["shippingoption"].ToString().Replace("___", "_").Split(new[] { '_' })[0];
- var shippingOptionId = form["selectedShippingOption"].ToString();
+ model.TryGetValue("shippingoption", out var shippingOption);
+ model.TryGetValue("selectedShippingOption", out var shippingOptionId);
+
+ var shippingMethodName = shippingOption?.Replace("___", "_").Split(new[] { '_' })[0];
if (string.IsNullOrEmpty(shippingOptionId))
return new List<string>() { _translationService.GetResource("Shipping.ShippingPoint.SelectBeforeProceed") };
@@ -117,10 +119,7 @@ namespace Shipping.ShippingPoint
_workContext.CurrentStore.Id);
var forCustomer =
- string.Format("<strong>{0}:</strong> {1}<br><strong>{2}:</strong> {3}<br>",
- _translationService.GetResource("Shipping.ShippingPoint.Fields.ShippingPointName"), chosenShippingOption.ShippingPointName,
- _translationService.GetResource("Shipping.ShippingPoint.Fields.Description"), chosenShippingOption.Description
- );
+ $"<strong>{_translationService.GetResource("Shipping.ShippingPoint.Fields.ShippingPointName")}:</strong> {chosenShippingOption.ShippingPointName}<br><strong>{_translationService.GetResource("Shipping.ShippingPoint.Fields.Description")}:</strong> {chosenShippingOption.Description}<br>";
await _userFieldService.SaveField(
_workContext.CurrentCustomer,
@@ -144,7 +143,7 @@ namespace Shipping.ShippingPoint
var stringBuilder = new StringBuilder();
string serializedAttribute;
- using (var tw = new StringWriter(stringBuilder))
+ await using (var tw = new StringWriter(stringBuilder))
{
var xmlS = new XmlSerializer(typeof(Domain.ShippingPointSerializable));
xmlS.Serialize(tw, serializedObject);
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index 38d85d6d5..514a43030 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -126,9 +126,10 @@ namespace Grand.Web.Controllers
}
[NonAction]
- protected async Task<IList<string>> ValidateShippingForm(IFormCollection form)
+ private async Task<IList<string>> ValidateShippingForm(IFormCollection form)
{
- var warnings = (await GetShippingComputation(form["shippingoption"]).ValidateShippingForm(form)).ToList();
+ var warnings = (await GetShippingComputation(form["shippingoption"])
+ .ValidateShippingForm(form.ToDictionary(x=>x.Key, y=>y.Value.ToString()))).ToList();
foreach (var warning in warnings)
ModelState.AddModelError("", warning);
return warnings;
@@ -951,13 +952,13 @@ namespace Grand.Web.Controllers
if (paymentMethod == null)
throw new Exception("Payment method is not selected");
- var warnings = await paymentMethod.ValidatePaymentForm(form);
+ var warnings = await paymentMethod.ValidatePaymentForm(form.ToDictionary(x=>x.Key, y=>y.Value.ToString()));
foreach (var warning in warnings)
ModelState.AddModelError("", warning);
if (ModelState.IsValid)
{
//save payment info
- var paymentTransaction = await paymentMethod.SavePaymentInfo(form);
+ var paymentTransaction = await paymentMethod.SavePaymentInfo(form.ToDictionary(x=>x.Key, y=>y.Value.ToString()));
if (paymentTransaction != null)
{
//save