From 5293f3f347830850fe7f4ef6db144723528b16c0 Mon Sep 17 00:00:00 2001
From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com>
Date: Wed, 3 Jun 2026 22:47:31 -0700
Subject: [PATCH] Fixes to calendar lifecycle

---
 web/modules/custom/riverside_pt/css/app.css   |  4 ++++
 .../riverside_pt/js/components/rpt-booking.js | 23 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/web/modules/custom/riverside_pt/css/app.css b/web/modules/custom/riverside_pt/css/app.css
index 518dbe8..aebdbf9 100644
--- a/web/modules/custom/riverside_pt/css/app.css
+++ b/web/modules/custom/riverside_pt/css/app.css
@@ -761,6 +761,10 @@ html {
   margin-top: 2vw;
 }
 
+.mb-3{
+  margin-bottom: 0.75rem;
+}
+
 .block{
   display: block;
 }
diff --git a/web/modules/custom/riverside_pt/js/components/rpt-booking.js b/web/modules/custom/riverside_pt/js/components/rpt-booking.js
index 31ad3ae..6c18670 100644
--- a/web/modules/custom/riverside_pt/js/components/rpt-booking.js
+++ b/web/modules/custom/riverside_pt/js/components/rpt-booking.js
@@ -13,7 +13,7 @@ const CHECK = html`<svg width="14" height="11" viewBox="0 0 14 11" fill="none" x
   <polyline points="1,5.5 5,9.5 13,1" stroke="white" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>`;
 
-const EMPTY_FORM = { firstName: "", lastName: "", phone: "", comments: "" };
+const EMPTY_FORM = { firstName: "", lastName: "", email: "", phone: "", comments: "" };
 
 function formatPhone(raw) {
   let d = String(raw || "").replace(/\D/g, "");
@@ -298,6 +298,7 @@ function BookingPanel({ service, settings, onServiceChange }) {
         service: service,
         firstName: formData.firstName,
         lastName: formData.lastName,
+        email: formData.email,
         phone: formData.phone,
         comments: formData.comments,
       }),
@@ -310,6 +311,7 @@ function BookingPanel({ service, settings, onServiceChange }) {
           service: service,
           firstName: formData.firstName,
           lastName: formData.lastName,
+          email: formData.email,
         });
         setSuccess(true);
         setSelectedSlotId(null);
@@ -371,6 +373,10 @@ function BookingPanel({ service, settings, onServiceChange }) {
         </div>
         ${slots.length > 0 ? html`
           <div id="riverside-slots-wrap">
+            <p class="text-xs text-gray-500 mb-3">Select a time on ${(function () {
+              var p = slots[0].start.split("T")[0].split("-");
+              return parseInt(p[1]) + "/" + parseInt(p[2]) + "/" + p[0];
+            })()}:</p>
             <div id="riverside-booking-slots">
               ${slots.map(function (slot) {
                 return html`
@@ -420,6 +426,20 @@ function BookingPanel({ service, settings, onServiceChange }) {
                 class=${CX.formInput}
               />
             </div>
+            <div class="sm:col-span-2">
+              <label class=${CX.formLabel}>
+                Email address <span class=${CX.formRequired}>*</span>
+              </label>
+              <input
+                type="email"
+                name="email"
+                autocomplete="email"
+                required
+                value=${formData.email}
+                onInput=${function (e) { handleFormChange("email", e.target.value); }}
+                class=${CX.formInput}
+              />
+            </div>
             <div class="sm:col-span-2">
               <label class=${CX.formLabel}>
                 Phone number <span class=${CX.formRequired}>*</span>
@@ -465,6 +485,7 @@ function BookingPanel({ service, settings, onServiceChange }) {
             <p class=${CX.successTitle}>Request received!</p>
             <div class=${CX.successSummary}>
               <p>${confirmedAppointment.firstName} ${confirmedAppointment.lastName}</p>
+              <p>${confirmedAppointment.email}</p>
               <p>${TYPES.find(function (t) { return t.id === confirmedAppointment.service; }).label}</p>
               <p>${formatAppointmentDate(confirmedAppointment.start)}</p>
             </div>