@open-tender/store 0.1.327 → 0.1.329

package/dist/cjs/components/CategoryItem.js

@@ -5,6 +5,7 @@ var utils_1 = require("@open-tender/utils");
 var react_1 = require("react");
 var hooks_1 = require("../app/hooks");
 var slices_1 = require("../slices");
+var removeOptions_1 = require("../utils/removeOptions");
 var CategoryItem = function (_a) {
     var item = _a.item, favorite = _a.favorite, allergenAlerts = _a.allergenAlerts, placeholder = _a.placeholder, index = _a.index, navigate = _a.navigate, children = _a.children;
     var dispatch = (0, hooks_1.useAppDispatch)();
@@ -19,8 +20,9 @@ var CategoryItem = function (_a) {
     var _c = displaySettings || {}, _d = _c.calories, showCals = _d === void 0 ? false : _d, _e = _c.tags, showTags = _e === void 0 ? false : _e, _f = _c.allergens, showAllergens = _f === void 0 ? false : _f;
     var showDesc = 'SHOW';
     var orderItem = (0, react_1.useMemo)(function () {
-        return favorite
+        var base = favorite
             ? tslib_1.__assign(tslib_1.__assign({}, (0, utils_1.rehydrateOrderItem)(item, favorite.item)), { index: -1 }) : (0, utils_1.makeOrderItem)(item, undefined, soldOut, undefined, hasPoints);
+        return (0, utils_1.calcPrices)((0, removeOptions_1.applyRemoveOptions)(base));
     }, [favorite, hasPoints, item, soldOut]);
     var _g = (0, utils_1.useMenuItem)(orderItem, null, {}, null, undefined), displayPrice = _g.displayPrice, displayCals = _g.displayCals;
     var cartItem = (0, utils_1.useOrderItem)(orderItem, favorite, allergenAlerts, cartCounts, showCals, showTags, showAllergens, showDesc);

package/dist/cjs/hooks/useOrderValidate.js

@@ -14,9 +14,18 @@ var useOrderValidate = function () {
     var orderCheckout = tslib_1.__rest(preparedOrder || {}, []);
     var prevOrderCheckout = (0, usePrevious_1.default)(orderCheckout);
     (0, react_1.useEffect)(function () {
+        // Don't validate if the order is already submitted/completed
+        if (checkout.completedOrder)
+            return;
         if (preparedOrder && !(0, react_fast_compare_1.default)(prevOrderCheckout, orderCheckout)) {
             dispatch((0, slices_1.validatePosOrder)());
         }
-    }, [dispatch, preparedOrder, prevOrderCheckout, orderCheckout]);
+    }, [
+        dispatch,
+        preparedOrder,
+        prevOrderCheckout,
+        orderCheckout,
+        checkout.completedOrder
+    ]);
 };
 exports.default = useOrderValidate;

package/dist/cjs/utils/removeOptions.d.ts

@@ -0,0 +1,2 @@
+import { CartItem } from '@open-tender/types';
+export declare function applyRemoveOptions(item: CartItem): CartItem;

package/dist/cjs/utils/removeOptions.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyRemoveOptions = void 0;
+var tslib_1 = require("tslib");
+var REMOVE_SYNONYMS = ['remove', 'without'];
+var nutritionKeys = [
+    'calories',
+    'cholesterol',
+    'dietary_fiber',
+    'protein',
+    'saturated_fat',
+    'sodium',
+    'sugars',
+    'total_carbs',
+    'total_fat',
+    'trans_fat'
+];
+function hasRemovePrefix(name) {
+    var lower = name.trim().toLowerCase();
+    return REMOVE_SYNONYMS.some(function (syn) { return lower.startsWith(syn); });
+}
+function negateNutrition(info) {
+    if (!info)
+        return null;
+    var result = tslib_1.__assign({}, info);
+    nutritionKeys.forEach(function (key) {
+        var val = result[key];
+        if (typeof val === 'number')
+            result[key] = -val;
+    });
+    return result;
+}
+function negateRemoveOption(option) {
+    return tslib_1.__assign(tslib_1.__assign({}, option), { cals: typeof option.cals === 'number' ? -option.cals : option.cals, price: -option.price, points: typeof option.points === 'number' ? -option.points : option.points, nutritionalInfo: negateNutrition(option.nutritionalInfo) });
+}
+function addToBase(base, option) {
+    var optInfo = option.nutritionalInfo;
+    if (!optInfo)
+        return base;
+    var result = tslib_1.__assign({}, (base || {}));
+    nutritionKeys.forEach(function (key) {
+        var addVal = optInfo[key];
+        if (typeof addVal === 'number') {
+            var cur = result[key];
+            result[key] = (typeof cur === 'number' ? cur : 0) + addVal;
+        }
+    });
+    return result;
+}
+function applyRemoveOptions(item) {
+    var baseCals = item.cals;
+    var baseNutrition = item.nutritionalInfo;
+    var groups = item.groups.map(function (group) {
+        var options = group.options.map(function (option) {
+            if (!hasRemovePrefix(option.name))
+                return option;
+            if (typeof option.cals === 'number') {
+                baseCals = (baseCals !== null && baseCals !== void 0 ? baseCals : 0) + option.cals;
+            }
+            baseNutrition = addToBase(baseNutrition, option);
+            return negateRemoveOption(option);
+        });
+        return tslib_1.__assign(tslib_1.__assign({}, group), { options: options });
+    });
+    return tslib_1.__assign(tslib_1.__assign({}, item), { cals: baseCals, nutritionalInfo: baseNutrition, groups: groups });
+}
+exports.applyRemoveOptions = applyRemoveOptions;

