-
+
Order your beverage here and pick it up at the Twilio booth.
{hasPermissions && (
diff --git a/src/app/(master-layout)/event/[slug]/orders/ordersList.tsx b/src/app/(master-layout)/event/[slug]/orders/ordersList.tsx
index ac97806..fc9563d 100644
--- a/src/app/(master-layout)/event/[slug]/orders/ordersList.tsx
+++ b/src/app/(master-layout)/event/[slug]/orders/ordersList.tsx
@@ -3,7 +3,7 @@
import { useState } from "react";
import { Privilege } from "@/proxy";
import { getCookie } from "cookies-next";
-import { sendMessage } from "@/lib/twilio";
+import { sendMessage, getPinnedSender } from "@/lib/twilio";
import { Badge } from "@/components/ui/badge";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -127,6 +127,12 @@ export default function OrdersList({
return data.key;
}
+ // The sender the attendee last messaged in on — pinned so replies never
+ // come from a different Messaging Service-selected sender/channel.
+ function pinnedFrom(phone: string): Promise
{
+ return getPinnedSender(process.env.NEXT_PUBLIC_ATTENDEES_MAP || "", phone);
+ }
+
function listComponent(orders: any[]) {
return orders.map((order) => {
const { data, index, dateUpdated } = order;
@@ -184,10 +190,13 @@ export default function OrdersList({
onClick={async () => {
startProcessing(index, "remind");
try {
- const message = await getOrderReadyReminderMessage(
- data.item, index, event.pickupLocation, event.language,
- );
- sendMessage(toAddress(data), "", message.contentSid, message.contentVariables);
+ const [message, from] = await Promise.all([
+ getOrderReadyReminderMessage(
+ data.item, index, event.pickupLocation, event.language,
+ ),
+ pinnedFrom(data.key),
+ ]);
+ sendMessage(toAddress(data), "", message.contentSid, message.contentVariables, from);
updateOrder(index, { reminded: true });
toast({ title: "Customer Reminded", description: "Reminder sent." });
} finally {
@@ -208,8 +217,13 @@ export default function OrdersList({
try {
updateOrder(index, { status: "ready" });
if (!data?.manual) {
- const message = await getOrderReadyMessage(data.item, index, event.pickupLocation);
- sendMessage(toAddress(data), "", message.contentSid, message.contentVariables);
+ const [message, from] = await Promise.all([
+ getOrderReadyMessage(
+ data.item, index, event.pickupLocation, event.language,
+ ),
+ pinnedFrom(data.key),
+ ]);
+ sendMessage(toAddress(data), "", message.contentSid, message.contentVariables, from);
}
toast({
title: "Order Ready",
diff --git a/src/app/(master-layout)/event/[slug]/page.tsx b/src/app/(master-layout)/event/[slug]/page.tsx
index b12ed5f..42900ec 100644
--- a/src/app/(master-layout)/event/[slug]/page.tsx
+++ b/src/app/(master-layout)/event/[slug]/page.tsx
@@ -411,14 +411,22 @@ function EventPage({ params }: { params: Promise<{ slug: string }> }) {
{
+ onSelectionChange={(newSelection) => {
+ updateEvent({ ...internalEvent, selection: newSelection });
if (!isNewEvent) {
- fetch(`/api/event/${internalEvent.slug}/selection`, {
- method: "PUT",
- body: JSON.stringify({ selection: newSelection }),
- });
+ // Debounce the save (like updateMenuItemField/
+ // updateModifierField below) so rapid successive
+ // selections send a single PUT with the latest state,
+ // rather than one fire-and-forget PUT per click that can
+ // complete out of order and regress the saved selection.
+ clearTimeout(aiUpdateTimerRef.current);
+ aiUpdateTimerRef.current = setTimeout(() => {
+ fetch(`/api/event/${internalEvent.slug}/selection`, {
+ method: "PUT",
+ body: JSON.stringify({ selection: newSelection }),
+ });
+ }, 1500);
}
- updateEvent({ ...internalEvent, selection: newSelection });
}}
/>
@@ -504,8 +512,8 @@ function EventPage({ params }: { params: Promise<{ slug: string }> }) {