Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

State not showing in pickup address #316

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3c66b7a
Widget slider is showing other stores images #193
Dec 10, 2021
c9cf7e8
Merge branch 'master' of https://github.com/i-cuboid/grandnode2
Dec 10, 2021
4b47db1
Merge branch 'grandnode:master' into master
Nikhil13x Dec 11, 2021
ab6d31e
Revert "Widget slider is showing other stores images #193"
Dec 11, 2021
75f1f9d
Corrected null check
Dec 11, 2021
aecd77c
Merge branch 'grandnode:master' into master
Nikhil13x Dec 13, 2021
368a1d6
Merge pull request #1 from i-cuboid/bugfix/nullcheck
Dec 13, 2021
e8654ec
Merge branch 'grandnode:master' into master
Nikhil13x Dec 18, 2021
843e233
Merge branch 'grandnode:master' into master
Nikhil13x Dec 25, 2021
a4cb5b1
Merge branch 'grandnode:master' into master
Nikhil13x Jan 1, 2022
1eac2d0
Merge branch 'grandnode:master' into master
Nikhil13x Jan 5, 2022
6d1f53c
Merge branch 'grandnode:master' into master
Nikhil13x Jan 9, 2022
2a33fa8
Merge branch 'grandnode:master' into master
Nikhil13x Jan 11, 2022
0f4c2cc
Merge branch 'grandnode:master' into master
Nikhil13x Jan 14, 2022
6edb6b7
Merge branch 'grandnode:master' into master
Nikhil13x Jan 20, 2022
3493ad2
Merge branch 'grandnode:master' into master
Nikhil13x Jan 26, 2022
a51186a
Merge branch 'grandnode:master' into master
Nikhil13x Jan 28, 2022
8524fd2
Merge branch 'grandnode:master' into master
Nikhil13x Jan 28, 2022
5a398be
Merge branch 'master' of https://github.com/i-cuboid/grandnode2
Aug 31, 2022
902badc
state name added to pickup point address
Aug 31, 2022
04faf0d
widget zone added
Aug 31, 2022
1405823
Merge branch 'master' of https://github.com/i-cuboid/grandnode2 into …
Feb 18, 2023
2ee67ce
Merge branch 'master' of https://github.com/i-cuboid/grandnode2 into …
Feb 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Web/Grand.Web/Views/Checkout/Partials/ReviewData.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
</span>
</li>
</template>
@await Component.InvokeAsync("Widget", new { widgetZone = "confirm_payment_bottom" })
</ul>
</div>
</div>
Expand Down Expand Up @@ -136,6 +137,7 @@
{{vmorder.OrderReviewData.PickupAddress.CountryName}}
</li>
</template>
@await Component.InvokeAsync("Widget", new { widgetZone = "confirm_pickupaddress_bottom" })
<li class="title">
<h5>@Loc["Order.Shipping"]</h5>
</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -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())
{
Expand Down Expand Up @@ -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)
<div class="section single-pickup-point">
<ul>
<li class="single-pickup-point name">@point.Name</li>
<li class="single-pickup-point address">@($"{point.Address.City} {point.Address.ZipPostalCode} {point.Address.Address1}")</li>
<li class="single-pickup-point address">@(string.Format("{0} {1} {2} {3}",pickupPointStateProvince, point.Address.City, point.Address.ZipPostalCode, point.Address.Address1))</li>
@if (!string.IsNullOrEmpty(point.PickupFee))
{
<li class="single-pickup-point fee">@point.PickupFee</li>
Expand All @@ -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}");
Expand Down