@open-tender/store 1.1.185 → 1.1.186

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

@@ -1,9 +1,9 @@
 import { Order } from '@open-tender/types';
 import { ErrorMessageProps, OrderCardProps } from '@open-tender/ui';
 import React, { ReactNode } from 'react';
-declare const OrderCard: ({ order, navigate, children, ErrorMessageView }: {
+declare const OrderCard: ({ order, goToCheckout, children, ErrorMessageView }: {
     order: Order;
-    navigate: (route: string) => void;
+    goToCheckout: () => void;
     children: (props: OrderCardProps) => ReactNode;
     ErrorMessageView: (props: ErrorMessageProps) => ReactNode;
 }) => React.ReactNode;

package/dist/cjs/components/OrderCard.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
+var uuid_1 = require("uuid");
 var hooks_1 = require("../app/hooks");
 var hooks_2 = require("../hooks");
 var slices_1 = require("../slices");
 var ErrorMessage_1 = tslib_1.__importDefault(require("./ErrorMessage"));
 var OrderCard = function (_a) {
-    var order = _a.order, navigate = _a.navigate, children = _a.children, ErrorMessageView = _a.ErrorMessageView;
+    var order = _a.order, goToCheckout = _a.goToCheckout, children = _a.children, ErrorMessageView = _a.ErrorMessageView;
     var dispatch = (0, hooks_1.useAppDispatch)();
     var apiUrl = (0, hooks_1.useAppSelector)(slices_1.selectKioskApi);
     var _b = (0, react_1.useState)(null), errMsg = _b[0], setErrMsg = _b[1];
@@ -17,7 +18,7 @@ var OrderCard = function (_a) {
     var isLoading = loading === 'pending';
     var _e = (0, hooks_2.useOrder)(order), itemImages = _e.itemImages, itemNames = _e.itemNames, orderNo = _e.orderNo, title = _e.title, subtitle = _e.subtitle;
     var view = function () {
-        dispatch((0, slices_1.openModal)({ type: 'ORDER_DETAILS', args: { order: order } }));
+        dispatch((0, slices_1.openModal)({ type: 'ORDER_DETAILS', args: { order: order, goToCheckout: goToCheckout } }));
     };
     var reorder = function () {
         setErrMsg(null);
@@ -32,10 +33,11 @@ var OrderCard = function (_a) {
                 setErrMsg(error.detail);
             }
             else {
-                navigate('/checkout/details');
+                dispatch((0, slices_1.setOrderId)((0, uuid_1.v4)()));
+                goToCheckout();
             }
         }
-    }, [isLoading, isReordering, error, navigate]);
+    }, [dispatch, isLoading, isReordering, error, goToCheckout]);
     var renderErrorMessage = (0, react_1.useCallback)(function (errMsg) { return (react_1.default.createElement(ErrorMessage_1.default, { content: errMsg, children: ErrorMessageView })); }, [ErrorMessageView]);
     if (!config)
         return null;

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

@@ -1,9 +1,10 @@
 import { Order } from '@open-tender/types';
 import { CheckTotalsProps, OrderDetailsItemProps, OrderDetailsProps } from '@open-tender/ui';
 import React, { ReactNode } from 'react';
