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
Reservation on Quick View - minor changes
DanielŻuławski1847cc9f20c3
diff --git a/src/Web/Grand.Web/Views/Shared/_ReservationInfoQV.cshtml b/src/Web/Grand.Web/Views/Shared/_ReservationInfoQV.cshtmlindex 3e551cda2..0f2794530 100644--- a/src/Web/Grand.Web/Views/Shared/_ReservationInfoQV.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_ReservationInfoQV.cshtml@@ -23,7 +23,7 @@<template v-else><div><h5>@Loc["Products.Reservation.Date"]:</h5>- <input id="reservationDatepicker" class="form-control datepicker" v-model="PopupQuickViewVueModal.RentalStartDateUtc" />+ <input id="reservationDatepicker" class="form-control datepicker" v-model="PopupQuickViewVueModal.StartDate" /></div><div><h5 style="margin-top:10px">@Loc["Products.Reservation.Hour"]:</h5>diff --git a/src/Web/Grand.Web/wwwroot/theme/script/app.js b/src/Web/Grand.Web/wwwroot/theme/script/app.jsindex 5038d54be..20f68cc12 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/app.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/app.js@@ -329,10 +329,24 @@}}if (vm.PopupQuickViewVueModal.ProductType == 20) {- var StartDate = this.formatDate(vm.PopupQuickViewVueModal.RentalStartDateUtc);- var EndDate = this.formatDate(vm.PopupQuickViewVueModal.RentalEndDateUtc);- vm.PopupQuickViewVueModal.RentalStartDateUtc = StartDate;- vm.PopupQuickViewVueModal.RentalEndDateUtc = EndDate;+ var StartDate;+ var EndDate;+ if (vm.PopupQuickViewVueModal.RentalStartDateUtc !== null) {+ StartDate = this.formatDate(vm.PopupQuickViewVueModal.RentalStartDateUtc);+ vm.PopupQuickViewVueModal.RentalStartDateUtc = StartDate;+ }+ if (vm.PopupQuickViewVueModal.RentalEndDateUtc !== null) {+ EndDate = this.formatDate(vm.PopupQuickViewVueModal.RentalEndDateUtc);+ vm.PopupQuickViewVueModal.RentalEndDateUtc = EndDate;+ }+ if (vm.PopupQuickViewVueModal.IntervalUnit !== 10) {+ StartDate = this.formatDate(vm.PopupQuickViewVueModal.RentalStartDateUtc);+ if (vm.PopupQuickViewVueModal.RentalStartDateUtc !== null) {+ vm.PopupQuickViewVueModal.StartDate = this.formatDate(vm.PopupQuickViewVueModal.StartDate);+ } else {+ vm.PopupQuickViewVueModal.StartDate = null;+ }+ }}}},