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
Migrate Product/Partials/CreateOrUpdate.cshtml to AdminShared (ARCH-001 Phase 2)
KrzysztofPajaka7066ba5294e
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.cshtmlsimilarity index 56%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.cshtmlindex 51140f456..31f8bd452 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.cshtml@@ -1,52 +1,52 @@-@using Grand.Business.Core.Interfaces.Common.Security+@using Grand.Business.Core.Interfaces.Common.Security@using Grand.Domain.Permissions@model ProductModel@inject IPermissionService permissionService@{- //has "Manage Documents" permission?- var canManageDocuments = await permissionService.Authorize(StandardPermission.ManageDocuments);+ //has "Manage Documents" permission? (Vendor never shows the Documents tab, so skip the check entirely for it)+ var canManageDocuments = Scope.ResourceKeyPrefix != "Vendor" && await permissionService.Authorize(StandardPermission.ManageDocuments);}<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/><input asp-for="Ticks" type="hidden"/><admin-tabstrip name="product-edit" SetTabPos="true" BindGrid="true"><items>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Info"]" tab-index="0">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Info"]" tab-index="0"><content><div><partial name="Partials/CreateOrUpdate.Info" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Prices"]" tab-index="1" id="tab-price-product">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Prices"]" tab-index="1" id="tab-price-product"><content><div><partial name="Partials/CreateOrUpdate.Prices" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Additional"]" tab-index="2">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Additional"]" tab-index="2"><content><div><partial name="Partials/CreateOrUpdate.Additional" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Common.SEO"]" tab-index="3">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Common.SEO"]" tab-index="3"><content><div><partial name="Partials/CreateOrUpdate.SEO" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Pictures"]" tab-index="4">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Pictures"]" tab-index="4"><content><div><partial name="Partials/CreateOrUpdate.Pictures" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Mappings"]" tab-index="5">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Mappings"]" tab-index="5"><content><div><partial name="Partials/CreateOrUpdate.Categories" model="Model"/>@@ -54,49 +54,49 @@</div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Inventory"]" tab-index="6" id="tab-inventory-product">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Inventory"]" tab-index="6" id="tab-inventory-product"><content><div><partial name="Partials/CreateOrUpdate.Inventory" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.SpecificationAttributes"]" tab-index="7">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.SpecificationAttributes"]" tab-index="7"><content><div><partial name="Partials/CreateOrUpdate.SpecificationAttributes" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.ProductAttributes"]" tab-index="8" id="tab-attributes-product">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.ProductAttributes"]" tab-index="8" id="tab-attributes-product"><content><div><partial name="Partials/CreateOrUpdate.ProductAttributes" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.BundleProducts"]" tab-index="9" id="tab-bundle-products">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.BundleProducts"]" tab-index="9" id="tab-bundle-products"><content><div><partial name="Partials/CreateOrUpdate.BundleProducts" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Calendar"]" tab-index="10" id="tab-calendar">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar"]" tab-index="10" id="tab-calendar"><content><div><partial name="Partials/CreateOrUpdate.Calendar" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Bids"]" tab-index="11" id="tab-bids">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Bids"]" tab-index="11" id="tab-bids"><content><div><partial name="Partials/CreateOrUpdate.Bids" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.LinkedProducts"]" tab-index="12">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.LinkedProducts"]" tab-index="12"><content><div><partial name="Partials/CreateOrUpdate.RelatedProducts" model="Model"/>@@ -106,7 +106,7 @@</div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.AssociatedProducts"]" tab-index="13" id="tab-associated-products">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.AssociatedProducts"]" tab-index="13" id="tab-associated-products"><content><div><partial name="Partials/CreateOrUpdate.AssociatedProducts" model="Model"/>@@ -115,39 +115,49 @@</tabstrip-item>@if (!string.IsNullOrEmpty(Model.Id)){- <tabstrip-item text="@Loc["Admin.Catalog.Products.PurchasedWithOrders"]" tab-index="14" id="tab-purchased-product">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.PurchasedWithOrders"]" tab-index="14" id="tab-purchased-product"><content><div><partial name="Partials/CreateOrUpdate.PurchasedWithOrders" model="Model"/></div></content></tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Reviews"]" tab-index="15">+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Reviews"]" tab-index="15"><content><div><partial name="Partials/CreateOrUpdate.Reviews" model="Model"/></div></content></tabstrip-item>- if (canManageDocuments)+ @if (Scope.ResourceKeyPrefix != "Vendor"){- <tabstrip-item text="@Loc["Admin.Catalog.Products.Documents"]" tab-index="16">+ if (canManageDocuments)+ {+ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Documents"]" tab-index="16">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.Documents" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ }++ <tabstrip-item text="@Loc[$"{Scope.ResourceKeyPrefix}.Common.UserFields.Tab"]" tab-index="17"><content><div>- <partial name="Partials/CreateOrUpdate.Documents" model="Model"/>+ <partial name="Partials/UserFields" model="Model"/></div></content></tabstrip-item>}-- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="17">- <content>- <div>- <partial name="Partials/UserFields" model="Model"/>- </div>- </content>- </tabstrip-item>}- <vc:admin-widget widget-zone="product_details_tabs" additional-data="Model"/>+ @if (Scope.ResourceKeyPrefix == "Vendor")+ {+ <vc:vendor-widget widget-zone="vendor_product_details_tabs" additional-data="Model"/>+ }+ else+ {+ <vc:admin-widget widget-zone="product_details_tabs" additional-data="Model"/>+ }</items>-</admin-tabstrip>\ No newline at end of file+</admin-tabstrip>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index 51140f456..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,153 +0,0 @@-@using Grand.Business.Core.Interfaces.Common.Security-@using Grand.Domain.Permissions-@model ProductModel-@inject IPermissionService permissionService-@{- //has "Manage Documents" permission?- var canManageDocuments = await permissionService.Authorize(StandardPermission.ManageDocuments);-}-<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="Ticks" type="hidden"/>-<admin-tabstrip name="product-edit" SetTabPos="true" BindGrid="true">- <items>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Info" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Prices"]" tab-index="1" id="tab-price-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Prices" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Additional"]" tab-index="2">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Additional" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Common.SEO"]" tab-index="3">- <content>- <div>- <partial name="Partials/CreateOrUpdate.SEO" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Pictures"]" tab-index="4">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Pictures" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Mappings"]" tab-index="5">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Categories" model="Model"/>- <partial name="Partials/CreateOrUpdate.Collections" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Inventory"]" tab-index="6" id="tab-inventory-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Inventory" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.SpecificationAttributes"]" tab-index="7">- <content>- <div>- <partial name="Partials/CreateOrUpdate.SpecificationAttributes" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.ProductAttributes"]" tab-index="8" id="tab-attributes-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.ProductAttributes" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.BundleProducts"]" tab-index="9" id="tab-bundle-products">- <content>- <div>- <partial name="Partials/CreateOrUpdate.BundleProducts" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Calendar"]" tab-index="10" id="tab-calendar">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Calendar" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Bids"]" tab-index="11" id="tab-bids">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Bids" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.LinkedProducts"]" tab-index="12">- <content>- <div>- <partial name="Partials/CreateOrUpdate.RelatedProducts" model="Model"/>- <partial name="Partials/CreateOrUpdate.CrossSells" model="Model"/>- <partial name="Partials/CreateOrUpdate.SimilarProducts" model="Model"/>- <partial name="Partials/CreateOrUpdate.Recommended" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.AssociatedProducts"]" tab-index="13" id="tab-associated-products">- <content>- <div>- <partial name="Partials/CreateOrUpdate.AssociatedProducts" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (!string.IsNullOrEmpty(Model.Id))- {- <tabstrip-item text="@Loc["Admin.Catalog.Products.PurchasedWithOrders"]" tab-index="14" id="tab-purchased-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.PurchasedWithOrders" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Products.Reviews"]" tab-index="15">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Reviews" model="Model"/>- </div>- </content>- </tabstrip-item>- if (canManageDocuments)- {- <tabstrip-item text="@Loc["Admin.Catalog.Products.Documents"]" tab-index="16">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Documents" model="Model"/>- </div>- </content>- </tabstrip-item>- }-- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="17">- <content>- <div>- <partial name="Partials/UserFields" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <vc:admin-widget widget-zone="product_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index 642c1c1a7..000000000--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,129 +0,0 @@-@model ProductModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="Ticks" type="hidden"/>-<admin-tabstrip name="product-edit" SetTabPos="true" BindGrid="true">- <items>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Info" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Prices"]" tab-index="1" id="tab-price-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Prices" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Additional"]" tab-index="2">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Additional" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Common.SEO"]" tab-index="3">- <content>- <div>- <partial name="Partials/CreateOrUpdate.SEO" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Pictures"]" tab-index="4">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Pictures" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Mappings"]" tab-index="5">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Categories" model="Model"/>- <partial name="Partials/CreateOrUpdate.Collections" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Inventory"]" tab-index="6" id="tab-inventory-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Inventory" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.SpecificationAttributes"]" tab-index="7">- <content>- <div>- <partial name="Partials/CreateOrUpdate.SpecificationAttributes" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.ProductAttributes"]" tab-index="8" id="tab-attributes-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.ProductAttributes" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.BundleProducts"]" tab-index="9" id="tab-bundle-products">- <content>- <div>- <partial name="Partials/CreateOrUpdate.BundleProducts" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Calendar"]" tab-index="10" id="tab-calendar">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Calendar" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Bids"]" tab-index="11" id="tab-bids">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Bids" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.LinkedProducts"]" tab-index="12">- <content>- <div>- <partial name="Partials/CreateOrUpdate.RelatedProducts" model="Model"/>- <partial name="Partials/CreateOrUpdate.CrossSells" model="Model"/>- <partial name="Partials/CreateOrUpdate.SimilarProducts" model="Model"/>- <partial name="Partials/CreateOrUpdate.Recommended" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.AssociatedProducts"]" tab-index="13" id="tab-associated-products">- <content>- <div>- <partial name="Partials/CreateOrUpdate.AssociatedProducts" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (!string.IsNullOrEmpty(Model.Id))- {- <tabstrip-item text="@Loc["Vendor.Catalog.Products.PurchasedWithOrders"]" tab-index="14" id="tab-purchased-product">- <content>- <div>- <partial name="Partials/CreateOrUpdate.PurchasedWithOrders" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Vendor.Catalog.Products.Reviews"]" tab-index="15">- <content>- <div>- <partial name="Partials/CreateOrUpdate.Reviews" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <vc:vendor-widget widget-zone="vendor_product_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of file