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.

Extend address model - add new field HideAddressType - for hide address type on the checkout page

KrzysztofPajak2388e4c78896
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
index 5c9635b94..1d3afe1ea 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
@@ -78,6 +78,7 @@ 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;
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 18fa74fd0..f569dff39 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
@@ -84,6 +84,7 @@ 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;
return model;
diff --git a/src/Web/Grand.Web/Models/Common/AddressModel.cs b/src/Web/Grand.Web/Models/Common/AddressModel.cs
index 4762cac78..ab15a6320 100644
--- a/src/Web/Grand.Web/Models/Common/AddressModel.cs
+++ b/src/Web/Grand.Web/Models/Common/AddressModel.cs
@@ -93,5 +93,6 @@ namespace Grand.Web.Models.Common
[GrandResourceDisplayName("Address.Fields.AddressType")]
public int AddressTypeId { get; set; }
+ public bool HideAddressType { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Views/Shared/_CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web/Views/Shared/_CreateOrUpdateAddress.cshtml
index ec6ec8d8b..bf277eadb 100644
--- a/src/Web/Grand.Web/Views/Shared/_CreateOrUpdateAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_CreateOrUpdateAddress.cshtml
@@ -272,7 +272,7 @@
<span asp-validation-for="Note"></span>
</div>
}
- @if (Model.AddressTypeEnabled)
+ @if (Model.AddressTypeEnabled && !Model.HideAddressType)
{
<div class="form-group col-sm-12 col-md-6">
<label asp-for="AddressTypeId" class="col-form-label">@Loc["Address.Fields.AddressType"]:</label>