@feedmepos/order-plugin-gallery 0.0.9 → 0.0.10-beta.0

package/dist/plugins/compulsory-items.d.ts

@@ -0,0 +1,3 @@
+import { PluginFunction } from "@feedmepos/ordering-sdk";
+declare const compulsoryItemsPlugin: PluginFunction;
+export default compulsoryItemsPlugin;

package/dist/plugins/compulsory-items.js

@@ -0,0 +1,113 @@
+const formatQty = (qty) => {
+    if (Number.isInteger(qty))
+        return `${qty}`;
+    return qty.toFixed(2).replace(/\.?0+$/, "");
+};
+const addQuantity = (quantityMap, itemId, quantity) => {
+    if (!itemId || typeof itemId !== "string")
+        return;
+    if (typeof quantity !== "number" || !Number.isFinite(quantity))
+        return;
+    if (quantity <= 0)
+        return;
+    quantityMap.set(itemId, (quantityMap.get(itemId) || 0) + quantity);
+};
+const getQuantityMap = (items) => {
+    const quantityMap = new Map();
+    for (const item of items) {
+        addQuantity(quantityMap, item.productId, item.quantity);
+    }
+    return quantityMap;
+};
+const getNormalizedRules = (rawRules) => {
+    if (!Array.isArray(rawRules))
+        return [];
+    const normalizedRules = [];
+    for (const rule of rawRules) {
+        const itemId = typeof rule?.itemId === "string"
+            ? rule.itemId.trim()
+            : "";
+        const minQty = rule?.minQty;
+        const maxQty = rule?.maxQty;
+        if (!itemId || !Number.isFinite(minQty) || !Number.isFinite(maxQty)) {
+            console.warn("[compulsory-items] Skip invalid rule. Expect { itemId, minQty, maxQty } with finite numbers.", rule);
+            continue;
+        }
+        if (minQty < 0 || maxQty < minQty) {
+            console.warn("[compulsory-items] Skip invalid rule. Expect minQty >= 0 and maxQty >= minQty.", rule);
+            continue;
+        }
+        normalizedRules.push({ itemId, minQty, maxQty });
+    }
+    return normalizedRules;
+};
+const getItemTitleMap = (sdk) => {
+    const titleMap = new Map();
+    const menuItems = (sdk.menuManager.state.value.menu?.items ||
+        []);
+    for (const menuItem of menuItems) {
+        const itemId = menuItem.id?.trim();
+        const title = menuItem.title?.trim();
+        if (!itemId || !title)
+            continue;
+        titleMap.set(itemId, title);
+    }
+    const rawItems = (sdk.menuManager.state.value.overridedMenu?.modules?.item ||
+        []);
+    for (const rawItem of rawItems) {
+        const itemId = rawItem._id?.trim();
+        const title = rawItem.name?.trim();
+        if (!itemId || !title || titleMap.has(itemId))
+            continue;
+        titleMap.set(itemId, title);
+    }
+    return titleMap;
+};
+const compulsoryItemsPlugin = ({ sdk, onBeforeSubmitOrder, pluginParams, }) => {
+    onBeforeSubmitOrder(() => {
+        const params = (pluginParams || {});
+        const rules = getNormalizedRules(params.itemLimitConfig);
+        if (rules.length === 0)
+            return true;
+        const submittedItems = (sdk.orderManager.state.value.slotActiveBills?.[0]?.items ||
+            []);
+        const draftItems = (sdk.orderManager.state.value.order?.draft || []);
+        const submittedQtyByItemId = getQuantityMap(submittedItems);
+        const draftQtyByItemId = getQuantityMap(draftItems);
+        const itemTitleMap = getItemTitleMap(sdk);
+        const violationMessages = [];
+        for (const rule of rules) {
+            const submittedQty = submittedQtyByItemId.get(rule.itemId) || 0;
+            const draftQty = draftQtyByItemId.get(rule.itemId) || 0;
+            const totalQty = submittedQty + draftQty;
+            const itemTitle = itemTitleMap.get(rule.itemId) || rule.itemId;
+            if (totalQty < rule.minQty) {
+                const delta = rule.minQty - totalQty;
+                violationMessages.push(`Add ${formatQty(delta)} more "${itemTitle}" (minimum ${formatQty(rule.minQty)}, current total ${formatQty(totalQty)}).`);
+            }
+            if (submittedQty > rule.maxQty) {
+                if (draftQty > 0) {
+                    violationMessages.push(`"${itemTitle}" is already above the limit in submitted orders. Remove ${formatQty(draftQty)} from your current cart to continue.`);
+                }
+                continue;
+            }
+            if (totalQty > rule.maxQty) {
+                const delta = totalQty - rule.maxQty;
+                violationMessages.push(`Remove ${formatQty(delta)} "${itemTitle}" from your current cart (maximum ${formatQty(rule.maxQty)}, current total ${formatQty(totalQty)}).`);
+            }
+        }
+        if (violationMessages.length === 0) {
+            return true;
+        }
+        sdk.ui.toast.show({
+            title: [
+                "Please update your cart before submitting:",
+                ...violationMessages.map((message) => `- ${message}`),
+            ].join("\n"),
+            type: "error",
+            duration: 6000,
+        });
+        return false;
+    });
+};
+export default compulsoryItemsPlugin;

