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
Admin hints as plain text, store no-discounts note, vendor profile label, launchSettings fix (#864)
Krzysztof Pajake6987bbb4ffc
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Brand/Partials/CreateOrUpdate.TabDiscounts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Brand/Partials/CreateOrUpdate.TabDiscounts.cshtmlindex 48b520cf2..a65b182dd 100644--- a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Brand/Partials/CreateOrUpdate.TabDiscounts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Brand/Partials/CreateOrUpdate.TabDiscounts.cshtml@@ -21,7 +21,15 @@else{<div class="note note-info">- @Html.Raw(Loc["Admin.Catalog.Brands.Discounts.NoDiscounts"])+ @* the Admin text links to /Admin/Discount/List, which a store manager cannot open *@+ @if (ViewContext.RouteData.Values["area"] as string == "Store")+ {+ @Loc["Admin.Catalog.Discounts.NoStoreDiscounts"]+ }+ else+ {+ @Html.Raw(Loc["Admin.Catalog.Brands.Discounts.NoDiscounts"])+ }</div>}<partial name="Partials/WidgetZone.Discounts.Bottom" model="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Category/Partials/CreateOrUpdate.TabDiscounts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Category/Partials/CreateOrUpdate.TabDiscounts.cshtmlindex d0fe9f325..0aed833c8 100644--- a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Category/Partials/CreateOrUpdate.TabDiscounts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Category/Partials/CreateOrUpdate.TabDiscounts.cshtml@@ -21,7 +21,15 @@else{<div class="note note-info">- @Html.Raw(Loc["Admin.Catalog.Categories.Discounts.NoDiscounts"])+ @* the Admin text links to /Admin/Discount/List, which a store manager cannot open *@+ @if (ViewContext.RouteData.Values["area"] as string == "Store")+ {+ @Loc["Admin.Catalog.Discounts.NoStoreDiscounts"]+ }+ else+ {+ @Html.Raw(Loc["Admin.Catalog.Categories.Discounts.NoDiscounts"])+ }</div>}<partial name="Partials/WidgetZone.Discounts.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Collection/Partials/CreateOrUpdate.TabDiscounts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Collection/Partials/CreateOrUpdate.TabDiscounts.cshtmlindex 740f7b245..16e9796ac 100644--- a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Collection/Partials/CreateOrUpdate.TabDiscounts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Collection/Partials/CreateOrUpdate.TabDiscounts.cshtml@@ -21,7 +21,15 @@else{<div class="note note-info">- @Html.Raw(Loc["Admin.Catalog.Collections.Discounts.NoDiscounts"])+ @* the Admin text links to /Admin/Discount/List, which a store manager cannot open *@+ @if (ViewContext.RouteData.Values["area"] as string == "Store")+ {+ @Loc["Admin.Catalog.Discounts.NoStoreDiscounts"]+ }+ else+ {+ @Html.Raw(Loc["Admin.Catalog.Collections.Discounts.NoDiscounts"])+ }</div>}<partial name="Partials/WidgetZone.Discounts.Bottom" model="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Product/Partials/CreateOrUpdate.Discounts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Product/Partials/CreateOrUpdate.Discounts.cshtmlindex fc001280f..e7b5fdec6 100644--- a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Product/Partials/CreateOrUpdate.Discounts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Product/Partials/CreateOrUpdate.Discounts.cshtml@@ -21,7 +21,15 @@else{<div class="note note-info">- @Html.Raw(Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Collections.Discounts.NoDiscounts"])+ @* the Admin text links to /Admin/Discount/List, which a store manager cannot open *@+ @if (ViewContext.RouteData.Values["area"] as string == "Store")+ {+ @Loc["Admin.Catalog.Discounts.NoStoreDiscounts"]+ }+ else+ {+ @Html.Raw(Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Collections.Discounts.NoDiscounts"])+ }</div>}<partial name="Partials/WidgetZone.Discounts.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Prices.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Prices.cshtmlindex 526c9ee2d..8695488a4 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Prices.cshtml+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Prices.cshtml@@ -180,7 +180,8 @@ elseelse{<div class="note note-info">- @Html.Raw(Loc["Admin.Catalog.Collections.Discounts.NoDiscounts"])+ @* not the Admin text: that one links to /Admin/Discount/List, which a store manager cannot open *@+ @Loc["Admin.Catalog.Discounts.NoStoreDiscounts"]</div>}<vc:store-widget widget-zone="store_product_details_prices_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex bdc7a0ac1..b6b89567f 100644Binary files a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml and b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml differdiff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xmlindex 3c164986d..4fa0b9b6f 100644--- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml@@ -295,52 +295,52 @@<Value>There are no configured discounts. Create at least one discount in the <a href="/Admin/Discount/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Discounts section</a></Value></Resource><Resource Name="admin.catalog.brands.fields.collectionlayout.hint" Area="Admin">- <Value>Select the frontend appearance of the brand. Product layouts may be defined in the <a href="/Admin/Layout/CollectionLayouts" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Layouts section</a>.</Value>+ <Value>Select the frontend appearance of the brand. Brand layouts are managed under Configuration → Layouts → Brand layouts.</Value></Resource><Resource Name="admin.catalog.categories.discounts.nodiscounts" Area="Admin"><Value>There are no configured discounts. Create at least one discount in the <a href="/Admin/Discount/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Discounts section</a></Value></Resource><Resource Name="admin.catalog.categories.fields.categorylayout.hint" Area="Admin">- <Value>Select the frontend appearance of the category. Category layouts may be defined in the <a href="/Admin/Layout/CategoryLayouts" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Layouts section</a>.</Value>+ <Value>Select the frontend appearance of the category. Category layouts are managed under Configuration → Layouts → Category layouts.</Value></Resource><Resource Name="admin.catalog.collections.discounts.nodiscounts" Area="Admin"><Value>There are no configured discounts. Create at least one discount in the <a href="/Admin/Discount/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Discounts section</a></Value></Resource><Resource Name="admin.catalog.collections.fields.collectionlayout.hint" Area="Admin">- <Value>Select the frontend appearance of the collection. Product layouts may be defined in the <a href="/Admin/Layout/CollectionLayouts" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Layouts section</a>.</Value>+ <Value>Select the frontend appearance of the collection. Collection layouts are managed under Configuration → Layouts → Collection layouts.</Value></Resource><Resource Name="admin.catalog.products.discounts.nodiscounts" Area="Admin"><Value>There are no configured discounts. Create at least one discount in the <a href="/Admin/Discount/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Discounts section</a></Value></Resource><Resource Name="admin.catalog.products.fields.productlayout.hint" Area="Admin">- <Value>Select the frontend appearance of the product. Product layouts may be defined in the <a href="/Admin/Layout/ProductLayouts" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Layouts section</a>.</Value>+ <Value>Select the frontend appearance of the product. Product layouts are managed under Configuration → Layouts → Product layouts.</Value></Resource><Resource Name="admin.catalog.products.fields.taxcategory.hint" Area="Admin">- <Value>Select the tax category for this product. Tax categories may be defined in <a href="/Admin/Tax/Categories" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Tax section</a>.</Value>+ <Value>Select the tax category for this product. Tax categories are managed under Configuration → Tax → Tax categories.</Value></Resource><Resource Name="admin.catalog.products.fields.vendor.hint" Area="Admin">- <Value>Select a vendor that manages this product. You can manage them in the <a href="/Admin/Vendor/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Vendors section.</a></Value>+ <Value>Select a vendor that manages this product. Vendors are managed under Customers → Vendors.</Value></Resource><Resource Name="admin.catalog.products.specificationattributes.fields.specificationattribute.hint" Area="Admin">- <Value>Choose a product specification attribute. Specification attributes may be defined in the <a href="/Admin/SpecificationAttribute/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i>Specification Attributes section</a></Value>+ <Value>Choose a product specification attribute. Specification attributes are managed under Catalog → Specification attributes.</Value></Resource><Resource Name="admin.customers.customergroups.products.info" Area="Admin"><Value>To increase the general performance of the larger stores, recommended products are ignored by default. You can enable them in the Performance tab of <a href="/Admin/Setting/Catalog" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Catalog settings - section</a>.</Value></Resource><Resource Name="admin.customers.customers.fields.seid.hint" Area="Admin">- <Value>Choose a sales employee associated to this customer account. You can manage them in the <a href="/Admin/SalesEmployee" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Sales employees section</a>.</Value>+ <Value>Choose a sales employee associated to this customer account. Sales employees are managed under Customers → Sales employees.</Value></Resource><Resource Name="admin.customers.customertags.products.info" Area="Admin"><Value>To increase the general performance of the larger stores, suggested products are ignored by default. You can enable them in the Performance tab of <a href="/Admin/Setting/Catalog" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Catalog settings - section</a>.</Value></Resource><Resource Name="admin.documents.document.fields.seid.hint" Area="Admin">- <Value>Choose a sales employee associated to this customer account. You can manage them in the <a href="/Admin/SalesEmployee" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Sales employees section</a>.</Value>+ <Value>Choose a sales employee associated to this customer account. Sales employees are managed under Customers → Sales employees.</Value></Resource><Resource Name="admin.settings.catalog.savesearchautocomplete.hint" Area="Admin">- <Value>If checked, you will be able to see the most popular search keywords in the <a href="/Admin/Home/Statistics" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Statistics section</a>.</Value>+ <Value>If checked, the most popular search keywords are shown under Dashboard → Statistics.</Value></Resource><Resource Name="admin.settings.generalcommon.displaycookieinformation.hint" Area="Admin">- <Value>Enable the cookie bar notification. You can customize it by editing the cookie.description2 resource string in <a href="/Admin/Language/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Languages section</a>.</Value>+ <Value>Enable the cookie bar notification. You can customize it by editing the cookie.description2 resource string under Configuration → Languages.</Value></Resource><Resource Name="admin.vendors.discounts.nodiscounts" Area="Admin"><Value>There are no configured discounts. Create at least one discount in the <a href="/Admin/Discount/List" class="color-text" target="_blank"><i class="bi bi-pencil-square"></i> Discounts section</a></Value>@@ -474,4 +474,10 @@<Resource Name="admin.configuration.shipping.settings.defaultshippingrate.hint" Area="Admin"><Value>Standard cost of shipping one item, in the primary store currency, entered like a shipping method's rate. Published for products without free shipping, plus the product's additional shipping charge; products that qualify for free shipping over X are published as free.</Value></Resource>+ <Resource Name="vendor.header.profile" Area="Vendor">+ <Value>Vendor profile</Value>+ </Resource>+ <Resource Name="admin.catalog.discounts.nostorediscounts" Area="Admin">+ <Value>There are no configured discounts. Create one under Marketing → Discounts.</Value>+ </Resource></Language>\ No newline at end of filediff --git a/src/Web/Grand.Web/Properties/launchSettings.json b/src/Web/Grand.Web/Properties/launchSettings.jsonindex 87d91cfb9..419c701a8 100644--- a/src/Web/Grand.Web/Properties/launchSettings.json+++ b/src/Web/Grand.Web/Properties/launchSettings.json@@ -1,4 +1,4 @@-mo{+{"iisSettings": {"windowsAuthentication": false,"anonymousAuthentication": true,