package/dist/esm/components/CategoryItem.js

@@ -1,8 +1,9 @@
 import { __assign } from "tslib";
-import { makeOrderItem, rehydrateOrderItem, useMenuItem, useOrderItem } from '@open-tender/utils';
+import { calcPrices, makeOrderItem, rehydrateOrderItem, useMenuItem, useOrderItem } from '@open-tender/utils';
 import { memo, useMemo } from 'react';
 import { useAppDispatch, useAppSelector } from '../app/hooks';
 import { selectCartCounts, selectKioskApi, selectKioskConfig, selectMenu, selectPointsProgram, selectStoreSettings, setCurrentItem } from '../slices';
+import { applyRemoveOptions } from '../utils/removeOptions';
 var CategoryItem = function (_a) {
     var item = _a.item, favorite = _a.favorite, allergenAlerts = _a.allergenAlerts, placeholder = _a.placeholder, index = _a.index, navigate = _a.navigate, children = _a.children;
     var dispatch = useAppDispatch();
@@ -17,8 +18,9 @@ var CategoryItem = function (_a) {
     var _c = displaySettings || {}, _d = _c.calories, showCals = _d === void 0 ? false : _d, _e = _c.tags, showTags = _e === void 0 ? false : _e, _f = _c.allergens, showAllergens = _f === void 0 ? false : _f;
     var showDesc = 'SHOW';
     var orderItem = useMemo(function () {
-        return favorite
+        var base = favorite
             ? __assign(__assign({}, rehydrateOrderItem(item, favorite.item)), { index: -1 }) : makeOrderItem(item, undefined, soldOut, undefined, hasPoints);
+        return calcPrices(applyRemoveOptions(base));
     }, [favorite, hasPoints, item, soldOut]);
     var _g = useMenuItem(orderItem, null, {}, null, undefined), displayPrice = _g.displayPrice, displayCals = _g.displayCals;
     var cartItem = useOrderItem(orderItem, favorite, allergenAlerts, cartCounts, showCals, showTags, showAllergens, showDesc);

package/dist/esm/hooks/useOrderValidate.js

@@ -12,9 +12,18 @@ var useOrderValidate = function () {
     var orderCheckout = __rest(preparedOrder || {}, []);
     var prevOrderCheckout = usePrevious(orderCheckout);
     useEffect(function () {
+        // Don't validate if the order is already submitted/completed
+        if (checkout.completedOrder)
+            return;
         if (preparedOrder && !isEqual(prevOrderCheckout, orderCheckout)) {
             dispatch(validatePosOrder());
         }
-    }, [dispatch, preparedOrder, prevOrderCheckout, orderCheckout]);
+    }, [
+        dispatch,
+        preparedOrder,
+        prevOrderCheckout,
+        orderCheckout,
+        checkout.completedOrder
+    ]);
 };
 export default useOrderValidate;

package/dist/esm/utils/removeOptions.d.ts

@@ -0,0 +1,2 @@
+import { CartItem } from '@open-tender/types';
+export declare function applyRemoveOptions(item: CartItem): CartItem;

package/dist/esm/utils/removeOptions.js

@@ -0,0 +1,63 @@
+import { __assign } from "tslib";
+var REMOVE_SYNONYMS = ['remove', 'without'];
+var nutritionKeys = [
+    'calories',
+    'cholesterol',
+    'dietary_fiber',
+    'protein',
+    'saturated_fat',
+    'sodium',
+    'sugars',
+    'total_carbs',
+    'total_fat',
+    'trans_fat'
+];
+function hasRemovePrefix(name) {
+    var lower = name.trim().toLowerCase();
+    return REMOVE_SYNONYMS.some(function (syn) { return lower.startsWith(syn); });
+}
+function negateNutrition(info) {
+    if (!info)
+        return null;
+    var result = __assign({}, info);
+    nutritionKeys.forEach(function (key) {
+        var val = result[key];
+        if (typeof val === 'number')
+            result[key] = -val;
+    });
+    return result;
+}
+function negateRemoveOption(option) {
+    return __assign(__assign({}, option), { cals: typeof option.cals === 'number' ? -option.cals : option.cals, price: -option.price, points: typeof option.points === 'number' ? -option.points : option.points, nutritionalInfo: negateNutrition(option.nutritionalInfo) });
+}
+function addToBase(base, option) {
+    var optInfo = option.nutritionalInfo;
+    if (!optInfo)
+        return base;
+    var result = __assign({}, (base || {}));
+    nutritionKeys.forEach(function (key) {
+        var addVal = optInfo[key];
+        if (typeof addVal === 'number') {
+            var cur = result[key];
+            result[key] = (typeof cur === 'number' ? cur : 0) + addVal;
+        }
+    });
+    return result;
+}
+export function applyRemoveOptions(item) {
+    var baseCals = item.cals;
+    var baseNutrition = item.nutritionalInfo;
+    var groups = item.groups.map(function (group) {
+        var options = group.options.map(function (option) {
+            if (!hasRemovePrefix(option.name))
+                return option;
+            if (typeof option.cals === 'number') {
+                baseCals = (baseCals !== null && baseCals !== void 0 ? baseCals : 0) + option.cals;
+            }
+            baseNutrition = addToBase(baseNutrition, option);
+            return negateRemoveOption(option);
+        });
+        return __assign(__assign({}, group), { options: options });
+    });
+    return __assign(__assign({}, item), { cals: baseCals, nutritionalInfo: baseNutrition, groups: groups });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-tender/store",
-  "version": "0.1.327",
+  "version": "0.1.329",
   "description": "A library of hooks, reducers, utility functions, and types for use with Open Tender applications that utilize our in-store POS API",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",