@open-tender/store 0.3.54 → 0.3.56

package/dist/cjs/slices/kds.js

@@ -87,7 +87,7 @@ exports.updateKdsOrder = (0, toolkit_1.createAsyncThunk)(KdsActionType.UpdateKds
                     return [4 /*yield*/, api.patchOrder(orderId, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _c.sent();
@@ -111,7 +111,7 @@ exports.printKdsOrder = (0, toolkit_1.createAsyncThunk)(KdsActionType.PrintKdsOr
                     return [4 /*yield*/, api.postReceipt(orderId)];
                 case 1:
                     order = _b.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_3 = _b.sent();
@@ -139,7 +139,7 @@ exports.printTickets = (0, toolkit_1.createAsyncThunk)(KdsActionType.PrintTicket
                     return [4 /*yield*/, api.postTicketsPrint(orderId, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_4 = _c.sent();
@@ -167,7 +167,7 @@ exports.updateTickets = (0, toolkit_1.createAsyncThunk)(KdsActionType.PrintTicke
                     return [4 /*yield*/, api.putTicketsStatus(orderId, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_5 = _c.sent();
@@ -191,7 +191,7 @@ exports.resetTickets = (0, toolkit_1.createAsyncThunk)(KdsActionType.ResetTicket
                     return [4 /*yield*/, api.postTicketsReset(orderId)];
                 case 1:
                     order = _b.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_6 = _b.sent();
@@ -217,7 +217,7 @@ exports.printTicket = (0, toolkit_1.createAsyncThunk)(KdsActionType.PrintTicket,
                     return [4 /*yield*/, api.postTicketPrint(orderId, ticketNo, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_7 = _c.sent();
@@ -243,7 +243,7 @@ exports.updateTicket = (0, toolkit_1.createAsyncThunk)(KdsActionType.UpdateTicke
                     return [4 /*yield*/, api.putTicketStatus(orderId, ticketNo, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_8 = _c.sent();
@@ -268,7 +268,7 @@ exports.resetTicket = (0, toolkit_1.createAsyncThunk)(KdsActionType.ResetTicket,
                     return [4 /*yield*/, api.postTicketStatus(orderId, ticketNo, 'reset')];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_9 = _c.sent();
@@ -293,7 +293,7 @@ exports.doneTicket = (0, toolkit_1.createAsyncThunk)(KdsActionType.DoneTicket, f
                     return [4 /*yield*/, api.postTicketStatus(orderId, ticketNo, 'done')];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_10 = _c.sent();
@@ -318,7 +318,7 @@ exports.completeTicket = (0, toolkit_1.createAsyncThunk)(KdsActionType.CompleteT
                     return [4 /*yield*/, api.postTicketStatus(orderId, ticketNo, 'complete')];
                 case 1:
                     order = _c.sent();
-                    dispatch((0, exports.replaceKdsOrder)(order));
+                    dispatch((0, exports.replaceKdsOrder)((0, utils_1.makeKdsOrder)(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_11 = _c.sent();

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

@@ -1,4 +1,4 @@
-import { FetchOrdersAPIArgs, FetchOrdersArgs, HeaderColors, ItemType, ItemTypes, KdsOrderType, KdsStationCounts, KdsStationOrderTypeCount, ModifiersMetadata, OrderBuckets, OrderCart, OrderItem, OrderItemCount, OrderKds, Orders, OrdersKds, OrderTickets, OrderTimes, PrepStation, PrepStations, PrepStatus, PrepStatusMap, Store, TicketGroups, Timezone } from '../types';
+import { FetchOrdersAPIArgs, FetchOrdersArgs, HeaderColors, ItemType, ItemTypes, KdsOrderType, KdsPrepType, KdsStationCounts, KdsStationOrderTypeCount, ModifiersMetadata, Order, OrderBuckets, OrderCart, OrderItem, OrderItemCount, OrderKds, Orders, OrdersKds, OrderTickets, OrderTimes, PrepStation, PrepStations, PrepStatus, PrepStatusMap, Store, TicketGroups, Timezone } from '../types';
 export declare const prepStatus: PrepStatusMap;
 export declare const makeFetchOrdersArgs: ({ businessDate, receiptType, channelType, prepStatus, search, sortBy, sortDirection, parentOrderId }: FetchOrdersArgs) => FetchOrdersAPIArgs;
 export declare const notDone: (prep_status: PrepStatus) => boolean;
@@ -6,6 +6,7 @@ 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;
@@ -13,6 +14,7 @@ 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: KdsPrepType) => OrdersKds;
 export declare const filterOrdersToday: (orders: OrdersKds) => OrdersKds;
 export declare const makeOrdersForPrepStation: (orders: OrdersKds, prepStation: PrepStation, orderType: KdsOrderType) => OrdersKds;
 export declare const makeOrderItemSignature: (item: OrderItem, withNotes?: boolean) => string;
@@ -30,7 +32,7 @@ export declare const makeCurrentAndFutureOrders: (orders: OrdersKds) => {
     current: OrdersKds;
     future: OrdersKds;
 };
-export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null) => KdsStationOrderTypeCount;
+export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null, prepType: KdsPrepType) => 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>;

package/dist/cjs/utils/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeHeaderStatusColor = exports.makeOrderTimes = exports.makeBucketColor = exports.displayCounts = exports.makeDisplayCounts = exports.makeTicketGroups = exports.makeModifiersMetadataLookup = exports.makeCartLookup = exports.makeItemTypesMap = exports.makeItemTypeSettings = exports.makeTicketCounts = exports.makeOrderBucketsCounts = exports.makeOrderBuckets = exports.makeKdsStationCounts = exports.makeKdsStationCount = exports.makeCurrentAndFutureOrders = exports.makeKdsCounts = exports.makeItemCounts = exports.makeOrderItemSignature = exports.makeOrdersForPrepStation = exports.filterOrdersToday = exports.filterOrdersByItemType = exports.makeOrdersOfType = exports.makeCompletedOrders = exports.makeIncompleteOrders = exports.makeFutureOrders = exports.makeCurrentOrders = exports.makeKdsOrders = exports.isFutureOrder = exports.isCompleted = exports.notCompleted = exports.isDone = exports.notDone = exports.makeFetchOrdersArgs = exports.prepStatus = void 0;
+exports.makeHeaderStatusColor = exports.makeOrderTimes = exports.makeBucketColor = exports.displayCounts = exports.makeDisplayCounts = exports.makeTicketGroups = exports.makeModifiersMetadataLookup = exports.makeCartLookup = exports.makeItemTypesMap = exports.makeItemTypeSettings = exports.makeTicketCounts = exports.makeOrderBucketsCounts = exports.makeOrderBuckets = exports.makeKdsStationCounts = exports.makeKdsStationCount = exports.makeCurrentAndFutureOrders = exports.makeKdsCounts = exports.makeItemCounts = exports.makeOrderItemSignature = exports.makeOrdersForPrepStation = exports.filterOrdersToday = exports.filterOrdersByPrepType = exports.filterOrdersByItemType = exports.makeOrdersOfType = exports.makeCompletedOrders = exports.makeIncompleteOrders = exports.makeFutureOrders = exports.makeCurrentOrders = exports.makeKdsOrders = exports.makeKdsOrder = exports.isFutureOrder = exports.isCompleted = exports.notCompleted = exports.isDone = exports.notDone = exports.makeFetchOrdersArgs = exports.prepStatus = void 0;
 var tslib_1 = require("tslib");
 var datetimes_1 = require("./datetimes");
 var order_1 = require("./order");
@@ -77,6 +77,10 @@ var isFutureOrder = function (order) {
     return (0, exports.notDone)(prep_status) && fireDate && fireDate > currentDate;
 };
 exports.isFutureOrder = isFutureOrder;
+var makeKdsOrder = function (order) {
+    return tslib_1.__assign(tslib_1.__assign({}, order), { order_type: (0, order_1.normalizeOrderType)(order.order_type) });
+};
+exports.makeKdsOrder = makeKdsOrder;
 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 (tslib_1.__assign(tslib_1.__assign({}, i), { order_type: (0, order_1.normalizeOrderType)(i.order_type) })); });
@@ -145,6 +149,18 @@ var filterOrdersByItemType = function (orders, itemTypeIds) {
         .filter(function (i) { return i.tickets.length; });
 };
 exports.filterOrdersByItemType = filterOrdersByItemType;
+var filterOrdersByPrepType = function (orders, prepType) {
+    var isAssembly = prepType === 'ASSEMBLY';
+    return orders
+        .reduce(function (arr, i) {
+        var tickets = i.tickets.filter(function (t) {
+            return isAssembly ? (0, exports.notDone)(t.ticket_status) : t.ticket_status === 'DONE';
+        });
+        return tslib_1.__spreadArray(tslib_1.__spreadArray([], arr, true), [tslib_1.__assign(tslib_1.__assign({}, i), { tickets: tickets })], false);
+    }, [])
+        .filter(function (i) { return i.tickets.length; });
+};
+exports.filterOrdersByPrepType = filterOrdersByPrepType;
 var filterOrdersToday = function (orders) {
     if (!orders.length)
         return [];
@@ -280,8 +296,9 @@ var makeCurrentAndFutureOrders = function (orders) {
     return { current: current, future: future };
 };
 exports.makeCurrentAndFutureOrders = makeCurrentAndFutureOrders;
-var makeKdsStationCount = function (orders, itemTypeIds) {
-    var filtered = (0, exports.filterOrdersByItemType)(orders, itemTypeIds);
+var makeKdsStationCount = function (orders, itemTypeIds, prepType) {
+    var byItemType = (0, exports.filterOrdersByItemType)(orders, itemTypeIds);
+    var filtered = (0, exports.filterOrdersByPrepType)(byItemType, prepType);
     var tickets = filtered.reduce(function (arr, i) { return tslib_1.__spreadArray(tslib_1.__spreadArray([], arr, true), i.tickets, true); }, []);
     return { orders: filtered.length, tickets: tickets.length };
 };
@@ -301,13 +318,13 @@ var makeKdsStationCounts = function (orders, prepStations) {
             : i.expo_done_only
                 ? currentExpoDone
                 : currentExpo;
-        var current = (0, exports.makeKdsStationCount)(currentFiltered, i.item_type_ids);
+        var current = (0, exports.makeKdsStationCount)(currentFiltered, i.item_type_ids, i.prep_type);
         var futureFiltered = i.prep_type === 'ASSEMBLY'
             ? futureAssembly
             : i.expo_done_only
                 ? futureExpoDone
                 : futureExpo;
-        var future = (0, exports.makeKdsStationCount)(futureFiltered, i.item_type_ids);
+        var future = (0, exports.makeKdsStationCount)(futureFiltered, i.item_type_ids, i.prep_type);
         return tslib_1.__assign(tslib_1.__assign({}, obj), (_a = {}, _a[i.prep_station_id] = { CURRENT: current, FUTURE: future }, _a));
     }, {});
 };

package/dist/esm/slices/kds.js

@@ -2,7 +2,7 @@ var _a;
 import { __assign, __awaiter, __generator } from "tslib";
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { ReducerType } from './types';
-import { currentLocalDate, filterOrdersToday, isoToDate, makeFetchOrdersArgs, makeItemCounts, makeKdsOrders, makeKdsStationCounts, makeOrdersForPrepStation, notDone, timezoneMap } from '../utils';
+import { currentLocalDate, filterOrdersToday, isoToDate, makeFetchOrdersArgs, makeItemCounts, makeKdsOrder, makeKdsOrders, makeKdsStationCounts, makeOrdersForPrepStation, notDone, timezoneMap } from '../utils';
 import { addAlert } from './alerts';
 var initialState = {
     itemTypes: null,
@@ -83,7 +83,7 @@ export var updateKdsOrder = createAsyncThunk(KdsActionType.UpdateKdsOrder, funct
                     return [4 /*yield*/, api.patchOrder(orderId, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _c.sent();
@@ -107,7 +107,7 @@ export var printKdsOrder = createAsyncThunk(KdsActionType.PrintKdsOrder, functio
                     return [4 /*yield*/, api.postReceipt(orderId)];
                 case 1:
                     order = _b.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_3 = _b.sent();
@@ -135,7 +135,7 @@ export var printTickets = createAsyncThunk(KdsActionType.PrintTickets, function
                     return [4 /*yield*/, api.postTicketsPrint(orderId, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_4 = _c.sent();
@@ -163,7 +163,7 @@ export var updateTickets = createAsyncThunk(KdsActionType.PrintTickets, function
                     return [4 /*yield*/, api.putTicketsStatus(orderId, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_5 = _c.sent();
@@ -187,7 +187,7 @@ export var resetTickets = createAsyncThunk(KdsActionType.ResetTickets, function
                     return [4 /*yield*/, api.postTicketsReset(orderId)];
                 case 1:
                     order = _b.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_6 = _b.sent();
@@ -213,7 +213,7 @@ export var printTicket = createAsyncThunk(KdsActionType.PrintTicket, function (_
                     return [4 /*yield*/, api.postTicketPrint(orderId, ticketNo, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_7 = _c.sent();
@@ -239,7 +239,7 @@ export var updateTicket = createAsyncThunk(KdsActionType.UpdateTicket, function
                     return [4 /*yield*/, api.putTicketStatus(orderId, ticketNo, data)];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_8 = _c.sent();
@@ -264,7 +264,7 @@ export var resetTicket = createAsyncThunk(KdsActionType.ResetTicket, function (_
                     return [4 /*yield*/, api.postTicketStatus(orderId, ticketNo, 'reset')];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_9 = _c.sent();
@@ -289,7 +289,7 @@ export var doneTicket = createAsyncThunk(KdsActionType.DoneTicket, function (_a,
                     return [4 /*yield*/, api.postTicketStatus(orderId, ticketNo, 'done')];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_10 = _c.sent();
@@ -314,7 +314,7 @@ export var completeTicket = createAsyncThunk(KdsActionType.CompleteTicket, funct
                     return [4 /*yield*/, api.postTicketStatus(orderId, ticketNo, 'complete')];
                 case 1:
                     order = _c.sent();
-                    dispatch(replaceKdsOrder(order));
+                    dispatch(replaceKdsOrder(makeKdsOrder(order)));
                     return [3 /*break*/, 3];
                 case 2:
                     err_11 = _c.sent();

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

@@ -1,4 +1,4 @@
-import { FetchOrdersAPIArgs, FetchOrdersArgs, HeaderColors, ItemType, ItemTypes, KdsOrderType, KdsStationCounts, KdsStationOrderTypeCount, ModifiersMetadata, OrderBuckets, OrderCart, OrderItem, OrderItemCount, OrderKds, Orders, OrdersKds, OrderTickets, OrderTimes, PrepStation, PrepStations, PrepStatus, PrepStatusMap, Store, TicketGroups, Timezone } from '../types';
+import { FetchOrdersAPIArgs, FetchOrdersArgs, HeaderColors, ItemType, ItemTypes, KdsOrderType, KdsPrepType, KdsStationCounts, KdsStationOrderTypeCount, ModifiersMetadata, Order, OrderBuckets, OrderCart, OrderItem, OrderItemCount, OrderKds, Orders, OrdersKds, OrderTickets, OrderTimes, PrepStation, PrepStations, PrepStatus, PrepStatusMap, Store, TicketGroups, Timezone } from '../types';
 export declare const prepStatus: PrepStatusMap;
 export declare const makeFetchOrdersArgs: ({ businessDate, receiptType, channelType, prepStatus, search, sortBy, sortDirection, parentOrderId }: FetchOrdersArgs) => FetchOrdersAPIArgs;
 export declare const notDone: (prep_status: PrepStatus) => boolean;
@@ -6,6 +6,7 @@ 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;
@@ -13,6 +14,7 @@ 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: KdsPrepType) => OrdersKds;
 export declare const filterOrdersToday: (orders: OrdersKds) => OrdersKds;
 export declare const makeOrdersForPrepStation: (orders: OrdersKds, prepStation: PrepStation, orderType: KdsOrderType) => OrdersKds;
 export declare const makeOrderItemSignature: (item: OrderItem, withNotes?: boolean) => string;
@@ -30,7 +32,7 @@ export declare const makeCurrentAndFutureOrders: (orders: OrdersKds) => {
     current: OrdersKds;
     future: OrdersKds;
 };
-export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null) => KdsStationOrderTypeCount;
+export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null, prepType: KdsPrepType) => 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>;

package/dist/esm/utils/orders.js

@@ -68,6 +68,9 @@ export var isFutureOrder = function (order) {
     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) });
+};
 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) })); });
@@ -129,6 +132,17 @@ export var filterOrdersByItemType = function (orders, itemTypeIds) {
     }, [])
         .filter(function (i) { return i.tickets.length; });
 };
+export var filterOrdersByPrepType = function (orders, prepType) {
+    var isAssembly = prepType === 'ASSEMBLY';
+    return orders
+        .reduce(function (arr, i) {
+        var tickets = i.tickets.filter(function (t) {
+            return isAssembly ? notDone(t.ticket_status) : t.ticket_status === 'DONE';
+        });
+        return __spreadArray(__spreadArray([], arr, true), [__assign(__assign({}, i), { tickets: tickets })], false);
+    }, [])
+        .filter(function (i) { return i.tickets.length; });
+};
 export var filterOrdersToday = function (orders) {
     if (!orders.length)
         return [];
@@ -258,8 +272,9 @@ export var makeCurrentAndFutureOrders = function (orders) {
     });
     return { current: current, future: future };
 };
-export var makeKdsStationCount = function (orders, itemTypeIds) {
-    var filtered = filterOrdersByItemType(orders, itemTypeIds);
+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); }, []);
     return { orders: filtered.length, tickets: tickets.length };
 };
@@ -278,13 +293,13 @@ export var makeKdsStationCounts = function (orders, prepStations) {
             : i.expo_done_only
                 ? currentExpoDone
                 : currentExpo;
-        var current = makeKdsStationCount(currentFiltered, i.item_type_ids);
+        var current = makeKdsStationCount(currentFiltered, i.item_type_ids, i.prep_type);
         var futureFiltered = i.prep_type === 'ASSEMBLY'
             ? futureAssembly
             : i.expo_done_only
                 ? futureExpoDone
                 : futureExpo;
-        var future = makeKdsStationCount(futureFiltered, i.item_type_ids);
+        var future = makeKdsStationCount(futureFiltered, i.item_type_ids, i.prep_type);
         return __assign(__assign({}, obj), (_a = {}, _a[i.prep_station_id] = { CURRENT: current, FUTURE: future }, _a));
     }, {});
 };

package/package.json

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