@open-tender/store 0.3.36 → 0.3.38

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

@@ -350,7 +350,7 @@ export interface OrderUpdate {
     prep_status?: PrepStatus;
 }
 export interface OrderBucket {
-    orders: Orders;
+    orders: OrdersKds;
     start: Date;
     end: Date;
 }

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

@@ -13,7 +13,8 @@ export declare const currentLocalIso: (tz: Timezone) => string;
 export declare const dateToIso: (date: Date, tz: Timezone) => ISOString;
 export declare const isoToDate: (dt: ISOStringOffset, tz: Timezone) => Date;
 export declare const isoToDateStr: (dt: ISOStringOffset, tz: Timezone, fmt?: string) => string;
-export declare const adjustZonedIso: (dt: ISOStringOffset, tz: Timezone, adjustment: Record<string, number>) => string;
+export declare const adjustDateToIso: (date: Date, tz: Timezone, adjustment: Record<string, number>) => string;
+export declare const adjustIso: (dt: ISOStringOffset, tz: Timezone, adjustment: Record<string, number>) => string;
 export declare const cleanISOString: (date: Date) => ISOString;
 export declare const replaceAmPm: (str: string) => string;
 export declare const formatDate: (date: Date, fmt?: string, amPm?: boolean) => string;

package/dist/cjs/utils/datetimes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeLeft = exports.secondsToTime = exports.secondsLeft = exports.minutesLeft = exports.makeIntervals = exports.getNextInterval = exports.getLastInterval = exports.formatDateStr = exports.formatDate = exports.replaceAmPm = exports.cleanISOString = exports.adjustZonedIso = exports.isoToDateStr = exports.isoToDate = exports.dateToIso = exports.currentLocalIso = exports.currentLocalDateStr = exports.currentLocalDate = exports.getUserTimezone = exports.timezoneMap = exports.ISO_STRING = exports.HUMAN_DATETIME = exports.HUMAN_TIME = exports.DATETIME = exports.TIME = exports.DATE = void 0;
+exports.timeLeft = exports.secondsToTime = exports.secondsLeft = exports.minutesLeft = exports.makeIntervals = exports.getNextInterval = exports.getLastInterval = exports.formatDateStr = exports.formatDate = exports.replaceAmPm = exports.cleanISOString = exports.adjustIso = exports.adjustDateToIso = exports.isoToDateStr = exports.isoToDate = exports.dateToIso = exports.currentLocalIso = exports.currentLocalDateStr = exports.currentLocalDate = exports.getUserTimezone = exports.timezoneMap = exports.ISO_STRING = exports.HUMAN_DATETIME = exports.HUMAN_TIME = exports.DATETIME = exports.TIME = exports.DATE = void 0;
 var date_fns_1 = require("date-fns");
 var date_fns_tz_1 = require("date-fns-tz");
 exports.DATE = 'yyyy-MM-dd';
@@ -52,12 +52,16 @@ var isoToDateStr = function (dt, tz, fmt) {
     return (0, date_fns_tz_1.formatInTimeZone)(date, tz, fmt);
 };
 exports.isoToDateStr = isoToDateStr;
-var adjustZonedIso = function (dt, tz, adjustment) {
-    var date = (0, exports.isoToDate)(dt, tz);
+var adjustDateToIso = function (date, tz, adjustment) {
     var adj = (0, date_fns_1.add)(date, adjustment);
     return (0, date_fns_tz_1.formatInTimeZone)(adj, tz, exports.ISO_STRING);
 };
-exports.adjustZonedIso = adjustZonedIso;
+exports.adjustDateToIso = adjustDateToIso;
+var adjustIso = function (dt, tz, adjustment) {
+    var date = (0, date_fns_tz_1.toDate)(dt);
+    return (0, exports.adjustDateToIso)(date, tz, adjustment);
+};
+exports.adjustIso = adjustIso;
 var cleanISOString = function (date) {
     return (date.toISOString().split('.')[0] + 'Z');
 };

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

@@ -28,7 +28,7 @@ export declare const makeCurrentAndFutureOrders: (orders: OrdersKds) => {
 };
 export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null) => KdsStationOrderTypeCount;
 export declare const makeKdsStationCounts: (orders: OrdersKds, prepStations: PrepStations) => KdsStationCounts;
-export declare const makeOrderBuckets: (orders: OrdersKds, tz: Timezone, prepStates?: Array<PrepStatus>) => OrderBuckets;
+export declare const makeOrderBuckets: (orders: OrdersKds, tz: Timezone) => OrderBuckets;
 export declare const makeOrderBucketsCounts: (itemTypes?: ItemTypes, orders?: OrdersKds) => Record<string, number>;
 export declare const makeTicketCounts: (tickets: OrderTickets) => Record<string, number>;
 export declare const makeItemTypeSettings: (itemType: ItemType) => {

package/dist/cjs/utils/orders.js

@@ -256,18 +256,33 @@ var makeKdsStationCounts = function (orders, prepStations) {
     }, {});
 };
 exports.makeKdsStationCounts = makeKdsStationCounts;
