@resira/ui 0.4.8 → 0.4.10

package/dist/index.js

@@ -379,7 +379,7 @@ function useReservation() {
   const [error, setError] = useState(null);
   const submit = useCallback(
     async (data) => {
-      if (!data.resourceId) {
+      if (!data.resourceId && !data.checkoutSessionToken) {
         setError("No resource selected");
         return null;
       }
@@ -1894,18 +1894,28 @@ function groupProductsByCategory(products, resources) {
   );
   const groups = /* @__PURE__ */ new Map();
   products.forEach((product) => {
-    let categoryResource;
-    const categoryType = product.equipmentIds.map((equipmentId) => {
-      const res = resourceById.get(equipmentId);
-      if (res?.resourceType?.trim() && !categoryResource) {
-        categoryResource = res;
-      }
-      return res?.resourceType?.trim();
-    }).find((resourceType) => Boolean(resourceType));
-    const groupId = categoryType?.toLowerCase() ?? UNCATEGORIZED_CATEGORY_KEY;
-    const label = categoryType ? formatCategoryLabel(categoryType) : UNCATEGORIZED_CATEGORY_LABEL;
+    const productCategory = product.category?.trim();
+    let groupId;
+    let label;
+    let catImage;
+    if (productCategory) {
+      groupId = productCategory.toLowerCase();
+      label = product.categoryName?.trim() ? product.categoryName.trim() : formatCategoryLabel(productCategory);
+      catImage = product.categoryImage ?? void 0;
+    } else {
+      let categoryResource;
+      const categoryType = product.equipmentIds.map((equipmentId) => {
+        const res = resourceById.get(equipmentId);
+        if (res?.resourceType?.trim() && !categoryResource) {
+          categoryResource = res;
+        }
+        return res?.resourceType?.trim();
+      }).find((resourceType) => Boolean(resourceType));
+      groupId = categoryType?.toLowerCase() ?? UNCATEGORIZED_CATEGORY_KEY;
+      label = categoryType ? formatCategoryLabel(categoryType) : UNCATEGORIZED_CATEGORY_LABEL;
+      catImage = categoryResource?.images?.[0]?.url ?? categoryResource?.imageUrl ?? void 0;
+    }
     if (!groups.has(groupId)) {
-      const catImage = categoryResource?.images?.[0]?.url ?? categoryResource?.imageUrl ?? void 0;
       groups.set(groupId, {
         id: groupId,
         label,
@@ -1915,8 +1925,16 @@ function groupProductsByCategory(products, resources) {
     }
     const group = groups.get(groupId);
     group.products.push(product);
-    if (!group.imageUrl && categoryResource) {
-      group.imageUrl = categoryResource.images?.[0]?.url ?? categoryResource.imageUrl;
+    if (!group.imageUrl) {
+      if (catImage) {
+        group.imageUrl = catImage;
+      } else {
+        const coverImage = product.images?.[0];
+        const firstImage = (coverImage?.showInCategoryHeader !== false ? coverImage?.url : void 0) ?? product.imageUrl;
+        if (firstImage) {
+          group.imageUrl = firstImage;
+        }
+      }
     }
   });
   return Array.from(groups.values());
@@ -3079,9 +3097,10 @@ function ResiraBookingWidget() {
       guestPhone: guest.guestPhone.trim() || void 0,
       notes: guest.notes.trim() || void 0,
       promoCode: discountCode.trim() || void 0,
-      termsAccepted: termsAccepted || void 0
+      termsAccepted: termsAccepted || void 0,
+      waiverAccepted: waiverAccepted || void 0
     };
-  }, [activeResourceId, selectedProduct, selection, guest, discountCode, termsAccepted, isCheckoutMode, checkoutSession, checkoutSessionToken]);
+  }, [activeResourceId, selectedProduct, selection, guest, discountCode, termsAccepted, waiverAccepted, isCheckoutMode, checkoutSession, checkoutSessionToken]);
   const blockedDates = useMemo(() => {
     const dates = calendarData?.dates?.blockedDates ?? availability?.dates?.blockedDates ?? [];
     return new Set(dates);
@@ -3312,7 +3331,9 @@ function ResiraBookingWidget() {
         startTime: selection.startTime,
         endTime: selection.endTime,
         partySize: selection.partySize,
-        notes: guest.notes.trim() || void 0
+        notes: guest.notes.trim() || void 0,
+        termsAccepted: termsAccepted || void 0,
+        waiverAccepted: waiverAccepted || void 0
       };
       const result = await submit(payload);
       if (result) {
@@ -3362,6 +3383,10 @@ function ResiraBookingWidget() {
       setTermsError(locale.termsRequired);
       return;
     }
+    if (showWaiver && !waiverAccepted) {
+      setTermsError(locale.termsRequired);
+      return;
+    }
     setTermsError(null);
     const result = await createPayment(paymentPayload);
     if (!result) return;
@@ -3386,7 +3411,8 @@ function ResiraBookingWidget() {
     }
     const resourceId = activeResourceId ?? selectedProduct?.equipmentIds?.[0] ?? "";
     const payload = {
-      resourceId,
+      resourceId: isCheckoutMode ? void 0 : resourceId,
+      checkoutSessionToken: isCheckoutMode ? checkoutSessionToken : void 0,
       guestName: guest.guestName.trim(),
       guestEmail: guest.guestEmail.trim() || void 0,
       guestPhone: guest.guestPhone.trim() || void 0,
@@ -3395,7 +3421,9 @@ function ResiraBookingWidget() {
       startTime: selection.startTime,
       endTime: selection.endTime,
       partySize: selection.partySize,
-      notes: guest.notes.trim() || void 0
+      notes: guest.notes.trim() || void 0,
+      termsAccepted: termsAccepted || void 0,
+      waiverAccepted: waiverAccepted || void 0
     };
     const result = await submit(payload);
     if (result) {