From 1847cc9f20c3eba06dca5ca0415282aeb7e3d724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=C5=BBu=C5=82awski?= <dzulawski@unit-soft.pl>
Date: Mon, 13 Sep 2021 11:09:24 +0200
Subject: [PATCH] Reservation on Quick View - minor changes

---
 .../Views/Shared/_ReservationInfoQV.cshtml    |  2 +-
 src/Web/Grand.Web/wwwroot/theme/script/app.js | 22 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Web/Grand.Web/Views/Shared/_ReservationInfoQV.cshtml b/src/Web/Grand.Web/Views/Shared/_ReservationInfoQV.cshtml
index 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.js
index 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;
+                    }
+                }
             }
         }
     },