@ancon/wildcat-utils 1.21.0 → 1.21.2

package/checkout/getCheckoutOrderStatusTexts.d.ts

@@ -29,11 +29,13 @@ declare enum TranslationKey {
     ProcessingPayment = "processingPayment",
     YourOrderIsBeingPrepared = "yourOrderIsBeingPrepared",
     YourOrderIsReadyToCollect = "yourOrderIsReadyToCollect",
+    YourOrderIsBeingDelivered = "yourOrderIsBeingDelivered",
     YourOrderHasBeenCompleted = "yourOrderHasBeenCompleted",
     YourOrderWillArriveAtYourTable = "yourOrderWillArriveAtYourTable",
     ModifiedDeliveryStartTime = "modifiedDeliveryStartTime",
     ModifiedPickUpTime = "modifiedPickUpTime",
     YourOrderHasBeenAcceptedEstimatedDeliveryStartTime = "yourOrderHasBeenAcceptedEstimatedDeliveryStartTime",
+    YourOrderIsBeingPreparedEstimatedDeliveryStartTime = "yourOrderIsBeingPreparedEstimatedDeliveryStartTime",
     YourOrderHasBeenAcceptedEstimatedTime = "yourOrderHasBeenAcceptedEstimatedTime",
     YourOrderHasBeenAcceptedPickupTime = "yourOrderHasBeenAcceptedPickupTime",
     DeliveryWasCompleted = "deliveryWasCompleted",

package/checkout/getCheckoutOrderStatusTexts.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("@ancon/wildcat-types"),f=require("./getCheckoutItemsMappedByTicketItemStatus.js");var g=(e=>(e.YourOrderIsBeingProcessed="yourOrderIsBeingProcessed",e.YourOrderWasCancelled="yourOrderWasCancelled",e.ProcessingPayment="processingPayment",e.YourOrderIsBeingPrepared="yourOrderIsBeingPrepared",e.YourOrderIsReadyToCollect="yourOrderIsReadyToCollect",e.YourOrderHasBeenCompleted="yourOrderHasBeenCompleted",e.YourOrderWillArriveAtYourTable="yourOrderWillArriveAtYourTable",e.ModifiedDeliveryStartTime="modifiedDeliveryStartTime",e.ModifiedPickUpTime="modifiedPickUpTime",e.YourOrderHasBeenAcceptedEstimatedDeliveryStartTime="yourOrderHasBeenAcceptedEstimatedDeliveryStartTime",e.YourOrderHasBeenAcceptedEstimatedTime="yourOrderHasBeenAcceptedEstimatedTime",e.YourOrderHasBeenAcceptedPickupTime="yourOrderHasBeenAcceptedPickupTime",e.DeliveryWasCompleted="deliveryWasCompleted",e.OneItemIsReadyToCollect="oneItemIsReadyToCollect",e.MultipleItemsAreReadyToCollect="multipleItemsAreReadyToCollect",e.EnjoyMealWhileOtherItemsBeingPrepared="enjoyMealWhileOtherItemsBeingPrepared",e))(g||{});function m(e){switch(e){case r.CheckoutStatus.Created:case r.CheckoutStatus.Ready:case r.CheckoutStatus.Processing:case r.CheckoutStatus.Authorized:return"yourOrderIsBeingProcessed";case r.CheckoutStatus.Canceled:return"yourOrderWasCancelled";case r.CheckoutStatus.Received:return"processingPayment";case r.CheckoutStatus.ReadyToCollect:return"yourOrderIsReadyToCollect";default:return null}}function C(e){switch(e){case r.TicketStatus.Pending:case r.TicketStatus.PendingAccept:return"yourOrderIsBeingProcessed";case r.TicketStatus.Preparing:return"yourOrderIsBeingPrepared";case r.TicketStatus.Ready:return"yourOrderIsReadyToCollect";case r.TicketStatus.Closed:return"yourOrderHasBeenCompleted";case r.TicketStatus.Canceled:return"yourOrderWasCancelled";default:throw new Error(`Unhandled ticket status "${e}" in getTranslationKeyByTicketStatus()`)}}function T(e,{checkoutStatus:i,ticketStatus:a,customersFetchTableOrders:o}){const d=(e==null?void 0:e.orderFormat)===r.OrderFormat.Delivery,t=(e==null?void 0:e.orderFormat)===r.OrderFormat.TakeAway,l=(e==null?void 0:e.orderFormat)===r.OrderFormat.TableOrder;if(d||t||l&&!o)return!1;const u=i!=null,c=a!=null;if(u){const n=i===r.CheckoutStatus.Captured,s=i===r.CheckoutStatus.InProgress;return n||s}if(c){const n=a===r.TicketStatus.Preparing,s=a===r.TicketStatus.Ready;return n||s}return!1}function P(e,{checkoutStatus:i,ticketStatus:a,customersFetchTableOrders:o,pickupTimeUpdated:d},t){if(T(e,{checkoutStatus:i,ticketStatus:a,customersFetchTableOrders:o})){if(t.ready>0)return t.ready<2?["oneItemIsReadyToCollect"]:["multipleItemsAreReadyToCollect",{count:t.ready}];if(t.done>0&&t.done<t.all)return["enjoyMealWhileOtherItemsBeingPrepared",{count:Math.max(0,t.all-t.done-t.ready)}]}if(a!=null)return[C(a)];const l=m(i);if(l)return[l];const u=i===r.CheckoutStatus.Captured,c=i===r.CheckoutStatus.InProgress,n=i===r.CheckoutStatus.Done,s=(e==null?void 0:e.orderFormat)===r.OrderFormat.EatIn,p=(e==null?void 0:e.orderFormat)===r.OrderFormat.TakeAway,O=(e==null?void 0:e.orderFormat)===r.OrderFormat.TableOrder,y=(e==null?void 0:e.orderFormat)===r.OrderFormat.Delivery;if(u)return O&&!o?["yourOrderWillArriveAtYourTable"]:y?d?["modifiedDeliveryStartTime"]:["yourOrderHasBeenAcceptedEstimatedDeliveryStartTime"]:d?["modifiedPickUpTime"]:["yourOrderHasBeenAcceptedPickupTime"];if(c){if(y)return d?["modifiedDeliveryStartTime"]:["yourOrderHasBeenAcceptedEstimatedDeliveryStartTime"];if(s||p){if(t.ready===t.all)return["yourOrderIsReadyToCollect"];if(t.done===t.all)return["yourOrderHasBeenCompleted"]}return O?t.ready===t.all?o?["yourOrderIsReadyToCollect"]:["yourOrderWillArriveAtYourTable"]:t.done===t.all?o?["yourOrderHasBeenCompleted"]:["yourOrderWillArriveAtYourTable"]:d?["modifiedPickUpTime"]:o?["yourOrderIsBeingPrepared"]:["yourOrderWillArriveAtYourTable"]:d?["modifiedPickUpTime"]:["yourOrderIsBeingPrepared"]}if(n)return s||p?["yourOrderHasBeenCompleted"]:y?["deliveryWasCompleted"]:["yourOrderHasBeenCompleted"];throw new Error("Could not resolve translation key in getTranslationKey()")}const h={yourOrderIsBeingProcessed:()=>({title:"Your order is being processed"}),yourOrderWasCancelled:()=>({title:"Your order was canceled",message:"Sorry. Your order could not go through."}),processingPayment:()=>({title:"Processing payment",message:"Please wait while your payment is being processed"}),yourOrderIsBeingPrepared:()=>({title:"Your order is now being prepared!",message:"We will let you know when it is ready for pickup."}),yourOrderIsReadyToCollect:()=>({title:"Your order is ready to be collected!",message:"Please go ahead and show this screen at the collection point"}),yourOrderHasBeenCompleted:()=>({title:"Enjoy your meal!",message:"Your order has been completed!"}),yourOrderWillArriveAtYourTable:()=>({title:"Your order has been accepted!",message:"It will arrive at your table shortly"}),modifiedDeliveryStartTime:()=>({title:"Your delivery time was modified",message:"Delivery will start at approximately 00:00."}),modifiedPickUpTime:()=>({title:"Your pickup time was modified",message:"Pickup time: 00:00"}),yourOrderHasBeenAcceptedEstimatedDeliveryStartTime:()=>({title:"Your order has been accepted",message:"Estimated delivery start time: 00:00"}),yourOrderHasBeenAcceptedEstimatedTime:()=>({title:"Your order has been accepted",message:"Estimated time: 00:00"}),yourOrderHasBeenAcceptedPickupTime:()=>({title:"Your order has been accepted",message:"Pickup time: 00:00"}),deliveryWasCompleted:()=>({title:"Your order was completed",message:"Enjoy your meal!"}),oneItemIsReadyToCollect:()=>({title:"One item is ready to pick up!",message:"Please allow cashier or waiter to confirm that the prepared item has been successfully issued."}),multipleItemsAreReadyToCollect:()=>({title:"Multiple items are ready to pick up!",message:"Please allow cashier or waiter to confirm that the prepared items have been successfully issued."}),enjoyMealWhileOtherItemsBeingPrepared:({meta:e})=>({title:"Enjoy your meal while the rest of the items are being prepared!",message:`${e.count} more items are being prepared`})};function I(e,i,a=h){const o=f((e==null?void 0:e.items)??[]),[d,t]=P(e,i,{all:o.all.length,ready:o.ready.length,done:o.done.length}),l=a[d]({key:d,meta:t});if(!l)throw new Error("Could not resolve translation in getOrderStatusTexts()");return[l,d]}exports.TranslationKey=g;exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("@ancon/wildcat-types"),m=require("./getCheckoutItemsMappedByTicketItemStatus.js");var O=(e=>(e.YourOrderIsBeingProcessed="yourOrderIsBeingProcessed",e.YourOrderWasCancelled="yourOrderWasCancelled",e.ProcessingPayment="processingPayment",e.YourOrderIsBeingPrepared="yourOrderIsBeingPrepared",e.YourOrderIsReadyToCollect="yourOrderIsReadyToCollect",e.YourOrderIsBeingDelivered="yourOrderIsBeingDelivered",e.YourOrderHasBeenCompleted="yourOrderHasBeenCompleted",e.YourOrderWillArriveAtYourTable="yourOrderWillArriveAtYourTable",e.ModifiedDeliveryStartTime="modifiedDeliveryStartTime",e.ModifiedPickUpTime="modifiedPickUpTime",e.YourOrderHasBeenAcceptedEstimatedDeliveryStartTime="yourOrderHasBeenAcceptedEstimatedDeliveryStartTime",e.YourOrderIsBeingPreparedEstimatedDeliveryStartTime="yourOrderIsBeingPreparedEstimatedDeliveryStartTime",e.YourOrderHasBeenAcceptedEstimatedTime="yourOrderHasBeenAcceptedEstimatedTime",e.YourOrderHasBeenAcceptedPickupTime="yourOrderHasBeenAcceptedPickupTime",e.DeliveryWasCompleted="deliveryWasCompleted",e.OneItemIsReadyToCollect="oneItemIsReadyToCollect",e.MultipleItemsAreReadyToCollect="multipleItemsAreReadyToCollect",e.EnjoyMealWhileOtherItemsBeingPrepared="enjoyMealWhileOtherItemsBeingPrepared",e))(O||{});function f(e,i){switch(e){case r.CheckoutStatus.Created:case r.CheckoutStatus.Ready:case r.CheckoutStatus.Processing:case r.CheckoutStatus.Authorized:return"yourOrderIsBeingProcessed";case r.CheckoutStatus.Canceled:return"yourOrderWasCancelled";case r.CheckoutStatus.Received:return"processingPayment";case r.CheckoutStatus.ReadyToCollect:return i?"yourOrderIsBeingDelivered":"yourOrderIsReadyToCollect";default:return null}}function C(e){switch(e){case r.TicketStatus.Pending:case r.TicketStatus.PendingAccept:return"yourOrderIsBeingProcessed";case r.TicketStatus.Preparing:return"yourOrderIsBeingPrepared";case r.TicketStatus.Ready:return"yourOrderIsReadyToCollect";case r.TicketStatus.Closed:return"yourOrderHasBeenCompleted";case r.TicketStatus.Canceled:return"yourOrderWasCancelled";default:throw new Error(`Unhandled ticket status "${e}" in getTranslationKeyByTicketStatus()`)}}function T(e,{checkoutStatus:i,ticketStatus:a,customersFetchTableOrders:o}){const d=(e==null?void 0:e.orderFormat)===r.OrderFormat.Delivery,t=(e==null?void 0:e.orderFormat)===r.OrderFormat.TakeAway,l=(e==null?void 0:e.orderFormat)===r.OrderFormat.TableOrder;if(d||t||l&&!o)return!1;const u=i!=null,c=a!=null;if(u){const s=i===r.CheckoutStatus.Captured,n=i===r.CheckoutStatus.InProgress;return s||n}if(c){const s=a===r.TicketStatus.Preparing,n=a===r.TicketStatus.Ready;return s||n}return!1}function P(e,{checkoutStatus:i,ticketStatus:a,customersFetchTableOrders:o,pickupTimeUpdated:d},t){if(T(e,{checkoutStatus:i,ticketStatus:a,customersFetchTableOrders:o})){if(t.ready>0)return t.ready<2?["oneItemIsReadyToCollect"]:["multipleItemsAreReadyToCollect",{count:t.ready}];if(t.done>0&&t.done<t.all)return["enjoyMealWhileOtherItemsBeingPrepared",{count:Math.max(0,t.all-t.done-t.ready)}]}if(a!=null)return[C(a)];const l=(e==null?void 0:e.orderFormat)===r.OrderFormat.Delivery,u=f(i,l);if(u)return[u];const c=i===r.CheckoutStatus.Captured,s=i===r.CheckoutStatus.InProgress,n=i===r.CheckoutStatus.Done,y=(e==null?void 0:e.orderFormat)===r.OrderFormat.EatIn,p=(e==null?void 0:e.orderFormat)===r.OrderFormat.TakeAway,g=(e==null?void 0:e.orderFormat)===r.OrderFormat.TableOrder;if(c)return g&&!o?["yourOrderWillArriveAtYourTable"]:l?d?["modifiedDeliveryStartTime"]:["yourOrderHasBeenAcceptedEstimatedDeliveryStartTime"]:d?["modifiedPickUpTime"]:["yourOrderHasBeenAcceptedPickupTime"];if(s){if(l)return d?["modifiedDeliveryStartTime"]:["yourOrderIsBeingPreparedEstimatedDeliveryStartTime"];if(y||p){if(t.ready===t.all)return["yourOrderIsReadyToCollect"];if(t.done===t.all)return["yourOrderHasBeenCompleted"]}return g?t.ready===t.all?o?["yourOrderIsReadyToCollect"]:["yourOrderWillArriveAtYourTable"]:t.done===t.all?o?["yourOrderHasBeenCompleted"]:["yourOrderWillArriveAtYourTable"]:d?["modifiedPickUpTime"]:o?["yourOrderIsBeingPrepared"]:["yourOrderWillArriveAtYourTable"]:d?["modifiedPickUpTime"]:["yourOrderIsBeingPrepared"]}if(n)return y||p?["yourOrderHasBeenCompleted"]:l?["deliveryWasCompleted"]:["yourOrderHasBeenCompleted"];throw new Error("Could not resolve translation key in getTranslationKey()")}const I={yourOrderIsBeingProcessed:()=>({title:"Your order is being processed"}),yourOrderWasCancelled:()=>({title:"Your order was canceled",message:"Sorry. Your order could not go through."}),processingPayment:()=>({title:"Processing payment",message:"Please wait while your payment is being processed"}),yourOrderIsBeingPrepared:()=>({title:"Your order is now being prepared!",message:"We will let you know when it is ready for pickup."}),yourOrderIsReadyToCollect:()=>({title:"Your order is ready to be collected!",message:"Please go ahead and show this screen at the collection point"}),yourOrderIsBeingDelivered:()=>({title:"Your order is being delivered",message:"It will arrive at your door shortly. Enjoy your meal!"}),yourOrderHasBeenCompleted:()=>({title:"Enjoy your meal!",message:"Your order has been completed!"}),yourOrderWillArriveAtYourTable:()=>({title:"Your order has been accepted!",message:"It will arrive at your table shortly"}),modifiedDeliveryStartTime:()=>({title:"Your delivery time was modified",message:"Delivery will start at approximately 00:00."}),modifiedPickUpTime:()=>({title:"Your pickup time was modified",message:"Pickup time: 00:00"}),yourOrderHasBeenAcceptedEstimatedDeliveryStartTime:()=>({title:"Your order has been accepted",message:"Estimated delivery start time: 00:00"}),yourOrderIsBeingPreparedEstimatedDeliveryStartTime:()=>({title:"Your order is now being prepared!",message:"Estimated delivery start time: 00:00"}),yourOrderHasBeenAcceptedEstimatedTime:()=>({title:"Your order has been accepted",message:"Estimated time: 00:00"}),yourOrderHasBeenAcceptedPickupTime:()=>({title:"Your order has been accepted",message:"Pickup time: 00:00"}),deliveryWasCompleted:()=>({title:"Your order was completed",message:"Enjoy your meal!"}),oneItemIsReadyToCollect:()=>({title:"One item is ready to pick up!",message:"Please allow cashier or waiter to confirm that the prepared item has been successfully issued."}),multipleItemsAreReadyToCollect:()=>({title:"Multiple items are ready to pick up!",message:"Please allow cashier or waiter to confirm that the prepared items have been successfully issued."}),enjoyMealWhileOtherItemsBeingPrepared:({meta:e})=>({title:"Enjoy your meal while the rest of the items are being prepared!",message:`${e.count} more items are being prepared`})};function h(e,i,a=I){const o=m((e==null?void 0:e.items)??[]),[d,t]=P(e,i,{all:o.all.length,ready:o.ready.length,done:o.done.length}),l=a[d]({key:d,meta:t});if(!l)throw new Error("Could not resolve translation in getOrderStatusTexts()");return[l,d]}exports.TranslationKey=O;exports.default=h;

package/checkout/getCheckoutOrderStatusTexts.mjs

@@ -1,35 +1,35 @@
-import { CheckoutStatus as t, OrderFormat as s, TicketStatus as a } from "@ancon/wildcat-types";
-import m from "./getCheckoutItemsMappedByTicketItemStatus.mjs";
-var P = /* @__PURE__ */ ((e) => (e.YourOrderIsBeingProcessed = "yourOrderIsBeingProcessed", e.YourOrderWasCancelled = "yourOrderWasCancelled", e.ProcessingPayment = "processingPayment", e.YourOrderIsBeingPrepared = "yourOrderIsBeingPrepared", e.YourOrderIsReadyToCollect = "yourOrderIsReadyToCollect", e.YourOrderHasBeenCompleted = "yourOrderHasBeenCompleted", e.YourOrderWillArriveAtYourTable = "yourOrderWillArriveAtYourTable", e.ModifiedDeliveryStartTime = "modifiedDeliveryStartTime", e.ModifiedPickUpTime = "modifiedPickUpTime", e.YourOrderHasBeenAcceptedEstimatedDeliveryStartTime = "yourOrderHasBeenAcceptedEstimatedDeliveryStartTime", e.YourOrderHasBeenAcceptedEstimatedTime = "yourOrderHasBeenAcceptedEstimatedTime", e.YourOrderHasBeenAcceptedPickupTime = "yourOrderHasBeenAcceptedPickupTime", e.DeliveryWasCompleted = "deliveryWasCompleted", e.OneItemIsReadyToCollect = "oneItemIsReadyToCollect", e.MultipleItemsAreReadyToCollect = "multipleItemsAreReadyToCollect", e.EnjoyMealWhileOtherItemsBeingPrepared = "enjoyMealWhileOtherItemsBeingPrepared", e))(P || {});
-function C(e) {
+import { OrderFormat as n, CheckoutStatus as i, TicketStatus as s } from "@ancon/wildcat-types";
+import f from "./getCheckoutItemsMappedByTicketItemStatus.mjs";
+var I = /* @__PURE__ */ ((e) => (e.YourOrderIsBeingProcessed = "yourOrderIsBeingProcessed", e.YourOrderWasCancelled = "yourOrderWasCancelled", e.ProcessingPayment = "processingPayment", e.YourOrderIsBeingPrepared = "yourOrderIsBeingPrepared", e.YourOrderIsReadyToCollect = "yourOrderIsReadyToCollect", e.YourOrderIsBeingDelivered = "yourOrderIsBeingDelivered", e.YourOrderHasBeenCompleted = "yourOrderHasBeenCompleted", e.YourOrderWillArriveAtYourTable = "yourOrderWillArriveAtYourTable", e.ModifiedDeliveryStartTime = "modifiedDeliveryStartTime", e.ModifiedPickUpTime = "modifiedPickUpTime", e.YourOrderHasBeenAcceptedEstimatedDeliveryStartTime = "yourOrderHasBeenAcceptedEstimatedDeliveryStartTime", e.YourOrderIsBeingPreparedEstimatedDeliveryStartTime = "yourOrderIsBeingPreparedEstimatedDeliveryStartTime", e.YourOrderHasBeenAcceptedEstimatedTime = "yourOrderHasBeenAcceptedEstimatedTime", e.YourOrderHasBeenAcceptedPickupTime = "yourOrderHasBeenAcceptedPickupTime", e.DeliveryWasCompleted = "deliveryWasCompleted", e.OneItemIsReadyToCollect = "oneItemIsReadyToCollect", e.MultipleItemsAreReadyToCollect = "multipleItemsAreReadyToCollect", e.EnjoyMealWhileOtherItemsBeingPrepared = "enjoyMealWhileOtherItemsBeingPrepared", e))(I || {});
+function P(e, t) {
   switch (e) {
-    case t.Created:
-    case t.Ready:
-    case t.Processing:
-    case t.Authorized:
+    case i.Created:
+    case i.Ready:
+    case i.Processing:
+    case i.Authorized:
       return "yourOrderIsBeingProcessed";
-    case t.Canceled:
+    case i.Canceled:
       return "yourOrderWasCancelled";
-    case t.Received:
+    case i.Received:
       return "processingPayment";
-    case t.ReadyToCollect:
-      return "yourOrderIsReadyToCollect";
+    case i.ReadyToCollect:
+      return t ? "yourOrderIsBeingDelivered" : "yourOrderIsReadyToCollect";
     default:
       return null;
   }
 }
-function I(e) {
+function C(e) {
   switch (e) {
-    case a.Pending:
-    case a.PendingAccept:
+    case s.Pending:
+    case s.PendingAccept:
       return "yourOrderIsBeingProcessed";
-    case a.Preparing:
+    case s.Preparing:
       return "yourOrderIsBeingPrepared";
-    case a.Ready:
+    case s.Ready:
       return "yourOrderIsReadyToCollect";
-    case a.Closed:
+    case s.Closed:
       return "yourOrderHasBeenCompleted";
-    case a.Canceled:
+    case s.Canceled:
       return "yourOrderWasCancelled";
     default:
       throw new Error(
@@ -37,33 +37,33 @@ function I(e) {
       );
   }
 }
-function T(e, {
-  checkoutStatus: i,
+function B(e, {
+  checkoutStatus: t,
   ticketStatus: l,
   customersFetchTableOrders: o
 }) {
-  const d = (e == null ? void 0 : e.orderFormat) === s.Delivery, r = (e == null ? void 0 : e.orderFormat) === s.TakeAway, n = (e == null ? void 0 : e.orderFormat) === s.TableOrder;
-  if (d || r || n && !o)
+  const d = (e == null ? void 0 : e.orderFormat) === n.Delivery, r = (e == null ? void 0 : e.orderFormat) === n.TakeAway, a = (e == null ? void 0 : e.orderFormat) === n.TableOrder;
+  if (d || r || a && !o)
     return !1;
-  const p = i != null, y = l != null;
-  if (p) {
-    const u = i === t.Captured, c = i === t.InProgress;
+  const y = t != null, p = l != null;
+  if (y) {
+    const u = t === i.Captured, c = t === i.InProgress;
     return u || c;
   }
-  if (y) {
-    const u = l === a.Preparing, c = l === a.Ready;
+  if (p) {
+    const u = l === s.Preparing, c = l === s.Ready;
     return u || c;
   }
   return !1;
 }
-function B(e, {
-  checkoutStatus: i,
+function T(e, {
+  checkoutStatus: t,
   ticketStatus: l,
   customersFetchTableOrders: o,
   pickupTimeUpdated: d
 }, r) {
-  if (T(e, {
-    checkoutStatus: i,
+  if (B(e, {
+    checkoutStatus: t,
     ticketStatus: l,
     customersFetchTableOrders: o
   })) {
@@ -79,17 +79,17 @@ function B(e, {
       ];
   }
   if (l != null)
-    return [I(l)];
-  const n = C(i);
-  if (n)
-    return [n];
-  const p = i === t.Captured, y = i === t.InProgress, u = i === t.Done, c = (e == null ? void 0 : e.orderFormat) === s.EatIn, g = (e == null ? void 0 : e.orderFormat) === s.TakeAway, O = (e == null ? void 0 : e.orderFormat) === s.TableOrder, f = (e == null ? void 0 : e.orderFormat) === s.Delivery;
+    return [C(l)];
+  const a = (e == null ? void 0 : e.orderFormat) === n.Delivery, y = P(t, a);
+  if (y)
+    return [y];
+  const p = t === i.Captured, u = t === i.InProgress, c = t === i.Done, g = (e == null ? void 0 : e.orderFormat) === n.EatIn, m = (e == null ? void 0 : e.orderFormat) === n.TakeAway, O = (e == null ? void 0 : e.orderFormat) === n.TableOrder;
   if (p)
-    return O && !o ? ["yourOrderWillArriveAtYourTable"] : f ? d ? ["modifiedDeliveryStartTime"] : ["yourOrderHasBeenAcceptedEstimatedDeliveryStartTime"] : d ? ["modifiedPickUpTime"] : ["yourOrderHasBeenAcceptedPickupTime"];
-  if (y) {
-    if (f)
-      return d ? ["modifiedDeliveryStartTime"] : ["yourOrderHasBeenAcceptedEstimatedDeliveryStartTime"];
-    if (c || g) {
+    return O && !o ? ["yourOrderWillArriveAtYourTable"] : a ? d ? ["modifiedDeliveryStartTime"] : ["yourOrderHasBeenAcceptedEstimatedDeliveryStartTime"] : d ? ["modifiedPickUpTime"] : ["yourOrderHasBeenAcceptedPickupTime"];
+  if (u) {
+    if (a)
+      return d ? ["modifiedDeliveryStartTime"] : ["yourOrderIsBeingPreparedEstimatedDeliveryStartTime"];
+    if (g || m) {
       if (r.ready === r.all)
         return ["yourOrderIsReadyToCollect"];
       if (r.done === r.all)
@@ -97,11 +97,11 @@ function B(e, {
     }
     return O ? r.ready === r.all ? o ? ["yourOrderIsReadyToCollect"] : ["yourOrderWillArriveAtYourTable"] : r.done === r.all ? o ? ["yourOrderHasBeenCompleted"] : ["yourOrderWillArriveAtYourTable"] : d ? ["modifiedPickUpTime"] : o ? ["yourOrderIsBeingPrepared"] : ["yourOrderWillArriveAtYourTable"] : d ? ["modifiedPickUpTime"] : ["yourOrderIsBeingPrepared"];
   }
-  if (u)
-    return c || g ? ["yourOrderHasBeenCompleted"] : f ? ["deliveryWasCompleted"] : ["yourOrderHasBeenCompleted"];
+  if (c)
+    return g || m ? ["yourOrderHasBeenCompleted"] : a ? ["deliveryWasCompleted"] : ["yourOrderHasBeenCompleted"];
   throw new Error("Could not resolve translation key in getTranslationKey()");
 }
-const h = {
+const v = {
   yourOrderIsBeingProcessed: () => ({
     title: "Your order is being processed"
   }),
@@ -121,6 +121,10 @@ const h = {
     title: "Your order is ready to be collected!",
     message: "Please go ahead and show this screen at the collection point"
   }),
+  yourOrderIsBeingDelivered: () => ({
+    title: "Your order is being delivered",
+    message: "It will arrive at your door shortly. Enjoy your meal!"
+  }),
   yourOrderHasBeenCompleted: () => ({
     title: "Enjoy your meal!",
     message: "Your order has been completed!"
@@ -141,6 +145,10 @@ const h = {
     title: "Your order has been accepted",
     message: "Estimated delivery start time: 00:00"
   }),
+  yourOrderIsBeingPreparedEstimatedDeliveryStartTime: () => ({
+    title: "Your order is now being prepared!",
+    message: "Estimated delivery start time: 00:00"
+  }),
   yourOrderHasBeenAcceptedEstimatedTime: () => ({
     title: "Your order has been accepted",
     message: "Estimated time: 00:00"
@@ -166,19 +174,19 @@ const h = {
     message: `${e.count} more items are being prepared`
   })
 };
-function w(e, i, l = h) {
-  const o = m(
+function Y(e, t, l = v) {
+  const o = f(
     (e == null ? void 0 : e.items) ?? []
-  ), [d, r] = B(e, i, {
+  ), [d, r] = T(e, t, {
     all: o.all.length,
     ready: o.ready.length,
     done: o.done.length
-  }), n = l[d]({ key: d, meta: r });
-  if (!n)
+  }), a = l[d]({ key: d, meta: r });
+  if (!a)
     throw new Error("Could not resolve translation in getOrderStatusTexts()");
-  return [n, d];
+  return [a, d];
 }
 export {
-  P as TranslationKey,
-  w as default
+  I as TranslationKey,
+  Y as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.21.0",
+  "version": "1.21.2",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",

package/signalr/createUseSignalRHook.d.ts

@@ -1,15 +1,15 @@
 import { SignalRHubName, SignalRSignalName } from '@ancon/wildcat-types';
 import { SignalRConfig, SignalREventListener } from './types';
 declare type SignalRConfigArg = Omit<SignalRConfig, 'hub'>;
-declare type ReduxSelectorsArg<RootState = unknown> = {
+declare type ReduxSelectorsArg<RootState = unknown> = Partial<{
     clientIdSelector: (state: RootState) => string | null;
     isSignalROnlineSelector: (state: RootState) => boolean;
-};
-declare type ReduxActionsArg = {
+}>;
+declare type ReduxActionsArg = Partial<{
     setIsSignalROnlineAction: (payload: {
         isSignalROnline: boolean;
     }) => unknown;
-};
+}>;
 declare type ReduxHooksArg = Partial<{
     useAppDispatch: () => (action: unknown) => unknown;
     useAppStore: <T = {}>() => {
@@ -17,7 +17,7 @@ declare type ReduxHooksArg = Partial<{
     };
     useAppSelector: <T extends (...args: any[]) => any>(selector: T) => ReturnType<T>;
 }>;
-declare function createUseSignalRHook(signalRConfig: SignalRConfigArg, selectors: ReduxSelectorsArg, actions: ReduxActionsArg, hooks?: ReduxHooksArg): (hub: SignalRHubName) => {
+declare function createUseSignalRHook<RootState = unknown>(signalRConfig: SignalRConfigArg, selectors?: ReduxSelectorsArg<RootState>, actions?: ReduxActionsArg, hooks?: ReduxHooksArg): (hub: SignalRHubName) => {
     isHubConnected: boolean;
     join: (group: string) => Promise<void>;
     leave: (group: string) => Promise<void>;

package/signalr/createUseSignalRHook.js

@@ -1 +1 @@
-"use strict";const e=require("react"),l=require("react-redux"),U=require("./SignalR.js");require("@microsoft/signalr");require("@ancon/wildcat-types");require("../shared/wait.js");require("../api/generateBackoffWithEqualJitter.js");require("../number/randomIntFromInterval.js");function M(O,k,q,H){const{signalRApiUrl:h,logger:A,enableLogging:m}=O,{clientIdSelector:D,isSignalROnlineSelector:d}=k,{setIsSignalROnlineAction:f}=q,{useAppStore:w=l.useStore,useAppDispatch:x=l.useDispatch,useAppSelector:y=l.useSelector}=H??{};return function(G){const n=e.useRef(new U({signalRApiUrl:h,hub:G,logger:A,enableLogging:m})),i=w(),u=x(),g=y(D),[c,j]=e.useState(!1),[s,S]=e.useState(!1),R=e.useRef(c),o=e.useCallback(()=>{d(i.getState())||u(f({isSignalROnline:!0})),s||S(!0)},[u,s,i]),b=o,v=e.useCallback(()=>{d(i.getState())&&u(f({isSignalROnline:!1})),s&&S(!1)},[u,s,i]),p=e.useCallback(async t=>{n.current.groups.indexOf(t)<0&&await n.current.joinGroup(t)},[]),C=e.useCallback(async t=>{n.current.groups.indexOf(t)>=0&&await n.current.leaveGroup(t)},[]),E=e.useCallback((t,r,a)=>n.current.addSignalListener(t,r,a),[]),L=e.useCallback((t,r)=>n.current.removeSignalListener(t,r),[]),I=e.useCallback(()=>n.current.getHubConnectionId(),[]);return e.useEffect(()=>{R.current=c},[c]),e.useEffect(()=>{const t=n.current.addEventListener("connected",o),r=n.current.addEventListener("reconnected",b),a=n.current.addEventListener("disconnected",v);return R.current||j(!0),()=>{t(),r(),a()}},[o,v,b]),e.useEffect(()=>{n.current.setClientId(g||void 0)},[g]),e.useEffect(()=>{async function t(){await n.current.connect()}c&&t()},[c]),e.useEffect(()=>()=>{n.current.leaveAllGroups().then(()=>{n.current.disconnect()})},[n]),e.useMemo(()=>({isHubConnected:s,join:p,leave:C,subscribe:E,unsubscribe:L,getHubConnectionId:I}),[s,p,C,E,L,I])}}module.exports=M;
+"use strict";const e=require("react"),f=require("react-redux"),U=require("./SignalR.js");require("@microsoft/signalr");require("@ancon/wildcat-types");require("../shared/wait.js");require("../api/generateBackoffWithEqualJitter.js");require("../number/randomIntFromInterval.js");function M(k,q,H,h){const{signalRApiUrl:A,logger:O,enableLogging:m}=k,{clientIdSelector:D,isSignalROnlineSelector:s}=q??{},{setIsSignalROnlineAction:u}=H??{},{useAppStore:w=f.useStore,useAppDispatch:x=f.useDispatch,useAppSelector:y=f.useSelector}=h??{};return function(G){const n=e.useRef(new U({signalRApiUrl:A,hub:G,logger:O,enableLogging:m})),o=w(),a=x(),g=y(D??(()=>{})),[r,j]=e.useState(!1),[c,v]=e.useState(!1),b=e.useRef(r),l=e.useCallback(()=>{(s==null?void 0:s(o.getState()))===!1&&u&&a(u({isSignalROnline:!0})),c||v(!0)},[a,c,o]),R=l,S=e.useCallback(()=>{(s==null?void 0:s(o.getState()))===!0&&u&&a(u({isSignalROnline:!1})),c&&v(!1)},[a,c,o]),p=e.useCallback(async t=>{n.current.groups.indexOf(t)<0&&await n.current.joinGroup(t)},[]),C=e.useCallback(async t=>{n.current.groups.indexOf(t)>=0&&await n.current.leaveGroup(t)},[]),E=e.useCallback((t,i,d)=>n.current.addSignalListener(t,i,d),[]),L=e.useCallback((t,i)=>n.current.removeSignalListener(t,i),[]),I=e.useCallback(()=>n.current.getHubConnectionId(),[]);return e.useEffect(()=>{b.current=r},[r]),e.useEffect(()=>{const t=n.current.addEventListener("connected",l),i=n.current.addEventListener("reconnected",R),d=n.current.addEventListener("disconnected",S);return b.current||j(!0),()=>{t(),i(),d()}},[l,S,R]),e.useEffect(()=>{n.current.setClientId(g||void 0)},[g]),e.useEffect(()=>{async function t(){await n.current.connect()}r&&t()},[r]),e.useEffect(()=>()=>{n.current.leaveAllGroups().then(()=>{n.current.disconnect()})},[n]),e.useMemo(()=>({isHubConnected:c,join:p,leave:C,subscribe:E,unsubscribe:L,getHubConnectionId:I}),[c,p,C,E,L,I])}}module.exports=M;

package/signalr/createUseSignalRHook.mjs

@@ -1,4 +1,4 @@
-import { useRef as O, useState as C, useCallback as t, useEffect as i, useMemo as z } from "react";
+import { useRef as C, useState as H, useCallback as t, useEffect as o, useMemo as z } from "react";
 import { useStore as B, useDispatch as F, useSelector as J } from "react-redux";
 import K from "./SignalR.mjs";
 import "@microsoft/signalr";
@@ -6,70 +6,71 @@ import "@ancon/wildcat-types";
 import "../shared/wait.mjs";
 import "../api/generateBackoffWithEqualJitter.mjs";
 import "../number/randomIntFromInterval.mjs";
-function $(H, h, A, D) {
-  const { signalRApiUrl: w, logger: x, enableLogging: y } = H, { clientIdSelector: G, isSignalROnlineSelector: d } = h, { setIsSignalROnlineAction: g } = A, {
+function $(h, A, O, D) {
+  const { signalRApiUrl: w, logger: x, enableLogging: y } = h, { clientIdSelector: G, isSignalROnlineSelector: r } = A ?? {}, { setIsSignalROnlineAction: u } = O ?? {}, {
     useAppStore: j = B,
     useAppDispatch: k = F,
     useAppSelector: U = J
   } = D ?? {};
   return function(M) {
-    const e = O(
+    const e = C(
       new K({
         signalRApiUrl: w,
         hub: M,
         logger: x,
         enableLogging: y
       })
-    ), o = j(), u = k(), f = U(G), [s, q] = C(!1), [r, p] = C(!1), S = O(s), a = t(() => {
-      d(o.getState()) || u(g({ isSignalROnline: !0 })), r || p(!0);
-    }, [u, r, o]), R = a, v = t(() => {
-      d(o.getState()) && u(g({ isSignalROnline: !1 })), r && p(!1);
-    }, [u, r, o]), m = t(async (n) => {
+    ), a = j(), d = k(), g = U(G ?? (() => {
+    })), [c, q] = H(!1), [s, p] = H(!1), v = C(c), l = t(() => {
+      (r == null ? void 0 : r(a.getState())) === !1 && u && d(u({ isSignalROnline: !0 })), s || p(!0);
+    }, [d, s, a]), m = l, R = t(() => {
+      (r == null ? void 0 : r(a.getState())) === !0 && u && d(u({ isSignalROnline: !1 })), s && p(!1);
+    }, [d, s, a]), S = t(async (n) => {
       e.current.groups.indexOf(n) < 0 && await e.current.joinGroup(n);
     }, []), b = t(async (n) => {
       e.current.groups.indexOf(n) >= 0 && await e.current.leaveGroup(n);
     }, []), L = t(
-      (n, c, l) => e.current.addSignalListener(
+      (n, i, f) => e.current.addSignalListener(
         n,
-        c,
-        l
+        i,
+        f
       ),
       []
     ), I = t(
-      (n, c) => e.current.removeSignalListener(n, c),
+      (n, i) => e.current.removeSignalListener(n, i),
       []
     ), E = t(
       () => e.current.getHubConnectionId(),
       []
     );
-    return i(() => {
-      S.current = s;
-    }, [s]), i(() => {
+    return o(() => {
+      v.current = c;
+    }, [c]), o(() => {
       const n = e.current.addEventListener(
         "connected",
-        a
-      ), c = e.current.addEventListener(
+        l
+      ), i = e.current.addEventListener(
         "reconnected",
-        R
-      ), l = e.current.addEventListener(
+        m
+      ), f = e.current.addEventListener(
         "disconnected",
-        v
+        R
       );
-      return S.current || q(!0), () => {
-        n(), c(), l();
+      return v.current || q(!0), () => {
+        n(), i(), f();
       };
     }, [
-      a,
-      v,
-      R
-    ]), i(() => {
-      e.current.setClientId(f || void 0);
-    }, [f]), i(() => {
+      l,
+      R,
+      m
+    ]), o(() => {
+      e.current.setClientId(g || void 0);
+    }, [g]), o(() => {
       async function n() {
         await e.current.connect();
       }
-      s && n();
-    }, [s]), i(
+      c && n();
+    }, [c]), o(
       () => () => {
         e.current.leaveAllGroups().then(() => {
           e.current.disconnect();
@@ -78,14 +79,14 @@ function $(H, h, A, D) {
       [e]
     ), z(
       () => ({
-        isHubConnected: r,
-        join: m,
+        isHubConnected: s,
+        join: S,
         leave: b,
         subscribe: L,
         unsubscribe: I,
         getHubConnectionId: E
       }),
-      [r, m, b, L, I, E]
+      [s, S, b, L, I, E]
     );
   };
 }