From 6dae57f3f4363efcc44f3183e3768ba2950001ec Mon Sep 17 00:00:00 2001 From: Padreug Date: Mon, 11 May 2026 09:03:10 +0200 Subject: [PATCH 1/3] feat(api): public GET /restaurants/by-slug/{slug} Prerequisite for the customer webapp module (aiolabs/webapp, branch feat/restaurant-bundle): the webapp's /r/:slug route needs to resolve a slug to a Restaurant payload without an admin key. crud.get_restaurant_by_slug already exists (used by the server- rendered CMS routes in views.py); just expose it as a public REST endpoint. Mirrors api_get_restaurant by id and is declared before the bare-id route so the static prefix wins FastAPI's path match. Verified live against seeded 'Big Jay's Bustaurant': GET /restaurant/api/v1/restaurants/by-slug/big-jays-bustaurant -> 200 with the Restaurant payload. --- docs/api-reference.md | 1 + docs/webapp-integration.md | 12 +++++++++++- views_api.py | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/api-reference.md b/docs/api-reference.md index 442a9b3..ec7ed36 100644 --- a/docs/api-reference.md +++ b/docs/api-reference.md @@ -15,6 +15,7 @@ the catalog. | Method | Path | Notes | |---|---|---| | `GET` | `/restaurants/{id}` | Restaurant profile | +| `GET` | `/restaurants/by-slug/{slug}` | Restaurant profile by URL slug — used by webapps that route on `/r/:slug` and need to resolve to an `id` before any other lookup. 404 when no match | | `GET` | `/restaurants/{id}/menu` | `{restaurant, tree, items}` — the canonical [[menu-tree|menu tree]] (hydrated children + items per node) plus a flat enriched items list with modifier groups + availability windows pre-joined | | `GET` | `/menu_items/{id}` | Single item | | `GET` | `/menu_nodes/{id}` | Single node row | diff --git a/docs/webapp-integration.md b/docs/webapp-integration.md index 4c0a925..e37c0c8 100644 --- a/docs/webapp-integration.md +++ b/docs/webapp-integration.md @@ -9,7 +9,17 @@ of restaurants, especially the multi-restaurant cart pattern. A webapp can either talk to one restaurant directly or aggregate many. There's no central directory inside this extension — grouping ("festival", "collective space", "food court") is **emergent** via -NIP-51 list events curated by whoever runs the venue: +NIP-51 list events curated by whoever runs the venue. + +For the **single-venue** case, a webapp that routes on a URL slug +(`/r/big-jays-bustaurant`) resolves the slug → restaurant via the +public `GET /restaurants/by-slug/{slug}` endpoint +([[api-reference]]) and proceeds with that one `id` for menu reads +and order placement. Slug is just a URL nicety — internally +everything continues to key on the restaurant `id`. + +For the **aggregator** case (multiple restaurants in one cart), the +webapp consumes a curated NIP-51 list event: ``` { diff --git a/views_api.py b/views_api.py index 74ca8e3..ad26520 100644 --- a/views_api.py +++ b/views_api.py @@ -59,6 +59,7 @@ from .crud import ( get_print_job, get_print_jobs, get_restaurant, + get_restaurant_by_slug, get_restaurants, get_settings, move_menu_node, @@ -248,6 +249,20 @@ async def api_list_restaurants( return await get_restaurants(wallet_ids) +@restaurant_api_router.get("/api/v1/restaurants/by-slug/{slug}") +async def api_get_restaurant_by_slug(slug: str) -> Restaurant: + """Public — used by the customer webapp to resolve a URL slug + (e.g. /r/big-jays-bustaurant) to a restaurant. Mirrors + api_get_restaurant; declared *before* the bare-id route so the + static prefix wins the path match in FastAPI's router.""" + restaurant = await get_restaurant_by_slug(slug) + if not restaurant: + raise HTTPException( + status_code=HTTPStatus.NOT_FOUND, detail="Restaurant not found." + ) + return restaurant + + @restaurant_api_router.get("/api/v1/restaurants/{restaurant_id}") async def api_get_restaurant(restaurant_id: str) -> Restaurant: """Public — used by the webapp to fetch profile metadata.""" From 638f36e94592bbe9b7a37c98805e8c23e98803a1 Mon Sep 17 00:00:00 2001 From: Padreug Date: Mon, 11 May 2026 17:49:12 +0200 Subject: [PATCH 2/3] fix(services): convert fiat menu prices to sat via exchange rates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this fix `_to_msat(item.price)` blindly did `price * 1000`, treating any menu price as sat-denominated regardless of the item's `currency` field. Quote and bolt11 were internally consistent but charged ~0.1% of the real price for fiat-priced menus. Big Jay's seeded with GTQ: 2× Tacos (Maíz, +Brisket, +Chicken) pre-fix: 170 GTQ → 170000 msat → 170 sat invoice (~$0.14) post-fix: 170 GTQ → 26968000 msat → 26968 sat invoice (~$22) services.py: - Drop `_to_msat` in favor of a `_price_to_msat(amount, currency)` helper. Sat-aliased currencies ("sat", "sats", "satoshi", "msat", …) take the flat ×1000 path; everything else round- trips through lnbits.utils.exchange_rates.fiat_amount_as_satoshis (same pool the events extension uses). - Update _price_line_item: item.price AND each modifier.price_delta are converted using item.currency. Modifier deltas inherit the parent item's currency since we don't carry a per-modifier currency field. - Update quote_balance_required: same conversion via the item's currency. Verified live against the seeded "Big Jay's Bustaurant": GTQ → sat conversion matches LNbits's bitcoin-price aggregate (Binance / Blockchain / Bitfinex / Bitstamp / Coinbase / yadio). Quote returns 26968 sats for 170 GTQ — within ~2% of expected rate from external sources. --- docs/order-flow.md | 16 ++++++++++++---- services.py | 47 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/docs/order-flow.md b/docs/order-flow.md index ffa2888..fd29bc7 100644 --- a/docs/order-flow.md +++ b/docs/order-flow.md @@ -37,14 +37,22 @@ States and their meaning: 2. Re-prices every line item against the live menu (modifier ids are matched server-side; the customer's claimed `price_delta` values are ignored). -3. Sums `subtotal_msat`, applies `tax_rate`, adds `tip_msat` → +3. Converts each item's `price` from its declared `currency` to + msat. For sat-denominated items (`currency` ∈ `{sat, sats, + satoshi}`) this is a flat `× 1000`. For fiat (`USD`, `GTQ`, …) + it calls `lnbits.utils.exchange_rates.fiat_amount_as_satoshis` + to look up the live rate, then `× 1000`. The conversion lives + in `services._price_to_msat` so the rate lookup is the same path + the quote endpoint uses — a customer's preview and the recorded + `order.total_msat` cannot drift apart between request and place. +4. Sums `subtotal_msat`, applies `tax_rate`, adds `tip_msat` → `total_msat`. -4. For Lightning / internal: calls +5. For Lightning / internal: calls `lnbits.core.services.create_invoice` with `extra={"tag": "restaurant", "restaurant_id": ...}`. -5. Persists the order with `id = payment_hash` so the listener can +6. Persists the order with `id = payment_hash` so the listener can look it up cheaply, plus one `order_items` row per line. -6. For cash: `payment_method = "cash"` skips invoice creation and +7. For cash: `payment_method = "cash"` skips invoice creation and marks the order `accepted` directly. Returns `(Order, OrderInvoice | None)`. The webapp pays the bolt11. diff --git a/services.py b/services.py index f187e2a..793e86e 100644 --- a/services.py +++ b/services.py @@ -25,6 +25,7 @@ from loguru import logger from lnbits.core.services import create_invoice from lnbits.helpers import urlsafe_short_hash +from lnbits.utils.exchange_rates import fiat_amount_as_satoshis from .crud import ( create_order, @@ -55,9 +56,33 @@ from .models import ( # --------------------------------------------------------------------- # -def _to_msat(amount: float) -> int: - """Convert a sat amount (possibly fractional) to integer msat.""" - return int(round(amount * 1000)) +_SAT_ALIASES = {"sat", "sats", "satoshi", "satoshis", "msat", "msats"} + + +def _is_sat_currency(currency: str | None) -> bool: + return (currency or "sat").strip().lower() in _SAT_ALIASES + + +async def _price_to_msat(amount: float, currency: str | None) -> int: + """ + Convert a menu-item-currency amount to integer **msat**. + + - For native sat-denominated prices (currency in + `_SAT_ALIASES`) this is a flat ×1000. + - For any other ISO-ish currency code (GTQ, USD, EUR, BRL, …) + we round-trip through LNbits's `fiat_amount_as_satoshis` + which queries the same exchange-rate pool the rest of LNbits + uses, then multiply by 1000. + + Side-effect-free helper; safe to call multiple times per + request (rates are LNbits-cached internally). + """ + if amount == 0: + return 0 + if _is_sat_currency(currency): + return int(round(amount * 1000)) + sats = await fiat_amount_as_satoshis(amount, (currency or "").upper()) + return int(round(sats * 1000)) async def _price_line_item(line: CreateOrderItem) -> tuple[OrderItemRow, int]: @@ -81,7 +106,9 @@ async def _price_line_item(line: CreateOrderItem) -> tuple[OrderItemRow, int]: if item.stock is not None and item.stock < line.quantity: raise ValueError(f"Menu item {item.name!r} is out of stock") - # Resolve & price modifiers against canonical DB rows. + # Resolve & price modifiers against canonical DB rows. Modifier + # `price_delta` is denominated in the same currency as the parent + # item (we don't carry a per-modifier currency). resolved: list[SelectedModifier] = [] delta_msat_each = 0 requested_ids = {m.modifier_id for m in line.selected_modifiers if m.modifier_id} @@ -101,9 +128,13 @@ async def _price_line_item(line: CreateOrderItem) -> tuple[OrderItemRow, int]: price_delta=mod.price_delta, ) ) - delta_msat_each += _to_msat(mod.price_delta) + delta_msat_each += await _price_to_msat( + mod.price_delta, item.currency + ) - unit_price_msat = _to_msat(item.price) + delta_msat_each + unit_price_msat = ( + await _price_to_msat(item.price, item.currency) + ) + delta_msat_each line_total_msat = unit_price_msat * line.quantity row = OrderItemRow( @@ -334,8 +365,8 @@ async def quote_balance_required(items: list[CreateOrderItem]) -> int: item = await get_menu_item(line.menu_item_id) if not item: continue - unit = _to_msat(item.price) + unit = await _price_to_msat(item.price, item.currency) for sm in line.selected_modifiers: - unit += _to_msat(sm.price_delta or 0) + unit += await _price_to_msat(sm.price_delta or 0, item.currency) total += unit * line.quantity return total From 42746d73214e8f6ea8cc52f68cecfc63b363c5bd Mon Sep 17 00:00:00 2001 From: Padreug Date: Mon, 11 May 2026 18:16:39 +0200 Subject: [PATCH 3/3] fix(cms): KDS card text legible on dark mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The age-escalation highlights (bg-amber-1 / bg-orange-1 / bg-red-1) are very pale Quasar shades. On LNbits dark mode the q-card inherits a near-white text color from the theme — paired with the pale background that's white-on-cream, which is what the user reported: the '1x Coffee' on a ready-card was barely visible. Pin an explicit text-grey-9 alongside each pale bg so dark text on light background renders in both themes. The 'no highlight' branch returns '' unchanged, so non-aged orders still use the q-card's theme-aware default text color. --- docs/cms.md | 20 ++++++++++++++++++++ static/js/kds.js | 12 +++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/docs/cms.md b/docs/cms.md index 119be3f..59bef8c 100644 --- a/docs/cms.md +++ b/docs/cms.md @@ -73,6 +73,26 @@ orange, `>15min` red) and offers one-tap state transitions. Today the monitor + KDS poll every 5–8 s. SSE / Nostr push is on the roadmap. +### Dark-mode color discipline + +Quasar's pale `bg-{color}-1` utility classes (e.g. `bg-orange-1`, +`bg-red-1`, `bg-amber-1`) pair fine with the default light theme +but render **white-on-cream** under LNbits' dark theme — the +q-card otherwise inherits the body's light text color. The KDS +cards pin a dark text class alongside every pale background so +the card stays legible regardless of theme: + +```js +if (order.status === 'ready') return 'bg-amber-1 text-grey-9' +if (ageSec > 900) return 'bg-red-1 text-grey-9' +if (ageSec > 300) return 'bg-orange-1 text-grey-9' +return '' // theme-default branch keeps q-card's own text color +``` + +Any future surface that ages / escalates with `bg-{color}-1` must +do the same. Never assume a pale background "just works" on dark +theme. + ## Settings `settings.html` saves restaurant fields via diff --git a/static/js/kds.js b/static/js/kds.js index bc0980d..ab4f0cc 100644 --- a/static/js/kds.js +++ b/static/js/kds.js @@ -25,10 +25,16 @@ window.app = Vue.createApp({ }, cardClass(order) { // Visually escalate as orders age. >5min = highlight; >15min = alarm. + // + // Pair every pale `bg-{color}-1` with an explicit dark text color + // — otherwise on LNbits dark mode the q-card inherits light text + // and renders white-on-cream, which is unreadable. The non- + // highlighted branch (default theme) returns '' so the q-card + // keeps its theme-aware defaults. const ageSec = (Date.now() - new Date(order.time).getTime()) / 1000 - if (order.status === 'ready') return 'bg-amber-1' - if (ageSec > 900) return 'bg-red-1' - if (ageSec > 300) return 'bg-orange-1' + if (order.status === 'ready') return 'bg-amber-1 text-grey-9' + if (ageSec > 900) return 'bg-red-1 text-grey-9' + if (ageSec > 300) return 'bg-orange-1 text-grey-9' return '' }, async fetchActive() {