@open-tender/store 0.9.5 → 1.0.0

package/dist/esm/slices/kds.js

@@ -2,8 +2,9 @@ var _a;
 import { __assign, __awaiter, __generator } from "tslib";
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { ReducerType } from './types';
-import { currentLocalDate, filterOrdersToday, isoToDate, makeFetchOrdersArgs, makeItemCounts, makeKdsOrder, makeKdsOrders, makeKdsStationCounts, makeOrdersForPrepStation, notDone, timezoneMap } from '../utils';
+import { currentLocalDate, filterOrdersToday, makeItemCounts, makeKdsOrder, makeKdsOrders, makeKdsStationCounts, makeOrdersForPrepStation, makeOrdersParams, notDone, timezoneMap } from '../utils';
 import { addAlert } from './alerts';
+import { isoToDate } from '@open-tender/utils';
 var initialState = {
     terminalId: null,
     itemTypes: null,
@@ -51,7 +52,7 @@ export var fetchKdsOrders = createAsyncThunk(KdsActionType.FetchKdsOrders, funct
                 case 0:
                     _b.trys.push([0, 2, , 3]);
                     api = getState().config.api;
-                    args = makeFetchOrdersArgs(params);
+                    args = makeOrdersParams(params);
                     return [4 /*yield*/, api.getOrders(args)];
                 case 1:
                     orders = _b.sent();
@@ -393,9 +394,14 @@ var kdsSlice = createSlice({
                 .map(function (i) {
                 return i.order_uuid === updated.order_uuid ? updated : i;
             })
-                .filter(function (i) { return i.fire_at; });
+                .filter(function (i) { var _a; return (_a = i.order_prep) === null || _a === void 0 ? void 0 : _a.fire_at; });
             var orders = updatedOrders
-                .map(function (i) { return (__assign(__assign({}, i), { fireAt: isoToDate(i.fire_at, tz) })); })
+                .map(function (i) {
+                var _a;
+                return (__assign(__assign({}, i), { fireAt: ((_a = i.order_prep) === null || _a === void 0 ? void 0 : _a.fire_at)
+                        ? isoToDate(i.order_prep.fire_at, tz)
+                        : new Date() }));
+            })
                 .sort(function (a, b) { return a.fireAt.getTime() - b.fireAt.getTime(); });
             // const counts = makeKdsCounts(state.itemTypes, orders)
             var stationCounts = makeKdsStationCounts(updatedOrders, state.prepStations || []);
@@ -555,10 +561,15 @@ export var selectKdsOrders = function (state) {
 export var selectKdsCurrentOrders = function (state) {
     var _a = state.kds, orders = _a.orders, loading = _a.loading, error = _a.error;
     var filtered = orders.filter(function (i) {
+        if (!i.order_prep)
+            return false;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        if (!fire_at)
+            return false;
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
+        var fireDate = isoToDate(fire_at, tz);
         var currentDate = currentLocalDate(tz);
-        return notDone(i.prep_status) && fireDate && fireDate < currentDate;
+        return notDone(prep_status) && fireDate < currentDate;
     });
     return { orders: filtered, loading: loading, error: error };
 };
@@ -569,10 +580,15 @@ export var selectKdsCurrentCount = function (state) {
 export var selectKdsFutureOrders = function (state) {
     var _a = state.kds, orders = _a.orders, loading = _a.loading, error = _a.error;
     var filtered = orders.filter(function (i) {
+        if (!i.order_prep)
+            return false;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        if (!fire_at)
+            return false;
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
+        var fireDate = isoToDate(fire_at, tz);
         var currentDate = currentLocalDate(tz);
-        return notDone(i.prep_status) && fireDate && fireDate > currentDate;
+        return notDone(prep_status) && fireDate > currentDate;
     });
     return { orders: filtered, loading: loading, error: error };
 };

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

@@ -47,7 +47,6 @@ export declare const selectKioskConfigScreen: (screen: string) => ((state: {
     arrivals: import("./arrivals").ArrivalsState;
     cartSummary: import("./cartSummary").CartSummaryState;
     checkout: import("./checkout").CheckoutState;
-    completedOrders: import("./completedOrders").CompletedOrdersState;
     config: import("./config").ConfigState;
     discounts: import("./discounts").DiscountsState;
     errorAlerts: import("./errorAlerts").ErrorAlertsState;

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

@@ -25,7 +25,6 @@ export declare const selectMenuPagesFiltered: ((state: {
     arrivals: import("./arrivals").ArrivalsState;
     cartSummary: import("./cartSummary").CartSummaryState;
     checkout: import("./checkout").CheckoutState;
-    completedOrders: import("./completedOrders").CompletedOrdersState;
     config: import("./config").ConfigState;
     discounts: import("./discounts").DiscountsState;
     errorAlerts: import("./errorAlerts").ErrorAlertsState;

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

@@ -1,4 +1,5 @@
-import { Cashier, DeviceColorScheme, DeviceFontSize, Employee, Order, RequestError } from '../types';
+import { DeviceColorScheme, DeviceFontSize, Order, RequestError } from '@open-tender/types';
+import { Cashier, Employee } from '../types';
 import { AppState } from '../app';
 export interface PosState {
     terminalId: number | null;

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

@@ -1,4 +1,5 @@
-import { Order, Orders, RefundArgs, RequestError, RequestStatus } from '../types';
+import { Order, Orders, RequestError, RequestStatus } from '@open-tender/types';
+import { RefundArgs } from '../types';
 import { AppState } from '../app';
 export interface RefundState {
     previous: Orders | null;

package/dist/esm/slices/refund.js

@@ -23,7 +23,10 @@ export var fetchPreviousRefunds = createAsyncThunk(RefundActionType.FetchPreviou
                 case 0:
                     _b.trys.push([0, 2, , 3]);
                     api = getState().config.api;
-                    args = { receipt_type: 'REFUND', parent_receipt_uuid: orderId };
+                    args = {
+                        receipt_type: 'REFUND',
+                        parent_receipt_uuid: orderId
+                    };
                     return [4 /*yield*/, api.getOrders(args)];
                 case 1: return [2 /*return*/, _b.sent()];
                 case 2:

package/dist/esm/types/api/index.d.ts

@@ -2,7 +2,6 @@ export * from './alerts';
 export * from './arrivals';
 export * from './cart';
 export * from './checkout';
-export * from './config';
 export * from './customer';
 export * from './device';
 export * from './devices';
@@ -11,7 +10,6 @@ export * from './employee';
 export * from './errorAlerts';
 export * from './favorite';
 export * from './giftCard';
-export * from './kds';
 export * from './kiosk';
 export * from './menu';
 export * from './menuPages';

package/dist/esm/types/api/index.js

@@ -2,7 +2,6 @@ export * from './alerts';
 export * from './arrivals';
 export * from './cart';
 export * from './checkout';
-export * from './config';
 export * from './customer';
 export * from './device';
 export * from './devices';
@@ -11,7 +10,6 @@ export * from './employee';
 export * from './errorAlerts';
 export * from './favorite';
 export * from './giftCard';
-export * from './kds';
 export * from './kiosk';
 export * from './menu';
 export * from './menuPages';

package/dist/esm/types/api/order.d.ts

@@ -1,7 +1,7 @@
-import { DateString, ISOStringOffset, TimezonePython } from '../datetimes';
+import { PrepStatus } from '@open-tender/types';
+import { ISOStringOffset, TimezonePython } from '../datetimes';
 import { CardType, ChannelType, Decimal, Money, NegativeMoney, OrderStatus, OrderType, ReceiptType, ServiceType, SurchargeType, Temperature, TenderStatus, TenderType } from '../global';
 import { Address, Customer } from './customer';
-import { PrepStatus, TicketStatus } from './kds';
 export interface OrderChannel {
     ext_id?: string | null;
     ext_name?: string | null;
@@ -329,92 +329,3 @@ export interface Order {
     totals: OrderTotals;
 }
 export type Orders = Array<Order>;
-export interface OrderKds extends Omit<Order, 'fire_at' | 'tickets' | 'expected_at'> {
-    expected_at: ISOStringOffset;
-    fire_at: ISOStringOffset;
-    tickets: OrderTickets;
-}
-export type OrdersKds = Array<OrderKds>;
-export interface FetchOrdersArgs {
-    businessDate?: DateString | null;
-    receiptType?: ReceiptType | 'BOTH';
-    channelType?: Array<ChannelType> | null;
-    prepStatus?: Array<PrepStatus> | null;
-    search?: string | null;
-    sortBy?: 'requested_at' | 'expected_at' | 'fire_at';
-    sortDirection?: 'ASC' | 'DESC';
-    parentOrderId?: string;
-}
-export interface FetchOrdersAPIArgs {
-    business_date?: DateString;
-    receipt_type?: ReceiptType | 'BOTH';
-    channel_type?: string;
-    prep_status?: string;
-    search?: string;
-    sort_by?: 'requested_at' | 'expected_at' | 'fire_at';
-    sort_direction?: 'ASC' | 'DESC';
-    parent_receipt_uuid?: string;
-}
-export interface OrderCounts {
-    current: Record<string, number> | null;
-    future: Record<string, number> | null;
-    qa: Record<string, number> | null;
-}
-export interface OrdersAndCounts {
-    orders: OrdersKds;
-    counts: OrderCounts;
-}
-export interface OrderUpdate {
-    expected_at?: string;
-    prep_status?: PrepStatus;
-}
-export interface OrderBucket {
-    orders: OrdersKds;
-    start: Date;
-    end: Date;
-}
-export type OrderBuckets = Array<OrderBucket>;
-export interface OrderTimes {
-    delayed: number;
-    requested: Date;
-    requestedTime: string;
-    expected: Date;
-    expectedDate: string;
-    expectedTime: string;
-    readyBy: Date;
-    readyTime: string;
-    dateStr: string;
-    status: string;
-}
-export interface TicketUpdate {
-    ticket_status: TicketStatus;
-}
-export interface TicketsUpdate {
-    ticket_status?: TicketStatus;
-    ticket_nos?: number[];
-}
-export type TicketStatusUpdate = 'done' | 'completed' | 'reset';
-export interface Ticket {
-    item_nos: number[];
-    item_type_id: number;
-    item_type_name: string;
-    ticket_no: number;
-    ticket_status: TicketStatus;
-    items: OrderCart;
-    is_default: boolean;
-    is_grouped: boolean;
-    is_hidden_assembly: boolean;
-    is_hidden_qa: boolean;
-    print_on_completed: boolean;
-}
-export type TicketGroup = Ticket[];
-export type TicketGroups = TicketGroup[];
-export interface OrderKdsStatus {
-    NOT_DONE: boolean;
-    DONE: boolean;
-    COMPLETED: boolean;
-}
-export interface OrderItemCount {
-    item: OrderItem;
-    count: number;
-}

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

@@ -1,25 +1,27 @@
-import { FetchOrdersAPIArgs, FetchOrdersArgs, HeaderColors, ItemType, ItemTypes, KdsOrderType, PrepStationPrepType, KdsStationCounts, KdsStationOrderTypeCount, ModifiersMetadata, Order, OrderBuckets, OrderCart, OrderItem, OrderItemCount, OrderKds, Orders, OrdersKds, OrderTickets, OrderTimes, PrepStation, PrepStations, PrepStatus, PrepStatusMap, Store, TicketGroups, Timezone } from '../types';
+import { Order, Orders } from '@open-tender/types';
+import { HeaderColors, ItemType, ItemTypes, KdsOrderType, PrepStationPrepType, KdsStationCounts, KdsStationOrderTypeCount, ModifiersMetadata, OrderBuckets, OrderCart, OrderItem, OrderItemCount, OrderTickets, OrderPrepTimes, PrepStation, PrepStations, PrepStatus, PrepStatusMap, Store, TicketGroups, Timezone } from '@open-tender/types';
+import { OrdersArgs, OrdersParams } from '../slices';
 export declare const prepStatus: PrepStatusMap;
-export declare const makeFetchOrdersArgs: ({ businessDate, receiptType, channelType, prepStatus, search, sortBy, sortDirection, parentOrderId }: FetchOrdersArgs) => FetchOrdersAPIArgs;
+export declare const makeOrdersParams: ({ businessDate, receiptType, channelType, prepStatus, search, sortBy, sortDirection, parentOrderId }: OrdersArgs) => OrdersParams;
 export declare const notDone: (prep_status: PrepStatus) => boolean;
 export declare const isDone: (prep_status: PrepStatus) => boolean;
 export declare const notCompleted: (prep_status: PrepStatus) => boolean;
 export declare const isCompleted: (prep_status: PrepStatus) => boolean;
-export declare const isFutureOrder: (order: OrderKds) => boolean | null;
-export declare const makeKdsOrder: (order: Order) => OrderKds;
-export declare const makeKdsOrders: (orders: Orders) => OrdersKds;
-export declare const makeCurrentOrders: (orders: OrdersKds) => OrdersKds;
-export declare const makeFutureOrders: (orders: OrdersKds) => OrdersKds;
-export declare const makeIncompleteOrders: (orders: OrdersKds) => OrdersKds;
-export declare const makeCompletedOrders: (orders: OrdersKds) => OrdersKds;
-export declare const makeOrdersOfType: (orders: OrdersKds, orderType: KdsOrderType) => OrdersKds;
-export declare const filterOrdersByItemType: (orders: OrdersKds, itemTypeIds: number[] | null) => OrdersKds;
-export declare const filterOrdersByPrepType: (orders: OrdersKds, prepType: PrepStationPrepType) => OrdersKds;
-export declare const filterOrdersToday: (orders: OrdersKds) => OrdersKds;
-export declare const makeOrdersForPrepStation: (orders: OrdersKds, prepStation: PrepStation, orderType: KdsOrderType) => OrdersKds;
+export declare const isFutureOrder: (order: Order) => boolean | null;
+export declare const makeKdsOrder: (order: Order) => Order;
+export declare const makeKdsOrders: (orders: Orders) => Orders;
+export declare const makeCurrentOrders: (orders: Orders) => Orders;
+export declare const makeFutureOrders: (orders: Orders) => Orders;
+export declare const makeIncompleteOrders: (orders: Orders) => Orders;
+export declare const makeCompletedOrders: (orders: Orders) => Orders;
+export declare const makeOrdersOfType: (orders: Orders, orderType: KdsOrderType) => Orders;
+export declare const filterOrdersByItemType: (orders: Orders, itemTypeIds: number[] | null) => Orders;
+export declare const filterOrdersByPrepType: (orders: Orders, prepType: PrepStationPrepType) => Orders;
+export declare const filterOrdersToday: (orders: Orders) => Orders;
+export declare const makeOrdersForPrepStation: (orders: Orders, prepStation: PrepStation, orderType: KdsOrderType) => Orders;
 export declare const makeOrderItemSignature: (item: OrderItem, withNotes?: boolean) => string;
-export declare const makeItemCounts: (orders: OrdersKds, withMods?: boolean) => Record<string, OrderItemCount>;
-export declare const makeKdsCounts: (itemTypes: ItemTypes | null, orders: OrdersKds | null) => {
+export declare const makeItemCounts: (orders: Orders, withMods?: boolean) => Record<string, OrderItemCount>;
+export declare const makeKdsCounts: (itemTypes: ItemTypes | null, orders: Orders | null) => {
     current: null;
     future: null;
     qa: null;
@@ -28,14 +30,14 @@ export declare const makeKdsCounts: (itemTypes: ItemTypes | null, orders: Orders
     future: Record<string, number>;
     qa: Record<string, number>;
 };
-export declare const makeCurrentAndFutureOrders: (orders: OrdersKds) => {
-    current: OrdersKds;
-    future: OrdersKds;
+export declare const makeCurrentAndFutureOrders: (orders: Orders) => {
+    current: Orders;
+    future: Orders;
 };
-export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null, prepType: PrepStationPrepType) => KdsStationOrderTypeCount;
-export declare const makeKdsStationCounts: (orders: OrdersKds, prepStations: PrepStations) => KdsStationCounts;
-export declare const makeOrderBuckets: (orders: OrdersKds, tz: Timezone) => OrderBuckets;
-export declare const makeOrderBucketsCounts: (itemTypes?: ItemTypes, orders?: OrdersKds) => Record<string, number>;
+export declare const makeKdsStationCount: (orders: Orders, itemTypeIds: number[] | null, prepType: PrepStationPrepType) => KdsStationOrderTypeCount;
+export declare const makeKdsStationCounts: (orders: Orders, prepStations: PrepStations) => KdsStationCounts;
+export declare const makeOrderBuckets: (orders: Orders, tz: Timezone) => OrderBuckets;
+export declare const makeOrderBucketsCounts: (itemTypes?: ItemTypes, orders?: Orders) => Record<string, number>;
 export declare const makeTicketCounts: (tickets: OrderTickets) => Record<string, number>;
 export declare const makeItemTypeSettings: (itemType: ItemType) => {
     is_default: boolean;
@@ -51,5 +53,5 @@ export declare const makeTicketGroups: (tickets: OrderTickets, itemTypes: ItemTy
 export declare const makeDisplayCounts: (counts: Record<string, number>) => number[] | "";
 export declare const displayCounts: (counts: Record<string, number>) => string;
 export declare const makeBucketColor: (settings: Store, minutes: number) => "" | "error" | "alert" | "text";
-export declare const makeOrderTimes: (order: OrderKds, amPm?: boolean, warningMinutes?: number, alertMinutes?: number) => OrderTimes;
+export declare const makeOrderPrepTimes: (order: Order, amPm?: boolean, warningMinutes?: number, alertMinutes?: number) => OrderPrepTimes | null;
 export declare const makeHeaderStatusColor: (status: string) => keyof HeaderColors;

package/dist/esm/utils/orders.js

@@ -1,6 +1,6 @@
 import { __assign, __spreadArray } from "tslib";
-import { currentLocalDate, currentLocalDateStr, DATE, formatDate, isoToDate, isoToDateStr, makeIntervals, minutesLeft, timezoneMap } from './datetimes';
-import { normalizeOrderType } from './order';
+import { currentLocalDate, currentLocalDateStr, DATE, formatDate, makeIntervals, minutesLeft, timezoneMap } from './datetimes';
+import { isoToDate, isoToDateStr } from '@open-tender/utils';
 export var prepStatus = {
     TODO: 'TODO',
     IN_PROGRESS: 'IN_PROGRESS',
@@ -8,7 +8,7 @@ export var prepStatus = {
     COMPLETED: 'COMPLETED',
     FULFILLED: 'FULFILLED'
 };
-export var makeFetchOrdersArgs = function (_a) {
+export var makeOrdersParams = function (_a) {
     var businessDate = _a.businessDate, receiptType = _a.receiptType, channelType = _a.channelType, prepStatus = _a.prepStatus, search = _a.search, sortBy = _a.sortBy, sortDirection = _a.sortDirection, parentOrderId = _a.parentOrderId;
     var args = {};
     if (businessDate) {
@@ -62,50 +62,72 @@ export var isCompleted = function (prep_status) {
     return completeStates.includes(prep_status);
 };
 export var isFutureOrder = function (order) {
-    var timezone = order.timezone, fire_at = order.fire_at, prep_status = order.prep_status;
+    var timezone = order.timezone, order_prep = order.order_prep;
+    if (!order_prep)
+        return false;
+    var fire_at = order_prep.fire_at, prep_status = order_prep.prep_status;
     var tz = timezoneMap[timezone];
     var fireDate = fire_at ? isoToDate(fire_at, tz) : null;
     var currentDate = currentLocalDate(tz);
     return notDone(prep_status) && fireDate && fireDate > currentDate;
 };
 export var makeKdsOrder = function (order) {
-    return __assign(__assign({}, order), { order_type: normalizeOrderType(order.order_type) });
+    return order;
 };
 export var makeKdsOrders = function (orders) {
-    var filtered = orders.filter(function (i) { return i.expected_at && i.fire_at && i.tickets; });
-    return filtered.map(function (i) { return (__assign(__assign({}, i), { order_type: normalizeOrderType(i.order_type) })); });
+    return orders.filter(function (i) { var _a; return ((_a = i.order_prep) === null || _a === void 0 ? void 0 : _a.expected_at) && i.order_prep.fire_at && i.tickets; });
 };
 export var makeCurrentOrders = function (orders) {
     return orders.filter(function (i) {
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
+        if (!i.order_prep)
+            return false;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        if (!fire_at)
+            return false;
+        var fireDate = isoToDate(fire_at, tz);
         var currentDate = currentLocalDate(tz);
-        return notCompleted(i.prep_status) && fireDate && fireDate < currentDate;
+        return notCompleted(prep_status) && fireDate < currentDate;
     });
 };
 export var makeFutureOrders = function (orders) {
     return orders.filter(function (i) {
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
+        if (!i.order_prep)
+            return false;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        if (!fire_at)
+            return false;
+        var fireDate = isoToDate(fire_at, tz);
         var currentDate = currentLocalDate(tz);
-        return notCompleted(i.prep_status) && fireDate && fireDate > currentDate;
+        return notDone(prep_status) && fireDate > currentDate;
     });
 };
 export var makeIncompleteOrders = function (orders) {
     return orders.filter(function (i) {
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
-        return notCompleted(i.prep_status) && fireDate;
+        if (!i.order_prep)
+            return false;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        if (!fire_at)
+            return false;
+        var fireDate = isoToDate(fire_at, tz);
+        return notCompleted(prep_status) && fireDate;
     });
 };
 export var makeCompletedOrders = function (orders) {
     return orders.filter(function (i) {
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
-        var fireDateStr = fireDate ? formatDate(fireDate, 'yyyy-MM-dd') : null;
+        if (!i.order_prep)
+            return false;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        if (!fire_at)
+            return false;
+        var fireDate = isoToDate(fire_at, tz);
+        var fireDateStr = formatDate(fireDate, 'yyyy-MM-dd');
         var currentDate = currentLocalDate(tz);
         var currentDateStr = formatDate(currentDate, 'yyyy-MM-dd');
-        return (isCompleted(i.prep_status) && fireDate && fireDateStr === currentDateStr);
+        return isCompleted(prep_status) && fireDateStr === currentDateStr;
     });
 };
 export var makeOrdersOfType = function (orders, orderType) {
@@ -125,21 +147,23 @@ export var filterOrdersByItemType = function (orders, itemTypeIds) {
         return orders;
     return orders
         .reduce(function (arr, i) {
-        var tickets = i.tickets.filter(function (t) {
+        var _a;
+        var tickets = (_a = i.tickets) === null || _a === void 0 ? void 0 : _a.filter(function (t) {
             return itemTypeIds.includes(t.item_type_id);
         });
         return __spreadArray(__spreadArray([], arr, true), [__assign(__assign({}, i), { tickets: tickets })], false);
     }, [])
-        .filter(function (i) { return i.tickets.length; });
+        .filter(function (i) { var _a; return (_a = i.tickets) === null || _a === void 0 ? void 0 : _a.length; });
 };
 export var filterOrdersByPrepType = function (orders, prepType) {
     var statusFunc = prepType === 'ASSEMBLY' ? notDone : notCompleted;
     return orders
         .reduce(function (arr, i) {
-        var tickets = i.tickets.filter(function (t) { return statusFunc(t.ticket_status); });
+        var _a;
+        var tickets = (_a = i.tickets) === null || _a === void 0 ? void 0 : _a.filter(function (t) { return statusFunc(t.ticket_status); });
         return __spreadArray(__spreadArray([], arr, true), [__assign(__assign({}, i), { tickets: tickets })], false);
     }, [])
-        .filter(function (i) { return i.tickets.length; });
+        .filter(function (i) { var _a; return (_a = i.tickets) === null || _a === void 0 ? void 0 : _a.length; });
 };
 export var filterOrdersToday = function (orders) {
     if (!orders.length)
@@ -147,6 +171,8 @@ export var filterOrdersToday = function (orders) {
     var tz = timezoneMap[orders[0].timezone];
     var today = currentLocalDateStr(tz);
     return orders.filter(function (i) {
+        if (i.requested_at === 'asap')
+            return true;
         var requesteDateStr = isoToDateStr(i.requested_at, tz, DATE);
         return today === requesteDateStr;
     });
@@ -158,16 +184,20 @@ export var makeOrdersForPrepStation = function (orders, prepStation, orderType)
         return filterOrdersByItemType(ordersOfType, item_type_ids);
     }
     var filteredOrders = prep_type === 'ASSEMBLY'
-        ? ordersOfType.filter(function (i) { return notDone(i.prep_status); })
+        ? ordersOfType.filter(function (i) {
+            return i.order_prep ? notDone(i.order_prep.prep_status) : false;
+        })
         : ordersOfType.filter(function (i) {
-            return expo_done_only
-                ? i.prep_status === 'DONE'
-                : notCompleted(i.prep_status);
+            return !i.order_prep
+                ? false
+                : expo_done_only
+                    ? i.order_prep.prep_status === 'DONE'
+                    : notCompleted(i.order_prep.prep_status);
         });
     var filtered = filterOrdersByItemType(filteredOrders, item_type_ids);
     return prep_type === 'EXPO'
         ? filtered
-        : filtered.filter(function (i) { return i.tickets.filter(function (t) { return notDone(t.ticket_status); }).length; });
+        : filtered.filter(function (i) { var _a; return (_a = i.tickets) === null || _a === void 0 ? void 0 : _a.filter(function (t) { return notDone(t.ticket_status); }).length; });
 };
 export var makeOrderItemSignature = function (item, withNotes) {
     if (withNotes === void 0) { withNotes = false; }
@@ -225,14 +255,15 @@ export var makeKdsCounts = function (itemTypes, orders) {
     var current = __assign({ Orders: 0 }, itemTypeCounts);
     var qa = __assign({ Orders: 0 }, itemTypeCounts);
     var future = __assign({ Orders: 0 }, itemTypeCounts);
-    var openOrders = orders.filter(function (i) { return notCompleted(i.prep_status); });
+    var openOrders = orders.filter(function (i) { return i.order_prep && notCompleted(i.order_prep.prep_status); });
     openOrders.forEach(function (order) {
-        if (!order.fire_at || !order.tickets)
+        if (!order.order_prep || !order.tickets)
             return;
+        var _a = order.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
         var tz = timezoneMap[order.timezone];
-        var fireDate = isoToDate(order.fire_at, tz);
+        var fireDate = fire_at ? isoToDate(fire_at, tz) : null;
         var currentDate = currentLocalDate(tz);
-        var isDone = order.prep_status === prepStatus.DONE;
+        var isDone = prep_status === prepStatus.DONE;
         var isCurrent = fireDate ? fireDate < currentDate : false;
         var ticketCounts = order.tickets.reduce(function (obj, ticket) {
             var _a;
@@ -257,8 +288,11 @@ export var makeCurrentAndFutureOrders = function (orders) {
     var future = [];
     orders.forEach(function (i) {
         var tz = timezoneMap[i.timezone];
-        var fireDate = i.fire_at ? isoToDate(i.fire_at, tz) : null;
-        if (isCompleted(i.prep_status) || !fireDate)
+        if (!i.order_prep)
+            return;
+        var _a = i.order_prep, fire_at = _a.fire_at, prep_status = _a.prep_status;
+        var fireDate = fire_at ? isoToDate(fire_at, tz) : null;
+        if (isCompleted(prep_status) || !fireDate)
             return;
         var currentDate = currentLocalDate(tz);
         if (fireDate < currentDate) {
@@ -273,17 +307,29 @@ export var makeCurrentAndFutureOrders = function (orders) {
 export var makeKdsStationCount = function (orders, itemTypeIds, prepType) {
     var byItemType = filterOrdersByItemType(orders, itemTypeIds);
     var filtered = filterOrdersByPrepType(byItemType, prepType);
-    var tickets = filtered.reduce(function (arr, i) { return __spreadArray(__spreadArray([], arr, true), i.tickets, true); }, []);
+    var tickets = filtered.reduce(function (arr, i) { return __spreadArray(__spreadArray([], arr, true), (i.tickets || []), true); }, []);
     return { orders: filtered.length, tickets: tickets.length };
 };
 export var makeKdsStationCounts = function (orders, prepStations) {
     var _a = makeCurrentAndFutureOrders(orders), currentOrders = _a.current, futureOrders = _a.future;
-    var currentAssembly = currentOrders.filter(function (i) { return notDone(i.prep_status); });
-    var futureAssembly = futureOrders.filter(function (i) { return notDone(i.prep_status); });
-    var currentExpoDone = currentOrders.filter(function (i) { return i.prep_status === 'DONE'; });
-    var currentExpo = currentOrders.filter(function (i) { return notCompleted(i.prep_status); });
-    var futureExpoDone = futureOrders.filter(function (i) { return i.prep_status === 'DONE'; });
-    var futureExpo = futureOrders.filter(function (i) { return notCompleted(i.prep_status); });
+    var currentAssembly = currentOrders.filter(function (i) {
+        return i.order_prep ? notDone(i.order_prep.prep_status) : false;
+    });
+    var futureAssembly = futureOrders.filter(function (i) {
+        return i.order_prep ? notDone(i.order_prep.prep_status) : false;
+    });
+    var currentExpoDone = currentOrders.filter(function (i) {
+        return i.order_prep ? i.order_prep.prep_status === 'DONE' : false;
+    });
+    var currentExpo = currentOrders.filter(function (i) {
+        return i.order_prep ? notCompleted(i.order_prep.prep_status) : false;
+    });
+    var futureExpoDone = futureOrders.filter(function (i) {
+        return i.order_prep ? i.order_prep.prep_status === 'DONE' : false;
+    });
+    var futureExpo = futureOrders.filter(function (i) {
+        return i.order_prep ? notCompleted(i.order_prep.prep_status) : false;
+    });
     return prepStations.reduce(function (obj, i) {
         var _a;
         var currentFiltered = i.prep_type === 'ASSEMBLY'
@@ -301,30 +347,16 @@ export var makeKdsStationCounts = function (orders, prepStations) {
         return __assign(__assign({}, obj), (_a = {}, _a[i.prep_station_id] = { CURRENT: current, FUTURE: future }, _a));
     }, {});
 };
-// export const makeOrderBuckets = (
-//   orders: OrdersKds,
-//   tz: Timezone,
-//   prepStates: Array<PrepStatus> = []
-// ): OrderBuckets => {
-//   const intervals = makeIntervals(tz)
-//   const withOrders = intervals.map(i => {
-//     const inBucket = orders.filter(order => {
-//       if (!order.ready_at || !prepStates.length) return
-//       const incomplete = prepStates.includes(order.prep_status)
-//       const readyAt = isoToDate(order.ready_at, tz)
-//       return incomplete && i.start < readyAt && readyAt <= i.end
-//     })
-//     return { ...i, orders: inBucket }
-//   })
-//   return withOrders
-// }
 export var makeOrderBuckets = function (orders, tz) {
     var intervals = makeIntervals(tz);
     var withOrders = intervals.map(function (interval) {
         var inBucket = orders.filter(function (order) {
-            if (!order.ready_at)
+            if (!order.order_prep)
+                return false;
+            var ready_at = order.order_prep.ready_at;
+            if (!ready_at)
                 return false;
-            var readyAt = isoToDate(order.ready_at, tz);
+            var readyAt = isoToDate(ready_at, tz);
             return readyAt > interval.start && readyAt <= interval.end;
         });
         return __assign(__assign({}, interval), { orders: inBucket });
@@ -342,12 +374,14 @@ export var makeOrderBucketsCounts = function (itemTypes, orders) {
     }, {});
     var counts = __assign({ Orders: 0 }, itemTypeCounts);
     orders.forEach(function (order) {
-        var ticketCounts = order.tickets.reduce(function (obj, ticket) {
+        var _a;
+        var ticketCounts = (_a = order.tickets) === null || _a === void 0 ? void 0 : _a.reduce(function (obj, ticket) {
             var _a;
             var count = obj[ticket.item_type_name] || 0;
             return __assign(__assign({}, obj), (_a = {}, _a[ticket.item_type_name] = count + ticket.item_nos.length, _a));
         }, {});
-        counts = updateCounts(counts, ticketCounts);
+        if (ticketCounts)
+            counts = updateCounts(counts, ticketCounts);
     });
     return counts;
 };
@@ -377,7 +411,9 @@ export var makeItemTypesMap = function (itemTypes) {
 export var makeCartLookup = function (cart) {
     return cart.reduce(function (obj, i) {
         var _a;
-        return (__assign(__assign({}, obj), (_a = {}, _a[i.item_no.toString()] = i, _a)));
+        if (!i.item_no)
+            return obj;
+        return __assign(__assign({}, obj), (_a = {}, _a[i.item_no.toString()] = i, _a));
     }, {});
 };
 export var makeModifiersMetadataLookup = function (cart) {
@@ -436,11 +472,16 @@ export var makeBucketColor = function (settings, minutes) {
             ? 'alert'
             : 'text';
 };
-export var makeOrderTimes = function (order, amPm, warningMinutes, alertMinutes) {
+export var makeOrderPrepTimes = function (order, amPm, warningMinutes, alertMinutes) {
     if (amPm === void 0) { amPm = false; }
     if (warningMinutes === void 0) { warningMinutes = 5; }
     if (alertMinutes === void 0) { alertMinutes = 10; }
-    var timezone = order.timezone, ready_at = order.ready_at, requested_at = order.requested_at, expected_at = order.expected_at, prep_status = order.prep_status;
+    var order_prep = order.order_prep, timezone = order.timezone, requested_at = order.requested_at;
+    if (!order_prep)
+        return null;
+    var ready_at = order_prep.ready_at, expected_at = order_prep.expected_at, prep_status = order_prep.prep_status;
+    if (!ready_at || !expected_at || requested_at === 'asap')
+        return null;
     var tz = timezoneMap[timezone];
     var current = currentLocalDate(tz);
     var readyBy = isoToDate(ready_at || expected_at, tz);