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.

Retrofit CreateOrUpdate.Calendar.cshtml widget-zone selection to per-area partial files (ARCH-001 Phase 2)

KrzysztofPajakc13aa79b0883
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml
index e36ed2838..e5e6abae1 100644
--- a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml
@@ -7,14 +7,7 @@
{
<input type="hidden" asp-for="CalendarModel.ProductId"/>
- @if (Scope.ResourceKeyPrefix == "Vendor")
- {
- <vc:vendor-widget widget-zone="vendor_product_details_calendar_top" additional-data="Model"/>
- }
- else
- {
- <vc:admin-widget widget-zone="product_details_calendar_top" additional-data="Model"/>
- }
+ <partial name="Partials/WidgetZone.Calendar.Top" model="Model"/>
<div class="form-horizontal">
<h2>@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Calendarconfiguration"]</h2>
<div class="form-body">
@@ -141,14 +134,7 @@
<div id="reservations-grid"></div>
</div>
</div>
- @if (Scope.ResourceKeyPrefix == "Vendor")
- {
- <vc:vendor-widget widget-zone="vendor_product_details_calendar_bottom" additional-data="Model"/>
- }
- else
- {
- <vc:admin-widget widget-zone="product_details_calendar_bottom" additional-data="Model"/>
- }
+ <partial name="Partials/WidgetZone.Calendar.Bottom" model="Model"/>
<script>
$(document).ready(function () {
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Calendar.Bottom.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Calendar.Bottom.cshtml
new file mode 100644
index 000000000..a4ab3e0fd
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Calendar.Bottom.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="product_details_calendar_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Calendar.Top.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Calendar.Top.cshtml
new file mode 100644
index 000000000..30ece34a2
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Calendar.Top.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="product_details_calendar_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Calendar.Bottom.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Calendar.Bottom.cshtml
new file mode 100644
index 000000000..b254d1d2d
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Calendar.Bottom.cshtml
@@ -0,0 +1 @@
+<vc:vendor-widget widget-zone="vendor_product_details_calendar_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Calendar.Top.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Calendar.Top.cshtml
new file mode 100644
index 000000000..6d2816fbf
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Calendar.Top.cshtml
@@ -0,0 +1 @@
+<vc:vendor-widget widget-zone="vendor_product_details_calendar_top" additional-data="Model"/>