@open-tender/store 1.1.271 → 1.1.273

package/dist/cjs/components/Reward.d.ts

@@ -1,10 +1,11 @@
 import { Discount } from '@open-tender/types';
 import { RewardProps, AppliedProps } from '@open-tender/ui';
 import React, { ReactNode } from 'react';
-declare const Reward: ({ reward, callback, isLast, children, AppliedView }: {
+declare const Reward: ({ reward, isLast, index, callback, children, AppliedView }: {
     reward: Discount;
-    callback?: () => void;
     isLast?: boolean;
+    index: number;
+    callback?: () => void;
     children: (props: RewardProps) => ReactNode;
     AppliedView: (props: AppliedProps) => ReactNode;
 }) => React.ReactNode;

package/dist/cjs/components/Reward.js

@@ -6,21 +6,21 @@ var hooks_1 = require("../app/hooks");
 var slices_1 = require("../slices");
 var Applied_1 = tslib_1.__importDefault(require("./Applied"));
 var Reward = function (_a) {
-    var reward = _a.reward, callback = _a.callback, isLast = _a.isLast, children = _a.children, AppliedView = _a.AppliedView;
+    var reward = _a.reward, isLast = _a.isLast, index = _a.index, callback = _a.callback, children = _a.children, AppliedView = _a.AppliedView;
     var dispatch = (0, hooks_1.useAppDispatch)();
     var apiUrl = (0, hooks_1.useAppSelector)(slices_1.selectKioskApi);
     var _b = (0, hooks_1.useAppSelector)(slices_1.selectKioskConfig), config = _b.reward, cardConfig = _b.card;
     var check = (0, hooks_1.useAppSelector)(slices_1.selectPosCheckout).check;
-    var discountIds = check === null || check === void 0 ? void 0 : check.discounts.map(function (i) { return i.id; });
+    var discountIdIndexMap = new Map(check === null || check === void 0 ? void 0 : check.discounts.map(function (item, index) { return [item.id, index]; }));
     var id = reward.discount_id;
-    var isApplied = !!(discountIds === null || discountIds === void 0 ? void 0 : discountIds.includes(id));
+    var isApplied = discountIdIndexMap.get(id) === index;
     var apply = function () {
-        dispatch((0, slices_1.addDiscount)({ id: id }));
+        dispatch((0, slices_1.addDiscount)({ id: id, index: index }));
         if (callback)
             callback();
     };
     var remove = function () {
-        dispatch((0, slices_1.removeDiscount)({ id: id }));
+        dispatch((0, slices_1.removeDiscount)({ id: id, index: index }));
         if (callback)
             callback();
     };
@@ -33,6 +33,7 @@ var Reward = function (_a) {
         handlers: handlers,
         reward: reward,
         isApplied: isApplied,
+        index: index,
         isLast: isLast,
         cardConfig: cardConfig,
         renderApplied: renderApplied,

package/dist/cjs/components/Rewards.js

@@ -8,7 +8,7 @@ var Reward_1 = tslib_1.__importDefault(require("./Reward"));
 var Rewards = function (_a) {
     var title = _a.title, subtitle = _a.subtitle, rewards = _a.rewards, children = _a.children, RewardView = _a.RewardView, AppliedView = _a.AppliedView;
     var config = (0, hooks_1.useAppSelector)(slices_1.selectKioskConfig).rewards;
-    var renderReward = (0, react_1.useCallback)(function (reward, isLast) { return (react_1.default.createElement(Reward_1.default, { reward: reward, isLast: isLast, children: RewardView, AppliedView: AppliedView })); }, [RewardView, AppliedView]);
+    var renderReward = (0, react_1.useCallback)(function (reward, index, isLast) { return (react_1.default.createElement(Reward_1.default, { reward: reward, index: index, isLast: isLast, children: RewardView, AppliedView: AppliedView })); }, [RewardView, AppliedView]);
     if (!config)
         return null;
     return children({ config: config, title: title, subtitle: subtitle, rewards: rewards, renderReward: renderReward });

package/dist/cjs/hooks/useResetOrder.js

@@ -12,6 +12,7 @@ var useResetOrder = function (callback) {
         dispatch((0, slices_1.resetCustomerIdentify)());
         dispatch((0, slices_1.resetCustomer)());
         dispatch((0, slices_1.resetMenu)());
+        dispatch((0, slices_1.closeModal)());
         if (callback)
             callback();
     };

package/dist/cjs/slices/checkout.d.ts

@@ -164,7 +164,11 @@ export declare const activateGiftCards: import("@reduxjs/toolkit").AsyncThunk<an
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
-export declare const resetPosCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckout">, resetPosCheck: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheck">, resetPosCheckError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckError">, handleCheckoutError: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/handleCheckoutError">, addGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addGiftCard">, removeGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeGiftCard">, addSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/addSurcharge">, removeSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/removeSurcharge">, addDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount, "checkout/addDiscount">, removeDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount, "checkout/removeDiscount">, addTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTax">, removeTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeTax">, addTip: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTip">, removeTip: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeTip">, setTaxExempt: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setTaxExempt">, addCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addCustomer">, removeCustomer: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeCustomer">, setPendingDiscounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPendingDiscounts">, setPoints: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPoints">, setMadeFor: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setMadeFor">, setPhone: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPhone">;
+export declare const resetPosCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckout">, resetPosCheck: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheck">, resetPosCheckError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckError">, handleCheckoutError: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/handleCheckoutError">, addGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addGiftCard">, removeGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeGiftCard">, addSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/addSurcharge">, removeSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/removeSurcharge">, addDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount & {
+    index?: number | undefined;
+}, "checkout/addDiscount">, removeDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount & {
+    index?: number | undefined;
+}, "checkout/removeDiscount">, addTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTax">, removeTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeTax">, addTip: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTip">, removeTip: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeTip">, setTaxExempt: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setTaxExempt">, addCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addCustomer">, removeCustomer: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeCustomer">, setPendingDiscounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPendingDiscounts">, setPoints: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPoints">, setMadeFor: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setMadeFor">, setPhone: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPhone">;
 export declare const selectPosCheckout: (state: AppState) => CheckoutState;
 export declare const selectPosCheck: (state: AppState) => Order | null;
 export declare const selectPosCustomer: (state: AppState) => CustomerIdentify | null;

package/dist/cjs/slices/checkout.js

@@ -519,14 +519,15 @@ var checkoutSlice = (0, toolkit_1.createSlice)({
         },
         removeDiscount: function (state, action) {
             var id = action.payload.id;
+            var discountIndex = action.payload.index;
             var discount = state.check
-                ? state.check.discounts.find(function (i) { return i.id === id; })
+                ? state.check.discounts.find(function (item, index) { return item.id === id && index === discountIndex; })
                 : null;
             if (discount && discount.discount_type === 'LOYALTY') {
                 state.points = [];
             }
             else {
-                state.discounts = state.discounts.filter(function (i) { return i.id !== id; });
+                state.discounts = state.discounts.filter(function (item, index) { return item.id !== id && index !== discountIndex; });
             }
         },
         addTax: function (state, action) {

package/dist/esm/components/Reward.d.ts

@@ -1,10 +1,11 @@
 import { Discount } from '@open-tender/types';
 import { RewardProps, AppliedProps } from '@open-tender/ui';
 import React, { ReactNode } from 'react';
-declare const Reward: ({ reward, callback, isLast, children, AppliedView }: {
+declare const Reward: ({ reward, isLast, index, callback, children, AppliedView }: {
     reward: Discount;
-    callback?: () => void;
     isLast?: boolean;
+    index: number;
+    callback?: () => void;
     children: (props: RewardProps) => ReactNode;
     AppliedView: (props: AppliedProps) => ReactNode;
 }) => React.ReactNode;

package/dist/esm/components/Reward.js

@@ -3,21 +3,21 @@ import { useAppDispatch, useAppSelector } from '../app/hooks';
 import { addDiscount, removeDiscount, selectKioskApi, selectKioskConfig, selectPosCheckout } from '../slices';
 import { default as AppliedContainer } from './Applied';
 var Reward = function (_a) {
-    var reward = _a.reward, callback = _a.callback, isLast = _a.isLast, children = _a.children, AppliedView = _a.AppliedView;
+    var reward = _a.reward, isLast = _a.isLast, index = _a.index, callback = _a.callback, children = _a.children, AppliedView = _a.AppliedView;
     var dispatch = useAppDispatch();
     var apiUrl = useAppSelector(selectKioskApi);
     var _b = useAppSelector(selectKioskConfig), config = _b.reward, cardConfig = _b.card;
     var check = useAppSelector(selectPosCheckout).check;
-    var discountIds = check === null || check === void 0 ? void 0 : check.discounts.map(function (i) { return i.id; });
+    var discountIdIndexMap = new Map(check === null || check === void 0 ? void 0 : check.discounts.map(function (item, index) { return [item.id, index]; }));
     var id = reward.discount_id;
-    var isApplied = !!(discountIds === null || discountIds === void 0 ? void 0 : discountIds.includes(id));
+    var isApplied = discountIdIndexMap.get(id) === index;
     var apply = function () {
-        dispatch(addDiscount({ id: id }));
+        dispatch(addDiscount({ id: id, index: index }));
         if (callback)
             callback();
     };
     var remove = function () {
-        dispatch(removeDiscount({ id: id }));
+        dispatch(removeDiscount({ id: id, index: index }));
         if (callback)
             callback();
     };
@@ -30,6 +30,7 @@ var Reward = function (_a) {
         handlers: handlers,
         reward: reward,
         isApplied: isApplied,
+        index: index,
         isLast: isLast,
         cardConfig: cardConfig,
         renderApplied: renderApplied,

package/dist/esm/components/Rewards.js

@@ -5,7 +5,7 @@ import { default as RewardContainer } from './Reward';
 var Rewards = function (_a) {
     var title = _a.title, subtitle = _a.subtitle, rewards = _a.rewards, children = _a.children, RewardView = _a.RewardView, AppliedView = _a.AppliedView;
     var config = useAppSelector(selectKioskConfig).rewards;
-    var renderReward = useCallback(function (reward, isLast) { return (React.createElement(RewardContainer, { reward: reward, isLast: isLast, children: RewardView, AppliedView: AppliedView })); }, [RewardView, AppliedView]);
+    var renderReward = useCallback(function (reward, index, isLast) { return (React.createElement(RewardContainer, { reward: reward, index: index, isLast: isLast, children: RewardView, AppliedView: AppliedView })); }, [RewardView, AppliedView]);
     if (!config)
         return null;
     return children({ config: config, title: title, subtitle: subtitle, rewards: rewards, renderReward: renderReward });

package/dist/esm/hooks/useResetOrder.js

@@ -1,5 +1,5 @@
 import { useAppDispatch } from '../app/hooks';
-import { resetCart, resetCustomer, resetCustomerIdentify, resetIdleState, resetMenu, resetPosCheckout, setOrderId } from '../slices';
+import { closeModal, resetCart, resetCustomer, resetCustomerIdentify, resetIdleState, resetMenu, resetPosCheckout, setOrderId } from '../slices';
 var useResetOrder = function (callback) {
     var dispatch = useAppDispatch();
     var resetOrder = function () {
@@ -10,6 +10,7 @@ var useResetOrder = function (callback) {
         dispatch(resetCustomerIdentify());
         dispatch(resetCustomer());
         dispatch(resetMenu());
+        dispatch(closeModal());
         if (callback)
             callback();
     };

package/dist/esm/slices/checkout.d.ts

@@ -164,7 +164,11 @@ export declare const activateGiftCards: import("@reduxjs/toolkit").AsyncThunk<an
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
-export declare const resetPosCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckout">, resetPosCheck: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheck">, resetPosCheckError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckError">, handleCheckoutError: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/handleCheckoutError">, addGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addGiftCard">, removeGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeGiftCard">, addSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/addSurcharge">, removeSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/removeSurcharge">, addDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount, "checkout/addDiscount">, removeDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount, "checkout/removeDiscount">, addTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTax">, removeTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeTax">, addTip: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTip">, removeTip: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeTip">, setTaxExempt: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setTaxExempt">, addCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addCustomer">, removeCustomer: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeCustomer">, setPendingDiscounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPendingDiscounts">, setPoints: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPoints">, setMadeFor: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setMadeFor">, setPhone: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPhone">;
+export declare const resetPosCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckout">, resetPosCheck: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheck">, resetPosCheckError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/resetPosCheckError">, handleCheckoutError: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/handleCheckoutError">, addGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addGiftCard">, removeGiftCard: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeGiftCard">, addSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/addSurcharge">, removeSurcharge: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateSurcharge, "checkout/removeSurcharge">, addDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount & {
+    index?: number | undefined;
+}, "checkout/addDiscount">, removeDiscount: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderCreateDiscount & {
+    index?: number | undefined;
+}, "checkout/removeDiscount">, addTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTax">, removeTax: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/removeTax">, addTip: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addTip">, removeTip: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeTip">, setTaxExempt: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setTaxExempt">, addCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/addCustomer">, removeCustomer: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"checkout/removeCustomer">, setPendingDiscounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPendingDiscounts">, setPoints: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPoints">, setMadeFor: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setMadeFor">, setPhone: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "checkout/setPhone">;
 export declare const selectPosCheckout: (state: AppState) => CheckoutState;
 export declare const selectPosCheck: (state: AppState) => Order | null;
 export declare const selectPosCustomer: (state: AppState) => CustomerIdentify | null;

package/dist/esm/slices/checkout.js

@@ -515,14 +515,15 @@ var checkoutSlice = createSlice({
         },
         removeDiscount: function (state, action) {
             var id = action.payload.id;
+            var discountIndex = action.payload.index;
             var discount = state.check
-                ? state.check.discounts.find(function (i) { return i.id === id; })
+                ? state.check.discounts.find(function (item, index) { return item.id === id && index === discountIndex; })
                 : null;
             if (discount && discount.discount_type === 'LOYALTY') {
                 state.points = [];
             }
             else {
-                state.discounts = state.discounts.filter(function (i) { return i.id !== id; });
+                state.discounts = state.discounts.filter(function (item, index) { return item.id !== id && index !== discountIndex; });
             }
         },
         addTax: function (state, action) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-tender/store",
-  "version": "1.1.271",
+  "version": "1.1.273",
   "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",
@@ -62,8 +62,8 @@
   "peerDependencies": {
     "@emotion/react": "^11.11.1",
     "@open-tender/types": "^0.4.145",
-    "@open-tender/ui": "^0.4.49",
-    "@open-tender/utils": "^0.5.30",
+    "@open-tender/ui": "^0.4.51",
+    "@open-tender/utils": "^0.5.32",
     "@reduxjs/toolkit": "^2.0.1",
     "date-fns": "2.30.0",
     "date-fns-tz": "^2.0.0",