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.

Migrate CreateOrUpdateProductAttributeValue.cshtml to AdminShared (ARCH-001 Phase 2)

KrzysztofPajak64638dd6bf83
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
similarity index 94%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
index 4bca2da0f..a30ce9d09 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
@@ -1,5 +1,8 @@
@using Microsoft.AspNetCore.Mvc.Razor
@model ProductModel.ProductAttributeValueModel
+@{
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
+}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden"/>
@@ -76,8 +79,8 @@
<input asp-for="AssociatedProductId" type="hidden"/>
<span id="associate-product-name">@Model.AssociatedProductName</span>
<span asp-validation-for="AssociatedProductId"></span>
- <a id="btnAssociateProductToAttributeValuePopup" href="@(Url.Action("AssociateProductToAttributeValuePopup", "Product", new { productIdInput = Html.IdFor(model => model.AssociatedProductId), productNameInput = "associate-product-name", area = Constants.AreaAdmin }))" class="k-button">
- @Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AssociatedProduct.AddNew"]
+ <a id="btnAssociateProductToAttributeValuePopup" href="@(Url.Action("AssociateProductToAttributeValuePopup", "Product", new { productIdInput = Html.IdFor(model => model.AssociatedProductId), productNameInput = "associate-product-name", area = area }))" class="k-button">
+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AssociatedProduct.AddNew"]
</a>
</div>
</div>
@@ -185,7 +188,7 @@
</p>
<p style="float: left; padding-top: 20px;">
<label for="id_image_0">
- @Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Picture.NoPicture"]
+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Picture.NoPicture"]
</label>
</p>
</li>
@@ -213,9 +216,9 @@
<div class="form-group">
<div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">
<button class="btn btn-success" type="submit" name="save">
- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ <i class="fa fa-check"></i> @Loc[$"{Scope.ResourceKeyPrefix}.Common.Save"]
</button>
- <vc:admin-widget widget-zone="product_details_attribute_value_buttons" additional-data="null"/>
+ <partial name="Partials/WidgetZone.AttributeValueButtons"/>
</div>
</div>
</div>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.AttributeValueButtons.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.AttributeValueButtons.cshtml
new file mode 100644
index 000000000..505ed8ce8
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.AttributeValueButtons.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="product_details_attribute_value_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
deleted file mode 100644
index 6b635414f..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
+++ /dev/null
@@ -1,223 +0,0 @@
-@using Microsoft.AspNetCore.Mvc.Razor
-@model ProductModel.ProductAttributeValueModel
-
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-<input asp-for="ProductAttributeMappingId" type="hidden"/>
-<input asp-for="DisplayColorSquaresRgb" type="hidden"/>
-<input asp-for="DisplayImageSquaresPicture" type="hidden"/>
-
-
-<script>
- $(document).ready(function () {
-
- $("#@Html.IdFor(model => model.AttributeValueTypeId)").change(toggleProductType);
-
- toggleProductType();
- });
-
- $('#btnAssociateProductToAttributeValuePopup').magnificPopup({
- type: 'ajax',
- settings: { cache: false, async: false },
- midClick: true,
- callbacks: {
- parseAjax: function (mfpResponse) {
- mfpResponse.data = $('<div></div>').html(mfpResponse.data);
- },
- ajaxContentAdded: function () {
- $('.mfp-wrap').removeAttr('tabindex');
- }
- }
- });
-
- function toggleProductType() {
- var selectedProductTypeId = $("#@Html.IdFor(model => model.AttributeValueTypeId)").val();
- if (selectedProductTypeId == @(((int)AttributeValueType.Simple).ToString())) {
- $('#group-associated-product').hide();
- $('#group-quantity').hide();
- $('#group-weight-adjustment').show();
- $('#group-cost').show();
- } else if (selectedProductTypeId == @(((int)AttributeValueType.AssociatedToProduct).ToString())) {
- $('#group-associated-product').show();
- $('#group-quantity').show();
- $('#group-weight-adjustment').hide();
- $('#group-cost').hide();
- }
- }
-</script>
-<!-- #region languages template -->
-@{
- Func<int, HelperResult>
- template = @<div class="form-body">
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].Name"/>
- <span asp-validation-for="@Model.Locales[item].Name"></span>
- </div>
- </div>
- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>
- </div>;
-}
-<!-- #endregion -->
-
-<div class="form-horizontal">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="AttributeValueTypeId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="AttributeValueTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeValueTypeId)"/>
- <span asp-validation-for="AttributeValueTypeId"></span>
- </div>
- </div>
- <div class="form-group" id="group-associated-product">
- <admin-label asp-for="AssociatedProductId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <input asp-for="AssociatedProductId" type="hidden"/>
- <span id="associate-product-name">@Model.AssociatedProductName</span>
- <span asp-validation-for="AssociatedProductId"></span>
- <a id="btnAssociateProductToAttributeValuePopup" href="@(Url.Action("AssociateProductToAttributeValuePopup", "Product", new { productIdInput = Html.IdFor(model => model.AssociatedProductId), productNameInput = "associate-product-name", area = Constants.AreaStore }))" class="k-button">
- @Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AssociatedProduct.AddNew"]
- </a>
- </div>
- </div>
- <div class="form-group" id="group-quantity">
- <admin-label asp-for="Quantity" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Quantity"/>
- <span asp-validation-for="Quantity"></span>
- </div>
- </div>
- </div>
-
- <localized-editor localized-template="@template" name="productattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="Name" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Name"/>
- <span asp-validation-for="Name"></span>
- </div>
- </div>
- </div>
- </localized-editor>
-
- <div class="form-body">
- @if (Model.DisplayColorSquaresRgb)
- {
- <div class="form-group">
- <admin-label asp-for="ColorSquaresRgb" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="ColorSquaresRgb"/>
- <div id="color-picker"></div>
- <script>
- $(document).ready(function(){
- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');
- });
- </script>
- <span asp-validation-for="ColorSquaresRgb"></span>
- </div>
- </div>
- }
- @if (Model.DisplayImageSquaresPicture)
- {
- <div class="form-group">
- @{
- ViewData["Reference"] = "Product";
- ViewData["ObjectId"] = Model.ProductId;
- }
- <admin-label asp-for="ImageSquaresPictureId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="ImageSquaresPictureId"/>
- <span asp-validation-for="ImageSquaresPictureId"></span>
- </div>
- </div>
- }
- <div class="form-group" id="group-price-adjustment">
- <admin-label asp-for="PriceAdjustment" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="PriceAdjustment"/> [@Model.PrimaryStoreCurrencyCode]
- <span asp-validation-for="PriceAdjustment"></span>
- </div>
- </div>
- <div class="form-group" id="group-weight-adjustment">
- <admin-label asp-for="WeightAdjustment" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="WeightAdjustment"/>
- <span asp-validation-for="WeightAdjustment"></span>
- </div>
- </div>
- <div class="form-group" id="group-cost">
- <admin-label asp-for="Cost" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Cost"/> [@Model.PrimaryStoreCurrencyCode]
- <span asp-validation-for="Cost"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="IsPreSelected" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
- <admin-input asp-for="IsPreSelected"/>
- <div class="control__indicator"></div>
- </label>
- <span asp-validation-for="IsPreSelected"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DisplayOrder" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="DisplayOrder"/>
- <span asp-validation-for="DisplayOrder"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="PictureId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <ul style="list-style: none;">
- <li style="float: left; width: 110px;">
- <p style="float: left; padding-top: 20px;">
- <input type="radio" name="@Html.NameFor(x => x.PictureId)" value="0" id="id_image_0"
- @if (!string.IsNullOrEmpty(Model.PictureId))
- {
- <text> checked="checked" </text>
- }>
- </p>
- <p style="float: left; padding-top: 20px;">
- <label for="id_image_0">
- @Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Picture.NoPicture"]
- </label>
- </p>
- </li>
- @foreach (var picture in Model.ProductPictureModels)
- {
- <li style="float: left; width: 110px;">
- <p style="float: left; padding-top: 20px;">
- <input type="radio" name="@Html.NameFor(x => x.PictureId)" value="@picture.PictureId" id="[email protected]"
- @if (picture.PictureId == Model.PictureId)
- {
- <text> checked="checked" </text>
- }>
- </p>
- <p style="float: left;">
- <label for="[email protected]">
- <img src="@picture.PictureUrl" alt="" title="" width="75">
- </label>
- </p>
- </li>
- }
- </ul>
- <span asp-validation-for="PictureId"></span>
- </div>
- </div>
- <div class="form-group">
- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">
- <button class="btn btn-success" type="submit" name="save">
- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
- </button>
- <vc:admin-widget widget-zone="product_details_attribute_value_buttons" additional-data="null"/>
- </div>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
deleted file mode 100644
index 72fc8f6e5..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateProductAttributeValue.cshtml
+++ /dev/null
@@ -1,223 +0,0 @@
-@using Microsoft.AspNetCore.Mvc.Razor
-@model ProductModel.ProductAttributeValueModel
-
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-<input asp-for="ProductAttributeMappingId" type="hidden"/>
-<input asp-for="DisplayColorSquaresRgb" type="hidden"/>
-<input asp-for="DisplayImageSquaresPicture" type="hidden"/>
-
-
-<script>
- $(document).ready(function () {
-
- $("#@Html.IdFor(model => model.AttributeValueTypeId)").change(toggleProductType);
-
- toggleProductType();
- });
-
- $('#btnAssociateProductToAttributeValuePopup').magnificPopup({
- type: 'ajax',
- settings: { cache: false, async: false },
- midClick: true,
- callbacks: {
- parseAjax: function (mfpResponse) {
- mfpResponse.data = $('<div></div>').html(mfpResponse.data);
- },
- ajaxContentAdded: function () {
- $('.mfp-wrap').removeAttr('tabindex');
- }
- }
- });
-
- function toggleProductType() {
- var selectedProductTypeId = $("#@Html.IdFor(model => model.AttributeValueTypeId)").val();
- if (selectedProductTypeId == @(((int)AttributeValueType.Simple).ToString())) {
- $('#group-associated-product').hide();
- $('#group-quantity').hide();
- $('#group-weight-adjustment').show();
- $('#group-cost').show();
- } else if (selectedProductTypeId == @(((int)AttributeValueType.AssociatedToProduct).ToString())) {
- $('#group-associated-product').show();
- $('#group-quantity').show();
- $('#group-weight-adjustment').hide();
- $('#group-cost').hide();
- }
- }
-</script>
-<!-- #region languages template -->
-@{
- Func<int, HelperResult>
- template = @<div class="form-body">
- <div class="form-group">
- <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="@Model.Locales[item].Name"/>
- <span asp-validation-for="@Model.Locales[item].Name"></span>
- </div>
- </div>
- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>
- </div>;
-}
-<!-- #endregion -->
-
-<div class="form-horizontal">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="AttributeValueTypeId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="AttributeValueTypeId" asp-items="EnumTranslationService.ToSelectList(Model.AttributeValueTypeId)"/>
- <span asp-validation-for="AttributeValueTypeId"></span>
- </div>
- </div>
- <div class="form-group" id="group-associated-product">
- <admin-label asp-for="AssociatedProductId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <input asp-for="AssociatedProductId" type="hidden"/>
- <span id="associate-product-name">@Model.AssociatedProductName</span>
- <span asp-validation-for="AssociatedProductId"></span>
- <a id="btnAssociateProductToAttributeValuePopup" href="@(Url.Action("AssociateProductToAttributeValuePopup", "Product", new { productIdInput = Html.IdFor(model => model.AssociatedProductId), productNameInput = "associate-product-name", area = Constants.AreaVendor }))" class="k-button">
- @Loc["Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.AssociatedProduct.AddNew"]
- </a>
- </div>
- </div>
- <div class="form-group" id="group-quantity">
- <admin-label asp-for="Quantity" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Quantity"/>
- <span asp-validation-for="Quantity"></span>
- </div>
- </div>
- </div>
-
- <localized-editor localized-template="@template" name="productattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="Name" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Name"/>
- <span asp-validation-for="Name"></span>
- </div>
- </div>
- </div>
- </localized-editor>
-
- <div class="form-body">
- @if (Model.DisplayColorSquaresRgb)
- {
- <div class="form-group">
- <admin-label asp-for="ColorSquaresRgb" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="ColorSquaresRgb"/>
- <div id="color-picker"></div>
- <script>
- $(document).ready(function(){
- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');
- });
- </script>
- <span asp-validation-for="ColorSquaresRgb"></span>
- </div>
- </div>
- }
- @if (Model.DisplayImageSquaresPicture)
- {
- <div class="form-group">
- @{
- ViewData["Reference"] = "Product";
- ViewData["ObjectId"] = Model.ProductId;
- }
- <admin-label asp-for="ImageSquaresPictureId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="ImageSquaresPictureId"/>
- <span asp-validation-for="ImageSquaresPictureId"></span>
- </div>
- </div>
- }
- <div class="form-group" id="group-price-adjustment">
- <admin-label asp-for="PriceAdjustment" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="PriceAdjustment"/> [@Model.PrimaryStoreCurrencyCode]
- <span asp-validation-for="PriceAdjustment"></span>
- </div>
- </div>
- <div class="form-group" id="group-weight-adjustment">
- <admin-label asp-for="WeightAdjustment" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="WeightAdjustment"/>
- <span asp-validation-for="WeightAdjustment"></span>
- </div>
- </div>
- <div class="form-group" id="group-cost">
- <admin-label asp-for="Cost" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Cost"/> [@Model.PrimaryStoreCurrencyCode]
- <span asp-validation-for="Cost"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="IsPreSelected" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
- <admin-input asp-for="IsPreSelected"/>
- <div class="control__indicator"></div>
- </label>
- <span asp-validation-for="IsPreSelected"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="DisplayOrder" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="DisplayOrder"/>
- <span asp-validation-for="DisplayOrder"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="PictureId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <ul style="list-style: none;">
- <li style="float: left; width: 110px;">
- <p style="float: left; padding-top: 20px;">
- <input type="radio" name="@Html.NameFor(x => x.PictureId)" value="0" id="id_image_0"
- @if (!string.IsNullOrEmpty(Model.PictureId))
- {
- <text> checked="checked" </text>
- }>
- </p>
- <p style="float: left; padding-top: 20px;">
- <label for="id_image_0">
- @Loc["Vendor.Catalog.Products.ProductAttributes.Attributes.Values.Fields.Picture.NoPicture"]
- </label>
- </p>
- </li>
- @foreach (var picture in Model.ProductPictureModels)
- {
- <li style="float: left; width: 110px;">
- <p style="float: left; padding-top: 20px;">
- <input type="radio" name="@Html.NameFor(x => x.PictureId)" value="@picture.PictureId" id="[email protected]"
- @if (picture.PictureId == Model.PictureId)
- {
- <text> checked="checked" </text>
- }>
- </p>
- <p style="float: left;">
- <label for="[email protected]">
- <img src="@picture.PictureUrl" alt="" title="" width="75">
- </label>
- </p>
- </li>
- }
- </ul>
- <span asp-validation-for="PictureId"></span>
- </div>
- </div>
- <div class="form-group">
- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">
- <button class="btn btn-success" type="submit" name="save">
- <i class="fa fa-check"></i> @Loc["Vendor.Common.Save"]
- </button>
- <vc:vendor-widget widget-zone="vendor_product_details_attribute_value_buttons" additional-data="null"/>
- </div>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.AttributeValueButtons.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.AttributeValueButtons.cshtml
new file mode 100644
index 000000000..4d75e5543
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.AttributeValueButtons.cshtml
@@ -0,0 +1 @@
+<vc:vendor-widget widget-zone="vendor_product_details_attribute_value_buttons" additional-data="null"/>