giles
ab75e505a8
Phase 1 — Macros: defmacro + quasiquote syntax (`, ,, ,@) in parser,
evaluator, HTML renderer, and JS mirror. Macro type, expansion, and
round-trip serialization.
Phase 2 — Expanded primitives: app-url, url-for, asset-url, config,
format-date, parse-int (pure); service, request-arg, request-path,
nav-tree, get-children (I/O); jinja-global, relations-from (pure).
Updated _io_service to accept (service "registry-name" "method" :kwargs)
with auto kebab→snake conversion. DTO-to-dict now expands datetime fields
into year/month/day convenience keys. Tuple returns converted to lists.
Phase 3 — Declarative handlers: HandlerDef type, defhandler special form,
handler registry (service → name → HandlerDef), async evaluator+renderer
(async_eval.py) that awaits I/O primitives inline within control flow.
Handler loading from .sx files, execute_handler, blueprint factory.
Phase 4 — Convert all fragment routes: 13 Python fragment handlers across
8 services replaced with declarative .sx handler files. All routes.py
simplified to uniform sx dispatch pattern. Two Jinja HTML handlers
(events/container-cards, events/account-page) kept as Python.
New files: shared/sx/async_eval.py, shared/sx/handlers.py,
shared/sx/tests/test_handlers.py, plus 13 handler .sx files under
{service}/sx/handlers/. MarketService.product_by_slug() added.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
397 lines
15 KiB
Python
397 lines
15 KiB
Python
"""
|
|
Orders service s-expression page components.
|
|
|
|
Each function renders a complete page section (full page, OOB, or pagination)
|
|
using shared s-expression components. Called from route handlers in place
|
|
of ``render_template()``.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
from typing import Any
|
|
|
|
from shared.sx.jinja_bridge import load_service_components
|
|
from shared.sx.helpers import (
|
|
call_url, root_header_sx,
|
|
full_page_sx, header_child_sx, oob_page_sx,
|
|
sx_call, SxExpr,
|
|
search_mobile_sx, search_desktop_sx,
|
|
)
|
|
from shared.infrastructure.urls import market_product_url, cart_url
|
|
|
|
# Load orders-specific .sx components + handlers at import time
|
|
load_service_components(os.path.dirname(os.path.dirname(__file__)),
|
|
service_name="orders")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Header helpers (shared auth + orders-specific) — sx-native
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _auth_nav_sx(ctx: dict) -> str:
|
|
"""Auth section desktop nav items as sx."""
|
|
parts = [
|
|
sx_call("nav-link",
|
|
href=call_url(ctx, "account_url", "/newsletters/"),
|
|
label="newsletters",
|
|
select_colours=ctx.get("select_colours", ""),
|
|
),
|
|
]
|
|
account_nav = ctx.get("account_nav")
|
|
if account_nav:
|
|
parts.append(str(account_nav))
|
|
return "(<> " + " ".join(parts) + ")"
|
|
|
|
|
|
def _auth_header_sx(ctx: dict, *, oob: bool = False) -> str:
|
|
"""Build the account section header row as sx."""
|
|
return sx_call(
|
|
"menu-row-sx",
|
|
id="auth-row", level=1, colour="sky",
|
|
link_href=call_url(ctx, "account_url", "/"),
|
|
link_label="account", icon="fa-solid fa-user",
|
|
nav=SxExpr(_auth_nav_sx(ctx)),
|
|
child_id="auth-header-child", oob=oob,
|
|
)
|
|
|
|
|
|
def _orders_header_sx(ctx: dict, list_url: str) -> str:
|
|
"""Build the orders section header row as sx."""
|
|
return sx_call(
|
|
"menu-row-sx",
|
|
id="orders-row", level=2, colour="sky",
|
|
link_href=list_url, link_label="Orders", icon="fa fa-gbp",
|
|
child_id="orders-header-child",
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Orders list rendering
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _status_pill_cls(status: str) -> str:
|
|
"""Return Tailwind classes for order status pill."""
|
|
sl = status.lower()
|
|
if sl == "paid":
|
|
return "border-emerald-300 bg-emerald-50 text-emerald-700"
|
|
if sl in ("failed", "cancelled"):
|
|
return "border-rose-300 bg-rose-50 text-rose-700"
|
|
return "border-stone-300 bg-stone-50 text-stone-700"
|
|
|
|
|
|
def _order_row_data(order: Any, detail_url: str) -> dict:
|
|
"""Extract display data from an order model object."""
|
|
status = order.status or "pending"
|
|
pill = _status_pill_cls(status)
|
|
created = order.created_at.strftime("%-d %b %Y, %H:%M") if order.created_at else "\u2014"
|
|
total = f"{order.currency or 'GBP'} {order.total_amount or 0:.2f}"
|
|
return dict(
|
|
oid=f"#{order.id}", created=created,
|
|
desc=order.description or "", total=total,
|
|
pill_desktop=f"inline-flex items-center rounded-full border px-2 py-0.5 text-[11px] sm:text-xs {pill}",
|
|
pill_mobile=f"inline-flex items-center rounded-full border px-2 py-0.5 text-[11px] {pill}",
|
|
status=status, url=detail_url,
|
|
)
|
|
|
|
|
|
|
|
def _orders_rows_sx(orders: list, page: int, total_pages: int,
|
|
url_for_fn: Any, qs_fn: Any) -> str:
|
|
"""S-expression wire format for order rows (client renders)."""
|
|
from shared.utils import route_prefix
|
|
pfx = route_prefix()
|
|
|
|
parts = []
|
|
for o in orders:
|
|
d = _order_row_data(o, pfx + url_for_fn("orders.order.order_detail", order_id=o.id))
|
|
parts.append(sx_call("order-row-desktop",
|
|
oid=d["oid"], created=d["created"],
|
|
desc=d["desc"], total=d["total"],
|
|
pill=d["pill_desktop"], status=d["status"],
|
|
url=d["url"]))
|
|
parts.append(sx_call("order-row-mobile",
|
|
oid=d["oid"], created=d["created"],
|
|
total=d["total"], pill=d["pill_mobile"],
|
|
status=d["status"], url=d["url"]))
|
|
|
|
if page < total_pages:
|
|
next_url = pfx + url_for_fn("orders.list_orders") + qs_fn(page=page + 1)
|
|
parts.append(sx_call("infinite-scroll",
|
|
url=next_url, page=page,
|
|
total_pages=total_pages,
|
|
id_prefix="orders", colspan=5))
|
|
else:
|
|
parts.append(sx_call("order-end-row"))
|
|
|
|
return "(<> " + " ".join(parts) + ")"
|
|
|
|
|
|
def _orders_main_panel_sx(orders: list, rows_sx: str) -> str:
|
|
"""Main panel with table or empty state (sx)."""
|
|
if not orders:
|
|
return sx_call("order-empty-state")
|
|
return sx_call("order-table", rows=SxExpr(rows_sx))
|
|
|
|
|
|
def _orders_summary_sx(ctx: dict) -> str:
|
|
"""Filter section for orders list (sx)."""
|
|
return sx_call("order-list-header", search_mobile=SxExpr(search_mobile_sx(ctx)))
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Public API: orders list
|
|
# ---------------------------------------------------------------------------
|
|
|
|
async def render_orders_page(ctx: dict, orders: list, page: int,
|
|
total_pages: int, search: str | None,
|
|
search_count: int, url_for_fn: Any,
|
|
qs_fn: Any) -> str:
|
|
"""Full page: orders list (sx wire format)."""
|
|
from shared.utils import route_prefix
|
|
|
|
ctx["search"] = search
|
|
ctx["search_count"] = search_count
|
|
list_url = route_prefix() + url_for_fn("orders.list_orders")
|
|
|
|
rows = _orders_rows_sx(orders, page, total_pages, url_for_fn, qs_fn)
|
|
main = _orders_main_panel_sx(orders, rows)
|
|
|
|
hdr = root_header_sx(ctx)
|
|
inner = "(<> " + _auth_header_sx(ctx) + " " + _orders_header_sx(ctx, list_url) + ")"
|
|
hdr = "(<> " + hdr + " " + header_child_sx(inner) + ")"
|
|
|
|
return full_page_sx(ctx, header_rows=hdr,
|
|
filter=_orders_summary_sx(ctx),
|
|
aside=search_desktop_sx(ctx),
|
|
content=main)
|
|
|
|
|
|
async def render_orders_rows(ctx: dict, orders: list, page: int,
|
|
total_pages: int, url_for_fn: Any,
|
|
qs_fn: Any) -> str:
|
|
"""Pagination: just the table rows (sx wire format)."""
|
|
return _orders_rows_sx(orders, page, total_pages, url_for_fn, qs_fn)
|
|
|
|
|
|
|
|
async def render_orders_oob(ctx: dict, orders: list, page: int,
|
|
total_pages: int, search: str | None,
|
|
search_count: int, url_for_fn: Any,
|
|
qs_fn: Any) -> str:
|
|
"""OOB response for HTMX navigation to orders list (sx)."""
|
|
from shared.utils import route_prefix
|
|
|
|
ctx["search"] = search
|
|
ctx["search_count"] = search_count
|
|
list_url = route_prefix() + url_for_fn("orders.list_orders")
|
|
|
|
rows = _orders_rows_sx(orders, page, total_pages, url_for_fn, qs_fn)
|
|
main = _orders_main_panel_sx(orders, rows)
|
|
|
|
auth_hdr = _auth_header_sx(ctx, oob=True)
|
|
auth_child_oob = sx_call("oob-header-sx",
|
|
parent_id="auth-header-child",
|
|
row=SxExpr(_orders_header_sx(ctx, list_url)))
|
|
root_hdr = root_header_sx(ctx, oob=True)
|
|
oobs = "(<> " + auth_hdr + " " + auth_child_oob + " " + root_hdr + ")"
|
|
|
|
return oob_page_sx(oobs=oobs,
|
|
filter=_orders_summary_sx(ctx),
|
|
aside=search_desktop_sx(ctx),
|
|
content=main)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Single order detail
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _order_items_sx(order: Any) -> str:
|
|
"""Render order items list as sx."""
|
|
if not order or not order.items:
|
|
return ""
|
|
items = []
|
|
for item in order.items:
|
|
prod_url = market_product_url(item.product_slug)
|
|
if item.product_image:
|
|
img = sx_call(
|
|
"order-item-image",
|
|
src=item.product_image, alt=item.product_title or "Product image",
|
|
)
|
|
else:
|
|
img = sx_call("order-item-no-image")
|
|
|
|
items.append(sx_call(
|
|
"order-item-row",
|
|
href=prod_url, img=SxExpr(img),
|
|
title=item.product_title or "Unknown product",
|
|
pid=f"Product ID: {item.product_id}",
|
|
qty=f"Qty: {item.quantity}",
|
|
price=f"{item.currency or order.currency or 'GBP'} {item.unit_price or 0:.2f}",
|
|
))
|
|
|
|
items_sx = "(<> " + " ".join(items) + ")"
|
|
return sx_call("order-items-panel", items=SxExpr(items_sx))
|
|
|
|
|
|
def _calendar_items_sx(calendar_entries: list | None) -> str:
|
|
"""Render calendar bookings for an order as sx."""
|
|
if not calendar_entries:
|
|
return ""
|
|
items = []
|
|
for e in calendar_entries:
|
|
st = e.state or ""
|
|
pill = (
|
|
"bg-emerald-100 text-emerald-800" if st == "confirmed"
|
|
else "bg-amber-100 text-amber-800" if st == "provisional"
|
|
else "bg-blue-100 text-blue-800" if st == "ordered"
|
|
else "bg-stone-100 text-stone-700"
|
|
)
|
|
ds = e.start_at.strftime("%-d %b %Y, %H:%M") if e.start_at else ""
|
|
if e.end_at:
|
|
ds += f" \u2013 {e.end_at.strftime('%-d %b %Y, %H:%M')}"
|
|
items.append(sx_call(
|
|
"order-calendar-entry",
|
|
name=e.name,
|
|
pill=f"inline-flex items-center rounded-full px-2 py-0.5 text-[11px] font-medium {pill}",
|
|
status=st.capitalize(), date_str=ds,
|
|
cost=f"\u00a3{e.cost or 0:.2f}",
|
|
))
|
|
|
|
items_sx = "(<> " + " ".join(items) + ")"
|
|
return sx_call("order-calendar-section", items=SxExpr(items_sx))
|
|
|
|
|
|
def _order_main_sx(order: Any, calendar_entries: list | None) -> str:
|
|
"""Main panel for single order detail (sx)."""
|
|
summary = sx_call(
|
|
"order-summary-card",
|
|
order_id=order.id,
|
|
created_at=order.created_at.strftime("%-d %b %Y, %H:%M") if order.created_at else None,
|
|
description=order.description, status=order.status, currency=order.currency,
|
|
total_amount=f"{order.total_amount:.2f}" if order.total_amount else None,
|
|
)
|
|
items = _order_items_sx(order)
|
|
calendar = _calendar_items_sx(calendar_entries)
|
|
return sx_call(
|
|
"order-detail-panel",
|
|
summary=SxExpr(summary),
|
|
items=SxExpr(items) if items else None,
|
|
calendar=SxExpr(calendar) if calendar else None,
|
|
)
|
|
|
|
|
|
def _order_filter_sx(order: Any, list_url: str, recheck_url: str,
|
|
pay_url: str, csrf_token: str) -> str:
|
|
"""Filter section for single order detail (sx)."""
|
|
created = order.created_at.strftime("%-d %b %Y, %H:%M") if order.created_at else "\u2014"
|
|
status = order.status or "pending"
|
|
|
|
pay = ""
|
|
if status != "paid":
|
|
pay = sx_call("order-pay-btn", url=pay_url)
|
|
|
|
return sx_call(
|
|
"order-detail-filter",
|
|
info=f"Placed {created} \u00b7 Status: {status}",
|
|
list_url=list_url, recheck_url=recheck_url,
|
|
csrf=csrf_token,
|
|
pay=SxExpr(pay) if pay else None,
|
|
)
|
|
|
|
|
|
async def render_order_page(ctx: dict, order: Any,
|
|
calendar_entries: list | None,
|
|
url_for_fn: Any) -> str:
|
|
"""Full page: single order detail (sx wire format)."""
|
|
from shared.utils import route_prefix
|
|
from shared.browser.app.csrf import generate_csrf_token
|
|
|
|
pfx = route_prefix()
|
|
detail_url = pfx + url_for_fn("orders.order.order_detail", order_id=order.id)
|
|
list_url = pfx + url_for_fn("orders.list_orders")
|
|
recheck_url = pfx + url_for_fn("orders.order.order_recheck", order_id=order.id)
|
|
pay_url = pfx + url_for_fn("orders.order.order_pay", order_id=order.id)
|
|
|
|
main = _order_main_sx(order, calendar_entries)
|
|
filt = _order_filter_sx(order, list_url, recheck_url, pay_url, generate_csrf_token())
|
|
|
|
# Header stack: root -> auth -> orders -> order
|
|
hdr = root_header_sx(ctx)
|
|
order_row = sx_call(
|
|
"menu-row-sx",
|
|
id="order-row", level=3, colour="sky", link_href=detail_url,
|
|
link_label="Order", icon="fa fa-gbp",
|
|
)
|
|
detail_header = sx_call(
|
|
"order-detail-header-stack",
|
|
auth=SxExpr(_auth_header_sx(ctx)),
|
|
orders=SxExpr(_orders_header_sx(ctx, list_url)),
|
|
order=SxExpr(order_row),
|
|
)
|
|
hdr = "(<> " + hdr + " " + detail_header + ")"
|
|
|
|
return full_page_sx(ctx, header_rows=hdr, filter=filt, content=main)
|
|
|
|
|
|
async def render_order_oob(ctx: dict, order: Any,
|
|
calendar_entries: list | None,
|
|
url_for_fn: Any) -> str:
|
|
"""OOB response for single order detail (sx)."""
|
|
from shared.utils import route_prefix
|
|
from shared.browser.app.csrf import generate_csrf_token
|
|
|
|
pfx = route_prefix()
|
|
detail_url = pfx + url_for_fn("orders.order.order_detail", order_id=order.id)
|
|
list_url = pfx + url_for_fn("orders.list_orders")
|
|
recheck_url = pfx + url_for_fn("orders.order.order_recheck", order_id=order.id)
|
|
pay_url = pfx + url_for_fn("orders.order.order_pay", order_id=order.id)
|
|
|
|
main = _order_main_sx(order, calendar_entries)
|
|
filt = _order_filter_sx(order, list_url, recheck_url, pay_url, generate_csrf_token())
|
|
|
|
order_row_oob = sx_call(
|
|
"menu-row-sx",
|
|
id="order-row", level=3, colour="sky", link_href=detail_url,
|
|
link_label="Order", icon="fa fa-gbp", oob=True,
|
|
)
|
|
header_child_oob = sx_call("oob-header-sx",
|
|
parent_id="orders-header-child",
|
|
row=SxExpr(order_row_oob))
|
|
root_hdr = root_header_sx(ctx, oob=True)
|
|
oobs = "(<> " + header_child_oob + " " + root_hdr + ")"
|
|
|
|
return oob_page_sx(oobs=oobs, filter=filt, content=main)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Public API: Checkout error
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def _checkout_error_filter_sx() -> str:
|
|
return sx_call("checkout-error-header")
|
|
|
|
|
|
def _checkout_error_content_sx(error: str | None, order: Any | None) -> str:
|
|
err_msg = error or "Unexpected error while creating the hosted checkout session."
|
|
order_sx = ""
|
|
if order:
|
|
order_sx = sx_call("checkout-error-order-id", oid=f"#{order.id}")
|
|
back_url = cart_url("/")
|
|
return sx_call(
|
|
"checkout-error-content",
|
|
msg=err_msg,
|
|
order=SxExpr(order_sx) if order_sx else None,
|
|
back_url=back_url,
|
|
)
|
|
|
|
|
|
async def render_checkout_error_page(ctx: dict, error: str | None = None, order: Any | None = None) -> str:
|
|
"""Full page: checkout error (sx wire format)."""
|
|
hdr = root_header_sx(ctx)
|
|
inner = _auth_header_sx(ctx)
|
|
hdr = "(<> " + hdr + " " + header_child_sx(inner) + ")"
|
|
filt = _checkout_error_filter_sx()
|
|
content = _checkout_error_content_sx(error, order)
|
|
return full_page_sx(ctx, header_rows=hdr, filter=filt, content=content)
|