package/dist/plugins/set-meal-validation-customer-v3.js

@@ -1,29 +1,28 @@
 const setMealValidationPlugin = ({ sdk, onBeforeAddToCart, onBeforeSubmitOrder, pluginParams, }) => {
-    console.log('[ItemRestriction Plugin] Loaded');
+    console.log('[ItemRestriction Plugin] Loaded (Simplified Version)');
     const REQUIRED_CATEGORY_IDS = pluginParams?.requiredCategoryIds || [];
     const RESTRICTED_CATEGORY_IDS = pluginParams?.restrictedCategoryIds || [];
     const errorMessage = pluginParams?.message || 'Please order items from required category first';
     const getMenu = () => sdk?.menuManager?.state?.value?.overridedMenu;
     const getCategoryIdForItem = (item, menu) => {
-        if (!menu?.modules?.item)
-            return null;
-        // Try direct categoryId first
-        if (item.categoryId)
-            return item.categoryId;
-        // Also check category property which exists in some models
-        if (item.category && typeof item.category === 'string')
-            return item.category;
-        // Look up by productId (in cart) or id/_id (in menu/item)
-        const itemProductId = item.productId || item.id || item._id;
-        if (!itemProductId)
-            return null;
-        // Find item in menu modules
-        const menuItem = menu.modules.item.find((i) => i._id === itemProductId || i.id === itemProductId);
-        return menuItem?.category || null;
+        // Trust the enriched item from plugin-loader, or check the normalized menu modules
+        if (item.categoryId || item.category) {
+            return item.categoryId || item.category;
+        }
+        // Fallback: Check if the item exists in the normalized modules.item list
+        // This handles cases where 'item' is a fresh cart object that hasn't been enriched yet,
+        // but the menu has the enriched version.
+        if (menu?.modules?.item) {
+            const itemProductId = item.productId || item.id || item._id;
+            const menuItem = menu.modules.item.find((i) => i._id === itemProductId || i.id === itemProductId);
+            if (menuItem) {
+                return menuItem.categoryId || menuItem.category || null;
+            }
+        }
+        return null;
     };
     onBeforeAddToCart(async (item) => {
         console.log('[ItemRestriction Plugin] Checking item:', item.title || item.name);
-        console.log('[ItemRestriction Plugin] Item ID:', item.id || item._id);
         const menu = getMenu();
         if (!menu) {
             console.log('[ItemRestriction Plugin] No menu found');
@@ -31,33 +30,24 @@ const setMealValidationPlugin = ({ sdk, onBeforeAddToCart, onBeforeSubmitOrder,
         }
         const itemCategoryId = getCategoryIdForItem(item, menu);
         const isRestricted = itemCategoryId && RESTRICTED_CATEGORY_IDS.includes(itemCategoryId);
-        if (!isRestricted) {
-            console.log('[ItemRestriction Plugin] Item not in restricted category, allowing');
+        console.log('[ItemRestriction Plugin] Category check:', {
+            itemName: item.title || item.name,
+            itemId: item.id || item._id,
+            resolvedCategoryId: itemCategoryId,
+            isRestricted
+        });
+        if (!isRestricted)
             return true;
-        }
         const slotActiveBills = sdk?.orderManager?.state?.value?.slotActiveBills || [];
-        // Use flatMap if available, or fallback to reduce/concat
         const orderedItems = slotActiveBills.flatMap
             ? slotActiveBills.flatMap((bill) => bill?.items || [])
             : slotActiveBills.reduce((acc, bill) => acc.concat(bill?.items || []), []);
         const draft = sdk?.orderManager?.state?.value?.order?.draft || [];
-        console.log('[ItemRestriction Plugin] Checking order state:', {
-            draftCount: draft.length,
-            billsCount: slotActiveBills.length,
-            orderedItemsCount: orderedItems.length,
-            totalItems: draft.length + orderedItems.length
-        });
         const allItems = [...orderedItems, ...draft];
         const requiredCategoryItemsFound = allItems.some((orderItem) => {
             const catId = getCategoryIdForItem(orderItem, menu);
-            console.log('[ItemRestriction Plugin] Item check:', {
-                productId: orderItem.productId || orderItem.id || orderItem._id,
-                foundCategoryId: catId,
-                isRequired: catId && REQUIRED_CATEGORY_IDS.includes(catId)
-            });
             return catId && REQUIRED_CATEGORY_IDS.includes(catId);
         });
-        console.log('[ItemRestriction Plugin] Required category items found?', requiredCategoryItemsFound);
         if (requiredCategoryItemsFound) {
             console.log('[ItemRestriction Plugin] Required category items already ordered, allowing item');
             return true;
@@ -67,13 +57,11 @@ const setMealValidationPlugin = ({ sdk, onBeforeAddToCart, onBeforeSubmitOrder,
         return false;
     });
     onBeforeSubmitOrder(async () => {
-        console.log('[ItemRestriction Plugin] onBeforeSubmitOrder called');
         const slotActiveBills = sdk?.orderManager?.state?.value?.slotActiveBills || [];
         const orderedItems = slotActiveBills.flatMap
             ? slotActiveBills.flatMap((bill) => bill?.items || [])
             : slotActiveBills.reduce((acc, bill) => acc.concat(bill?.items || []), []);
         const draft = sdk?.orderManager?.state?.value?.order?.draft || [];
-        console.log('[ItemRestriction Plugin] Checking order with', orderedItems.length + draft.length, 'items');
         if (orderedItems.length === 0 && draft.length === 0)
             return true;
         const menu = getMenu();
@@ -84,16 +72,13 @@ const setMealValidationPlugin = ({ sdk, onBeforeAddToCart, onBeforeSubmitOrder,
             const catId = getCategoryIdForItem(item, menu);
             return catId && RESTRICTED_CATEGORY_IDS.includes(catId);
         });
-        console.log('[ItemRestriction Plugin] Has restricted category items in order?', hasRestrictedCategoryItems);
         if (!hasRestrictedCategoryItems)
             return true;
         const requiredCategoryItemsFound = allItems.some((item) => {
             const catId = getCategoryIdForItem(item, menu);
             return catId && REQUIRED_CATEGORY_IDS.includes(catId);
         });
-        console.log('[ItemRestriction Plugin] Required category items found?', requiredCategoryItemsFound);
         if (!requiredCategoryItemsFound) {
-            console.log('[ItemRestriction Plugin] No required category items in order, blocking checkout');
             sdk?.ui?.toast?.show?.({ title: errorMessage, type: "error", duration: 5000 });
             return false;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/order-plugin-gallery",
-  "version": "0.0.9",
+  "version": "0.0.10-beta.0",
   "type": "module",
   "files": [
     "dist"
@@ -24,6 +24,10 @@
     "./menu-debug-logger": {
       "import": "./dist/plugins/menu-debug-logger.js",
       "types": "./dist/plugins/menu-debug-logger.d.ts"
+    },
+    "./compulsory-items": {
+      "import": "./dist/plugins/compulsory-items.js",
+      "types": "./dist/plugins/compulsory-items.d.ts"
     }
   },
   "peerDependencies": {