tripstorekrabi-shared 1.23.1 → 1.23.3

package/booking.js

@@ -367,31 +367,38 @@ export function requiresDietaryInfo(booking, product) {
 
   const mainIsFood = hasFood(product);
 
-  const foodAddOnsInBooking =
-    booking?.addOns?.filter((bAddOn) => {
-      const productAddOn = product.addOns?.find((pAddOn) => pAddOn.id === bAddOn.id);
-      return productAddOn && hasFood(productAddOn);
-    }) || [];
-
-  const hasFoodAddOnWithPax = foodAddOnsInBooking.some((bAddOn) => {
-    return (bAddOn.adults || 0) + (bAddOn.children || 0) > 0;
-  });
+  const productFoodAddOns = (product.addOns || []).filter(pAddOn => hasFood(pAddOn));
+
+  if (productFoodAddOns.length > 0) {
+    const hasActiveFoodAddOn = productFoodAddOns.some(pAddOn => {
+      const bookedAddOn = booking?.addOns?.find(bAddOn => bAddOn.id === pAddOn.id);
+      if (!bookedAddOn) return false;
 
-  if (foodAddOnsInBooking.length > 0) {
-    return hasFoodAddOnWithPax;
+      const totalPax = (bookedAddOn.adults || 0) + (bookedAddOn.children || 0);
+      return totalPax > 0;
+    });
+
+    return hasActiveFoodAddOn;
   }
 
   return mainIsFood;
 }
 
-export function hasFood(product) {
-  return (product.includes ?? []).find((item) => {
-    item = item.toLowerCase();
-    return item.includes('breakfast') || item.includes('lunch') || item.includes('brunch') || item.includes('dinner') || item.includes('snacks');
-  }) != null;
-}
+export function hasFood(input) {
+  if (!input) return false;
 
+  const items = [input].flat().map(item => {
+    if (typeof item === 'string') return item;
+    return item?.title || item?.name || '';
+  });
+
+  const foodKeywords = ['breakfast', 'lunch', 'brunch', 'dinner', 'snacks'];
 
+  return items.some(item => {
+    const lowerItem = item.toLowerCase();
+    return foodKeywords.some(keyword => lowerItem.includes(keyword));
+  });
+}
 
 export function createTodos(booking, product) {
   let todos = {};
@@ -432,7 +439,7 @@ export function createTodos(booking, product) {
       }
     }
 
-    if (product && hasFood(product)) {
+    if (product && requiresDietaryInfo(booking, product)) {
       if (!booking.dietary) {
         todos.dietary = "missing";
       } else if (!booking.dietaryConfirmed && booking.dietary?.length > 0 && booking.dietary !== 'None' && booking.sentToOperator === true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.23.1",
+  "version": "1.23.3",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {