Merge pull request #63 from untilhamza:release/v1.14.0

Release/v1.14.0
untilhamza · Mar 22, 2023 · 0abc0c3 · 0abc0c3
2 parents 126a674 + 698a885
commit 0abc0c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/http/serverInterface.ts b/src/http/serverInterface.ts
@@ -51,6 +51,8 @@ function processSlot(result) {
 async function checkUserAlreadyBookedDay(bookingData: NewBooking): Promise<boolean> {
   const ADMINS = ["Nwzxrf32Uee9i6hbTXSN2mWVzlC2", "lHxJifUfgHhJkECibwAudvf3MGp1", "lru8dL4JVWTycq0LHhHgyaWqX133"];
 
+  // const BLOCKED_USERS = ["lHxJifUfgHhJkECibwAudvf3MGp1", "lru8dL4JVWTycq0LHhHgyaWqX133"];
+
   if (ADMINS.includes(bookingData.userId)) {
     return true;
   }
@@ -68,7 +70,9 @@ async function checkUserAlreadyBookedDay(bookingData: NewBooking): Promise<boole
 
   const bookingsSnap = await getDocs(bookingsQuery);
 
-  return bookingsSnap.empty;
+  const numberOfBookings = bookingsSnap.size;
+
+  return numberOfBookings <= 1;
 }
 
 function makeSlotMoment(momentDate: Moment, timeString) {

diff --git a/src/pages/NewBooking.js b/src/pages/NewBooking.js
@@ -58,7 +58,7 @@ const NewBooking = () => {
     if (submitBookingsError && submitBookingsError.includes("Looks like you have already booked today")) {
       Swal.fire({
         title: `Oops!`,
-        html: `<p>Looks like you have already booked on this day. Please cancel your previous appointment to make a new one.</p>
+        html: `<p>Looks like you have already booked twice on this day. Please cancel one of your previous appointments to make a new one.</p>
           `,
         icon: `info`,
         confirmButtonText: "Okay",

diff --git a/src/version.json b/src/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.13.1"
+  "version": "1.14.0"
 }