-var makeOrderBuckets = function (orders, tz, prepStates) {
-    if (prepStates === void 0) { prepStates = []; }
+// 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
+// }
+var makeOrderBuckets = function (orders, tz) {
     var intervals = (0, datetimes_1.makeIntervals)(tz);
-    var withOrders = intervals.map(function (i) {
+    var withOrders = intervals.map(function (interval) {
         var inBucket = orders.filter(function (order) {
-            if (!order.ready_at || !prepStates.length)
-                return;
-            var incomplete = prepStates.includes(order.prep_status);
+            if (!order.ready_at)
+                return false;
             var readyAt = (0, datetimes_1.isoToDate)(order.ready_at, tz);
-            return incomplete && i.start < readyAt && readyAt <= i.end;
+            return readyAt > interval.start && readyAt <= interval.end;
         });
-        return tslib_1.__assign(tslib_1.__assign({}, i), { orders: inBucket });
+        return tslib_1.__assign(tslib_1.__assign({}, interval), { orders: inBucket });
     });
     return withOrders;
 };

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

@@ -350,7 +350,7 @@ export interface OrderUpdate {
     prep_status?: PrepStatus;
 }
 export interface OrderBucket {
-    orders: Orders;
+    orders: OrdersKds;
     start: Date;
     end: Date;
 }

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

@@ -13,7 +13,8 @@ export declare const currentLocalIso: (tz: Timezone) => string;
 export declare const dateToIso: (date: Date, tz: Timezone) => ISOString;
 export declare const isoToDate: (dt: ISOStringOffset, tz: Timezone) => Date;
 export declare const isoToDateStr: (dt: ISOStringOffset, tz: Timezone, fmt?: string) => string;
-export declare const adjustZonedIso: (dt: ISOStringOffset, tz: Timezone, adjustment: Record<string, number>) => string;
+export declare const adjustDateToIso: (date: Date, tz: Timezone, adjustment: Record<string, number>) => string;
+export declare const adjustIso: (dt: ISOStringOffset, tz: Timezone, adjustment: Record<string, number>) => string;
 export declare const cleanISOString: (date: Date) => ISOString;
 export declare const replaceAmPm: (str: string) => string;
 export declare const formatDate: (date: Date, fmt?: string, amPm?: boolean) => string;

package/dist/esm/utils/datetimes.js

@@ -42,11 +42,14 @@ export var isoToDateStr = function (dt, tz, fmt) {
     var date = isoToDate(dt, tz);
     return formatInTimeZone(date, tz, fmt);
 };
-export var adjustZonedIso = function (dt, tz, adjustment) {
-    var date = isoToDate(dt, tz);
+export var adjustDateToIso = function (date, tz, adjustment) {
     var adj = add(date, adjustment);
     return formatInTimeZone(adj, tz, ISO_STRING);
 };
+export var adjustIso = function (dt, tz, adjustment) {
+    var date = toDate(dt);
+    return adjustDateToIso(date, tz, adjustment);
+};
 export var cleanISOString = function (date) {
     return (date.toISOString().split('.')[0] + 'Z');
 };

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

@@ -28,7 +28,7 @@ export declare const makeCurrentAndFutureOrders: (orders: OrdersKds) => {
 };
 export declare const makeKdsStationCount: (orders: OrdersKds, itemTypeIds: number[] | null) => KdsStationOrderTypeCount;
 export declare const makeKdsStationCounts: (orders: OrdersKds, prepStations: PrepStations) => KdsStationCounts;
-export declare const makeOrderBuckets: (orders: OrdersKds, tz: Timezone, prepStates?: Array<PrepStatus>) => OrderBuckets;
+export declare const makeOrderBuckets: (orders: OrdersKds, tz: Timezone) => OrderBuckets;
 export declare const makeOrderBucketsCounts: (itemTypes?: ItemTypes, orders?: OrdersKds) => Record<string, number>;
 export declare const makeTicketCounts: (tickets: OrderTickets) => Record<string, number>;
 export declare const makeItemTypeSettings: (itemType: ItemType) => {

package/dist/esm/utils/orders.js

@@ -236,18 +236,33 @@ export var makeKdsStationCounts = function (orders, prepStations) {
         return __assign(__assign({}, obj), (_a = {}, _a[i.prep_station_id] = { CURRENT: current, FUTURE: future }, _a));
     }, {});
 };
-export var makeOrderBuckets = function (orders, tz, prepStates) {
-    if (prepStates === void 0) { prepStates = []; }
+// 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 (i) {
+    var withOrders = intervals.map(function (interval) {
         var inBucket = orders.filter(function (order) {
-            if (!order.ready_at || !prepStates.length)
-                return;
-            var incomplete = prepStates.includes(order.prep_status);
+            if (!order.ready_at)
+                return false;
             var readyAt = isoToDate(order.ready_at, tz);
-            return incomplete && i.start < readyAt && readyAt <= i.end;
+            return readyAt > interval.start && readyAt <= interval.end;
         });
-        return __assign(__assign({}, i), { orders: inBucket });
+        return __assign(__assign({}, interval), { orders: inBucket });
     });
     return withOrders;
 };

package/package.json

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