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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Improve Admin panel - allow to hide the store column on the grid
KrzysztofPajakee14f70a377c
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.csindex 9f4c50908..0e7bad0ce 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs@@ -163,6 +163,7 @@ namespace Grand.Business.System.Services.InstallationDefaultGridPageSize = 15,GridPageSizes = "10, 15, 20, 50, 100",UseIsoDateTimeConverterInJson = true,+ HideStoreColumn = true,});await _settingService.SaveSetting(new CatalogSettings {diff --git a/src/Core/Grand.Domain/Common/AdminAreaSettings.cs b/src/Core/Grand.Domain/Common/AdminAreaSettings.csindex fe681d4b7..6d2943844 100644--- a/src/Core/Grand.Domain/Common/AdminAreaSettings.cs+++ b/src/Core/Grand.Domain/Common/AdminAreaSettings.cs@@ -17,5 +17,10 @@ namespace Grand.Domain.Common/// </summary>public bool UseIsoDateTimeConverterInJson { get; set; }+ /// <summary>+ /// Gets or sets a value indicating whether to hide column Store in a grid list+ /// </summary>+ public bool HideStoreColumn { get; set; }+}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactForm/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactForm/List.cshtmlindex b17cc7bbc..462d5c04a 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactForm/List.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactForm/List.cshtml@@ -114,11 +114,18 @@ $(document).ready(function () {width: 100,type: "date",format: "{0:G}"- }, {- field: "Store",- title: "@Loc["Admin.System.ContactForm.Fields.Store"]",- width: 100- }, {+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "Store",+ title: "@Loc["Admin.System.ContactForm.Fields.Store"]",+ width: 100+ },+ </text>+ }+ {field: "Email",title: "@Loc["Admin.System.ContactForm.Fields.FullName"]",width: 150diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtmlindex ca9ece618..718103497 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml@@ -121,11 +121,18 @@width: 100,type: "date",format: "{0:G}"- }, {- field: "Store",- title: "@Loc["Admin.System.ContactForm.Fields.Store"]",- width: 100- }, {+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "Store",+ title: "@Loc["Admin.System.ContactForm.Fields.Store"]",+ width: 100+ },+ </text>+ }+ {field: "Email",title: "@Loc["Admin.System.ContactForm.Fields.FullName"]",width: 150diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentShoppingCart.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentShoppingCart.cshtmlindex a64c1f5c5..a377422e9 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentShoppingCart.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentShoppingCart.cshtml@@ -1,4 +1,5 @@@model CustomerModel+@inject AdminAreaSettings adminAreaSettings<div class="panel panel-default"><div class="panel-heading">@@ -105,11 +106,18 @@ $(document).ready(function () {field: "Total",title: "@Loc["Admin.CurrentCarts.Total"]",width:200- },{- field: "Store",- title: "@Loc["Admin.CurrentCarts.Store"]",- width:200- },{+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "Store",+ title: "@Loc["Admin.CurrentCarts.Store"]",+ width:200+ },+ </text>+ }+ {field: "UpdatedOn",title: "@Loc["Admin.CurrentCarts.UpdatedOn"]",width: 200,diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentWishlist.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentWishlist.cshtmlindex 5b8e3f0aa..ded49e99a 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentWishlist.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabCurrentWishlist.cshtml@@ -1,4 +1,6 @@@model CustomerModel+@inject AdminAreaSettings adminAreaSettings+<div class="panel panel-default"><div class="panel-heading">@Loc["Admin.Customers.Customers.CurrentWishlist"]@@ -81,11 +83,18 @@ $(document).ready(function () {field: "Total",title: "@Loc["Admin.CurrentCarts.Total"]",width:200- },{- field: "Store",- title: "@Loc["Admin.CurrentCarts.Store"]",- width:200- },{+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "Store",+ title: "@Loc["Admin.CurrentCarts.Store"]",+ width:200+ },+ </text>+ }+ {field: "UpdatedOn",title: "@Loc["Admin.CurrentCarts.UpdatedOn"]",width: 200,diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabLoyaltyPoints.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabLoyaltyPoints.cshtmlindex 9e02a5e0f..a6ef01313 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabLoyaltyPoints.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabLoyaltyPoints.cshtml@@ -1,4 +1,5 @@@model CustomerModel+@inject AdminAreaSettings adminAreaSettings<div class="panel panel-default"><vc:admin-widget widget-zone="customer_details_loyalty_points_top" additional-data="Model" />@@ -45,10 +46,17 @@mode: "inline"},scrollable: false,- columns: [{- field: "StoreName",- title: "@Loc["Admin.Customers.Customers.LoyaltyPoints.Fields.Store"]"- },{+ columns: [+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "StoreName",+ title: "@Loc["Admin.Customers.Customers.LoyaltyPoints.Fields.Store"]"+ },+ </text>+ }+ {field: "Points",title: "@Loc["Admin.Customers.Customers.LoyaltyPoints.Fields.Points"]"}, {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOrders.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOrders.cshtmlindex 8f6f2b5d3..77fe59d5a 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOrders.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOrders.cshtml@@ -75,11 +75,18 @@field: "ShippingStatus",title: "@Loc["Admin.Customers.Customers.Orders.ShippingStatus"]",width: 180- }, {- field: "StoreName",- title: "@Loc["Admin.Customers.Customers.Orders.Store"]",- width: 200- }, {+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "StoreName",+ title: "@Loc["Admin.Customers.Customers.Orders.Store"]",+ width: 200+ },+ </text>+ }+ {field: "CreatedOn",title: "@Loc["Admin.System.Log.Fields.CreatedOn"]",width: 220,diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOutOfStockSubscriptions.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOutOfStockSubscriptions.cshtmlindex a65dd1ae8..17d3e11a2 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOutOfStockSubscriptions.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabOutOfStockSubscriptions.cshtml@@ -8,7 +8,7 @@</div><vc:admin-widget widget-zone="customer_details_back_in_stock_bottom" additional-data="Model" /></div>- <script>+<script>$(document).ready(function () {$("#outofstock-subscriptions-grid").kendoGrid({dataSource: {@@ -44,11 +44,18 @@mode: "inline"},scrollable: false,- columns: [{- field: "StoreName",- title: "@Loc["Admin.Customers.Customers.OutOfStockSubscriptions.Store"]",- width: 200,- }, {+ columns: [+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "StoreName",+ title: "@Loc["Admin.Customers.Customers.OutOfStockSubscriptions.Store"]",+ width: 200,+ },+ </text>+ }+ {field: "ProductId",title: "@Loc["Admin.Customers.Customers.OutOfStockSubscriptions.Product"]",width: 300,@@ -62,5 +69,5 @@}]});});- </script>+</script>}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/NewsLetterSubscription/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/NewsLetterSubscription/List.cshtmlindex 89a66c760..e8999c62e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/NewsLetterSubscription/List.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/NewsLetterSubscription/List.cshtml@@ -152,14 +152,21 @@headerAttributes: { style: "text-align:center" },attributes: { style: "text-align:center" },template: '# if(Active) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }, {- field: "StoreName",- title: "@Loc["admin.marketing.NewsLetterSubscriptions.Fields.Store"]",- width: 150- }, {+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "StoreName",+ title: "@Loc["admin.marketing.NewsLetterSubscriptions.Fields.Store"]",+ width: 150+ },+ </text>+ }+ {field: "Categories",- title: "@Loc["admin.marketing.NewsLetterSubscriptions.Fields.Categories"]",- width: 300+ title: "@Loc["admin.marketing.NewsLetterSubscriptions.Fields.Categories"]",+ width: 300}, {field: "CreatedOn",title: "@Loc["admin.marketing.NewsLetterSubscriptions.Fields.CreatedOn"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtmlindex 33455a7c5..6660c05c4 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/List.cshtml@@ -317,7 +317,7 @@width: 120,template: '<a class="k-link" href="Edit/#=Id#">#=ShippingStatus#</a>'},</text>- }+ }{field: "CustomerEmail",title: "@Loc["Admin.Orders.Fields.Customer"]",@@ -331,12 +331,18 @@</text>}},+ @if (!adminAreaSettings.HideStoreColumn){- field: "StoreName",- title: "@Loc["Admin.Orders.Fields.Store"]",- width: 150,- minScreenWidth: 770,- }, {+ <text>+ {+ field: "StoreName",+ title: "@Loc["Admin.Orders.Fields.Store"]",+ width: 150,+ minScreenWidth: 770,+ },+ </text>+ }+ {field: "CreatedOn",title: "@Loc["Admin.Orders.Fields.CreatedOn"]",width: 180,@@ -353,7 +359,7 @@width: 150,template: '#=OrderTotal#',headerAttributes: { style: "text-align:right" },- attributes: { style: "text-align:right" },+ attributes: { style: "text-align:right" },},</text>}]diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Prices.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Prices.cshtmlindex f5b34fbb2..750ca6490 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Prices.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Prices.cshtml@@ -1,4 +1,5 @@@model ProductModel+@inject AdminAreaSettings adminAreaSettings<vc:admin-widget widget-zone="product_details_prices_top" additional-data="Model" /><div class="form-horizontal portlet bg-inverse form-fit" id="group-prices"><div class="form-body">@@ -45,7 +46,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="DisableBuyButton" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="DisableBuyButton"></span></div>@@ -55,7 +56,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="DisableWishlistButton" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="DisableWishlistButton"></span></div>@@ -65,7 +66,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="AvailableForPreOrder" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="AvailableForPreOrder"></span></div>@@ -82,7 +83,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="CallForPrice" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="CallForPrice"></span></div>@@ -92,7 +93,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="EnteredPrice" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="EnteredPrice"></span></div>@@ -116,7 +117,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="BasepriceEnabled" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="BasepriceEnabled"></span></div>@@ -154,7 +155,7 @@<div class="col-md-9 col-sm-9"><label class="mt-checkbox mt-checkbox-outline control control-checkbox"><admin-input asp-for="IsTaxExempt" />- <div class="control__indicator"></div>+ <div class="control__indicator"></div></label><span asp-validation-for="IsTaxExempt"></span></div>@@ -253,11 +254,17 @@mode: "inline"},scrollable: false,- columns: [{- field: "StoreId",- title: "@Loc["Admin.Catalog.Products.TierPrices.Fields.Store"]",- template: "#:Store#"- },+ columns: [+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "StoreId",+ title: "@Loc["Admin.Catalog.Products.TierPrices.Fields.Store"]",+ template: "#:Store#"+ },+ </text>+ }{field: "CustomerGroupId",title: "@Loc["Admin.Catalog.Products.TierPrices.Fields.CustomerGroup"]",@@ -318,10 +325,10 @@ else{<label class="mt-checkbox mt-checkbox-outline control control-checkbox"><input type="checkbox" name="SelectedDiscountIds" value="@discount.Id"- @if (Model.SelectedDiscountIds != null && Model.SelectedDiscountIds.Contains(discount.Id)) { <text> checked="checked" </text> } />@discount.Name- <div class="control__indicator"></div>+ @if (Model.SelectedDiscountIds != null && Model.SelectedDiscountIds.Contains(discount.Id)) { <text> checked="checked" </text> } />@discount.Name+ <div class="control__indicator"></div></label>- }+ }</div></div></div>@@ -332,4 +339,4 @@ else@Html.Raw(@Loc["Admin.Catalog.Collections.Discounts.NoDiscounts"])</div>}- <vc:admin-widget widget-zone="product_details_prices_bottom" additional-data="Model" />\ No newline at end of file+<vc:admin-widget widget-zone="product_details_prices_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtmlindex 248a4e6a9..3c953dd07 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml@@ -93,6 +93,18 @@<span asp-validation-for="GridPageSizes"></span></div></div>+ <div class="form-group">+ <div class="col-8 col-md-4 col-sm-4 text-right">+ <admin-label asp-for="HideStoreColumn" class="control-label" />+ </div>+ <div class="col-4 col-md-8 col-sm-8">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="HideStoreColumn" />+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="HideStoreColumn"></span>+ </div>+ </div><div class="form-group"><div class="col-8 col-md-4 col-sm-4 text-right"><admin-label asp-for="DefaultAdminLanguageId" class="control-label" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/LatestOrder/Default.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/LatestOrder/Default.cshtmlindex 7ef95f8cd..acb706116 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/LatestOrder/Default.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/LatestOrder/Default.cshtml@@ -1,4 +1,5 @@@model bool+@inject AdminAreaSettings adminAreaSettings<div id="latest-orders-grid"></div>@@ -65,13 +66,18 @@</text>}},+ @if (!adminAreaSettings.HideStoreColumn){- field: "StoreName",- title: "@Loc["Admin.Orders.Fields.Store"]",- width: 200,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- },+ <text>+ {+ field: "StoreName",+ title: "@Loc["Admin.Orders.Fields.Store"]",+ width: 200,+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ },+ </text>+ }{field: "PaymentStatus",title: "@Loc["Admin.Orders.Fields.PaymentStatus"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentCarts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentCarts.cshtmlindex 91dd91cdd..014f3bb50 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentCarts.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentCarts.cshtml@@ -106,11 +106,18 @@ function detailInitCart(e) {field: "Total",title: "@Loc["Admin.CurrentCarts.Total"]",width: 150- },{- field: "Store",- title: "@Loc["Admin.CurrentCarts.Store"]",- width: 150- },{+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "Store",+ title: "@Loc["Admin.CurrentCarts.Store"]",+ width: 150+ },+ </text>+ }+ {field: "UpdatedOn",title: "@Loc["Admin.CurrentCarts.UpdatedOn"]",width: 150,diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentWishlists.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentWishlists.cshtmlindex 63ba96b79..a04cda419 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentWishlists.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ShoppingCart/_CurrentCarts.TabCurrentWishlists.cshtml@@ -106,11 +106,18 @@field: "Total",title: "@Loc["Admin.CurrentCarts.Total"]",width: 150- },{- field: "Store",- title: "@Loc["Admin.CurrentCarts.Store"]",- width: 150- },{+ },+ @if (!adminAreaSettings.HideStoreColumn)+ {+ <text>+ {+ field: "Store",+ title: "@Loc["Admin.CurrentCarts.Store"]",+ width: 150+ },+ </text>+ }+ {field: "UpdatedOn",title: "@Loc["Admin.CurrentCarts.UpdatedOn"]",width: 150,diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex 3be4532b3..113228b37 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -1195,6 +1195,7 @@ namespace Grand.Web.Admin.Controllersmodel.DefaultGridPageSize = adminsettings.DefaultGridPageSize;model.GridPageSizes = adminsettings.GridPageSizes;model.UseIsoDateTimeConverterInJson = adminsettings.UseIsoDateTimeConverterInJson;+ model.HideStoreColumn = adminsettings.HideStoreColumn;//language settingsvar langsettings = _settingService.LoadSetting<LanguageSettings>();@@ -1231,6 +1232,7 @@ namespace Grand.Web.Admin.ControllersadminAreaSettings.DefaultGridPageSize = model.DefaultGridPageSize;adminAreaSettings.GridPageSizes = model.GridPageSizes;adminAreaSettings.UseIsoDateTimeConverterInJson = model.UseIsoDateTimeConverterInJson;+ adminAreaSettings.HideStoreColumn = model.HideStoreColumn;await _settingService.SaveSetting(adminAreaSettings);diff --git a/src/Web/Grand.Web.Admin/Models/Settings/SystemSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/SystemSettingsModel.csindex 140e5d4e3..54830b9c1 100644--- a/src/Web/Grand.Web.Admin/Models/Settings/SystemSettingsModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Settings/SystemSettingsModel.cs@@ -29,6 +29,8 @@ namespace Grand.Web.Admin.Models.Settings[GrandResourceDisplayName("Admin.Settings.System.UseIsoDateTimeConverterInJson")]public bool UseIsoDateTimeConverterInJson { get; set; }+ [GrandResourceDisplayName("Admin.Settings.System.HideStoreColumn")]+ public bool HideStoreColumn { get; set; }#endregiondiff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex f6018e013..7122dc6d7 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -11862,6 +11862,9 @@<Resource Name="Admin.Settings.System.GridPageSizes"><Value>Grid Page Sizes</Value></Resource>+ <Resource Name="Admin.Settings.System.HideStoreColumn">+ <Value>Hide column The Store on the grid</Value>+ </Resource><Resource Name="Admin.Settings.System.IgnoreRtlPropertyForAdminArea"><Value>Ignore RTL language property for admin area</Value></Resource>