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 CreateOrUpdate.Calendar.cshtml to AdminShared (ARCH-001 Phase 2)
KrzysztofPajak28dee1f97b99
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmlsimilarity index 82%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmlindex d1aa6cae8..e36ed2838 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml@@ -1,12 +1,22 @@-@model ProductModel+@model ProductModel@inject AdminAreaSettings adminAreaSettings+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}@if (!string.IsNullOrEmpty(Model.Id)){<input type="hidden" asp-for="CalendarModel.ProductId"/>- <vc:admin-widget widget-zone="product_details_calendar_top" additional-data="Model"/>+ @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"/>+ }<div class="form-horizontal">- <h2>@Loc["Admin.Catalog.Products.Calendar.Calendarconfiguration"]</h2>+ <h2>@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Calendarconfiguration"]</h2><div class="form-body"><div class="form-group"><div class="form-group">@@ -15,7 +25,7 @@<admin-input asp-for="CalendarModel.StartDate"/></div><div class="col-md-6" id="pnlStartTime">- <label class="col-md-3 control-label">@Loc["Admin.Catalog.Products.Fields.Calendar.StartTime"]</label>+ <label class="col-md-3 control-label">@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.StartTime"]</label><div class="col-md-3 col-sm-3"><admin-input asp-for="CalendarModel.StartTime"/></div>@@ -28,7 +38,7 @@<admin-input asp-for="CalendarModel.EndDate"/></div><div class="col-md-6" id="pnlEndTime">- <label class="col-md-3 control-label">@Loc["Admin.Catalog.Products.Fields.Calendar.EndTime"]</label>+ <label class="col-md-3 control-label">@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.EndTime"]</label><div class="col-md-3 col-sm-3"><admin-input asp-for="CalendarModel.EndTime"/></div>@@ -75,44 +85,44 @@</div><div class="portlet"><div class="x_title">- <div class="caption">@Loc["Admin.Catalog.Products.Calendar.WeekDay"]</div>+ <div class="caption">@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.WeekDay"]</div></div><div class="x_content"><div class="form-group"><div class="mt-checkbox-inline "><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Monday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Monday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Monday"]<div class="control__indicator"></div></label><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Tuesday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Tuesday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Tuesday"]<div class="control__indicator"></div></label><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Wednesday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Wednesday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Wednesday"]<div class="control__indicator"></div></label><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Thursday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Thursday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Thursday"]<div class="control__indicator"></div></label><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Friday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Friday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Friday"]<div class="control__indicator"></div></label><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Saturday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Saturday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Saturday"]<div class="control__indicator"></div></label><label class="mt-checkbox control control-checkbox"><admin-input asp-for="CalendarModel.Sunday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Sunday"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Calendar.Sunday"]<div class="control__indicator"></div></label></div>@@ -123,15 +133,22 @@</div><div class="panel panel-default"><div class="panel-footer">- <button id="generateCalendar" type="button" class="btn btn-primary">@Loc["Admin.Catalog.Products.Calendar.Generatecalendar"]</button>- <button id="clearOld" type="button" class="btn btn-secondary" style="margin-left:10px">@Loc["Admin.Catalog.Products.Calendar.Clearold"]</button>- <button id="clearCalendar" type="button" class="btn btn-danger" style="margin-left:10px">@Loc["Admin.Catalog.Products.Calendar.Clearcalendar"]</button>+ <button id="generateCalendar" type="button" class="btn btn-primary">@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Generatecalendar"]</button>+ <button id="clearOld" type="button" class="btn btn-secondary" style="margin-left:10px">@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Clearold"]</button>+ <button id="clearCalendar" type="button" class="btn btn-danger" style="margin-left:10px">@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Clearcalendar"]</button></div><div class="panel-body"><div id="reservations-grid"></div></div></div>- <vc:admin-widget widget-zone="product_details_calendar_bottom" additional-data="Model"/>+ @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"/>+ }<script>$(document).ready(function () {@@ -220,7 +237,7 @@$.ajax({cache: false,type: "POST",- url: "@(Url.Action("GenerateCalendar", "Product", new { area = Constants.AreaAdmin }))",+ url: "@(Url.Action("GenerateCalendar", "Product", new { area = area }))",dataType: 'json',data: postData,success: function (data) {@@ -239,7 +256,7 @@});$("#clearCalendar").click(function () {- if (confirm('@Loc["Admin.Common.AreYouSure"]')) {+ if (confirm('@Loc[$"{Scope.ResourceKeyPrefix}.Common.AreYouSure"]')) {var postData = {productId: '@(Model.Id)'};@@ -249,7 +266,7 @@$.ajax({cache: false,type: "POST",- url: "@(Url.Action("ClearCalendar", "Product", new { area = Constants.AreaAdmin }))",+ url: "@(Url.Action("ClearCalendar", "Product", new { area = area }))",dataType: 'json',data: postData,success: function (data) {@@ -273,7 +290,7 @@$.ajax({cache: false,type: "POST",- url: "@(Url.Action("ClearOld", "Product", new { area = Constants.AreaAdmin }))",+ url: "@(Url.Action("ClearOld", "Product", new { area = area }))",dataType: 'json',data: postData,success: function (data) {@@ -294,12 +311,12 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ListReservations", "Product", new { productId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("ListReservations", "Product", new { productId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken,}, destroy: {- url: "@Html.Raw(Url.Action("ProductReservationDelete", "Product", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("ProductReservationDelete", "Product", new { area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -336,31 +353,31 @@scrollable: false,columns: [{field: "Date",- title: "@Loc["Admin.Catalog.Products.Calendar.Date"]",+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Date"]",width: 200,type: "date",format: "{0:G}"}, {field: "Resource",- title: "@Loc["Admin.Catalog.Products.Calendar.Resource"]",+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Resource"]",width: 200}, {field: "Parameter",- title: "@Loc["Admin.Catalog.Products.Calendar.Parameter"]",+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Parameter"]",width: 200}, {field: "Duration",- title: "@Loc["Admin.Catalog.Products.Calendar.Duration"]",+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.Duration"]",width: 200}, {field: "OrderId",- title: "@Loc["Admin.Catalog.Products.Calendar.OrderId"]",+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.OrderId"]",width: 200,- template: '# if(OrderId) {# <a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = Constants.AreaAdmin })/#=OrderId#"><i class="fa fa-search"></i> @Loc["Admin.Common.View"]</a> #} #'+ template: '# if(OrderId) {# <a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = area })/#=OrderId#"><i class="fa fa-search"></i> @Loc[$"{Scope.ResourceKeyPrefix}.Common.View"]</a> #} #'}, {command: [{name: "destroy",- text: "@Loc["Admin.Common.Delete"]"+ text: "@Loc[$"{Scope.ResourceKeyPrefix}.Common.Delete"]"}],width: 100}]@@ -371,6 +388,6 @@else{<div class="note note-info">- @Loc["Admin.Catalog.Products.Calendar.SaveBeforeEdit"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Calendar.SaveBeforeEdit"]</div>-}\ No newline at end of file+}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmldeleted file mode 100644index d99b5a800..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml+++ /dev/null@@ -1,376 +0,0 @@-@model ProductModel-@inject AdminAreaSettings adminAreaSettings-@if (!string.IsNullOrEmpty(Model.Id))-{- <input type="hidden" asp-for="CalendarModel.ProductId"/>-- <vc:admin-widget widget-zone="product_details_calendar_top" additional-data="Model"/>- <div class="form-horizontal">- <h2>@Loc["Admin.Catalog.Products.Calendar.Calendarconfiguration"]</h2>- <div class="form-body">- <div class="form-group">- <div class="form-group">- <admin-label asp-for="CalendarModel.StartDate"/>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.StartDate"/>- </div>- <div class="col-md-6" id="pnlStartTime">- <label class="col-md-3 control-label">@Loc["Admin.Catalog.Products.Fields.Calendar.StartTime"]</label>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.StartTime"/>- </div>- </div>-- </div>- <div class="form-group">- <admin-label asp-for="CalendarModel.EndDate"/>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.EndDate"/>- </div>- <div class="col-md-6" id="pnlEndTime">- <label class="col-md-3 control-label">@Loc["Admin.Catalog.Products.Fields.Calendar.EndTime"]</label>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.EndTime"/>- </div>- </div>- </div>- <div class="form-group" id="pnlIncludeBothDates">- <admin-label asp-for="CalendarModel.IncBothDate"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="CalendarModel.IncBothDate"/>- <div class="control__indicator"></div>- </label>- </div>- </div>- </div>- <div class="form-group">- <admin-label asp-for="CalendarModel.Interval"/>- <div class="col-md-9 col-sm-9">- <span id="pnlInterval">- <admin-input asp-for="CalendarModel.Interval"/>- </span>- <admin-select asp-for="CalendarModel.IntervalUnit" asp-items="EnumTranslationService.ToSelectList((IntervalUnit)Model.CalendarModel.IntervalUnit)" class="form-control input-xsmall" style="height: 30px;padding: 0px; margin-bottom: 3px; margin-top: 3px; "/>- </div>- </div>- <div class="form-group" id="pnlQuantity">- <admin-label asp-for="CalendarModel.Quantity"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CalendarModel.Quantity"/>- </div>- </div>-- <div class="form-group" id="pnlResource">- <admin-label asp-for="CalendarModel.Resource"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CalendarModel.Resource"/>- </div>- </div>-- <div class="form-group" id="pnlParameter">- <admin-label asp-for="CalendarModel.Parameter"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CalendarModel.Parameter"/>- </div>- </div>- <div class="portlet">- <div class="x_title">- <div class="caption">@Loc["Admin.Catalog.Products.Calendar.WeekDay"]</div>- </div>- <div class="x_content">- <div class="form-group">- <div class="mt-checkbox-inline ">- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Monday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Monday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Tuesday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Tuesday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Wednesday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Wednesday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Thursday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Thursday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Friday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Friday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Saturday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Saturday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Sunday"/>- @Loc["Admin.Catalog.Products.Fields.Calendar.Sunday"]- <div class="control__indicator"></div>- </label>- </div>- </div>- </div>- </div>- </div>- </div>- <div class="panel panel-default">- <div class="panel-footer">- <button id="generateCalendar" type="button" class="btn btn-primary">@Loc["Admin.Catalog.Products.Calendar.Generatecalendar"]</button>- <button id="clearOld" type="button" class="btn btn-secondary" style="margin-left:10px">@Loc["Admin.Catalog.Products.Calendar.Clearold"]</button>- <button id="clearCalendar" type="button" class="btn btn-danger" style="margin-left:10px">@Loc["Admin.Catalog.Products.Calendar.Clearcalendar"]</button>- </div>- <div class="panel-body">- <div id="reservations-grid"></div>- </div>- </div>- <vc:admin-widget widget-zone="product_details_calendar_bottom" additional-data="Model"/>-- <script>- $(document).ready(function () {- function toggleInternalType() {- var selectedInternalTypeId = $("#@Html.IdFor(model => model.CalendarModel.IntervalUnit)").val();- if (selectedInternalTypeId == @(((int)IntervalUnit.Day).ToString())) {- $("#pnlStartTime").hide();- $("#pnlEndTime").hide();- $("#pnlResource").show();- $("#pnlIncludeBothDates").show();- $("#pnlParameter").hide();- $("#pnlQuantity").hide();- $("#pnlInterval").hide();- $("#@Html.IdFor(model => model.CalendarModel.Interval)").data("kendoNumericTextBox").value(1);- } else {- $("#pnlStartTime").show();- $("#pnlEndTime").show();- $("#pnlResource").hide();- $("#pnlIncludeBothDates").hide();- $("#pnlParameter").show();- $("#pnlQuantity").show();- $("#pnlInterval").show();- $("#@Html.IdFor(model => model.CalendarModel.Interval)").data("kendoNumericTextBox").value(0);- }-- }- toggleInternalType();- $("#@Html.IdFor(model => model.CalendarModel.IntervalUnit)").change(toggleInternalType);--- $("#generateCalendar").click(function () {-- var datepickerFrom = $("#@Html.IdFor(model => model.CalendarModel.StartDate)").data("kendoDatePicker");- var dateFrom = datepickerFrom.value();- dateFrom = kendo.toString(dateFrom, "@CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern");-- var datepickerTo = $("#@Html.IdFor(model => model.CalendarModel.EndDate)").data("kendoDatePicker");- var dateTo = datepickerTo.value();- dateTo = kendo.toString(dateTo, "@CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern");-- var timeFrom = $("#@Html.IdFor(model => model.CalendarModel.StartTime)").data("kendoTimePicker");- var hourFrom = timeFrom.value();- hourFrom = kendo.toString(hourFrom, "HH:mm");-- var timeTo = $("#@Html.IdFor(model => model.CalendarModel.EndTime)").data("kendoTimePicker");- var hourTo = timeTo.value();- hourTo = kendo.toString(hourTo, "HH:mm");-- var interval = $("#@Html.IdFor(model => model.CalendarModel.Interval)").val();- var intervalUnit = $("#@Html.IdFor(model => model.CalendarModel.IntervalUnit)").val();- var incBothDate = $("#@Html.IdFor(model => model.CalendarModel.IncBothDate)").prop("checked");- var quantity = $("#@Html.IdFor(model => model.CalendarModel.Quantity)").val();- var monday = $("#@Html.IdFor(model => model.CalendarModel.Monday)").prop("checked");- var tuesday = $("#@Html.IdFor(model => model.CalendarModel.Tuesday)").prop("checked");- var wednesday = $("#@Html.IdFor(model => model.CalendarModel.Wednesday)").prop("checked");- var thursday = $("#@Html.IdFor(model => model.CalendarModel.Thursday)").prop("checked");- var friday = $("#@Html.IdFor(model => model.CalendarModel.Friday)").prop("checked");- var saturday = $("#@Html.IdFor(model => model.CalendarModel.Saturday)").prop("checked");- var sunday = $("#@Html.IdFor(model => model.CalendarModel.Sunday)").prop("checked");- var resource = $("#@Html.IdFor(model => model.CalendarModel.Resource)").val()- var parameter = $("#@Html.IdFor(model => model.CalendarModel.Parameter)").val()-- var postData = {- productId: '@(Model.Id)',- StartDate: dateFrom,- StartTime: hourFrom,- EndDate: dateTo,- EndTime: hourTo,- Interval: interval,- IntervalUnit: intervalUnit,- IncBothDate: incBothDate,- Quantity: quantity,- Monday: monday,- Tuesday: tuesday,- Wednesday: wednesday,- Thursday: thursday,- Friday: friday,- Saturday: saturday,- Sunday: sunday,- Resource: resource,- Parameter: parameter- };-- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("GenerateCalendar", "Product", new { area = Constants.AreaStore }))",- dataType: 'json',- data: postData,- success: function (data) {- if (data.success) {- var grid = $("#reservations-grid").data('kendoGrid');- grid.dataSource.read();- }- else {- alert(data.errors);- }- },- error: function () {- alert('Error');- }- });- });-- $("#clearCalendar").click(function () {- if (confirm('@Loc["Admin.Common.AreYouSure"]')) {- var postData = {- productId: '@(Model.Id)'- };-- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("ClearCalendar", "Product", new { area = Constants.AreaStore }))",- dataType: 'json',- data: postData,- success: function (data) {- var grid = $("#reservations-grid").data('kendoGrid');- grid.dataSource.read();- },- error: function () {- alert('Error');- }- });- }- });-- $("#clearOld").click(function () {- var postData = {- productId: '@(Model.Id)'- };-- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("ClearOld", "Product", new { area = Constants.AreaStore }))",- dataType: 'json',- data: postData,- success: function (data) {- var grid = $("#reservations-grid").data('kendoGrid');- grid.dataSource.read();- },- error: function () {- alert('Error');- }- });- });- });--- $(document).ready(function () {-- $("#reservations-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ListReservations", "Product", new { productId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken,- }, destroy: {- url: "@Html.Raw(Url.Action("ProductReservationDelete", "Product", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- ProductId: "ProductId"- }- },- error: function (e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Date",- title: "@Loc["Admin.Catalog.Products.Calendar.Date"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "Resource",- title: "@Loc["Admin.Catalog.Products.Calendar.Resource"]",- width: 200- }, {- field: "Parameter",- title: "@Loc["Admin.Catalog.Products.Calendar.Parameter"]",- width: 200- }, {- field: "Duration",- title: "@Loc["Admin.Catalog.Products.Calendar.Duration"]",- width: 200- }, {- field: "OrderId",- title: "@Loc["Admin.Catalog.Products.Calendar.OrderId"]",- width: 200,- template: '# if(OrderId) {# <a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = Constants.AreaStore })/#=OrderId#"><i class="fa fa-search"></i> @Loc["Admin.Common.View"]</a> #} #'- }, {- command: [{- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }],- width: 100- }]- });- });- </script>-}-else-{- <div class="note note-info">- @Loc["Admin.Catalog.Products.Calendar.SaveBeforeEdit"]- </div>-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtmldeleted file mode 100644index b5fc4df0d..000000000--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Calendar.cshtml+++ /dev/null@@ -1,376 +0,0 @@-@model ProductModel-@inject AdminAreaSettings adminAreaSettings-@if (!string.IsNullOrEmpty(Model.Id))-{- <input type="hidden" asp-for="CalendarModel.ProductId"/>-- <vc:vendor-widget widget-zone="vendor_product_details_calendar_top" additional-data="Model"/>- <div class="form-horizontal">- <h2>@Loc["Vendor.Catalog.Products.Calendar.Calendarconfiguration"]</h2>- <div class="form-body">- <div class="form-group">- <div class="form-group">- <admin-label asp-for="CalendarModel.StartDate"/>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.StartDate"/>- </div>- <div class="col-md-6" id="pnlStartTime">- <label class="col-md-3 control-label">@Loc["Vendor.Catalog.Products.Fields.Calendar.StartTime"]</label>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.StartTime"/>- </div>- </div>-- </div>- <div class="form-group">- <admin-label asp-for="CalendarModel.EndDate"/>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.EndDate"/>- </div>- <div class="col-md-6" id="pnlEndTime">- <label class="col-md-3 control-label">@Loc["Vendor.Catalog.Products.Fields.Calendar.EndTime"]</label>- <div class="col-md-3 col-sm-3">- <admin-input asp-for="CalendarModel.EndTime"/>- </div>- </div>- </div>- <div class="form-group" id="pnlIncludeBothDates">- <admin-label asp-for="CalendarModel.IncBothDate"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="CalendarModel.IncBothDate"/>- <div class="control__indicator"></div>- </label>- </div>- </div>- </div>- <div class="form-group">- <admin-label asp-for="CalendarModel.Interval"/>- <div class="col-md-9 col-sm-9">- <span id="pnlInterval">- <admin-input asp-for="CalendarModel.Interval"/>- </span>- <admin-select asp-for="CalendarModel.IntervalUnit" asp-items="EnumTranslationService.ToSelectList((IntervalUnit)Model.CalendarModel.IntervalUnit)" class="form-control input-xsmall" style="height: 30px;padding: 0px; margin-bottom: 3px; margin-top: 3px; "/>- </div>- </div>- <div class="form-group" id="pnlQuantity">- <admin-label asp-for="CalendarModel.Quantity"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CalendarModel.Quantity"/>- </div>- </div>-- <div class="form-group" id="pnlResource">- <admin-label asp-for="CalendarModel.Resource"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CalendarModel.Resource"/>- </div>- </div>-- <div class="form-group" id="pnlParameter">- <admin-label asp-for="CalendarModel.Parameter"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CalendarModel.Parameter"/>- </div>- </div>- <div class="portlet">- <div class="x_title">- <div class="caption">@Loc["Vendor.Catalog.Products.Calendar.WeekDay"]</div>- </div>- <div class="x_content">- <div class="form-group">- <div class="mt-checkbox-inline ">- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Monday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Monday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Tuesday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Tuesday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Wednesday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Wednesday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Thursday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Thursday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Friday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Friday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Saturday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Saturday"]- <div class="control__indicator"></div>- </label>- <label class="mt-checkbox control control-checkbox">- <admin-input asp-for="CalendarModel.Sunday"/>- @Loc["Vendor.Catalog.Products.Fields.Calendar.Sunday"]- <div class="control__indicator"></div>- </label>- </div>- </div>- </div>- </div>- </div>- </div>- <div class="panel panel-default">- <div class="panel-footer">- <button id="generateCalendar" type="button" class="btn btn-primary">@Loc["Vendor.Catalog.Products.Calendar.Generatecalendar"]</button>- <button id="clearOld" type="button" class="btn btn-secondary" style="margin-left:10px">@Loc["Vendor.Catalog.Products.Calendar.Clearold"]</button>- <button id="clearCalendar" type="button" class="btn btn-danger" style="margin-left:10px">@Loc["Vendor.Catalog.Products.Calendar.Clearcalendar"]</button>- </div>- <div class="panel-body">- <div id="reservations-grid"></div>- </div>- </div>- <vc:vendor-widget widget-zone="vendor_product_details_calendar_bottom" additional-data="Model"/>-- <script>- $(document).ready(function () {- function toggleInternalType() {- var selectedInternalTypeId = $("#@Html.IdFor(model => model.CalendarModel.IntervalUnit)").val();- if (selectedInternalTypeId == @(((int)IntervalUnit.Day).ToString())) {- $("#pnlStartTime").hide();- $("#pnlEndTime").hide();- $("#pnlResource").show();- $("#pnlIncludeBothDates").show();- $("#pnlParameter").hide();- $("#pnlQuantity").hide();- $("#pnlInterval").hide();- $("#@Html.IdFor(model => model.CalendarModel.Interval)").data("kendoNumericTextBox").value(1);- } else {- $("#pnlStartTime").show();- $("#pnlEndTime").show();- $("#pnlResource").hide();- $("#pnlIncludeBothDates").hide();- $("#pnlParameter").show();- $("#pnlQuantity").show();- $("#pnlInterval").show();- $("#@Html.IdFor(model => model.CalendarModel.Interval)").data("kendoNumericTextBox").value(0);- }-- }- toggleInternalType();- $("#@Html.IdFor(model => model.CalendarModel.IntervalUnit)").change(toggleInternalType);--- $("#generateCalendar").click(function () {-- var datepickerFrom = $("#@Html.IdFor(model => model.CalendarModel.StartDate)").data("kendoDatePicker");- var dateFrom = datepickerFrom.value();- dateFrom = kendo.toString(dateFrom, "@CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern");-- var datepickerTo = $("#@Html.IdFor(model => model.CalendarModel.EndDate)").data("kendoDatePicker");- var dateTo = datepickerTo.value();- dateTo = kendo.toString(dateTo, "@CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern");-- var timeFrom = $("#@Html.IdFor(model => model.CalendarModel.StartTime)").data("kendoTimePicker");- var hourFrom = timeFrom.value();- hourFrom = kendo.toString(hourFrom, "HH:mm");-- var timeTo = $("#@Html.IdFor(model => model.CalendarModel.EndTime)").data("kendoTimePicker");- var hourTo = timeTo.value();- hourTo = kendo.toString(hourTo, "HH:mm");-- var interval = $("#@Html.IdFor(model => model.CalendarModel.Interval)").val();- var intervalUnit = $("#@Html.IdFor(model => model.CalendarModel.IntervalUnit)").val();- var incBothDate = $("#@Html.IdFor(model => model.CalendarModel.IncBothDate)").prop("checked");- var quantity = $("#@Html.IdFor(model => model.CalendarModel.Quantity)").val();- var monday = $("#@Html.IdFor(model => model.CalendarModel.Monday)").prop("checked");- var tuesday = $("#@Html.IdFor(model => model.CalendarModel.Tuesday)").prop("checked");- var wednesday = $("#@Html.IdFor(model => model.CalendarModel.Wednesday)").prop("checked");- var thursday = $("#@Html.IdFor(model => model.CalendarModel.Thursday)").prop("checked");- var friday = $("#@Html.IdFor(model => model.CalendarModel.Friday)").prop("checked");- var saturday = $("#@Html.IdFor(model => model.CalendarModel.Saturday)").prop("checked");- var sunday = $("#@Html.IdFor(model => model.CalendarModel.Sunday)").prop("checked");- var resource = $("#@Html.IdFor(model => model.CalendarModel.Resource)").val()- var parameter = $("#@Html.IdFor(model => model.CalendarModel.Parameter)").val()-- var postData = {- productId: '@(Model.Id)',- StartDate: dateFrom,- StartTime: hourFrom,- EndDate: dateTo,- EndTime: hourTo,- Interval: interval,- IntervalUnit: intervalUnit,- IncBothDate: incBothDate,- Quantity: quantity,- Monday: monday,- Tuesday: tuesday,- Wednesday: wednesday,- Thursday: thursday,- Friday: friday,- Saturday: saturday,- Sunday: sunday,- Resource: resource,- Parameter: parameter- };-- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("GenerateCalendar", "Product", new { area = Constants.AreaVendor }))",- dataType: 'json',- data: postData,- success: function (data) {- if (data.success) {- var grid = $("#reservations-grid").data('kendoGrid');- grid.dataSource.read();- }- else {- alert(data.errors);- }- },- error: function () {- alert('Error');- }- });- });-- $("#clearCalendar").click(function () {- if (confirm('@Loc["Vendor.Common.AreYouSure"]')) {- var postData = {- productId: '@(Model.Id)'- };-- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("ClearCalendar", "Product", new { area = Constants.AreaVendor }))",- dataType: 'json',- data: postData,- success: function (data) {- var grid = $("#reservations-grid").data('kendoGrid');- grid.dataSource.read();- },- error: function () {- alert('Error');- }- });- }- });-- $("#clearOld").click(function () {- var postData = {- productId: '@(Model.Id)'- };-- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("ClearOld", "Product", new { area = Constants.AreaVendor }))",- dataType: 'json',- data: postData,- success: function (data) {- var grid = $("#reservations-grid").data('kendoGrid');- grid.dataSource.read();- },- error: function () {- alert('Error');- }- });- });- });--- $(document).ready(function () {-- $("#reservations-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ListReservations", "Product", new { productId = Model.Id, area = Constants.AreaVendor }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken,- }, destroy: {- url: "@Html.Raw(Url.Action("ProductReservationDelete", "Product", new { area = Constants.AreaVendor }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- ProductId: "ProductId"- }- },- error: function (e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Date",- title: "@Loc["Vendor.Catalog.Products.Calendar.Date"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "Resource",- title: "@Loc["Vendor.Catalog.Products.Calendar.Resource"]",- width: 200- }, {- field: "Parameter",- title: "@Loc["Vendor.Catalog.Products.Calendar.Parameter"]",- width: 200- }, {- field: "Duration",- title: "@Loc["Vendor.Catalog.Products.Calendar.Duration"]",- width: 200- }, {- field: "OrderId",- title: "@Loc["Vendor.Catalog.Products.Calendar.OrderId"]",- width: 200,- template: '# if(OrderId) {# <a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = Constants.AreaVendor })/#=OrderId#"><i class="fa fa-search"></i> @Loc["Vendor.Common.View"]</a> #} #'- }, {- command: [{- name: "destroy",- text: "@Loc["Vendor.Common.Delete"]"- }],- width: 100- }]- });- });- </script>-}-else-{- <div class="note note-info">- @Loc["Vendor.Catalog.Products.Calendar.SaveBeforeEdit"]- </div>-}\ No newline at end of file