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.

Billing address / shipping address on checkout page - fix model validation

support3a9730a81c8d
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index 3c61f3a51..985c6b881 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -167,6 +167,7 @@ namespace Grand.Web.Controllers
errors.Add(er.ErrorMessage);
}
}
+
return errors;
}
@@ -176,6 +177,7 @@ namespace Grand.Web.Controllers
return new List<int> { 301, 302 }.Contains(response.StatusCode);
}
}
+
protected virtual bool IsPostBeingDone {
get {
if (HttpContext.Items["grand.IsPOSTBeingDone"] == null)
@@ -193,7 +195,8 @@ namespace Grand.Web.Controllers
{
var customer = _workContext.CurrentCustomer;
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
if (!cart.Any())
return RedirectToRoute("ShoppingCart");
@@ -205,7 +208,8 @@ namespace Grand.Web.Controllers
await _customerService.ResetCheckoutData(customer, _workContext.CurrentStore.Id);
//validation (cart)
- var checkoutAttributes = await customer.GetUserField<List<CustomAttribute>>(_userFieldService, SystemCustomerFieldNames.CheckoutAttributes,
+ var checkoutAttributes = await customer.GetUserField<List<CustomAttribute>>(_userFieldService,
+ SystemCustomerFieldNames.CheckoutAttributes,
_workContext.CurrentStore.Id);
var scWarnings = await _shoppingCartValidator.GetShoppingCartWarnings(cart, checkoutAttributes, true);
if (scWarnings.Any())
@@ -215,7 +219,9 @@ namespace Grand.Web.Controllers
foreach (ShoppingCartItem sci in cart)
{
var product = await _productService.GetProductById(sci.ProductId);
- var sciWarnings = await _shoppingCartValidator.GetShoppingCartItemWarnings(customer, sci, product, new ShoppingCartValidatorOptions());
+ var sciWarnings =
+ await _shoppingCartValidator.GetShoppingCartItemWarnings(customer, sci, product,
+ new ShoppingCartValidatorOptions());
if (sciWarnings.Any())
return RedirectToRoute("ShoppingCart", new { checkoutAttributes = true });
}
@@ -234,12 +240,14 @@ namespace Grand.Web.Controllers
{
order = await _orderService.GetOrderById(orderId);
}
+
if (order == null)
{
order = (await _orderService.SearchOrders(storeId: _workContext.CurrentStore.Id,
- customerId: _workContext.CurrentCustomer.Id, pageSize: 1))
+ customerId: _workContext.CurrentCustomer.Id, pageSize: 1))
.FirstOrDefault();
}
+
if (order == null || order.Deleted || _workContext.CurrentCustomer.Id != order.CustomerId)
{
return RedirectToRoute("HomePage");
@@ -282,10 +290,12 @@ namespace Grand.Web.Controllers
Store = _workContext.CurrentStore
});
- var selectedPickupPoint = _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.SelectedPickupPoint, _workContext.CurrentStore.Id);
+ var selectedPickupPoint =
+ _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(
+ SystemCustomerFieldNames.SelectedPickupPoint, _workContext.CurrentStore.Id);
if ((_shippingSettings.SkipShippingMethodSelectionIfOnlyOne &&
- shippingMethodModel.ShippingMethods.Count == 1) ||
+ shippingMethodModel.ShippingMethods.Count == 1) ||
(_shippingSettings.AllowPickUpInStore && !string.IsNullOrEmpty(selectedPickupPoint)))
{
if (!(_shippingSettings.AllowPickUpInStore && !string.IsNullOrEmpty(selectedPickupPoint)))
@@ -298,8 +308,7 @@ namespace Grand.Web.Controllers
return await LoadStepAfterShippingMethod(cart);
}
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "shipping-method",
model = shippingMethodModel
@@ -313,7 +322,8 @@ namespace Grand.Web.Controllers
{
//Check whether payment workflow is required
//we ignore loyalty points during cart total calculation
- var isPaymentWorkflowRequired = await _mediator.Send(new GetIsPaymentWorkflowRequired() { Cart = cart, UseLoyaltyPoints = false });
+ var isPaymentWorkflowRequired = await _mediator.Send(new GetIsPaymentWorkflowRequired()
+ { Cart = cart, UseLoyaltyPoints = false });
if (isPaymentWorkflowRequired)
{
//filter by country
@@ -346,7 +356,8 @@ namespace Grand.Web.Controllers
SystemCustomerFieldNames.SelectedPaymentMethod,
selectedPaymentMethodSystemName, _workContext.CurrentStore.Id);
- var paymentMethodInst = _paymentService.LoadPaymentMethodBySystemName(selectedPaymentMethodSystemName);
+ var paymentMethodInst =
+ _paymentService.LoadPaymentMethodBySystemName(selectedPaymentMethodSystemName);
if (paymentMethodInst == null ||
!paymentMethodInst.IsPaymentMethodActive(_paymentSettings) ||
!paymentMethodInst.IsAuthenticateStore(_workContext.CurrentStore))
@@ -356,8 +367,7 @@ namespace Grand.Web.Controllers
}
//customer have to choose a payment method
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "payment-method",
model = paymentMethodModel
@@ -370,9 +380,11 @@ namespace Grand.Web.Controllers
await _userFieldService.SaveField<string>(_workContext.CurrentCustomer,
SystemCustomerFieldNames.SelectedPaymentMethod, null, _workContext.CurrentStore.Id);
- var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage, Store = _workContext.CurrentStore });
- return Json(new
- {
+ var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() {
+ Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage,
+ Store = _workContext.CurrentStore
+ });
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
@@ -391,15 +403,18 @@ namespace Grand.Web.Controllers
}
[NonAction]
- protected async Task<JsonResult> LoadStepAfterPaymentMethod(IPaymentProvider paymentMethod, IList<ShoppingCartItem> cart)
+ protected async Task<JsonResult> LoadStepAfterPaymentMethod(IPaymentProvider paymentMethod,
+ IList<ShoppingCartItem> cart)
{
if (await paymentMethod.SkipPaymentInfo() ||
- (paymentMethod.PaymentMethodType == PaymentMethodType.Redirection
- && _paymentSettings.SkipPaymentInfo))
+ (paymentMethod.PaymentMethodType == PaymentMethodType.Redirection
+ && _paymentSettings.SkipPaymentInfo))
{
- var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage, Store = _workContext.CurrentStore });
- return Json(new
- {
+ var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() {
+ Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage,
+ Store = _workContext.CurrentStore
+ });
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
@@ -410,8 +425,7 @@ namespace Grand.Web.Controllers
//return payment info page
var paymenInfoModel = await _mediator.Send(new GetPaymentInfo() { PaymentMethod = paymentMethod });
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "payment-info",
model = paymenInfoModel
@@ -423,7 +437,8 @@ namespace Grand.Web.Controllers
public virtual async Task<IActionResult> Start()
{
//validation
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
if (!cart.Any())
return RedirectToRoute("ShoppingCart");
@@ -435,10 +450,12 @@ namespace Grand.Web.Controllers
foreach (ShoppingCartItem sci in cart)
{
var product = await _productService.GetProductById(sci.ProductId);
- var sciWarnings = await _shoppingCartValidator.GetShoppingCartItemWarnings(_workContext.CurrentCustomer, sci, product, new ShoppingCartValidatorOptions());
+ var sciWarnings = await _shoppingCartValidator.GetShoppingCartItemWarnings(_workContext.CurrentCustomer,
+ sci, product, new ShoppingCartValidatorOptions());
if (sciWarnings.Any())
return RedirectToRoute("ShoppingCart", new { checkoutAttributes = true });
}
+
var paymentMethodModel = await GetCheckoutPaymentMethodModel(cart);
var requiresShipping = cart.RequiresShipping();
var model = new CheckoutModel {
@@ -464,35 +481,33 @@ namespace Grand.Web.Controllers
{
model.BillingAddress.NewAddressPreselected = true;
}
+
return View(model);
}
- public virtual async Task<IActionResult> SaveBilling([FromServices] AddressSettings addressSettings, IFormCollection form)
+ public virtual async Task<IActionResult> SaveBilling(
+ [FromServices] AddressSettings addressSettings,
+ CheckoutBillingAddressModel model,
+ IFormCollection form)
{
try
{
//validation
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
await CartValidate(cart);
- string billingAddressId = form["billing_address_id"];
-
- if (!string.IsNullOrEmpty(billingAddressId))
+ if (!string.IsNullOrEmpty(model.BillingAddressId))
{
//existing address
- var address = _workContext.CurrentCustomer.Addresses.FirstOrDefault(a => a.Id == billingAddressId);
- _workContext.CurrentCustomer.BillingAddress = address ?? throw new Exception("Address can't be loaded");
+ var address =
+ _workContext.CurrentCustomer.Addresses.FirstOrDefault(a => a.Id == model.BillingAddressId);
+ _workContext.CurrentCustomer.BillingAddress =
+ address ?? throw new Exception("Address can't be loaded");
await _customerService.UpdateBillingAddress(address, _workContext.CurrentCustomer.Id);
}
else
{
- //new address
- var model = new CheckoutBillingAddressModel();
- await TryUpdateModelAsync(model.NewAddress, "BillingNewAddress");
-
- ModelState.Clear();
- TryValidateModel(model);
-
//custom address attributes
var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes() { Form = form });
var customAttributeWarnings = await _addressAttributeParser.GetAttributeWarnings(customAttributes);
@@ -510,13 +525,12 @@ namespace Grand.Web.Controllers
Customer = _workContext.CurrentCustomer,
Language = _workContext.WorkingLanguage,
Store = _workContext.CurrentStore,
- SelectedCountryId = model.NewAddress.CountryId,
+ SelectedCountryId = model.BillingNewAddress.CountryId,
OverrideAttributes = customAttributes
});
billingAddressModel.NewAddressPreselected = true;
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "billing",
model = billingAddressModel
@@ -528,29 +542,35 @@ namespace Grand.Web.Controllers
//try to find an address with the same values (don't duplicate records)
var address = _workContext.CurrentCustomer.Addresses.ToList().FindAddress(
- model.NewAddress.FirstName, model.NewAddress.LastName, model.NewAddress.PhoneNumber,
- model.NewAddress.Email, model.NewAddress.FaxNumber, model.NewAddress.Company,
- model.NewAddress.Address1, model.NewAddress.Address2, model.NewAddress.City,
- model.NewAddress.StateProvinceId, model.NewAddress.ZipPostalCode,
- model.NewAddress.CountryId);
+ model.BillingNewAddress.FirstName, model.BillingNewAddress.LastName,
+ model.BillingNewAddress.PhoneNumber,
+ model.BillingNewAddress.Email, model.BillingNewAddress.FaxNumber,
+ model.BillingNewAddress.Company,
+ model.BillingNewAddress.Address1, model.BillingNewAddress.Address2,
+ model.BillingNewAddress.City,
+ model.BillingNewAddress.StateProvinceId, model.BillingNewAddress.ZipPostalCode,
+ model.BillingNewAddress.CountryId);
if (address == null)
{
//address is not found. create a new one
address =
- await _groupService.IsGuest(_workContext.CurrentCustomer) ?
- model.NewAddress.ToEntity() :
- model.NewAddress.ToEntity(_workContext.CurrentCustomer, addressSettings);
+ await _groupService.IsGuest(_workContext.CurrentCustomer)
+ ? model.BillingNewAddress.ToEntity()
+ : model.BillingNewAddress.ToEntity(_workContext.CurrentCustomer, addressSettings);
address.Attributes = customAttributes;
address.CreatedOnUtc = DateTime.UtcNow;
- address.AddressType = _addressSettings.AddressTypeEnabled ? AddressType.Billing : AddressType.Any;
+ address.AddressType =
+ _addressSettings.AddressTypeEnabled ? AddressType.Billing : AddressType.Any;
_workContext.CurrentCustomer.Addresses.Add(address);
await _customerService.InsertAddress(address, _workContext.CurrentCustomer.Id);
}
+
_workContext.CurrentCustomer.BillingAddress = address;
await _customerService.UpdateBillingAddress(address, _workContext.CurrentCustomer.Id);
}
+
//load next step
if (cart.RequiresShipping())
return await LoadStepAfterBillingAddress(cart);
@@ -558,9 +578,11 @@ namespace Grand.Web.Controllers
{
//shipping is not required
_workContext.CurrentCustomer.ShippingAddress = null;
- await _customerService.UpdateCustomerField(_workContext.CurrentCustomer, x => x.ShippingAddress, null);
+ await _customerService.UpdateCustomerField(_workContext.CurrentCustomer, x => x.ShippingAddress,
+ null);
- await _userFieldService.SaveField<ShippingOption>(_workContext.CurrentCustomer, SystemCustomerFieldNames.SelectedShippingOption, null, _workContext.CurrentStore.Id);
+ await _userFieldService.SaveField<ShippingOption>(_workContext.CurrentCustomer,
+ SystemCustomerFieldNames.SelectedShippingOption, null, _workContext.CurrentStore.Id);
//load next step
return await LoadStepAfterShippingMethod(cart);
}
@@ -572,72 +594,79 @@ namespace Grand.Web.Controllers
}
}
- public virtual async Task<IActionResult> SaveShipping([FromServices] AddressSettings addressSettings,
- CheckoutShippingAddressModel model, IFormCollection form)
+ public virtual async Task<IActionResult> SaveShipping(
+ [FromServices] AddressSettings addressSettings,
+ CheckoutShippingAddressModel model,
+ IFormCollection form)
{
try
{
//validation
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
await CartValidate(cart);
if (!cart.RequiresShipping())
throw new Exception("Shipping is not required");
//Pick up in store?
- var pickupInstore = false;
+ //var pickupInstore = false;
if (_shippingSettings.AllowPickUpInStore)
{
if (model.PickUpInStore)
{
- pickupInstore = true;
+ //pickupInstore = true;
//customer decided to pick up in store
//no shipping address selected
_workContext.CurrentCustomer.ShippingAddress = null;
- await _customerService.UpdateCustomerField(_workContext.CurrentCustomer, x => x.ShippingAddress, null);
+ await _customerService.UpdateCustomerField(_workContext.CurrentCustomer, x => x.ShippingAddress,
+ null);
//clear shipping option XML/Description
- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ShippingOptionAttribute, "", _workContext.CurrentStore.Id);
- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ShippingOptionAttributeDescription, "", _workContext.CurrentStore.Id);
-
+ await _userFieldService.SaveField(_workContext.CurrentCustomer,
+ SystemCustomerFieldNames.ShippingOptionAttribute, "", _workContext.CurrentStore.Id);
+ await _userFieldService.SaveField(_workContext.CurrentCustomer,
+ SystemCustomerFieldNames.ShippingOptionAttributeDescription, "",
+ _workContext.CurrentStore.Id);
- var pickupPoint = form["pickup-point-id"];
- var pickupPoints = await _pickupPointService.LoadActivePickupPoints(_workContext.CurrentStore.Id);
- var selectedPoint = pickupPoints.FirstOrDefault(x => x.Id.Equals(pickupPoint));
+ var pickupPoints =
+ await _pickupPointService.LoadActivePickupPoints(_workContext.CurrentStore.Id);
+ var selectedPoint = pickupPoints.FirstOrDefault(x => x.Id.Equals(model.PickupPointId));
if (selectedPoint == null)
throw new Exception("Pickup point is not allowed");
//save "pick up in store" shipping method
var pickUpInStoreShippingOption = new ShippingOption {
- Name = string.Format(_translationService.GetResource("Checkout.PickupPoints.Name"), selectedPoint.Name),
+ Name = string.Format(_translationService.GetResource("Checkout.PickupPoints.Name"),
+ selectedPoint.Name),
Rate = selectedPoint.PickupFee,
Description = selectedPoint.Description,
- ShippingRateProviderSystemName = string.Format("PickupPoint_{0}", selectedPoint.Id)
+ ShippingRateProviderSystemName = $"PickupPoint_{selectedPoint.Id}"
};
await _userFieldService.SaveField(_workContext.CurrentCustomer,
- SystemCustomerFieldNames.SelectedShippingOption,
- pickUpInStoreShippingOption,
- _workContext.CurrentStore.Id);
+ SystemCustomerFieldNames.SelectedShippingOption,
+ pickUpInStoreShippingOption,
+ _workContext.CurrentStore.Id);
await _userFieldService.SaveField(_workContext.CurrentCustomer,
- SystemCustomerFieldNames.SelectedPickupPoint,
- selectedPoint.Id,
- _workContext.CurrentStore.Id);
+ SystemCustomerFieldNames.SelectedPickupPoint,
+ selectedPoint.Id,
+ _workContext.CurrentStore.Id);
}
else
//set value indicating that "pick up in store" option has not been chosen
- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.SelectedPickupPoint, "", _workContext.CurrentStore.Id);
+ await _userFieldService.SaveField(_workContext.CurrentCustomer,
+ SystemCustomerFieldNames.SelectedPickupPoint, "", _workContext.CurrentStore.Id);
}
- string shippingAddressId = form["shipping_address_id"];
-
- if (!pickupInstore)
+ if (!model.PickUpInStore)
{
- if (!string.IsNullOrEmpty(shippingAddressId))
+ if (!string.IsNullOrEmpty(model.ShippingAddressId))
{
//existing address
- var address = _workContext.CurrentCustomer.Addresses.FirstOrDefault(a => a.Id == shippingAddressId);
+ var address =
+ _workContext.CurrentCustomer.Addresses.FirstOrDefault(a => a.Id == model.ShippingAddressId);
if (address == null)
throw new Exception("Address can't be loaded");
@@ -647,13 +676,18 @@ namespace Grand.Web.Controllers
else
{
//new address
- await TryUpdateModelAsync(model.NewAddress, "ShippingNewAddress");
- ModelState.Clear();
- TryValidateModel(model);
+ //var model = new CheckoutShippingAddressModel();
+ /*const string prefix = "ShippingNewAddress";
+ await TryUpdateModelAsync(model.NewAddress, prefix);
+
+ var validationResult = await checkoutShippingAddressValidator.ValidateAsync(model);
+ validationResult.AddToModelState(ModelState, prefix);*/
//custom address attributes
- var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes() { Form = form });
- var customAttributeWarnings = await _addressAttributeParser.GetAttributeWarnings(customAttributes);
+ var customAttributes = await _mediator.Send(new GetParseCustomAddressAttributes()
+ { Form = form });
+ var customAttributeWarnings =
+ await _addressAttributeParser.GetAttributeWarnings(customAttributes);
foreach (var error in customAttributeWarnings)
{
ModelState.AddModelError("", error);
@@ -667,13 +701,12 @@ namespace Grand.Web.Controllers
Customer = _workContext.CurrentCustomer,
Language = _workContext.WorkingLanguage,
Store = _workContext.CurrentStore,
- SelectedCountryId = model.NewAddress.CountryId,
+ SelectedCountryId = model.ShippingNewAddress.CountryId,
OverrideAttributes = customAttributes,
});
shippingAddressModel.NewAddressPreselected = true;
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "shipping",
model = shippingAddressModel
@@ -685,36 +718,44 @@ namespace Grand.Web.Controllers
//try to find an address with the same values (don't duplicate records)
var address = _workContext.CurrentCustomer.Addresses.ToList().FindAddress(
- model.NewAddress.FirstName, model.NewAddress.LastName, model.NewAddress.PhoneNumber,
- model.NewAddress.Email, model.NewAddress.FaxNumber, model.NewAddress.Company,
- model.NewAddress.Address1, model.NewAddress.Address2, model.NewAddress.City,
- model.NewAddress.StateProvinceId, model.NewAddress.ZipPostalCode,
- model.NewAddress.CountryId);
+ model.ShippingNewAddress.FirstName, model.ShippingNewAddress.LastName,
+ model.ShippingNewAddress.PhoneNumber,
+ model.ShippingNewAddress.Email, model.ShippingNewAddress.FaxNumber,
+ model.ShippingNewAddress.Company,
+ model.ShippingNewAddress.Address1, model.ShippingNewAddress.Address2,
+ model.ShippingNewAddress.City,
+ model.ShippingNewAddress.StateProvinceId, model.ShippingNewAddress.ZipPostalCode,
+ model.ShippingNewAddress.CountryId);
if (address == null)
{
address =
- await _groupService.IsGuest(_workContext.CurrentCustomer) ?
- model.NewAddress.ToEntity() :
- model.NewAddress.ToEntity(_workContext.CurrentCustomer, addressSettings);
+ await _groupService.IsGuest(_workContext.CurrentCustomer)
+ ? model.ShippingNewAddress.ToEntity()
+ : model.ShippingNewAddress.ToEntity(_workContext.CurrentCustomer, addressSettings);
address.Attributes = customAttributes;
address.CreatedOnUtc = DateTime.UtcNow;
- address.AddressType = _addressSettings.AddressTypeEnabled ? (model.BillToTheSameAddress ? AddressType.Any : AddressType.Shipping) : AddressType.Any;
+ address.AddressType = _addressSettings.AddressTypeEnabled
+ ? (model.BillToTheSameAddress ? AddressType.Any : AddressType.Shipping)
+ : AddressType.Any;
//other null validations
_workContext.CurrentCustomer.Addresses.Add(address);
await _customerService.InsertAddress(address, _workContext.CurrentCustomer.Id);
}
+
_workContext.CurrentCustomer.ShippingAddress = address;
await _customerService.UpdateShippingAddress(address, _workContext.CurrentCustomer.Id);
}
}
- if (model.BillToTheSameAddress && !pickupInstore &&
- (_workContext.CurrentCustomer.ShippingAddress.AddressType != AddressType.Shipping))
+ if (model.BillToTheSameAddress && !model.PickUpInStore &&
+ (_workContext.CurrentCustomer.ShippingAddress!.AddressType != AddressType.Shipping))
{
_workContext.CurrentCustomer.BillingAddress = _workContext.CurrentCustomer.ShippingAddress;
- await _customerService.UpdateBillingAddress(_workContext.CurrentCustomer.BillingAddress, _workContext.CurrentCustomer.Id);
- await _userFieldService.SaveField<ShippingOption>(_workContext.CurrentCustomer, SystemCustomerFieldNames.SelectedShippingOption, null, _workContext.CurrentStore.Id);
+ await _customerService.UpdateBillingAddress(_workContext.CurrentCustomer.BillingAddress,
+ _workContext.CurrentCustomer.Id);
+ await _userFieldService.SaveField<ShippingOption>(_workContext.CurrentCustomer,
+ SystemCustomerFieldNames.SelectedShippingOption, null, _workContext.CurrentStore.Id);
return await LoadStepAfterBillingAddress(cart);
}
else
@@ -725,13 +766,12 @@ namespace Grand.Web.Controllers
Customer = _workContext.CurrentCustomer,
Language = _workContext.WorkingLanguage,
Store = _workContext.CurrentStore,
- SelectedCountryId = model.NewAddress.CountryId,
+ SelectedCountryId = model.ShippingNewAddress.CountryId,
});
if (!billingAddressModel.ExistingAddresses.Any())
billingAddressModel.NewAddressPreselected = true;
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "billing",
model = billingAddressModel
@@ -739,7 +779,6 @@ namespace Grand.Web.Controllers
goto_section = "billing"
});
}
-
}
catch (Exception exc)
{
@@ -756,7 +795,8 @@ namespace Grand.Web.Controllers
var customer = _workContext.CurrentCustomer;
var store = _workContext.CurrentStore;
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
await CartValidate(cart);
if (!cart.RequiresShipping())
@@ -774,37 +814,45 @@ namespace Grand.Web.Controllers
var shippingRateProviderSystemName = splittedOption[1];
//clear shipping option XML/Description
- await _userFieldService.SaveField(customer, SystemCustomerFieldNames.ShippingOptionAttribute, "", store.Id);
- await _userFieldService.SaveField(customer, SystemCustomerFieldNames.ShippingOptionAttributeDescription, "", store.Id);
+ await _userFieldService.SaveField(customer, SystemCustomerFieldNames.ShippingOptionAttribute, "",
+ store.Id);
+ await _userFieldService.SaveField(customer, SystemCustomerFieldNames.ShippingOptionAttributeDescription,
+ "", store.Id);
//validate customer's input
var warnings = (await ValidateShippingForm(form)).ToList();
//find it
//performance optimization. try cache first
- var shippingOptions = await customer.GetUserField<List<ShippingOption>>(_userFieldService, SystemCustomerFieldNames.OfferedShippingOptions, store.Id);
+ var shippingOptions = await customer.GetUserField<List<ShippingOption>>(_userFieldService,
+ SystemCustomerFieldNames.OfferedShippingOptions, store.Id);
if (shippingOptions == null || shippingOptions.Count == 0)
{
//not found? load them using shipping service
shippingOptions = (await _shippingService
- .GetShippingOptions(customer, cart, customer.ShippingAddress, shippingRateProviderSystemName, store))
+ .GetShippingOptions(customer, cart, customer.ShippingAddress,
+ shippingRateProviderSystemName, store))
.ShippingOptions
.ToList();
}
else
{
//loaded cached results. filter result by a chosen Shipping rate method
- shippingOptions = shippingOptions.Where(so => so.ShippingRateProviderSystemName.Equals(shippingRateProviderSystemName, StringComparison.OrdinalIgnoreCase))
+ shippingOptions = shippingOptions.Where(so =>
+ so.ShippingRateProviderSystemName.Equals(shippingRateProviderSystemName,
+ StringComparison.OrdinalIgnoreCase))
.ToList();
}
var shippingOption = shippingOptions
- .Find(so => !string.IsNullOrEmpty(so.Name) && so.Name.Equals(selectedName, StringComparison.OrdinalIgnoreCase));
+ .Find(so => !string.IsNullOrEmpty(so.Name) &&
+ so.Name.Equals(selectedName, StringComparison.OrdinalIgnoreCase));
if (shippingOption == null)
throw new Exception("Selected shipping method can't be loaded");
//save
- await _userFieldService.SaveField(customer, SystemCustomerFieldNames.SelectedShippingOption, shippingOption, store.Id);
+ await _userFieldService.SaveField(customer, SystemCustomerFieldNames.SelectedShippingOption,
+ shippingOption, store.Id);
if (ModelState.IsValid)
{
@@ -827,7 +875,8 @@ namespace Grand.Web.Controllers
try
{
//validation
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
await CartValidate(cart);
string paymentmethod = form["paymentmethod"];
@@ -847,16 +896,19 @@ namespace Grand.Web.Controllers
}
//Check whether payment workflow is required
- var isPaymentWorkflowRequired = await _mediator.Send(new GetIsPaymentWorkflowRequired() { Cart = cart });
+ var isPaymentWorkflowRequired =
+ await _mediator.Send(new GetIsPaymentWorkflowRequired() { Cart = cart });
if (!isPaymentWorkflowRequired)
{
//payment is not required
await _userFieldService.SaveField<string>(_workContext.CurrentCustomer,
SystemCustomerFieldNames.SelectedPaymentMethod, null, _workContext.CurrentStore.Id);
- var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage, Store = _workContext.CurrentStore });
- return Json(new
- {
+ var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() {
+ Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage,
+ Store = _workContext.CurrentStore
+ });
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
@@ -879,7 +931,8 @@ namespace Grand.Web.Controllers
if (paymentTransaction != null)
{
await _userFieldService.SaveField(_workContext.CurrentCustomer,
- SystemCustomerFieldNames.PaymentTransaction, paymentTransaction.Id, _workContext.CurrentStore.Id);
+ SystemCustomerFieldNames.PaymentTransaction, paymentTransaction.Id,
+ _workContext.CurrentStore.Id);
}
else
await _userFieldService.SaveField<string>(_workContext.CurrentCustomer,
@@ -899,7 +952,8 @@ namespace Grand.Web.Controllers
try
{
//validation
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
await CartValidate(cart);
var paymentMethodSystemName = await _workContext.CurrentCustomer.GetUserField<string>(
@@ -920,12 +974,15 @@ namespace Grand.Web.Controllers
{
//save
await _userFieldService.SaveField(_workContext.CurrentCustomer,
- SystemCustomerFieldNames.PaymentTransaction, paymentTransaction.Id, _workContext.CurrentStore.Id);
+ SystemCustomerFieldNames.PaymentTransaction, paymentTransaction.Id,
+ _workContext.CurrentStore.Id);
}
- var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage, Store = _workContext.CurrentStore });
- return Json(new
- {
+ var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() {
+ Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage,
+ Store = _workContext.CurrentStore
+ });
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
@@ -936,8 +993,7 @@ namespace Grand.Web.Controllers
//If we got this far, something failed, redisplay form
var paymenInfoModel = await _mediator.Send(new GetPaymentInfo() { PaymentMethod = paymentMethod });
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "payment-info",
model = paymenInfoModel
@@ -956,14 +1012,15 @@ namespace Grand.Web.Controllers
try
{
//validation
- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id,
+ ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);
await CartValidate(cart);
//prevent 2 orders being placed within an X seconds time frame
if (!await _mediator.Send(new GetMinOrderPlaceIntervalValid() {
- Customer = _workContext.CurrentCustomer,
- Store = _workContext.CurrentStore
- }))
+ Customer = _workContext.CurrentCustomer,
+ Store = _workContext.CurrentStore
+ }))
throw new Exception(_translationService.GetResource("Checkout.MinOrderPlacementInterval"));
var placeOrderResult = await _mediator.Send(new PlaceOrderCommand());
@@ -971,9 +1028,12 @@ namespace Grand.Web.Controllers
{
_ = _customerActivityService.InsertActivity("PublicStore.PlaceOrder", "",
_workContext.CurrentCustomer, HttpContext.Connection?.RemoteIpAddress?.ToString(),
- _translationService.GetResource("ActivityLog.PublicStore.PlaceOrder"), placeOrderResult.PlacedOrder.Id);
+ _translationService.GetResource("ActivityLog.PublicStore.PlaceOrder"),
+ placeOrderResult.PlacedOrder.Id);
- var paymentMethod = _paymentService.LoadPaymentMethodBySystemName(placeOrderResult.PaymentTransaction.PaymentMethodSystemName);
+ var paymentMethod =
+ _paymentService.LoadPaymentMethodBySystemName(placeOrderResult.PaymentTransaction
+ .PaymentMethodSystemName);
if (paymentMethod == null)
//payment method could be null if order total is 0
//success
@@ -984,9 +1044,9 @@ namespace Grand.Web.Controllers
//Redirection will not work because it's AJAX request.
var storeLocation = _workContext.CurrentHost.Url.TrimEnd('/');
//redirect
- return Json(new
- {
- redirect = $"{storeLocation}/checkout/CompleteRedirectionPayment?paymentTransactionId={placeOrderResult.PaymentTransaction.Id}",
+ return Json(new {
+ redirect =
+ $"{storeLocation}/checkout/CompleteRedirectionPayment?paymentTransactionId={placeOrderResult.PaymentTransaction.Id}",
});
}
@@ -996,12 +1056,14 @@ namespace Grand.Web.Controllers
}
//error
- var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage, Store = _workContext.CurrentStore });
+ var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() {
+ Cart = cart, Customer = _workContext.CurrentCustomer, Language = _workContext.WorkingLanguage,
+ Store = _workContext.CurrentStore
+ });
foreach (var error in placeOrderResult.Errors)
confirmOrderModel.Warnings.Add(error);
- return Json(new
- {
+ return Json(new {
update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
@@ -1020,7 +1082,8 @@ namespace Grand.Web.Controllers
{
try
{
- if ((await _groupService.IsGuest(_workContext.CurrentCustomer) && !_orderSettings.AnonymousCheckoutAllowed))
+ if ((await _groupService.IsGuest(_workContext.CurrentCustomer) &&
+ !_orderSettings.AnonymousCheckoutAllowed))
return Challenge();
var paymentTransaction = await _paymentTransactionService.GetById(paymentTransactionId);
@@ -1035,7 +1098,8 @@ namespace Grand.Web.Controllers
if (paymentTransaction.OrderGuid != order.OrderGuid)
return RedirectToRoute("HomePage");
- var paymentMethod = _paymentService.LoadPaymentMethodBySystemName(paymentTransaction.PaymentMethodSystemName);
+ var paymentMethod =
+ _paymentService.LoadPaymentMethodBySystemName(paymentTransaction.PaymentMethodSystemName);
if (paymentMethod == null)
return RedirectToRoute("HomePage");
if (paymentMethod.PaymentMethodType != PaymentMethodType.Redirection)
@@ -1050,6 +1114,7 @@ namespace Grand.Web.Controllers
{
return Content("Redirected");
}
+
return RedirectToRoute("CheckoutCompleted", new { orderId = order.Id });
}
catch (Exception exc)
@@ -1059,4 +1124,4 @@ namespace Grand.Web.Controllers
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
index b71824add..77adee71d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
@@ -60,13 +60,13 @@ namespace Grand.Web.Features.Handlers.Checkout
}
//new address
- model.NewAddress.CountryId = request.SelectedCountryId;
+ model.BillingNewAddress.CountryId = request.SelectedCountryId;
var countries = await _countryService.GetAllCountriesForBilling(request.Language.Id, request.Store.Id);
- model.NewAddress = await _mediator.Send(new GetAddressModel() {
+ model.BillingNewAddress = await _mediator.Send(new GetAddressModel() {
Language = request.Language,
Store = request.Store,
- Model = model.NewAddress,
+ Model = model.BillingNewAddress,
Address = null,
ExcludeProperties = false,
PrePopulateWithCustomerFields = request.PrePopulateNewAddressWithCustomerFields,
@@ -74,8 +74,8 @@ namespace Grand.Web.Features.Handlers.Checkout
Customer = request.Customer,
OverrideAttributes = request.OverrideAttributes
});
- model.NewAddress.HideAddressType = true;
- model.NewAddress.AddressTypeId = _addressSettings.AddressTypeEnabled ? (int)AddressType.Billing : (int)AddressType.Any;
+ model.BillingNewAddress.HideAddressType = true;
+ model.BillingNewAddress.AddressTypeId = _addressSettings.AddressTypeEnabled ? (int)AddressType.Billing : (int)AddressType.Any;
return model;
}
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
index f0c0a2980..ce92b716b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
@@ -67,12 +67,12 @@ namespace Grand.Web.Features.Handlers.Checkout
await PrepareAddresses(model, request);
//new address
- model.NewAddress.CountryId = request.SelectedCountryId;
+ model.ShippingNewAddress.CountryId = request.SelectedCountryId;
var countries = await _countryService.GetAllCountriesForShipping(request.Language.Id, request.Store.Id);
- model.NewAddress = await _mediator.Send(new GetAddressModel() {
+ model.ShippingNewAddress = await _mediator.Send(new GetAddressModel() {
Language = request.Language,
Store = request.Store,
- Model = model.NewAddress,
+ Model = model.ShippingNewAddress,
Address = null,
ExcludeProperties = false,
LoadCountries = () => countries,
@@ -80,8 +80,8 @@ namespace Grand.Web.Features.Handlers.Checkout
Customer = request.Customer,
OverrideAttributes = request.OverrideAttributes,
});
- model.NewAddress.HideAddressType = true;
- model.NewAddress.AddressTypeId = _addressSettings.AddressTypeEnabled ? (int)AddressType.Shipping : (int)AddressType.Any;
+ model.ShippingNewAddress.HideAddressType = true;
+ model.ShippingNewAddress.AddressTypeId = _addressSettings.AddressTypeEnabled ? (int)AddressType.Shipping : (int)AddressType.Any;
return model;
}
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs
index c226fa9e4..4d85bbf4a 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutBillingAddressModel.cs
@@ -8,10 +8,11 @@ namespace Grand.Web.Models.Checkout
public CheckoutBillingAddressModel()
{
ExistingAddresses = new List<AddressModel>();
- NewAddress = new AddressModel();
+ BillingNewAddress = new AddressModel();
}
public IList<AddressModel> ExistingAddresses { get; set; }
- public AddressModel NewAddress { get; set; }
+ public AddressModel BillingNewAddress { get; set; }
public bool NewAddressPreselected { get; set; }
+ public string BillingAddressId { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs b/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs
index a7a718883..70c5f3837 100644
--- a/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs
+++ b/src/Web/Grand.Web/Models/Checkout/CheckoutShippingAddressModel.cs
@@ -8,18 +8,19 @@ namespace Grand.Web.Models.Checkout
public CheckoutShippingAddressModel()
{
ExistingAddresses = new List<AddressModel>();
- NewAddress = new AddressModel();
+ ShippingNewAddress = new AddressModel();
Warnings = new List<string>();
PickupPoints = new List<CheckoutPickupPointModel>();
}
public IList<AddressModel> ExistingAddresses { get; set; }
public IList<string> Warnings { get; set; }
- public AddressModel NewAddress { get; set; }
-
+ public AddressModel ShippingNewAddress { get; set; }
+ public string ShippingAddressId { get; set; }
+ public string PickupPointId { get; set; }
public bool NewAddressPreselected { get; set; }
public IList<CheckoutPickupPointModel> PickupPoints { get; set; }
- public bool BillToTheSameAddress { get; set; }
+ public bool BillToTheSameAddress { get; set; }
public bool AllowPickUpInStore { get; set; }
public bool PickUpInStore { get; set; }
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
index a2618c11f..2eb04ff8c 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
@@ -11,13 +11,13 @@ namespace Grand.Web.Validators.Customer
{
public CheckoutBillingAddressValidator(
IEnumerable<IValidatorConsumer<CheckoutBillingAddressModel>> validators,
- IEnumerable<IValidatorConsumer<Models.Common.AddressModel>> addressvalidators,
+ IEnumerable<IValidatorConsumer<Models.Common.AddressModel>> addressValidators,
ITranslationService translationService,
ICountryService countryService,
AddressSettings addressSettings)
: base(validators)
{
- RuleFor(x => x.NewAddress).SetValidator(new AddressValidator(addressvalidators, translationService, countryService, addressSettings));
+ RuleFor(x => x.BillingNewAddress).SetValidator(new AddressValidator(addressValidators, translationService, countryService, addressSettings));
}
}
}
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
index fccbe7b76..f836035df 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
@@ -11,13 +11,13 @@ namespace Grand.Web.Validators.Customer
{
public CheckoutShippingAddressValidator(
IEnumerable<IValidatorConsumer<CheckoutShippingAddressModel>> validators,
- IEnumerable<IValidatorConsumer<Models.Common.AddressModel>> addressvalidators,
+ IEnumerable<IValidatorConsumer<Models.Common.AddressModel>> addressValidators,
ITranslationService translationService,
ICountryService countryService,
AddressSettings addressSettings)
: base(validators)
{
- RuleFor(x => x.NewAddress).SetValidator(new AddressValidator(addressvalidators, translationService, countryService, addressSettings));
+ RuleFor(x => x.ShippingNewAddress).SetValidator(new AddressValidator(addressValidators, translationService, countryService, addressSettings));
}
}
}
diff --git a/src/Web/Grand.Web/Views/Checkout/Partials/BillingAddress.cshtml b/src/Web/Grand.Web/Views/Checkout/Partials/BillingAddress.cshtml
index ccd75aecf..30efccbbc 100644
--- a/src/Web/Grand.Web/Views/Checkout/Partials/BillingAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Partials/BillingAddress.cshtml
@@ -4,7 +4,7 @@
<div class="section select-billing-address">
<label for="billing-address-select">@Loc["Checkout.SelectBillingAddressOrEnterNewOne"]</label>
<div>
- <select name="billing_address_id" id="billing-address-select" ref="billingSelect" class="custom-select address-select" title="" onchange="vmorder.vBilling.newAddress(!this.value)">
+ <select name="BillingAddressId" id="billing-address-select" ref="billingSelect" class="custom-select address-select" title="" onchange="vmorder.vBilling.newAddress(!this.value)">
<template v-for="address in vmorder.BillingExistingAddresses">
<option :value="address.Id">
{{address.FirstName}}
@@ -37,7 +37,7 @@
@{
var dataDictAddress = new ViewDataDictionary(ViewData);
dataDictAddress.TemplateInfo.HtmlFieldPrefix = "BillingNewAddress";
- <partial name="Partials/CreateOrUpdateAddress" model="Model.BillingAddress.NewAddress" view-data="dataDictAddress" />
+ <partial name="Partials/CreateOrUpdateAddress" model="Model.BillingAddress.BillingNewAddress" view-data="dataDictAddress" />
}
</div>
<template v-if="vmorder.billingAddressErrors !== null">
diff --git a/src/Web/Grand.Web/Views/Checkout/Partials/BillingWithoutShipping.cshtml b/src/Web/Grand.Web/Views/Checkout/Partials/BillingWithoutShipping.cshtml
index 22db1f09a..1918100ee 100644
--- a/src/Web/Grand.Web/Views/Checkout/Partials/BillingWithoutShipping.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Partials/BillingWithoutShipping.cshtml
@@ -8,7 +8,7 @@
<label class="genera" for="billing-address-select">@Loc["Checkout.SelectBillingAddressOrEnterNewOne"]</label>
</div>
<div class="col-12 px-0">
- <select name="billing_address_id" ref="billingSelect" id="billing-address-select" class="custom-select address-select"
+ <select name="BillingAddressId" ref="billingSelect" id="billing-address-select" class="custom-select address-select"
title="" onchange="vmorder.vBilling.newAddress(!this.value)">
@foreach (var address in Model.ExistingAddresses)
{
@@ -48,7 +48,7 @@
@{
var dataDictAddress = new ViewDataDictionary(ViewData);
dataDictAddress.TemplateInfo.HtmlFieldPrefix = "BillingNewAddress";
- <partial name="Partials/CreateOrUpdateAddress" model="Model.NewAddress" view-data="dataDictAddress" />
+ <partial name="Partials/CreateOrUpdateAddress" model="Model.BillingNewAddress" view-data="dataDictAddress" />
}
<div asp-validation-summary="ModelOnly" class="message-error"></div>
<template v-if="vmorder.billingAddressErrors !== null">
diff --git a/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddress.cshtml b/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddress.cshtml
index 8cc354afd..8cfb4bb54 100644
--- a/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddress.cshtml
@@ -23,7 +23,7 @@
<label class="genera" for="shipping-address-select">@Loc["Checkout.SelectShippingAddressOrEnterNewOne"]</label>
</div>
<div class="col-12 px-0">
- <select name="shipping_address_id" ref="shippingSelect" id="shipping-address-select" class="custom-select address-select"
+ <select name="ShippingAddressId" ref="shippingSelect" id="shipping-address-select" class="custom-select address-select"
onchange="vmorder.vShipping.newAddress(!this.value)">
@foreach (var address in Model.ExistingAddresses)
{
@@ -63,7 +63,7 @@
@{
var dataDictAddress = new ViewDataDictionary(ViewData);
dataDictAddress.TemplateInfo.HtmlFieldPrefix = "ShippingNewAddress";
- <partial name="Partials/CreateOrUpdateAddress" model="Model.NewAddress" view-data="dataDictAddress" />
+ <partial name="Partials/CreateOrUpdateAddress" model="Model.ShippingNewAddress" view-data="dataDictAddress" />
}
<div asp-validation-summary="ModelOnly" class="message-error"></div>
<template v-if="vmorder.shippingAddressErrors !== null">
diff --git a/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml b/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml
index 7d76e17c2..7abc13adc 100644
--- a/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml
@@ -32,7 +32,7 @@
@if (Model.PickupPoints.Count == 1)
{
var point = Model.PickupPoints.First();
- @Html.Hidden("pickup-point-id", point.Id)
+ @Html.Hidden("PickupPointId", point.Id)
<div class="section single-pickup-point">
<ul>
<li class="single-pickup-point name">@point.Name</li>
@@ -47,7 +47,7 @@
else
{
<label for="pickup-points-select">@Loc["Checkout.PickupPoints.SelectPickupPoint"]</label>
- <select name="pickup-point-id" id="pickup-points-select" class="custom-select address-select" title="">
+ <select name="PickupPointId" id="pickup-points-select" class="custom-select address-select" title="">
@foreach (var point in Model.PickupPoints)
{
var addressLine = new StringBuilder();
diff --git a/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml
index 15d680e29..6c52d9381 100644
--- a/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml
@@ -50,30 +50,27 @@
</div>
}
<div class="form-group col-sm-12 col-md-6">
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.FirstName'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="FirstName" class="col-form-label">@Loc["Address.Fields.FirstName"]:</label>
<span class="required">*</span>
<input asp-for="FirstName" v-model="createorupdateaddress@{@prefix}.FirstName" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="FirstName"></span>
</validation-provider>
</div>
<div class="form-group col-sm-12 col-md-6">
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.LastName'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="LastName" class="col-form-label">@Loc["Address.Fields.LastName"]:</label>
<span class="required">*</span>
<input asp-for="LastName" v-model="createorupdateaddress@{@prefix}.LastName" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="LastName"></span>
</validation-provider>
</div>
<div class="form-group col-sm-12">
- <validation-provider tag="div" rules="required|email" :name="'@prefix' + '.Email'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required|email" v-slot="{ errors, classes }">
<label asp-for="Email" class="col-form-label">@Loc["Address.Fields.Email"]:</label>
<span class="required">*</span>
<input asp-for="Email" v-model="createorupdateaddress@{@prefix}.Email" v-bind:class="[classes , 'form-control']" asp-readonly=@(Model.DisallowUsersToChangeEmail) />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="Email"></span>
</validation-provider>
</div>
@if (Model.CompanyEnabled)
@@ -81,12 +78,11 @@
<div class="form-group col-sm-12">
@if (Model.CompanyRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.Company'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="Company" class="col-form-label">@Loc["Address.Fields.Company"]:</label>
<span class="required">*</span>
<input asp-for="Company" v-model="createorupdateaddress@{@prefix}.Company" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="Company"></span>
</validation-provider>
}
else
@@ -94,7 +90,6 @@
<label asp-for="Company" class="col-form-label">@Loc["Address.Fields.Company"]:</label>
<input asp-for="Company" class="form-control" />
}
- <span asp-validation-for="Company"></span>
</div>
}
@if (Model.VatNumberEnabled)
@@ -102,12 +97,11 @@
<div class="form-group col-sm-12">
@if (Model.VatNumberRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.VatNumber'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="VatNumber" class="col-form-label">@Loc["Address.Fields.VatNumber"]:</label>
<span class="required">*</span>
<input asp-for="VatNumber" v-model="createorupdateaddress@{@prefix}.VatNumber" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="VatNumber"></span>
</validation-provider>
}
else
@@ -115,19 +109,17 @@
<label asp-for="VatNumber" class="col-form-label">@Loc["Address.Fields.VatNumber"]:</label>
<input asp-for="VatNumber" class="form-control" />
}
- <span asp-validation-for="VatNumber"></span>
</div>
}
@if (Model.CountryEnabled)
{
<div class="form-group col-sm-12 col-md-6">
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.CountryId'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="CountryId" class="col-form-label">@Loc["Address.Fields.Country"]:</label>
<span class="required">*</span>
<select asp-for="CountryId" asp-items="Model.AvailableCountries"
onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="createorupdateaddress@{@prefix}.CountryId"></select>
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="CountryId"></span>
</validation-provider>
</div>
}
@@ -135,13 +127,12 @@
@if (Model.CountryEnabled && Model.StateProvinceEnabled)
{
<div class="form-group col-sm-12 col-md-6">
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.StateProvinceId'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="StateProvinceId" class="col-form-label">@Loc["Address.Fields.StateProvince"]:</label>
<span class="required">*</span>
<select asp-for="StateProvinceId" data-val-required="@Loc["Address.Fields.StateProvince.Required"]" v-bind:class="[classes , 'form-control custom-select']"
onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="createorupdateaddress@{@prefix}.StateProvinceId"></select>
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="StateProvinceId"></span>
</validation-provider>
</div>
}
@@ -150,12 +141,11 @@
<div class="form-group col-sm-12">
@if (Model.CityRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.City'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="City" class="col-form-label">@Loc["Address.Fields.City"]:</label>
<span class="required">*</span>
<input asp-for="City" v-model="createorupdateaddress@{@prefix}.City" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="City"></span>
</validation-provider>
}
else
@@ -171,12 +161,11 @@
<div class="form-group col-sm-12 col-md-6">
@if (Model.StreetAddressRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.Address1'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="Address1" class="col-form-label">@Loc["Address.Fields.Address1"]:</label>
<span class="required">*</span>
<input asp-for="Address1" v-model="createorupdateaddress@{@prefix}.Address1" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="Address1"></span>
</validation-provider>
}
else
@@ -184,7 +173,6 @@
<label asp-for="Address1" class="col-form-label">@Loc["Address.Fields.Address1"]:</label>
<input asp-for="Address1" class="form-control" />
}
- <span asp-validation-for="Address1"></span>
</div>
}
@if (Model.StreetAddress2Enabled)
@@ -192,12 +180,11 @@
<div class="form-group col-sm-12 col-md-6">
@if (Model.StreetAddress2Required)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.Address2'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="Address2" class="col-form-label">@Loc["Address.Fields.Address2"]:</label>
<span class="required">*</span>
<input asp-for="Address2" v-model="createorupdateaddress@{@prefix}.Address2" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="Address2"></span>
</validation-provider>
}
else
@@ -205,7 +192,6 @@
<label asp-for="Address2" class="col-form-label">@Loc["Address.Fields.Address2"]:</label>
<input asp-for="Address2" class="form-control" />
}
- <span asp-validation-for="Address2"></span>
</div>
}
@if (Model.ZipPostalCodeEnabled)
@@ -213,12 +199,11 @@
<div class="form-group col-sm-12">
@if (Model.ZipPostalCodeRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.ZipPostalCode'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="ZipPostalCode" class="col-form-label">@Loc["Address.Fields.ZipPostalCode"]:</label>
<span class="required">*</span>
<input asp-for="ZipPostalCode" v-model="createorupdateaddress@{@prefix}.ZipPostalCode" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="ZipPostalCode"></span>
</validation-provider>
}
else
@@ -226,7 +211,6 @@
<label asp-for="ZipPostalCode" class="col-form-label">@Loc["Address.Fields.ZipPostalCode"]:</label>
<input asp-for="ZipPostalCode" class="form-control" />
}
- <span asp-validation-for="ZipPostalCode"></span>
</div>
}
@if (Model.PhoneEnabled)
@@ -234,12 +218,11 @@
<div class="form-group col-sm-12 col-md-6">
@if (Model.PhoneRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.PhoneNumber'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="PhoneNumber" class="col-form-label">@Loc["Address.Fields.PhoneNumber"]:</label>
<span class="required">*</span>
<input asp-for="PhoneNumber" v-model="createorupdateaddress@{@prefix}.PhoneNumber" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="PhoneNumber"></span>
</validation-provider>
}
else
@@ -247,7 +230,6 @@
<label asp-for="PhoneNumber" class="col-form-label">@Loc["Address.Fields.PhoneNumber"]:</label>
<input asp-for="PhoneNumber" class="form-control" />
}
- <span asp-validation-for="PhoneNumber"></span>
</div>
}
@if (Model.FaxEnabled)
@@ -255,12 +237,11 @@
<div class="form-group col-sm-12 col-md-6">
@if (Model.FaxRequired)
{
- <validation-provider tag="div" rules="required" :name="'@prefix' + '.FaxNumber'" v-slot="{ errors, classes }">
+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
<label asp-for="FaxNumber" class="col-form-label">@Loc["Address.Fields.FaxNumber"]:</label>
<span class="required">*</span>
<input asp-for="FaxNumber" v-model="createorupdateaddress@{@prefix}.FaxNumber" v-bind:class="[classes , 'form-control']" />
<span class="field-validation-error">{{ errors[0] }}</span>
- <span asp-validation-for="FaxNumber"></span>
</validation-provider>
}
else
@@ -268,7 +249,6 @@
<label asp-for="FaxNumber" class="col-form-label">@Loc["Address.Fields.FaxNumber"]:</label>
<input asp-for="FaxNumber" class="form-control" />
}
- <span asp-validation-for="FaxNumber"></span>
</div>
}
@if (Model.NoteEnabled)