@bash-app/bash-common 30.47.0 → 30.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.47.0",
+  "version": "30.48.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/src/utils/luxonUtils.ts

@@ -763,7 +763,10 @@ export interface TimeSlots {
 //   } as TimeSlots;
 // }
 
-export function generateTimeSlots(filteredHours: LuxonDateRange[]): TimeSlots {
+export function generateTimeSlots(
+  filteredHours: LuxonDateRange[],
+  incMin: number = 15
+): TimeSlots {
   const timeSlotsStart: string[] = [];
   let timeSlotsEnd: string[] = [];
 
@@ -775,13 +778,13 @@ export function generateTimeSlots(filteredHours: LuxonDateRange[]): TimeSlots {
 
     while (currentTime < startEnd) {
       timeSlotsStart.push(dateTimeFormatTime(currentTime)); // Add the time in "HH:mm" format
-      currentTime = currentTime.plus({ minutes: 30 }); // Increment by 30 minutes
+      currentTime = currentTime.plus({ minutes: incMin }); // Increment by 30 minutes
     }
 
     currentTime = end;
     while (currentTime < endEnd) {
       timeSlotsEnd.push(dateTimeFormatTime(currentTime)); // Add the time in "HH:mm" format
-      currentTime = currentTime.plus({ minutes: 30 }); // Increment by 30 minutes
+      currentTime = currentTime.plus({ minutes: incMin }); // Increment by 30 minutes
     }
 
     const finalTime =

package/src/utils/service/frontendServiceBookingUtils.ts

@@ -85,9 +85,6 @@ export function frontendServiceGetBookingDayInfo({
 }: FrontendServiceGetBookingDayInfoFrontParams): FrontendServiceBookingDayInfo[] {
   const bookingDayResults: FrontendServiceBookingDayInfo[] =
     daysToBookParams.map((day) => {
-      const rates = serviceRatesFilter(filteredRates, [day.dateTimeRange]);
-      const { generalRate, specialRates, dailyRates } = rates;
-
       let priceBreakdown: ServiceBookingPriceBreakdownBaseT[] = [];
       const durationHours = dateTimeDiffHours(
         day.dateTimeRange.start,
@@ -101,6 +98,9 @@ export function frontendServiceGetBookingDayInfo({
       let hoursRemaining = durationHours;
       let currentRange = { ...day.dateTimeRange };
       let baseCostDiscountedCents = 0;
+
+      const rates = serviceRatesFilter(filteredRates, [day.dateTimeRange]);
+      const { generalRate, specialRates, dailyRates } = rates;
       while (serviceRatesHasRates(rates) && hoursRemaining > 0) {
         const pricingInfo = getServiceRatePricingInfo(
           currentRange,

package/src/utils/service/serviceBookingStatusUtils.ts

@@ -107,20 +107,20 @@ export function serviceBookingCanHaveApprovalDecision(
       errorMessage: "Approval decisions can only be made on booking requests.",
     };
   }
-  if (serviceBookingIsCanceled(booking)) {
-    return {
-      valid: false,
-      errorMessage:
-        "Approval decisions can not be made on canceled booking requests.",
-    };
-  }
-  if (serviceBookingIsConfirmed(booking)) {
-    return {
-      valid: false,
-      errorMessage:
-        "Approval decisions can not be made on confirmed booking requests.",
-    };
-  }
+  // if (serviceBookingIsCanceled(booking)) {
+  //   return {
+  //     valid: false,
+  //     errorMessage:
+  //       "Approval decisions can not be made on canceled booking requests.",
+  //   };
+  // }
+  // if (serviceBookingIsConfirmed(booking)) {
+  //   return {
+  //     valid: false,
+  //     errorMessage:
+  //       "Approval decisions can not be made on confirmed booking requests.",
+  //   };
+  // }
 
   return { valid: true };
 }