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.

Admin panel - Address - hide address type

KrzysztofPajak69fd992c5489
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml
index fee14b2b0..19b615ca1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Address.cshtml
@@ -194,13 +194,16 @@
</div>
</div>
}
- <div class="form-group">
- <admin-label asp-for="AddressType" />
- <div class="col-md-9 col-sm-9">
- <select asp-for="AddressType" asp-items="@AddressType.Any.ToSelectList(Context, false).ToList()" class="form-control custom-select"></select>
- <span asp-validation-for="AddressType"></span>
+ @if (Model.AddressTypeEnabled)
+ {
+ <div class="form-group">
+ <admin-label asp-for="AddressType" />
+ <div class="col-md-9 col-sm-9">
+ <select asp-for="AddressType" asp-items="@AddressType.Any.ToSelectList(Context, false).ToList()" class="form-control custom-select"></select>
+ <span asp-validation-for="AddressType"></span>
+ </div>
</div>
- </div>
+ }
@if (Model.CustomAddressAttributes.Count > 0)
{
<partial name="_AddressAttributes" model="Model.CustomAddressAttributes" />
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
index 32c83f2b3..2c617a602 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
@@ -333,6 +333,7 @@ namespace Grand.Web.Admin.Controllers
model.ShippingOriginAddress.StreetAddressEnabled = true;
model.ShippingOriginAddress.ZipPostalCodeEnabled = true;
model.ShippingOriginAddress.ZipPostalCodeRequired = true;
+ model.ShippingOriginAddress.AddressTypeEnabled = false;
return View(model);
}
diff --git a/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs b/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs
index aa3c55e00..c59d5fc21 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/AddressModel.cs
@@ -114,6 +114,8 @@ namespace Grand.Web.Admin.Models.Common
public bool FaxEnabled { get; set; }
public bool FaxRequired { get; set; }
public bool NoteEnabled { get; set; }
+
+ public bool AddressTypeEnabled { get; set; }
[GrandResourceDisplayName("Address.Fields.AddressType")]
public AddressType AddressType { get; set; }
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
index 47a14f9b2..a7e704515 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
@@ -1199,6 +1199,7 @@ namespace Grand.Web.Admin.Services
model.Address.FaxEnabled = _addressSettings.FaxEnabled;
model.Address.FaxRequired = _addressSettings.FaxRequired;
model.Address.NoteEnabled = _addressSettings.NoteEnabled;
+ model.Address.AddressTypeEnabled = _addressSettings.AddressTypeEnabled;
//countries
model.Address.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.SelectCountry"), Value = "" });
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 406a0414b..75bb4f3d9 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -922,6 +922,7 @@ namespace Grand.Web.Admin.Services
model.Address.FaxEnabled = _addressSettings.FaxEnabled;
model.Address.FaxRequired = _addressSettings.FaxRequired;
model.Address.NoteEnabled = _addressSettings.NoteEnabled;
+ model.Address.AddressTypeEnabled = _addressSettings.AddressTypeEnabled;
//countries
model.Address.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.SelectCountry"), Value = "" });
diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
index e68e2c07d..4eeb459de 100644
--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
@@ -136,6 +136,7 @@ namespace Grand.Web.Admin.Services
model.Address.FaxEnabled = _vendorSettings.AddressSettings.FaxEnabled;
model.Address.FaxRequired = _vendorSettings.AddressSettings.FaxRequired;
model.Address.NoteEnabled = _vendorSettings.AddressSettings.NoteEnabled;
+ model.Address.AddressTypeEnabled = false;
//address
model.Address.AvailableCountries.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Address.SelectCountry"), Value = "" });