diff --git a/src/modules/restaurant/components/CartLineItem.vue b/src/modules/restaurant/components/CartLineItem.vue index 0149867..cd27b60 100644 --- a/src/modules/restaurant/components/CartLineItem.vue +++ b/src/modules/restaurant/components/CartLineItem.vue @@ -10,7 +10,6 @@ import type { CartLine } from '../stores/cart' const props = defineProps<{ line: CartLine - currencyHint?: string }>() const emit = defineEmits<{ @@ -24,14 +23,12 @@ const modifierSummary = computed(() => ) const lineTotal = computed(() => { - // unit_msat is base + modifier delta snapshot; the cart store - // currently stores it as a sat-major number (price * 1000-less - // because the extension's `price` is already in the declared - // currency, not msat — see useCheckout's buildCreateOrder for the - // canonical conversion at order-place time). + // Displayed in the menu item's currency (e.g. GTQ). Authoritative + // sat conversion happens server-side at /orders/quote — the + // checkout page surfaces that as a "≈ X sat" badge. const fmt = new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 }) - const total = props.line.unit_msat * props.line.quantity - return `${fmt.format(total)} ${props.currencyHint || 'sat'}` + const total = props.line.unit_price * props.line.quantity + return `${fmt.format(total)} ${props.line.currency}` }) diff --git a/src/modules/restaurant/components/OrderInvoiceCard.vue b/src/modules/restaurant/components/OrderInvoiceCard.vue new file mode 100644 index 0000000..64d613b --- /dev/null +++ b/src/modules/restaurant/components/OrderInvoiceCard.vue @@ -0,0 +1,104 @@ + + + + + + + Lightning invoice + + expires in {{ fmtCountdown(expiresInSec) }} + expired + + + + + + + Amount + + {{ Math.ceil(invoice.amount_msat / 1000) }} sat + + + + + + {{ copied ? 'Copied' : 'Copy invoice' }} + + + + diff --git a/src/modules/restaurant/composables/useCheckout.ts b/src/modules/restaurant/composables/useCheckout.ts new file mode 100644 index 0000000..f42e6c8 --- /dev/null +++ b/src/modules/restaurant/composables/useCheckout.ts @@ -0,0 +1,309 @@ +/** + * useCheckout — drives the customer's place-and-pay flow against + * the restaurant extension. + * + * v1 ships REST-only: + * 1. quote (msat required) + * 2. balance pre-check (sum across all restaurants in the cart) + * 3. POST /orders → { order, invoice } + * 4. (optional, customer choice) POST /api/v1/payments to settle + * the bolt11 from the customer's LNbits wallet. They can also + * skip this step and scan the QR with any other wallet — the + * extension's invoice listener marks the order paid either way. + * + * Split into two distinct actions so the UI can render the QR codes + * between place and pay, giving the customer the option to scan + * with an external wallet rather than auto-paying from LNbits: + * + * placeOrders() — runs steps 1-3, populates `state.value.placedOrders` + * payOrder(idx) — runs step 4 for one placed-order index + * + * The festival aggregator (aiolabs/restaurant#8) exercises this same + * path with N > 1 restaurants in the cart. v1 happens to ship a UI + * where N == 1, but the orchestration is multi-restaurant ready. + * + * NIP-17 transport (aiolabs/restaurant#9) plugs in via the + * `buildCreateOrder` helper — single point both REST and Nostr + * transports construct CreateOrder. Loyalty (#5) injects its + * pass-through fields the same way. + */ +import { ref, type Ref } from 'vue' +import { injectService, SERVICE_TOKENS } from '@/core/di-container' +import { useAuth } from '@/composables/useAuthService' +import appConfig from '@/app.config' +import type { RestaurantAPI } from '../services/RestaurantAPI' +import { useCartStore, type CartLine } from '../stores/cart' +import type { + CreateOrder, + CreateOrderItem, + Order, + OrderInvoice, + PlaceOrderResponse, +} from '../types/restaurant' + +export interface PlacedOrder { + restaurantId: string + restaurantSlug: string + order: Order + invoice: OrderInvoice | null +} + +export interface CheckoutState { + step: + | 'idle' + | 'quoting' + | 'placing' + | 'placed' + | 'paying' + | 'paid' + | 'error' + progress: { current: number; total: number } + currentRestaurantSlug: string | null + placedOrders: PlacedOrder[] + /** Set of `placedOrders[i].order.id` that have been auto-paid + * via LNbits in this session. External-wallet payments don't + * populate this — they're detected via the per-order poller in + * CheckoutPage. */ + paidOrderIds: Set + error: string | null +} + +export interface UseCheckoutReturn { + state: Ref + /** Run quote → balance precheck → POST /orders for every cart + * bucket. Returns the placed orders (also persisted in state). */ + placeOrders: () => Promise + /** Pay one already-placed order's bolt11 from the customer's + * LNbits wallet. Idempotent — calling twice on the same order + * is a no-op after the first success. */ + payOrder: (placedIndex: number) => Promise + /** Pay every unpaid placed-order in sequence. Best-effort: if + * one fails, earlier successes stay paid. */ + payAll: () => Promise + /** Reset to idle and drop placed/paid state. */ + reset: () => void +} + +/** + * The single point CreateOrder is built — keeps loyalty (#5), NIP-17 + * transport (#9), and tip overrides one-place changes rather than + * touching the whole flow. + */ +function buildCreateOrder( + restaurantId: string, + customerPubkey: string | undefined, + lines: CartLine[] +): CreateOrder { + const items: CreateOrderItem[] = lines.map((l) => ({ + menu_item_id: l.menu_item_id, + quantity: l.quantity, + selected_modifiers: l.selected_modifiers, + note: l.note ?? undefined, + })) + // Loyalty (#5) future-extension point: when implemented, inject + // { loyalty_credits_msat, loyalty_pubkey } into extra.fields here. + return { + restaurant_id: restaurantId, + customer_pubkey: customerPubkey || null, + items, + channel: 'rest', + payment_method: 'lightning', + } +} + +function blankState(): CheckoutState { + return { + step: 'idle', + progress: { current: 0, total: 0 }, + currentRestaurantSlug: null, + placedOrders: [], + paidOrderIds: new Set(), + error: null, + } +} + +export function useCheckout(): UseCheckoutReturn { + const api = injectService(SERVICE_TOKENS.RESTAURANT_API) + const cart = useCartStore() + const { user } = useAuth() + + // We talk to LNbits's payments endpoint directly rather than + // pulling in the whole `wallet` module — the restaurant-app + // bundle is a customer surface, not a wallet UI. + const apiBaseUrl = + ( + appConfig.modules.restaurant as + | { config?: { apiBaseUrl?: string } } + | undefined + )?.config?.apiBaseUrl || '' + + const state = ref(blankState()) + + function reset(): void { + state.value = blankState() + } + + // ----------------------------------------------------------------- // + // place // + // ----------------------------------------------------------------- // + + async function placeOrders(): Promise { + const buckets = cart.restaurantsInCart.map((rid) => ({ + restaurantId: rid, + restaurantSlug: cart.linesFor(rid)[0]?.restaurant_slug ?? '', + lines: cart.linesFor(rid), + })) + if (!buckets.length) { + throw new Error('Cart is empty') + } + + state.value = { + ...blankState(), + step: 'quoting', + progress: { current: 0, total: buckets.length }, + } + + // 1. Quote per restaurant. + const quotes: Array<{ + restaurantId: string + restaurantSlug: string + lines: CartLine[] + msat: number + }> = [] + for (let i = 0; i < buckets.length; i++) { + const b = buckets[i] + state.value.currentRestaurantSlug = b.restaurantSlug + state.value.progress = { current: i, total: buckets.length } + const quote = await api.quoteOrder( + b.lines.map((l) => ({ + menu_item_id: l.menu_item_id, + quantity: l.quantity, + selected_modifiers: l.selected_modifiers, + note: l.note ?? undefined, + })) + ) + quotes.push({ ...b, msat: quote.required_msat }) + } + + // 2. Balance pre-check. + const totalMsatRequired = quotes.reduce((s, q) => s + q.msat, 0) + const wallet0 = user.value?.wallets?.[0] + if (wallet0 && typeof wallet0.balance_msat === 'number') { + if (wallet0.balance_msat < totalMsatRequired) { + const needSat = Math.ceil(totalMsatRequired / 1000) + const haveSat = Math.floor(wallet0.balance_msat / 1000) + // Not fatal — the customer may still want to scan the QR + // and pay from an external wallet. Surface a warning but + // continue. + console.warn( + `[restaurant] LNbits wallet balance is below the cart total ` + + `(have ${haveSat} sat, need ${needSat} sat). Auto-pay will ` + + `fail; scan the QR with an external wallet to settle.` + ) + } + } + + // 3. Place orders. + state.value.step = 'placing' + const placed: PlacedOrder[] = [] + for (let i = 0; i < quotes.length; i++) { + const q = quotes[i] + state.value.currentRestaurantSlug = q.restaurantSlug + state.value.progress = { current: i, total: quotes.length } + const payload = buildCreateOrder( + q.restaurantId, + user.value?.pubkey, + q.lines + ) + const result: PlaceOrderResponse = await api.placeOrder(payload) + placed.push({ + restaurantId: q.restaurantId, + restaurantSlug: q.restaurantSlug, + order: result.order, + invoice: result.invoice, + }) + } + + state.value.step = 'placed' + state.value.placedOrders = placed + state.value.currentRestaurantSlug = null + return placed + } + + // ----------------------------------------------------------------- // + // pay // + // ----------------------------------------------------------------- // + + async function payBolt11Raw( + bolt11: string, + adminkey: string + ): Promise { + const response = await fetch(`${apiBaseUrl}/api/v1/payments`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Api-Key': adminkey, + }, + body: JSON.stringify({ out: true, bolt11 }), + }) + if (!response.ok) { + let detail = response.statusText + try { + const body = await response.json() + if (body?.detail) detail = body.detail + } catch { + /* body wasn't JSON */ + } + throw new Error(`Payment failed: ${response.status} ${detail}`) + } + } + + async function payOrder(placedIndex: number): Promise { + const placed = state.value.placedOrders[placedIndex] + if (!placed) throw new Error(`No placed order at index ${placedIndex}`) + if (!placed.invoice) return // cash orders skip payment + if (state.value.paidOrderIds.has(placed.order.id)) return // already paid + + const adminkey = user.value?.wallets?.[0]?.adminkey + if (!adminkey) { + throw new Error('No wallet available — please log in first.') + } + + state.value.step = 'paying' + state.value.currentRestaurantSlug = placed.restaurantSlug + try { + await payBolt11Raw(placed.invoice.bolt11, adminkey) + // Set semantics keeps `paidOrderIds` from re-renders; rebuild + // it on update so Vue picks up the change. + state.value.paidOrderIds = new Set([ + ...state.value.paidOrderIds, + placed.order.id, + ]) + // Bump to 'paid' only when every placed order is paid. + if ( + state.value.placedOrders.every((p) => + state.value.paidOrderIds.has(p.order.id) + ) + ) { + state.value.step = 'paid' + } else { + state.value.step = 'placed' + } + } catch (err) { + state.value.step = 'error' + state.value.error = err instanceof Error ? err.message : String(err) + throw err + } + } + + async function payAll(): Promise { + for (let i = 0; i < state.value.placedOrders.length; i++) { + const p = state.value.placedOrders[i] + if (!p.invoice) continue + if (state.value.paidOrderIds.has(p.order.id)) continue + await payOrder(i) + } + } + + return { state, placeOrders, payOrder, payAll, reset } +} diff --git a/src/modules/restaurant/composables/useMenu.ts b/src/modules/restaurant/composables/useMenu.ts index b35e178..2c5d706 100644 --- a/src/modules/restaurant/composables/useMenu.ts +++ b/src/modules/restaurant/composables/useMenu.ts @@ -15,8 +15,13 @@ */ import { ref, computed, onScopeDispose, watch, type Ref } from 'vue' -import { injectService, SERVICE_TOKENS } from '@/core/di-container' +import { + injectService, + tryInjectService, + SERVICE_TOKENS, +} from '@/core/di-container' import type { RestaurantAPI } from '../services/RestaurantAPI' +import type { RestaurantNostrSync } from '../services/RestaurantNostrSync' import type { EnrichedMenuItem, MenuNode, @@ -33,6 +38,7 @@ function looksLikeId(value: string): boolean { export interface UseMenuReturn { restaurant: Ref tree: Ref + /** Items with the Nostr live overlay merged in. */ items: Ref isLoading: Ref error: Ref @@ -41,10 +47,13 @@ export interface UseMenuReturn { export function useMenu(slugOrId: Ref | string): UseMenuReturn { const api = injectService(SERVICE_TOKENS.RESTAURANT_API) + const sync = tryInjectService( + SERVICE_TOKENS.RESTAURANT_NOSTR_SYNC + ) const restaurant = ref(null) const tree = ref([]) - const items = ref([]) + const baseItems = ref([]) const isLoading = ref(false) const error = ref(null) @@ -54,6 +63,24 @@ export function useMenu(slugOrId: Ref | string): UseMenuReturn { typeof slugOrId === 'string' ? slugOrId : slugOrId.value ) + /** + * `items` exposes the base REST snapshot patched with the live + * overlay from RestaurantNostrSync. Operator edits on the + * extension side surface here within ~1s of arriving at the + * relay, without a refetch. + */ + const items = computed(() => { + const overlay = sync?.overlay + const deleted = sync?.deleted + if (!overlay && !deleted) return baseItems.value + return baseItems.value + .filter((it) => !(deleted && deleted.has(it.id))) + .map((it) => { + const patch = overlay?.get(it.id) + return patch ? ({ ...it, ...patch } as EnrichedMenuItem) : it + }) + }) + async function load(value: string): Promise { if (!value) return abortController?.abort() @@ -73,7 +100,7 @@ export function useMenu(slugOrId: Ref | string): UseMenuReturn { restaurant.value = menu.restaurant tree.value = menu.tree - items.value = menu.items + baseItems.value = menu.items } catch (err) { if (my.signal.aborted) return error.value = err instanceof Error ? err : new Error(String(err)) diff --git a/src/modules/restaurant/composables/useOrder.ts b/src/modules/restaurant/composables/useOrder.ts new file mode 100644 index 0000000..00347da --- /dev/null +++ b/src/modules/restaurant/composables/useOrder.ts @@ -0,0 +1,154 @@ +/** + * useOrder(orderId) — polls the restaurant extension for status + * updates on a single order. + * + * Polls every `orderPollMs` (from app.config.modules.restaurant) + * while status is in a non-terminal state. Resets to an immediate + * fetch on `VisibilityService.onVisible` so a backgrounded tab + * catches up the moment it comes back. Cleans the interval on + * scope dispose. + * + * Status is treated as an open string (see KNOWN_ORDER_STATUSES) + * — production / kitchen workflow (aiolabs/restaurant#4) may + * introduce new states. + */ +import { onScopeDispose, ref, watch, type Ref } from 'vue' +import { + injectService, + tryInjectService, + SERVICE_TOKENS, +} from '@/core/di-container' +import appConfig from '@/app.config' +import type { VisibilityService } from '@/core/services/VisibilityService' +import type { RestaurantAPI } from '../services/RestaurantAPI' +import type { + Order, + OrderItemRow, + OrderStatus, +} from '../types/restaurant' + +const TERMINAL_STATUSES: OrderStatus[] = [ + 'completed', + 'canceled', + 'refunded', +] + +export interface UseOrderReturn { + order: Ref + items: Ref + isLoading: Ref + error: Ref + refresh: () => Promise +} + +export function useOrder(orderId: Ref | string): UseOrderReturn { + const api = injectService(SERVICE_TOKENS.RESTAURANT_API) + const visibility = tryInjectService( + SERVICE_TOKENS.VISIBILITY_SERVICE + ) + + const pollMs = + ( + appConfig.modules.restaurant as + | { config?: { orderPollMs?: number } } + | undefined + )?.config?.orderPollMs ?? 5000 + + const order = ref(null) + const items = ref([]) + const isLoading = ref(false) + const error = ref(null) + + let timer: ReturnType | null = null + let unregisterVisibility: (() => void) | null = null + + function targetId(): string { + return typeof orderId === 'string' ? orderId : orderId.value + } + + async function fetchOnce(): Promise { + const id = targetId() + if (!id) return + isLoading.value = true + try { + const data = await api.getOrder(id) + order.value = data.order + items.value = data.items + error.value = null + } catch (err) { + error.value = err instanceof Error ? err : new Error(String(err)) + } finally { + isLoading.value = false + } + } + + function isTerminal(status: OrderStatus | undefined): boolean { + return !!status && TERMINAL_STATUSES.includes(status) + } + + function startPolling(): void { + if (timer) return + timer = setInterval(async () => { + if (isTerminal(order.value?.status)) { + stopPolling() + return + } + await fetchOnce() + }, pollMs) + } + + function stopPolling(): void { + if (timer) { + clearInterval(timer) + timer = null + } + } + + // Refetch immediately when the tab becomes visible again — useful + // for mobile where polling pauses during background. The + // VisibilityService takes (name, onResume, onPause) and returns + // an unregister fn. + if (visibility) { + unregisterVisibility = visibility.registerService( + `useOrder-${typeof orderId === 'string' ? orderId : 'ref'}`, + async () => { + await fetchOnce() + if ( + !isTerminal((order.value as Order | null)?.status) + ) { + startPolling() + } + }, + async () => { + // pause polling while hidden — saves battery on mobile + stopPolling() + } + ) + } + + watch( + () => targetId(), + async (id) => { + stopPolling() + order.value = null + items.value = [] + if (!id) return + await fetchOnce() + if (!isTerminal((order.value as Order | null)?.status)) startPolling() + }, + { immediate: true } + ) + + onScopeDispose(() => { + stopPolling() + unregisterVisibility?.() + }) + + return { + order, + items, + isLoading, + error, + refresh: fetchOnce, + } +} diff --git a/src/modules/restaurant/index.ts b/src/modules/restaurant/index.ts index 1195dc0..3b57b9b 100644 --- a/src/modules/restaurant/index.ts +++ b/src/modules/restaurant/index.ts @@ -4,6 +4,7 @@ import type { ModulePlugin } from '@/core/types' import { container, SERVICE_TOKENS } from '@/core/di-container' import { RestaurantAPI } from './services/RestaurantAPI' +import { RestaurantNostrSync } from './services/RestaurantNostrSync' // v1 skeleton — REST-only, single-venue, URL-driven (/r/:slug). // @@ -64,7 +65,21 @@ export const restaurantModule: ModulePlugin = { console.warn('🍴 RestaurantAPI init deferred:', error) }) - // RestaurantNostrSync lands in commit 8. + // Nostr live-overlay sync. Requires RelayHub from baseModule; + // BaseService.waitForDependencies handles the timing if base + // initialization hasn't quite landed by the time we get here. + const restaurantNostrSync = new RestaurantNostrSync() + container.provide( + SERVICE_TOKENS.RESTAURANT_NOSTR_SYNC, + restaurantNostrSync + ) + await restaurantNostrSync + .initialize({ waitForDependencies: true, maxRetries: 3 }) + .catch((error) => { + // No-overlay mode is fine: REST still works, the menu just + // doesn't reflect operator edits without a page refresh. + console.warn('🍴 RestaurantNostrSync init deferred:', error) + }) console.log('✅ Restaurant module installed') }, @@ -94,6 +109,30 @@ export const restaurantModule: ModulePlugin = { component: () => import('./views/CartPage.vue'), meta: { requiresAuth: false, title: 'Cart' }, }, + { + path: '/checkout', + name: 'restaurant-checkout', + component: () => import('./views/CheckoutPage.vue'), + meta: { requiresAuth: false, title: 'Checkout' }, + }, + { + path: '/orders/:id', + name: 'restaurant-order', + component: () => import('./views/OrderStatusPage.vue'), + meta: { requiresAuth: false, title: 'Order' }, + }, + { + path: '/orders', + name: 'restaurant-orders', + component: () => import('./views/OrdersListPage.vue'), + meta: { requiresAuth: false, title: 'Orders' }, + }, + { + path: '/settings', + name: 'restaurant-settings', + component: () => import('./views/SettingsPage.vue'), + meta: { requiresAuth: false, title: 'Settings' }, + }, ] as RouteRecordRaw[], } diff --git a/src/modules/restaurant/services/RestaurantNostrSync.ts b/src/modules/restaurant/services/RestaurantNostrSync.ts new file mode 100644 index 0000000..c3e7166 --- /dev/null +++ b/src/modules/restaurant/services/RestaurantNostrSync.ts @@ -0,0 +1,211 @@ +/** + * RestaurantNostrSync — live overlay for menu item state via NIP-99. + * + * Subscribes to the restaurant's `nostr_pubkey` for: + * - kind 30402 (NIP-99 classified listings) tagged + * `["l", "restaurant:"]` + * - kind 5 (NIP-09 deletion requests) + * + * Each incoming 30402 is parsed into a partial MenuItem patch keyed + * by the `d` tag (= menu item id) and pushed to a reactive overlay + * map. `useMenu` merges this overlay into its `items` computed so + * price changes, sold-out flips, and availability updates render + * within ~1s of the operator's edit on the extension side. + * + * Subscription lifecycle is owned by the *consumer* (RestaurantPage + * opens on mount, closes on route leave). Visibility integration is + * handled implicitly by the RelayHub — backgrounded tabs lose the + * underlying WebSocket; we re-subscribe on the next mount. + * + * This service holds NO state about which restaurants are subscribed + * — it expects callers to track their own sub ids if they need to + * tear them down individually. + */ +import { reactive } from 'vue' +import type { Filter } from 'nostr-tools' +import { BaseService } from '@/core/base/BaseService' +import type { RelayHub } from '@/modules/base/nostr/relay-hub' +import type { MenuItem } from '../types/restaurant' + +interface NostrEvent { + id: string + pubkey: string + created_at: number + kind: number + tags: string[][] + content: string + sig?: string +} + +const SUB_KIND_LISTING = 30402 +const SUB_KIND_DELETION = 5 + +export type MenuItemPatch = Partial< + Pick< + MenuItem, + 'name' | 'description' | 'price' | 'is_available' | 'stock' | 'nostr_event_id' | 'nostr_event_created_at' + > +> + +export class RestaurantNostrSync extends BaseService { + protected readonly metadata = { + name: 'RestaurantNostrSync', + version: '1.0.0', + dependencies: ['RelayHub'] as string[], + } + + /** + * Reactive overlay: itemId → partial patch. `useMenu` watches + * this and merges into its `items` array. + */ + readonly overlay = reactive(new Map()) + + /** Deleted item ids — useMenu filters these out. */ + readonly deleted = reactive(new Set()) + + // BaseService auto-populates `this.relayHub` from + // SERVICE_TOKENS.RELAY_HUB because our `metadata.dependencies` + // includes 'RelayHub' — no manual inject needed in onInitialize. + + private unsubscribers = new Map void>() + + protected async onInitialize(): Promise { + this.debug('RestaurantNostrSync ready') + } + + /** Typed accessor for the BaseService-injected relay hub. */ + private get hub(): RelayHub | null { + return (this.relayHub as RelayHub | null) ?? null + } + + /** + * Open the per-restaurant subscription. Returns an unsubscribe + * fn for convenience; calling subscribe() again with the same + * restaurantId is a no-op (idempotent). + */ + subscribe(restaurantPubkey: string, restaurantId: string): () => void { + const hub = this.hub + if (!hub) { + this.debug('subscribe: relay hub not ready') + return () => {} + } + if (this.unsubscribers.has(restaurantId)) { + return () => this.unsubscribe(restaurantId) + } + const filter: Filter = { + kinds: [SUB_KIND_LISTING, SUB_KIND_DELETION], + authors: [restaurantPubkey], + '#l': [`restaurant:${restaurantId}`], + } + try { + const offEvent = hub.subscribe({ + id: `restaurant-${restaurantId}`, + filters: [filter], + onEvent: (event) => this.handleEvent(event as NostrEvent), + }) + this.unsubscribers.set(restaurantId, offEvent) + this.debug(`subscribed authors=${restaurantPubkey.slice(0, 8)}…`) + } catch (err) { + // RelayHub throws if not connected. The user can still browse + // via REST — this just means no live updates this session. + this.debug(`subscribe failed (live overlay disabled): ${String(err)}`) + } + return () => this.unsubscribe(restaurantId) + } + + unsubscribe(restaurantId: string): void { + const off = this.unsubscribers.get(restaurantId) + if (off) { + off() + this.unsubscribers.delete(restaurantId) + this.debug(`unsubscribed ${restaurantId}`) + } + } + + /** + * Drop all subscriptions and clear the overlay. BaseService + * defines this as async; we honor the signature even though our + * cleanup is synchronous. + */ + async dispose(): Promise { + for (const off of this.unsubscribers.values()) off() + this.unsubscribers.clear() + this.overlay.clear() + this.deleted.clear() + } + + // ----------------------------------------------------------------- // + // event handlers // + // ----------------------------------------------------------------- // + + private handleEvent(event: NostrEvent): void { + if (event.kind === SUB_KIND_LISTING) { + this.handleListing(event) + } else if (event.kind === SUB_KIND_DELETION) { + this.handleDeletion(event) + } + } + + private handleListing(event: NostrEvent): void { + const dTag = event.tags.find((t) => t[0] === 'd')?.[1] + if (!dTag) return + + // Skip if we've already seen a newer version of this addressable + // event (NIP-33 replaceable semantics — operator-side bug + // protection). + const existing = this.overlay.get(dTag) + if ( + existing?.nostr_event_created_at && + existing.nostr_event_created_at >= event.created_at + ) { + return + } + + const patch: MenuItemPatch = { + nostr_event_id: event.id, + nostr_event_created_at: event.created_at, + } + + const title = event.tags.find((t) => t[0] === 'title')?.[1] + if (title) patch.name = title + + const summary = event.tags.find((t) => t[0] === 'summary')?.[1] + if (summary) patch.description = summary + + const priceTag = event.tags.find((t) => t[0] === 'price') + if (priceTag && priceTag[1]) { + const parsed = parseFloat(priceTag[1]) + if (!Number.isNaN(parsed)) patch.price = parsed + } + + // NIP-99 status: 'active' | 'sold'. We map to is_available + + // stock=0 so the existing UI badges (sold out / low stock) + // render consistently. + const statusTag = event.tags.find((t) => t[0] === 'status')?.[1] + if (statusTag === 'sold') { + patch.is_available = false + patch.stock = 0 + } else if (statusTag === 'active') { + patch.is_available = true + } + + this.overlay.set(dTag, patch) + this.debug(`overlay merge id=${dTag.slice(0, 8)}…`) + } + + private handleDeletion(event: NostrEvent): void { + // NIP-09: an `a` tag references the addressable event the author + // is deleting. Format: 'kind:pubkey:dTag'. + for (const tag of event.tags) { + if (tag[0] !== 'a' || !tag[1]) continue + const parts = tag[1].split(':') + if (parts[0] !== String(SUB_KIND_LISTING)) continue + const dTag = parts[2] + if (dTag) { + this.deleted.add(dTag) + this.overlay.delete(dTag) + this.debug(`deletion id=${dTag.slice(0, 8)}…`) + } + } + } +} diff --git a/src/modules/restaurant/stores/cart.ts b/src/modules/restaurant/stores/cart.ts index 7beb1e4..dfc6839 100644 --- a/src/modules/restaurant/stores/cart.ts +++ b/src/modules/restaurant/stores/cart.ts @@ -30,8 +30,16 @@ export interface CartLine { /** Snapshot at add-time so the cart still renders if the menu * item is later edited / deleted. */ name: string - /** Base price + selected modifier deltas, in msat. */ - unit_msat: number + /** + * Base price + selected modifier deltas, **in the menu item's + * declared currency** (e.g. 25 for "25 GTQ" or 100 for "100 sat"). + * Authoritative sat conversion happens server-side via + * `POST /orders/quote`; the cart's value is for display only. + */ + unit_price: number + /** ISO-ish currency code from the menu item, e.g. "GTQ", "USD", + * "sat". Used for cart-side display labels. */ + currency: string quantity: number selected_modifiers: SelectedModifier[] note?: string | null @@ -91,19 +99,42 @@ export const useCartStore = defineStore('restaurant-cart', () => { return n }) - const restaurantTotalsMsat = computed>(() => { - const out: Record = {} + /** Per-restaurant subtotal in that restaurant's declared currency. */ + const restaurantTotals = computed< + Record + >(() => { + const out: Record = {} for (const rid of Object.keys(lines.value)) { - out[rid] = lines.value[rid].reduce( - (s, l) => s + l.unit_msat * l.quantity, - 0 - ) + const bucket = lines.value[rid] + if (!bucket.length) continue + out[rid] = { + amount: bucket.reduce( + (s, l) => s + l.unit_price * l.quantity, + 0 + ), + currency: bucket[0].currency, + } } return out }) - const grandTotalMsat = computed(() => - Object.values(restaurantTotalsMsat.value).reduce((s, v) => s + v, 0) + /** + * Single-currency cart subtotal. Returns null if the cart spans + * multiple currencies (e.g. one restaurant priced in GTQ + another + * in USD via the future festival aggregator) — the UI then falls + * back to per-restaurant subtotals only. + */ + const grandTotal = computed<{ amount: number; currency: string } | null>( + () => { + const totals = Object.values(restaurantTotals.value) + if (!totals.length) return null + const currencies = new Set(totals.map((t) => t.currency)) + if (currencies.size !== 1) return null + return { + amount: totals.reduce((s, t) => s + t.amount, 0), + currency: totals[0].currency, + } + } ) function linesFor(restaurantId: string): CartLine[] { @@ -214,8 +245,8 @@ export const useCartStore = defineStore('restaurant-cart', () => { // getters restaurantsInCart, itemCount, - restaurantTotalsMsat, - grandTotalMsat, + restaurantTotals, + grandTotal, linesFor, // actions setActiveRestaurant, diff --git a/src/modules/restaurant/types/restaurant.ts b/src/modules/restaurant/types/restaurant.ts index 87a61cf..d7044b8 100644 --- a/src/modules/restaurant/types/restaurant.ts +++ b/src/modules/restaurant/types/restaurant.ts @@ -233,6 +233,34 @@ export const KNOWN_ORDER_STATUSES = [ export type KnownOrderStatus = (typeof KNOWN_ORDER_STATUSES)[number] export type OrderStatus = string +/** + * Customer-facing labels for order statuses. The extension's raw + * status names are operational ('paid' / 'accepted' / 'ready') but + * customers prefer human-friendly framing ('Order received' / + * 'Cooking' / 'Ready for pickup'). + * + * Future statuses from aiolabs/restaurant#4 (kitchen workflow) — + * 'preparing', 'plating', 'at_pass', 'in_service', etc — can land + * here as they arrive. Unknown values fall through to the raw + * status string titlecased. + */ +export const FRIENDLY_ORDER_STATUS: Record = { + pending: 'Awaiting payment', + paid: 'Order received', + accepted: 'Cooking', + ready: 'Ready for pickup', + completed: 'Served', + canceled: 'Canceled', + refunded: 'Refunded', +} + +export function friendlyOrderStatus(status: OrderStatus): string { + if (status in FRIENDLY_ORDER_STATUS) return FRIENDLY_ORDER_STATUS[status] + // Unknown status — titlecase the raw key as a graceful fallback. + if (!status) return '' + return status.charAt(0).toUpperCase() + status.slice(1).replace(/_/g, ' ') +} + export interface Order { id: string restaurant_id: string diff --git a/src/modules/restaurant/views/CartPage.vue b/src/modules/restaurant/views/CartPage.vue index 7771c85..a485420 100644 --- a/src/modules/restaurant/views/CartPage.vue +++ b/src/modules/restaurant/views/CartPage.vue @@ -25,12 +25,12 @@ const buckets = computed(() => // a separate fetch for the cart page header. restaurantSlug: cart.linesFor(rid)[0]?.restaurant_slug ?? '', lines: cart.linesFor(rid), - totalMsat: cart.restaurantTotalsMsat[rid] ?? 0, + total: cart.restaurantTotals[rid] ?? null, })) ) -function fmtSat(value: number): string { - return `${new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 }).format(value)} sat` +function fmt(value: number, currency: string): string { + return `${new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 }).format(value)} ${currency}` } @@ -70,7 +70,7 @@ function fmtSat(value: number): string { - {{ fmtSat(b.totalMsat) }} + {{ b.total ? fmt(b.total.amount, b.total.currency) : '—' }} @@ -91,12 +91,16 @@ function fmtSat(value: number): string { - + Subtotal - {{ fmtSat(cart.grandTotalMsat) }} + {{ fmt(cart.grandTotal.amount, cart.grandTotal.currency) }} + + Cart spans multiple currencies — per-restaurant subtotals above. + Lightning sat amount shown at checkout. + +/** + * Two-phase checkout: + * + * Phase 1 — Review: + * · cart subtotal in the menu's declared currency (e.g. GTQ) + * · live ≈sat preview from POST /orders/quote + * · "Place order" CTA → useCheckout.placeOrders() + * + * Phase 2 — Pay: + * · OrderInvoiceCard per placed order (QR + amount + copy + + * expiry countdown) + * · "Pay from my LNbits wallet" CTA → useCheckout.payAll() + * · External-wallet scans are detected via per-order polling + * (the extension's invoice listener flips the order to + * paid the moment ANY pay path settles). + * · When all placed orders show paid, auto-redirect to + * /orders/. + * + * Cart lines are cleared per restaurant as each order is observed + * paid, so a partial-pay state can be re-checked-out without + * duplicates. + */ +import { computed, onMounted, onUnmounted, ref, watch } from 'vue' +import { useRouter } from 'vue-router' +import { + ArrowLeft, + CheckCircle2, + Loader2, + Zap, +} from 'lucide-vue-next' +import { + Alert, + AlertDescription, + AlertTitle, +} from '@/components/ui/alert' +import { Badge } from '@/components/ui/badge' +import { Button } from '@/components/ui/button' +import { + Card, + CardContent, + CardHeader, + CardTitle, +} from '@/components/ui/card' +import { Separator } from '@/components/ui/separator' +import OrderInvoiceCard from '../components/OrderInvoiceCard.vue' +import { useCartStore } from '../stores/cart' +import { useCheckout, type PlacedOrder } from '../composables/useCheckout' +import { friendlyOrderStatus } from '../types/restaurant' +import { + injectService, + tryInjectService, + SERVICE_TOKENS, +} from '@/core/di-container' +import type { StorageService } from '@/core/services/StorageService' +import type { RestaurantAPI } from '../services/RestaurantAPI' + +const router = useRouter() +const cart = useCartStore() +const { state, placeOrders, payAll, reset } = useCheckout() +const storage = tryInjectService(SERVICE_TOKENS.STORAGE_SERVICE) +const api = injectService(SERVICE_TOKENS.RESTAURANT_API) + +// ----------------------------------------------------------------- // +// review phase // +// ----------------------------------------------------------------- // + +function fmt(value: number, currency: string) { + return `${new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 }).format(value)} ${currency}` +} + +const buckets = computed(() => + cart.restaurantsInCart.map((rid) => ({ + restaurantId: rid, + restaurantSlug: cart.linesFor(rid)[0]?.restaurant_slug ?? '', + lines: cart.linesFor(rid), + total: cart.restaurantTotals[rid] ?? null, + })) +) + +/** Live ≈sat preview: one /orders/quote per restaurant. */ +const previewSatPerRestaurant = ref>({}) +const previewSatTotal = computed(() => { + const vals = Object.values(previewSatPerRestaurant.value) + if (!vals.length || vals.some((v) => v === null)) return null + return (vals as number[]).reduce((s, v) => s + v, 0) +}) + +watch( + () => + cart.restaurantsInCart.map((rid) => ({ + rid, + lines: cart.linesFor(rid), + })), + async (groups) => { + if (state.value.step !== 'idle') return // freeze preview after place + const next: Record = {} + for (const g of groups) { + try { + const q = await api.quoteOrder( + g.lines.map((l) => ({ + menu_item_id: l.menu_item_id, + quantity: l.quantity, + selected_modifiers: l.selected_modifiers, + note: l.note ?? undefined, + })) + ) + next[g.rid] = Math.ceil(q.required_msat / 1000) + } catch { + next[g.rid] = null + } + } + previewSatPerRestaurant.value = next + }, + { immediate: true, deep: true } +) + +// ----------------------------------------------------------------- // +// place phase // +// ----------------------------------------------------------------- // + +onMounted(() => { + if (!buckets.value.length && !state.value.placedOrders.length) { + router.replace('/cart') + } +}) + +async function onPlaceOrder() { + try { + await placeOrders() + const entries = state.value.placedOrders.map((p) => ({ + orderId: p.order.id, + restaurantId: p.restaurantId, + restaurantSlug: p.restaurantSlug, + placedAt: Date.now(), + totalMsat: p.order.total_msat, + })) + if (storage && entries.length) { + const existing = + storage.getUserData( + 'restaurant.lastOrders.v1', + [] + ) || [] + const merged = [...entries, ...existing].slice(0, 50) + storage.setUserData('restaurant.lastOrders.v1', merged) + } + } catch (err) { + state.value.step = 'error' + state.value.error = err instanceof Error ? err.message : String(err) + } +} + +// ----------------------------------------------------------------- // +// pay phase + poller // +// ----------------------------------------------------------------- // + +const liveStatusByOrderId = ref>({}) + +function statusOf(orderId: string): string { + return ( + liveStatusByOrderId.value[orderId] || + state.value.placedOrders.find((p) => p.order.id === orderId)?.order + .status || + 'pending' + ) +} + +function isPaid(orderId: string): boolean { + const s = statusOf(orderId) + return ['paid', 'accepted', 'ready', 'completed'].includes(s) +} + +const allPaid = computed(() => { + if (!state.value.placedOrders.length) return false + return state.value.placedOrders.every((p) => isPaid(p.order.id)) +}) + +let pollTimer: ReturnType | null = null + +function startPolling() { + if (pollTimer) return + pollTimer = setInterval(async () => { + if (!state.value.placedOrders.length) return + for (const p of state.value.placedOrders) { + if (isPaid(p.order.id)) continue + try { + const fresh = await api.getOrder(p.order.id) + liveStatusByOrderId.value = { + ...liveStatusByOrderId.value, + [p.order.id]: fresh.order.status, + } + if ( + ['paid', 'accepted', 'ready', 'completed'].includes( + fresh.order.status + ) + ) { + cart.clearRestaurant(p.restaurantId) + } + } catch { + // transient — try again next tick + } + } + }, 3000) +} + +function stopPolling() { + if (pollTimer) { + clearInterval(pollTimer) + pollTimer = null + } +} + +watch(allPaid, (paid) => { + if (paid && state.value.placedOrders.length) { + stopPolling() + setTimeout(() => { + const first = state.value.placedOrders[0] + if (first) router.push(`/orders/${first.order.id}`) + }, 1200) + } +}) + +watch( + () => state.value.placedOrders.length, + (n) => { + if (n > 0) startPolling() + else stopPolling() + } +) + +onUnmounted(stopPolling) + +const isPlacing = computed(() => + ['quoting', 'placing'].includes(state.value.step) +) +const isPaying = computed(() => state.value.step === 'paying') + +async function onPayAll() { + state.value.error = null + try { + await payAll() + } catch { + // useCheckout sets state.error already. + } +} + +function startOver() { + reset() +} + +function buildOrderInvoice(p: PlacedOrder) { + return p.invoice +} + + + + + + + Back + + + Checkout + + + + + + + {{ b.restaurantSlug }} + + {{ b.total ? fmt(b.total.amount, b.total.currency) : '—' }} + + + + + + {{ line.quantity }}× {{ line.name }} + + · {{ line.selected_modifiers.map((m) => m.name).join(', ') }} + + + + {{ fmt(line.unit_price * line.quantity, line.currency) }} + + + + + ≈ {{ new Intl.NumberFormat().format(previewSatPerRestaurant[b.restaurantId]!) }} sat + + + + + + + + + + Total + + {{ fmt(cart.grandTotal.amount, cart.grandTotal.currency) }} + + + + + + Pay in sats + + + ≈ {{ new Intl.NumberFormat().format(previewSatTotal) }} sat + + + + + Couldn't place order + {{ state.error }} + + + + + Quoting… + Placing orders… + Place order + + + {{ state.currentRestaurantSlug }} ({{ state.progress.current + 1 }} of {{ state.progress.total }}) + + + + + + + + + Payment received + Redirecting to your order… + + + + Scan with any Lightning wallet, or tap the button below to + pay from your LNbits wallet. + + + + + + + {{ placed.restaurantSlug }} + + + {{ friendlyOrderStatus(statusOf(placed.order.id)) }} + + + + + + Paid + + + View order → + + + + + + No Lightning invoice — payment is handled out-of-band. + + + + + + + + + + Payment didn't go through + + {{ state.error }} You can still scan the QR with another + wallet. + + + + + + + Pay from my LNbits wallet + + + + Cancel and start over + + + + + diff --git a/src/modules/restaurant/views/ItemPage.vue b/src/modules/restaurant/views/ItemPage.vue index 945a4ca..2b971f7 100644 --- a/src/modules/restaurant/views/ItemPage.vue +++ b/src/modules/restaurant/views/ItemPage.vue @@ -87,7 +87,8 @@ function addToCart() { restaurant_slug: restaurant.value.slug, menu_item_id: item.value.id, name: item.value.name, - unit_msat: unitPrice.value, + unit_price: unitPrice.value, + currency: item.value.currency || restaurant.value.currency, quantity: quantity.value, selected_modifiers: selectedModifiers.value, note: note.value || null, diff --git a/src/modules/restaurant/views/OrderStatusPage.vue b/src/modules/restaurant/views/OrderStatusPage.vue new file mode 100644 index 0000000..530ae49 --- /dev/null +++ b/src/modules/restaurant/views/OrderStatusPage.vue @@ -0,0 +1,279 @@ + + + + + + + All orders + + + + + Loading order… + + + + + Couldn't load order + + {{ error.message }} + + Try again + + + + + + + + Order + + {{ order.id.slice(0, 12) }}… + + + + {{ friendlyOrderStatus(order.status) }} + + + + + + + + Order received + + Payment confirmed — the kitchen will start preparing it + shortly. + + + + + + Cooking + + Your food is being made. + + + + + + Ready for pickup + + Pick up at the counter. + + + + + + Served + Enjoy! Thanks for ordering. + + + + + Items + + + + + {{ line.quantity }}× {{ line.name }} + + {{ line.selected_modifiers.map((m) => m.name).join(', ') }} + + + Note: {{ line.note }} + + + + {{ fmtSat(line.line_total_msat) }} + + + + + + + + Timeline + + + + + {{ entry.label }} + + {{ fmtTime(entry.at) }} + + + + + + + + + Subtotal + {{ fmtSat(order.subtotal_msat) }} + + + Tax + {{ fmtSat(order.tax_msat) }} + + + Tip + {{ fmtSat(order.tip_msat) }} + + + Total + {{ fmtSat(order.total_msat) }} + + + + + diff --git a/src/modules/restaurant/views/OrdersListPage.vue b/src/modules/restaurant/views/OrdersListPage.vue new file mode 100644 index 0000000..c5928b2 --- /dev/null +++ b/src/modules/restaurant/views/OrdersListPage.vue @@ -0,0 +1,228 @@ + + + + + Your orders + + + + No orders yet + + Place an order and it'll show up here. + + + + + + + {{ group.day }} + + + + + + + + {{ o.restaurantSlug }} + + + {{ o.orderId.slice(0, 12) }}… + · {{ fmtTime(o.placedAt) }} + + + {{ friendlyOrderStatus(liveByOrderId[o.orderId]!.status) }} + + + + + {{ fmtSat(o.totalMsat) }} + + + ≈ {{ fmtFiat( + liveByOrderId[o.orderId]!.fiat_amount!, + liveByOrderId[o.orderId]!.currency_display + ) }} + + + + + + + + + + + + + + diff --git a/src/modules/restaurant/views/RestaurantPage.vue b/src/modules/restaurant/views/RestaurantPage.vue index abbdb50..d9f06f0 100644 --- a/src/modules/restaurant/views/RestaurantPage.vue +++ b/src/modules/restaurant/views/RestaurantPage.vue @@ -11,7 +11,7 @@ * handles modifier selection and "Add to cart" (cart store lands in * commit 5). */ -import { computed, toRef } from 'vue' +import { computed, onBeforeUnmount, toRef, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import { Loader2, AlertCircle } from 'lucide-vue-next' import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert' @@ -21,16 +21,48 @@ import CategoryNav from '../components/CategoryNav.vue' import MenuTree from '../components/MenuTree.vue' import { useMenu } from '../composables/useMenu' import { useCartStore } from '../stores/cart' +import { + tryInjectService, + SERVICE_TOKENS, +} from '@/core/di-container' +import type { RestaurantNostrSync } from '../services/RestaurantNostrSync' const route = useRoute() const router = useRouter() const cart = useCartStore() +const sync = tryInjectService( + SERVICE_TOKENS.RESTAURANT_NOSTR_SYNC +) const slug = computed(() => String(route.params.slug || '')) const { restaurant, tree, items, isLoading, error, refresh } = useMenu( toRef(() => slug.value) ) +// Open the Nostr live-overlay subscription the moment we know the +// restaurant's pubkey + id. Close it on route leave / unmount. If +// the relay hub isn't connected, sync.subscribe is a no-op (REST +// continues to work; the overlay is best-effort polish). +let activeRestaurantId: string | null = null +watch(restaurant, (r) => { + if (!sync) return + if (activeRestaurantId && activeRestaurantId !== r?.id) { + sync.unsubscribe(activeRestaurantId) + activeRestaurantId = null + } + if (r?.nostr_pubkey && r.id !== activeRestaurantId) { + sync.subscribe(r.nostr_pubkey, r.id) + activeRestaurantId = r.id + } +}) + +onBeforeUnmount(() => { + if (sync && activeRestaurantId) { + sync.unsubscribe(activeRestaurantId) + activeRestaurantId = null + } +}) + function openItem(itemId: string) { router.push(`/r/${slug.value}/item/${itemId}`) } @@ -52,7 +84,8 @@ function quickAdd(itemId: string) { restaurant_slug: restaurant.value.slug, menu_item_id: it.id, name: it.name, - unit_msat: it.price, + unit_price: it.price, + currency: it.currency || restaurant.value.currency, quantity: 1, selected_modifiers: [], note: null, diff --git a/src/modules/restaurant/views/SettingsPage.vue b/src/modules/restaurant/views/SettingsPage.vue new file mode 100644 index 0000000..99b0d28 --- /dev/null +++ b/src/modules/restaurant/views/SettingsPage.vue @@ -0,0 +1,153 @@ + + + + + + + Back + + + Settings + + + + Display + + + + + Show prices in millisats + + + (settings.currencyDisplay = val ? 'msat' : 'sats') + " + /> + + + Currently: + {{ settings.currencyDisplay }}. + Order totals from the extension are always msat; this is + local display only. + + + + + + + Nostr relays + + + + Override relays (comma-separated) + + + + Reload the app for changes to take effect — the relay hub + initializes once on boot. + + + + + + + Local data + + + + + Clear cart + history + + + Wipes the cart, recent venues, and order history from this + device. Doesn't refund or cancel any placed orders. + + + + +
Lightning invoice
+ expires in {{ fmtCountdown(expiresInSec) }} + expired +
+ Cart spans multiple currencies — per-restaurant subtotals above. + Lightning sat amount shown at checkout. +
+ {{ state.currentRestaurantSlug }} ({{ state.progress.current + 1 }} of {{ state.progress.total }}) +
+ Scan with any Lightning wallet, or tap the button below to + pay from your LNbits wallet. +
{{ error.message }}
+ {{ order.id.slice(0, 12) }}… +
+ {{ o.restaurantSlug }} +
+ {{ o.orderId.slice(0, 12) }}… + · {{ fmtTime(o.placedAt) }} +
+ {{ fmtSat(o.totalMsat) }} +
+ ≈ {{ fmtFiat( + liveByOrderId[o.orderId]!.fiat_amount!, + liveByOrderId[o.orderId]!.currency_display + ) }} +
+ Currently: + {{ settings.currencyDisplay }}. + Order totals from the extension are always msat; this is + local display only. +
{{ settings.currencyDisplay }}
+ Reload the app for changes to take effect — the relay hub + initializes once on boot. +
+ Wipes the cart, recent venues, and order history from this + device. Doesn't refund or cancel any placed orders. +