tripstorekrabi-shared 1.23.0 → 1.23.2

package/booking.js

@@ -362,11 +362,42 @@ export function getStartingPointMessage(booking, product, options = { compact: f
   return text;
 }
 
-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 requiresDietaryInfo(booking, product) {
+  if (!product) return true;
+
+  const mainIsFood = hasFood(product);
+
+  const foodAddOnsInBooking =
+    booking?.addOns?.filter((bAddOn) => {
+      const productAddOn = product.addOns?.find((pAddOn) => pAddOn.id === bAddOn.id);
+      return productAddOn && hasFood(productAddOn.title);
+    }) || [];
+
+  const hasFoodAddOnWithPax = foodAddOnsInBooking.some((bAddOn) => {
+    return (bAddOn.adults || 0) + (bAddOn.children || 0) > 0;
+  });
+
+  if (foodAddOnsInBooking.length > 0) {
+    return hasFoodAddOnWithPax;
+  }
+
+  return mainIsFood;
+}
+
+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) {
@@ -408,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.0",
+  "version": "1.23.2",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "dayjs": "^1.11.19",
-    "libphonenumber-js": "^1.12.33",
+    "libphonenumber-js": "^1.12.36",
     "nanoid": "^5.1.6"
   },
   "scripts": {