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 CreateOrUpdateTierPrice.cshtml to AdminShared (ARCH-001 Phase 2)

KrzysztofPajak1eb78417d82a
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
similarity index 64%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
index 628574efb..b46b3040c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
@@ -1,11 +1,11 @@
-@model ProductModel.TierPriceModel
+@model ProductModel.TierPriceModel
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden"/>
<input asp-for="ProductId" type="hidden"/>
<div class="form-horizontal">
- <vc:admin-widget widget-zone="product_details_tier_price_top" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.TierPrice.Top" model="Model"/>
<div class="form-body">
<div class="form-group">
<admin-label asp-for="Quantity" class="col-sm-3 control-label"/>
@@ -28,20 +28,23 @@
<span asp-validation-for="CurrencyCode"></span>
</div>
</div>
- <div class="form-group">
- <admin-label asp-for="StoreId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="StoreId" asp-items="Model.AvailableStores"/>
- <span asp-validation-for="StoreId"></span>
+ @if (Scope.ResourceKeyPrefix != "Vendor")
+ {
+ <div class="form-group">
+ <admin-label asp-for="StoreId" class="col-sm-3 control-label"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="StoreId" asp-items="Model.AvailableStores"/>
+ <span asp-validation-for="StoreId"></span>
+ </div>
</div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CustomerGroupId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="CustomerGroupId" asp-items="Model.AvailableCustomerGroups"/>
- <span asp-validation-for="CustomerGroupId"></span>
+ <div class="form-group">
+ <admin-label asp-for="CustomerGroupId" class="col-sm-3 control-label"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="CustomerGroupId" asp-items="Model.AvailableCustomerGroups"/>
+ <span asp-validation-for="CustomerGroupId"></span>
+ </div>
</div>
- </div>
+ }
<div class="form-group">
<admin-label asp-for="StartDateTime" class="col-sm-3 control-label"/>
<div class="col-md-9 col-sm-9">
@@ -59,11 +62,11 @@
<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_tier_price_buttons" additional-data="null"/>
+ <partial name="Partials/WidgetZone.TierPrice.Buttons"/>
</div>
</div>
</div>
- <vc:admin-widget widget-zone="product_details_tier_price_bottom" additional-data="Model"/>
-</div>
\ No newline at end of file
+ <partial name="Partials/WidgetZone.TierPrice.Bottom" model="Model"/>
+</div>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Bottom.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Bottom.cshtml
new file mode 100644
index 000000000..10fc2245f
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel.TierPriceModel
+<vc:admin-widget widget-zone="product_details_tier_price_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Buttons.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Buttons.cshtml
new file mode 100644
index 000000000..a5544db33
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Buttons.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="product_details_tier_price_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Top.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Top.cshtml
new file mode 100644
index 000000000..559aa4d73
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.TierPrice.Top.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel.TierPriceModel
+<vc:admin-widget widget-zone="product_details_tier_price_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
deleted file mode 100644
index 628574efb..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
+++ /dev/null
@@ -1,69 +0,0 @@
-@model ProductModel.TierPriceModel
-
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-<input asp-for="ProductId" type="hidden"/>
-
-<div class="form-horizontal">
- <vc:admin-widget widget-zone="product_details_tier_price_top" additional-data="Model"/>
- <div class="form-body">
- <div class="form-group">
- <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 class="form-group">
- <admin-label asp-for="Price" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Price"/>
- <span asp-validation-for="Price"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CurrencyCode" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="CurrencyCode" asp-items="Model.AvailableCurrencies"/>
- <span asp-validation-for="CurrencyCode"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="StoreId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="StoreId" asp-items="Model.AvailableStores"/>
- <span asp-validation-for="StoreId"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CustomerGroupId" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="CustomerGroupId" asp-items="Model.AvailableCustomerGroups"/>
- <span asp-validation-for="CustomerGroupId"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="StartDateTime" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="StartDateTime"/>
- <span asp-validation-for="StartDateTime"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="EndDateTime" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="EndDateTime"/>
- <span asp-validation-for="EndDateTime"></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_tier_price_buttons" additional-data="null"/>
- </div>
- </div>
- </div>
- <vc:admin-widget widget-zone="product_details_tier_price_bottom" additional-data="Model"/>
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
deleted file mode 100644
index 3503bb67f..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdateTierPrice.cshtml
+++ /dev/null
@@ -1,55 +0,0 @@
-@model ProductModel.TierPriceModel
-
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-<input asp-for="ProductId" type="hidden"/>
-
-<div class="form-horizontal">
- <vc:vendor-widget widget-zone="vendor_product_details_tier_price_top" additional-data="Model"/>
- <div class="form-body">
- <div class="form-group">
- <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 class="form-group">
- <admin-label asp-for="Price" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Price"/>
- <span asp-validation-for="Price"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CurrencyCode" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-select asp-for="CurrencyCode" asp-items="Model.AvailableCurrencies"/>
- <span asp-validation-for="CurrencyCode"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="StartDateTime" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="StartDateTime"/>
- <span asp-validation-for="StartDateTime"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="EndDateTime" class="col-sm-3 control-label"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="EndDateTime"/>
- <span asp-validation-for="EndDateTime"></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_tier_price_buttons" additional-data="null"/>
- </div>
- </div>
- </div>
- <vc:vendor-widget widget-zone="vendor_product_details_tier_price_bottom" additional-data="Model"/>
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Bottom.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Bottom.cshtml
new file mode 100644
index 000000000..c853bd4c1
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel.TierPriceModel
+<vc:vendor-widget widget-zone="vendor_product_details_tier_price_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Buttons.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Buttons.cshtml
new file mode 100644
index 000000000..f79cb9d5a
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Buttons.cshtml
@@ -0,0 +1 @@
+<vc:vendor-widget widget-zone="vendor_product_details_tier_price_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Top.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Top.cshtml
new file mode 100644
index 000000000..01d166d13
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.TierPrice.Top.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel.TierPriceModel
+<vc:vendor-widget widget-zone="vendor_product_details_tier_price_top" additional-data="Model"/>