-declare const OrderDetails: ({ order, close, children, CheckTotalsView, OrderDetailsItemView }: {
+declare const OrderDetails: ({ order, close, goToCheckout, children, CheckTotalsView, OrderDetailsItemView }: {
     order: Order;
     close: () => void;
+    goToCheckout: () => void;
     children: (props: OrderDetailsProps) => ReactNode;
     CheckTotalsView: (props: CheckTotalsProps) => ReactNode;
     OrderDetailsItemView: (props: OrderDetailsItemProps) => ReactNode;

package/dist/cjs/components/OrderDetails.js

@@ -2,19 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
+var uuid_1 = require("uuid");
 var hooks_1 = require("../app/hooks");
 var hooks_2 = require("../hooks");
 var slices_1 = require("../slices");
 var CheckTotals_1 = tslib_1.__importDefault(require("./CheckTotals"));
 var OrderDetailsItem_1 = tslib_1.__importDefault(require("./OrderDetailsItem"));
 var OrderDetails = function (_a) {
-    var order = _a.order, close = _a.close, children = _a.children, CheckTotalsView = _a.CheckTotalsView, OrderDetailsItemView = _a.OrderDetailsItemView;
+    var order = _a.order, close = _a.close, goToCheckout = _a.goToCheckout, children = _a.children, CheckTotalsView = _a.CheckTotalsView, OrderDetailsItemView = _a.OrderDetailsItemView;
     var dispatch = (0, hooks_1.useAppDispatch)();
     var apiUrl = (0, hooks_1.useAppSelector)(slices_1.selectKioskApi);
     var _b = (0, react_1.useState)(null), errMsg = _b[0], setErrMsg = _b[1];
     var _c = (0, react_1.useState)(false), isReordering = _c[0], setIsReordering = _c[1];
     var _d = (0, hooks_2.useOrder)(order), subtitle = _d.title, title = _d.orderNo, requestedAt = _d.requestedAt;
-    var _e = (0, hooks_1.useAppSelector)(slices_1.selectKioskConfig), config = _e.orderDetails, modalContentConfig = _e.modalContent;
+    var _e = (0, hooks_1.useAppSelector)(slices_1.selectOrder), loading = _e.loading, error = _e.error;
+    var isLoading = loading === 'pending';
+    var _f = (0, hooks_1.useAppSelector)(slices_1.selectKioskConfig), config = _f.orderDetails, modalContentConfig = _f.modalContent;
     var reorder = function () {
         setErrMsg(null);
         setIsReordering(true);
@@ -22,6 +25,19 @@ var OrderDetails = function (_a) {
     };
     var renderCheckTotals = (0, react_1.useCallback)(function () { return react_1.default.createElement(CheckTotals_1.default, { check: order, children: CheckTotalsView }); }, [order, CheckTotalsView]);
     var renderOrderDetailsItem = (0, react_1.useCallback)(function (orderItem) { return (react_1.default.createElement(OrderDetailsItem_1.default, { key: orderItem.id, orderItem: orderItem, children: OrderDetailsItemView })); }, [OrderDetailsItemView]);
+    (0, react_1.useEffect)(function () {
+        if (isReordering && !isLoading) {
+            setIsReordering(false);
+            if (error) {
+                setErrMsg(error.detail);
+            }
+            else {
+                dispatch((0, slices_1.setOrderId)((0, uuid_1.v4)()));
+                goToCheckout();
+                close();
+            }
+        }
+    }, [dispatch, isLoading, isReordering, error, goToCheckout, close]);
     if (!config)
         return null;
     return children({

package/dist/cjs/components/SignInPhone.js

@@ -26,6 +26,7 @@ var SignInPhone = function (_a) {
     };
     var retry = function () {
         setShowSignUp(false);
+        setErrMsg(null);
     };
     var handlers = { submit: submit, retry: retry, close: close };
     (0, react_1.useEffect)(function () {

package/dist/cjs/hooks/useOrderValidate.js

@@ -11,12 +11,12 @@ var useOrderValidate = function () {
     var checkout = (0, hooks_1.useAppSelector)(slices_1.selectPosCheckout);
     var order = (0, hooks_1.useAppSelector)(slices_1.selectOrder);
     var preparedOrder = (0, slices_1.prepareOrder)(order, checkout);
-    var ordeCheckout = tslib_1.__rest(preparedOrder || {}, []);
-    var prevOrderCheckout = (0, usePrevious_1.default)(ordeCheckout);
+    var orderCheckout = tslib_1.__rest(preparedOrder || {}, []);
+    var prevOrderCheckout = (0, usePrevious_1.default)(orderCheckout);
     (0, react_1.useEffect)(function () {
-        if (preparedOrder && !(0, react_fast_compare_1.default)(prevOrderCheckout, ordeCheckout)) {
+        if (preparedOrder && !(0, react_fast_compare_1.default)(prevOrderCheckout, orderCheckout)) {
             dispatch((0, slices_1.validatePosOrder)());
         }
-    }, [dispatch, preparedOrder, prevOrderCheckout, ordeCheckout]);
+    }, [dispatch, preparedOrder, prevOrderCheckout, orderCheckout]);
 };
 exports.default = useOrderValidate;

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

@@ -1,9 +1,9 @@
 import { Order } from '@open-tender/types';
 import { ErrorMessageProps, OrderCardProps } from '@open-tender/ui';
 import React, { ReactNode } from 'react';
-declare const OrderCard: ({ order, navigate, children, ErrorMessageView }: {
+declare const OrderCard: ({ order, goToCheckout, children, ErrorMessageView }: {
     order: Order;
-    navigate: (route: string) => void;
+    goToCheckout: () => void;
     children: (props: OrderCardProps) => ReactNode;
     ErrorMessageView: (props: ErrorMessageProps) => ReactNode;
 }) => React.ReactNode;

package/dist/esm/components/OrderCard.js

@@ -1,10 +1,11 @@
 import React, { useCallback, useEffect, useState } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 import { useAppDispatch, useAppSelector } from '../app/hooks';
 import { useOrder } from '../hooks';
-import { selectKioskConfig, selectOrder, reorder as reorderPastOrder, openModal, selectKioskApi } from '../slices';
+import { selectKioskConfig, selectOrder, reorder as reorderPastOrder, openModal, selectKioskApi, setOrderId } from '../slices';
 import { default as ErrorMessageContainer } from './ErrorMessage';
 var OrderCard = function (_a) {
-    var order = _a.order, navigate = _a.navigate, children = _a.children, ErrorMessageView = _a.ErrorMessageView;
+    var order = _a.order, goToCheckout = _a.goToCheckout, children = _a.children, ErrorMessageView = _a.ErrorMessageView;
     var dispatch = useAppDispatch();
     var apiUrl = useAppSelector(selectKioskApi);
     var _b = useState(null), errMsg = _b[0], setErrMsg = _b[1];
@@ -14,7 +15,7 @@ var OrderCard = function (_a) {
     var isLoading = loading === 'pending';
     var _e = useOrder(order), itemImages = _e.itemImages, itemNames = _e.itemNames, orderNo = _e.orderNo, title = _e.title, subtitle = _e.subtitle;
     var view = function () {
-        dispatch(openModal({ type: 'ORDER_DETAILS', args: { order: order } }));
+        dispatch(openModal({ type: 'ORDER_DETAILS', args: { order: order, goToCheckout: goToCheckout } }));
     };
     var reorder = function () {
         setErrMsg(null);
@@ -29,10 +30,11 @@ var OrderCard = function (_a) {
                 setErrMsg(error.detail);
             }
             else {
-                navigate('/checkout/details');
+                dispatch(setOrderId(uuidv4()));
+                goToCheckout();
             }
         }
-    }, [isLoading, isReordering, error, navigate]);
+    }, [dispatch, isLoading, isReordering, error, goToCheckout]);
     var renderErrorMessage = useCallback(function (errMsg) { return (React.createElement(ErrorMessageContainer, { content: errMsg, children: ErrorMessageView })); }, [ErrorMessageView]);
     if (!config)
         return null;

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

@@ -1,9 +1,10 @@
 import { Order } from '@open-tender/types';
 import { CheckTotalsProps, OrderDetailsItemProps, OrderDetailsProps } from '@open-tender/ui';
 import React, { ReactNode } from 'react';
-declare const OrderDetails: ({ order, close, children, CheckTotalsView, OrderDetailsItemView }: {
+declare const OrderDetails: ({ order, close, goToCheckout, children, CheckTotalsView, OrderDetailsItemView }: {
     order: Order;
     close: () => void;
+    goToCheckout: () => void;
     children: (props: OrderDetailsProps) => ReactNode;
     CheckTotalsView: (props: CheckTotalsProps) => ReactNode;
     OrderDetailsItemView: (props: OrderDetailsItemProps) => ReactNode;

package/dist/esm/components/OrderDetails.js

@@ -1,17 +1,20 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 import { useAppDispatch, useAppSelector } from '../app/hooks';
 import { useOrder } from '../hooks';
-import { selectKioskConfig, reorder as reorderPastOrder, selectKioskApi } from '../slices';
+import { selectKioskConfig, reorder as reorderPastOrder, selectKioskApi, selectOrder, setOrderId } from '../slices';
 import { default as CheckTotalsContainer } from './CheckTotals';
 import { default as OrderDetailsItemContainer } from './OrderDetailsItem';
 var OrderDetails = function (_a) {
-    var order = _a.order, close = _a.close, children = _a.children, CheckTotalsView = _a.CheckTotalsView, OrderDetailsItemView = _a.OrderDetailsItemView;
+    var order = _a.order, close = _a.close, goToCheckout = _a.goToCheckout, children = _a.children, CheckTotalsView = _a.CheckTotalsView, OrderDetailsItemView = _a.OrderDetailsItemView;
     var dispatch = useAppDispatch();
     var apiUrl = useAppSelector(selectKioskApi);
     var _b = useState(null), errMsg = _b[0], setErrMsg = _b[1];
     var _c = useState(false), isReordering = _c[0], setIsReordering = _c[1];
     var _d = useOrder(order), subtitle = _d.title, title = _d.orderNo, requestedAt = _d.requestedAt;
-    var _e = useAppSelector(selectKioskConfig), config = _e.orderDetails, modalContentConfig = _e.modalContent;
+    var _e = useAppSelector(selectOrder), loading = _e.loading, error = _e.error;
+    var isLoading = loading === 'pending';
+    var _f = useAppSelector(selectKioskConfig), config = _f.orderDetails, modalContentConfig = _f.modalContent;
     var reorder = function () {
         setErrMsg(null);
         setIsReordering(true);
@@ -19,6 +22,19 @@ var OrderDetails = function (_a) {
     };
     var renderCheckTotals = useCallback(function () { return React.createElement(CheckTotalsContainer, { check: order, children: CheckTotalsView }); }, [order, CheckTotalsView]);
     var renderOrderDetailsItem = useCallback(function (orderItem) { return (React.createElement(OrderDetailsItemContainer, { key: orderItem.id, orderItem: orderItem, children: OrderDetailsItemView })); }, [OrderDetailsItemView]);
+    useEffect(function () {
+        if (isReordering && !isLoading) {
+            setIsReordering(false);
+            if (error) {
+                setErrMsg(error.detail);
+            }
+            else {
+                dispatch(setOrderId(uuidv4()));
+                goToCheckout();
+                close();
+            }
+        }
+    }, [dispatch, isLoading, isReordering, error, goToCheckout, close]);
     if (!config)
         return null;
     return children({

package/dist/esm/components/SignInPhone.js

@@ -23,6 +23,7 @@ var SignInPhone = function (_a) {
     };
     var retry = function () {
         setShowSignUp(false);
+        setErrMsg(null);
     };
     var handlers = { submit: submit, retry: retry, close: close };
     useEffect(function () {

package/dist/esm/hooks/useOrderValidate.js

@@ -9,12 +9,12 @@ var useOrderValidate = function () {
     var checkout = useAppSelector(selectPosCheckout);
     var order = useAppSelector(selectOrder);
     var preparedOrder = prepareOrder(order, checkout);
-    var ordeCheckout = __rest(preparedOrder || {}, []);
-    var prevOrderCheckout = usePrevious(ordeCheckout);
+    var orderCheckout = __rest(preparedOrder || {}, []);
+    var prevOrderCheckout = usePrevious(orderCheckout);
     useEffect(function () {
-        if (preparedOrder && !isEqual(prevOrderCheckout, ordeCheckout)) {
+        if (preparedOrder && !isEqual(prevOrderCheckout, orderCheckout)) {
             dispatch(validatePosOrder());
         }
-    }, [dispatch, preparedOrder, prevOrderCheckout, ordeCheckout]);
+    }, [dispatch, preparedOrder, prevOrderCheckout, orderCheckout]);
 };
 export default useOrderValidate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-tender/store",
-  "version": "1.1.185",
+  "version": "1.1.186",
   "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",