diff --git a/src/Web/Grand.Web/Views/Checkout/Partials/ReviewData.cshtml b/src/Web/Grand.Web/Views/Checkout/Partials/ReviewData.cshtml
index 48702a6f8..118a66f92 100644
--- a/src/Web/Grand.Web/Views/Checkout/Partials/ReviewData.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Partials/ReviewData.cshtml
@@ -62,6 +62,7 @@
+ @await Component.InvokeAsync("Widget", new { widgetZone = "confirm_payment_bottom" })
@@ -136,6 +137,7 @@
{{vmorder.OrderReviewData.PickupAddress.CountryName}}
+ @await Component.InvokeAsync("Widget", new { widgetZone = "confirm_pickupaddress_bottom" })
@Loc["Order.Shipping"]
diff --git a/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml b/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml
index 802a9c70e..2ca1a25c6 100644
--- a/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml
+++ b/src/Web/Grand.Web/Views/Checkout/Partials/ShippingAddressPickupInStore.cshtml
@@ -1,4 +1,7 @@
@model CheckoutShippingAddressModel
+@using System.Text
+@using Grand.Business.Core.Interfaces.Common.Directory
+@inject ICountryService _countryService
@if (Model.AllowPickUpInStore && !Model.PickUpInStoreOnly && Model.PickupPoints.Any())
{
@@ -31,11 +34,12 @@
@if (Model.PickupPoints.Count == 1)
{
var point = Model.PickupPoints.First();
+ var pickupPointStateProvince = (await _countryService.GetStateProvincesByCountryId(point.Address.CountryId))?.Where(x => x.Id == point.Address.StateProvinceId).FirstOrDefault().Name;
@Html.Hidden("PickupPointId", point.Id)
- @point.Name
- - @($"{point.Address.City} {point.Address.ZipPostalCode} {point.Address.Address1}")
+ - @(string.Format("{0} {1} {2} {3}",pickupPointStateProvince, point.Address.City, point.Address.ZipPostalCode, point.Address.Address1))
@if (!string.IsNullOrEmpty(point.PickupFee))
{
- @point.PickupFee
@@ -51,6 +55,11 @@
{
var addressLine = new StringBuilder();
addressLine.Append(point.Name);
+ if(!string.IsNullOrEmpty(point.Address.StateProvinceId))
+ {
+ var pickupPointStateProvince = (await _countryService.GetStateProvincesByCountryId(point.Address.CountryId))?.Where(x => x.Id == point.Address.StateProvinceId).FirstOrDefault().Name;
+ addressLine.AppendFormat(", {0}", pickupPointStateProvince);
+ }
if (!string.IsNullOrEmpty(point.Address.City))
{
addressLine.Append($", {point.Address.City}");