fix: correct endpoint name to market.browse.product.cart

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

alembic/versions/a1b2c3d4e5f6_add_page_configs_table.py

@@ -37,19 +37,21 @@ def upgrade() -> None:
     # 1. Pages with calendars -> features={"calendar": true}
     conn.execute(text("""
         INSERT INTO page_configs (post_id, features, created_at, updated_at)
-        SELECT DISTINCT p.id, '{"calendar": true}'::json, now(), now()
+        SELECT p.id, '{"calendar": true}'::jsonb, now(), now()
         FROM posts p
-        JOIN calendars c ON c.post_id = p.id
         WHERE p.is_page = true
           AND p.deleted_at IS NULL
-          AND c.deleted_at IS NULL
+          AND EXISTS (
+              SELECT 1 FROM calendars c
+              WHERE c.post_id = p.id AND c.deleted_at IS NULL
+          )
     """))
 
     # 2. Market page (slug='market', is_page=true) -> features={"market": true}
     #    Only if not already inserted above
     conn.execute(text("""
         INSERT INTO page_configs (post_id, features, created_at, updated_at)
-        SELECT p.id, '{"market": true}'::json, now(), now()
+        SELECT p.id, '{"market": true}'::jsonb, now(), now()
         FROM posts p
         WHERE p.slug = 'market'
           AND p.is_page = true
@@ -60,7 +62,7 @@ def upgrade() -> None:
     # 3. All other pages -> features={}
     conn.execute(text("""
         INSERT INTO page_configs (post_id, features, created_at, updated_at)
-        SELECT p.id, '{}'::json, now(), now()
+        SELECT p.id, '{}'::jsonb, now(), now()
         FROM posts p
         WHERE p.is_page = true
           AND p.deleted_at IS NULL

alembic/versions/b2c3d4e5f6a7_add_market_places_table.py

@@ -0,0 +1,97 @@
+"""add market_places table and nav_tops.market_id
+
+Revision ID: b2c3d4e5f6a7
+Revises: a1b2c3d4e5f6
+Create Date: 2026-02-10
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import text
+
+revision = 'b2c3d4e5f6a7'
+down_revision = 'a1b2c3d4e5f6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 1. Create market_places table
+    op.create_table(
+        'market_places',
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('post_id', sa.Integer(), nullable=False),
+        sa.Column('name', sa.String(255), nullable=False),
+        sa.Column('slug', sa.String(255), nullable=False),
+        sa.Column('description', sa.Text(), nullable=True),
+        sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+        sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True),
+        sa.ForeignKeyConstraint(['post_id'], ['posts.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id'),
+    )
+    op.create_index('ix_market_places_post_id', 'market_places', ['post_id'])
+    op.create_index(
+        'ux_market_places_slug_active',
+        'market_places',
+        [sa.text('lower(slug)')],
+        unique=True,
+        postgresql_where=sa.text('deleted_at IS NULL'),
+    )
+
+    # 2. Add market_id column to nav_tops
+    op.add_column(
+        'nav_tops',
+        sa.Column('market_id', sa.Integer(), nullable=True),
+    )
+    op.create_foreign_key(
+        'fk_nav_tops_market_id',
+        'nav_tops',
+        'market_places',
+        ['market_id'],
+        ['id'],
+        ondelete='SET NULL',
+    )
+    op.create_index('ix_nav_tops_market_id', 'nav_tops', ['market_id'])
+
+    # 3. Backfill: create default MarketPlace for the 'market' page
+    conn = op.get_bind()
+
+    # Find the market page
+    result = conn.execute(text("""
+        SELECT id FROM posts
+        WHERE slug = 'market' AND is_page = true AND deleted_at IS NULL
+        LIMIT 1
+    """))
+    row = result.fetchone()
+    if row:
+        post_id = row[0]
+
+        # Insert the default market
+        conn.execute(text("""
+            INSERT INTO market_places (post_id, name, slug, created_at, updated_at)
+            VALUES (:post_id, 'Suma Market', 'suma-market', now(), now())
+        """), {"post_id": post_id})
+
+        # Get the new market_places id
+        market_row = conn.execute(text("""
+            SELECT id FROM market_places
+            WHERE slug = 'suma-market' AND deleted_at IS NULL
+            LIMIT 1
+        """)).fetchone()
+
+        if market_row:
+            market_id = market_row[0]
+            # Assign all active nav_tops to this market
+            conn.execute(text("""
+                UPDATE nav_tops SET market_id = :market_id
+                WHERE deleted_at IS NULL
+            """), {"market_id": market_id})
+
+
+def downgrade() -> None:
+    op.drop_index('ix_nav_tops_market_id', table_name='nav_tops')
+    op.drop_constraint('fk_nav_tops_market_id', 'nav_tops', type_='foreignkey')
+    op.drop_column('nav_tops', 'market_id')
+    op.drop_index('ux_market_places_slug_active', table_name='market_places')
+    op.drop_index('ix_market_places_post_id', table_name='market_places')
+    op.drop_table('market_places')

alembic/versions/c3d4e5f6a7b8_add_page_tracking_to_orders.py

@@ -0,0 +1,55 @@
+"""add page_config_id to orders, market_place_id to cart_items
+
+Revision ID: c3d4e5f6a7b8
+Revises: b2c3d4e5f6a7
+Create Date: 2026-02-10
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = 'c3d4e5f6a7b8'
+down_revision = 'b2c3d4e5f6a7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 1. Add market_place_id to cart_items
+    op.add_column(
+        'cart_items',
+        sa.Column('market_place_id', sa.Integer(), nullable=True),
+    )
+    op.create_foreign_key(
+        'fk_cart_items_market_place_id',
+        'cart_items',
+        'market_places',
+        ['market_place_id'],
+        ['id'],
+        ondelete='SET NULL',
+    )
+    op.create_index('ix_cart_items_market_place_id', 'cart_items', ['market_place_id'])
+
+    # 2. Add page_config_id to orders
+    op.add_column(
+        'orders',
+        sa.Column('page_config_id', sa.Integer(), nullable=True),
+    )
+    op.create_foreign_key(
+        'fk_orders_page_config_id',
+        'orders',
+        'page_configs',
+        ['page_config_id'],
+        ['id'],
+        ondelete='SET NULL',
+    )
+    op.create_index('ix_orders_page_config_id', 'orders', ['page_config_id'])
+
+
+def downgrade() -> None:
+    op.drop_index('ix_orders_page_config_id', table_name='orders')
+    op.drop_constraint('fk_orders_page_config_id', 'orders', type_='foreignkey')
+    op.drop_column('orders', 'page_config_id')
+
+    op.drop_index('ix_cart_items_market_place_id', table_name='cart_items')
+    op.drop_constraint('fk_cart_items_market_place_id', 'cart_items', type_='foreignkey')
+    op.drop_column('cart_items', 'market_place_id')

models/__init__.py

@@ -14,6 +14,7 @@ from .ghost_membership_entities import (
 
 from .calendars import Calendar, CalendarEntry, Ticket
 from .page_config import PageConfig
+from .market_place import MarketPlace
 
 
 

models/ghost_content.py

@@ -172,6 +172,14 @@ class Post(Base):
         passive_deletes=True,
     )
 
+    markets: Mapped[List["MarketPlace"]] = relationship(
+        "MarketPlace",
+        back_populates="post",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+        order_by="MarketPlace.name",
+    )
+
 class Author(Base):
     __tablename__ = "authors"
 

models/market.py

@@ -186,11 +186,18 @@ class NavTop(Base):
     id: Mapped[int] = mapped_column(primary_key=True)
     label: Mapped[str] = mapped_column(String(255), nullable=False)
     slug: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
+    market_id: Mapped[Optional[int]] = mapped_column(
+        Integer,
+        ForeignKey("market_places.id", ondelete="SET NULL"),
+        nullable=True,
+        index=True,
+    )
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, server_default=func.now())
     updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, server_default=func.now())
     deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
-    
+
     listings: Mapped[List["Listing"]] = relationship(back_populates="top", cascade="all, delete-orphan")
+    market = relationship("MarketPlace", back_populates="nav_tops")
 
     __table_args__ = (UniqueConstraint("label", "slug", name="uq_nav_tops_label_slug"),)
 
@@ -406,13 +413,23 @@ class CartItem(Base):
         nullable=False,
         server_default=func.now(),
     )
+    market_place_id: Mapped[int | None] = mapped_column(
+        ForeignKey("market_places.id", ondelete="SET NULL"),
+        nullable=True,
+        index=True,
+    )
+
     deleted_at: Mapped[datetime | None] = mapped_column(
         DateTime(timezone=True),
         nullable=True,
     )
 
     # Relationships
-   
+
+    market_place: Mapped["MarketPlace | None"] = relationship(
+        "MarketPlace",
+        foreign_keys=[market_place_id],
+    )
     product: Mapped["Product"] = relationship(
         "Product",
         back_populates="cart_items",

models/market_place.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+from typing import Optional, List
+
+from sqlalchemy import (
+    Integer, String, Text, DateTime, ForeignKey, Index, func, text,
+)
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from db.base import Base
+
+
+def utcnow() -> datetime:
+    return datetime.now(timezone.utc)
+
+
+class MarketPlace(Base):
+    __tablename__ = "market_places"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    post_id: Mapped[int] = mapped_column(
+        Integer,
+        ForeignKey("posts.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    slug: Mapped[str] = mapped_column(String(255), nullable=False)
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), nullable=False, server_default=func.now(),
+    )
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), nullable=False, server_default=func.now(),
+    )
+    deleted_at: Mapped[Optional[datetime]] = mapped_column(
+        DateTime(timezone=True), nullable=True,
+    )
+
+    post = relationship("Post", back_populates="markets")
+    nav_tops: Mapped[List["NavTop"]] = relationship(
+        "NavTop", back_populates="market",
+    )
+
+    __table_args__ = (
+        Index("ix_market_places_post_id", "post_id"),
+        Index(
+            "ux_market_places_slug_active",
+            func.lower(slug),
+            unique=True,
+            postgresql_where=text("deleted_at IS NULL"),
+        ),
+    )

models/order.py

@@ -17,6 +17,12 @@ class Order(Base):
     user_id: Mapped[Optional[int]] = mapped_column(ForeignKey("users.id"), nullable=True)
     session_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, nullable=True)
 
+    page_config_id: Mapped[Optional[int]] = mapped_column(
+        ForeignKey("page_configs.id", ondelete="SET NULL"),
+        nullable=True,
+        index=True,
+    )
+
     status: Mapped[str] = mapped_column(
         String(32),
         nullable=False,
@@ -68,6 +74,11 @@ class Order(Base):
         back_populates="order",
         lazy="selectin",
     )
+    page_config: Mapped[Optional["PageConfig"]] = relationship(
+        "PageConfig",
+        foreign_keys=[page_config_id],
+        lazy="selectin",
+    )
 
 
 class OrderItem(Base):

shared/jinja_setup.py

@@ -13,7 +13,7 @@ from suma_browser.app.csrf import generate_csrf_token
 from suma_browser.app.authz import has_access
 from suma_browser.app.filters import register as register_filters
 
-from .urls import coop_url, market_url, cart_url, events_url, login_url
+from .urls import coop_url, market_url, cart_url, events_url, login_url, page_cart_url
 
 
 def setup_jinja(app: Quart) -> None:
@@ -93,6 +93,7 @@ def setup_jinja(app: Quart) -> None:
     app.jinja_env.globals["cart_url"] = cart_url
     app.jinja_env.globals["events_url"] = events_url
     app.jinja_env.globals["login_url"] = login_url
+    app.jinja_env.globals["page_cart_url"] = page_cart_url
 
     # register jinja filters
     register_filters(app)

shared/urls.py

@@ -37,6 +37,12 @@ def events_url(path: str = "/") -> str:
     return app_url("events", path)
 
 
+def page_cart_url(page_slug: str, path: str = "/") -> str:
+    if not path.startswith("/"):
+        path = "/" + path
+    return cart_url(f"/{page_slug}{path}")
+
+
 def login_url(next_url: str = "") -> str:
     if next_url:
         return coop_url(f"/auth/login/?next={quote(next_url, safe='')}")

suma_browser/templates/_types/cart/_cart.html

@@ -103,7 +103,7 @@
         {% if g.user %}
           <form
             method="post"
-            action="{{ url_for('cart.checkout')|host }}"
+            action="{{ url_for('page_cart.page_checkout')|host if page_post is defined and page_post else url_for('cart_global.checkout')|host }}"
             class="w-full"
           >
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">

suma_browser/templates/_types/cart/checkout_error.html

@@ -27,7 +27,7 @@
 
     <div>
       <a
-        href="{{ url_for('cart.view_cart')|host }}"
+        href="{{ cart_url('/') }}"
         class="inline-flex items-center px-3 py-2 text-xs sm:text-sm rounded-full border border-stone-300 bg-white hover:bg-stone-50 transition"
       >
         <i class="fa fa-shopping-cart mr-2" aria-hidden="true"></i>

suma_browser/templates/_types/cart/header/_header.html

@@ -1,7 +1,7 @@
 {% import 'macros/links.html' as links %}
 {% macro header_row(oob=False) %}
   {% call links.menu_row(id='cart-row', oob=oob) %}
-    {% call links.link(url_for('cart.view_cart'), hx_select_search ) %}
+    {% call links.link(cart_url('/'), hx_select_search ) %}
       <i class="fa fa-shopping-cart"></i>
       <h2 class="text-xl font-bold">cart</h2>
     {% endcall %}

suma_browser/templates/_types/post/admin/_nav_entries.html

@@ -37,6 +37,16 @@
             <div>{{calendar.name}}</div>
           </a>
         {% endfor %}
+
+        {# Markets #}
+        {% for m in markets %}
+          <a
+            href="{{ market_url('/' + post.slug + '/' + m.slug + '/') }}"
+            class="{{styles.nav_button_less_pad}}">
+            <i class="fa fa-shopping-bag" aria-hidden="true"></i>
+            <div>{{m.name}}</div>
+          </a>
+        {% endfor %}
       </div>
     </div>
 

suma_browser/templates/_types/product/_cart.html

@@ -7,9 +7,9 @@
   
   {% if not quantity %}
     <form
-      action="{{ market_url('/product/' + slug + '/cart') }}"
+      action="{{ url_for('market.browse.product.cart', slug=slug) }}"
       method="post"
-      hx-post="{{ market_url('/product/' + slug + '/cart') }}"
+      hx-post="{{ url_for('market.browse.product.cart', slug=slug) }}"
       hx-target="#cart-mini"
       hx-swap="outerHTML"
       class="rounded flex items-center"
@@ -38,9 +38,9 @@
     <div class="rounded flex items-center gap-2">
       <!-- minus -->
       <form
-        action="{{ market_url('/product/' + slug + '/cart') }}"
+        action="{{ url_for('market.browse.product.cart', slug=slug) }}"
         method="post"
-        hx-post="{{ market_url('/product/' + slug + '/cart') }}"
+        hx-post="{{ url_for('market.browse.product.cart', slug=slug) }}"
         hx-target="#cart-mini"
         hx-swap="outerHTML"
       >
@@ -80,9 +80,9 @@
 
       <!-- plus -->
       <form
-        action="{{ market_url('/product/' + slug + '/cart') }}"
+        action="{{ url_for('market.browse.product.cart', slug=slug) }}"
         method="post"
-        hx-post="{{ market_url('/product/' + slug + '/cart') }}"
+        hx-post="{{ url_for('market.browse.product.cart', slug=slug) }}"
         hx-target="#cart-mini"
         hx-swap="outerHTML"
       >
@@ -139,7 +139,7 @@
       <div class="flex flex-col sm:flex-row sm:items-start justify-between gap-2 sm:gap-3">
         <div class="min-w-0">
           <h2 class="text-sm sm:text-base md:text-lg font-semibold text-stone-900">
-            {% set href=market_url('/product/' + p.slug + '/') %}
+            {% set href=url_for('market.browse.product.product_detail', slug=p.slug) %}
             <a
               href="{{ href }}"
               hx_get="{{href}}"
@@ -189,9 +189,9 @@
         <div class="flex items-center gap-2 text-xs sm:text-sm text-stone-700">
           <span class="text-[0.65rem] sm:text-xs uppercase tracking-wide text-stone-500">Quantity</span>
           <form
-            action="{{ market_url('/product/' + p.slug + '/cart') }}"
+            action="{{ url_for('market.browse.product.cart', slug=p.slug) }}"
             method="post"
-            hx-post="{{ market_url('/product/' + p.slug + '/cart') }}"
+            hx-post="{{ url_for('market.browse.product.cart', slug=p.slug) }}"
             hx-target="#cart-mini"
             hx-swap="outerHTML"
           >
@@ -212,9 +212,9 @@
             {{ item.quantity }}
           </span>
           <form
-            action="{{ market_url('/product/' + p.slug + '/cart') }}"
+            action="{{ url_for('market.browse.product.cart', slug=p.slug) }}"
             method="post"
-            hx-post="{{ market_url('/product/' + p.slug + '/cart') }}"
+            hx-post="{{ url_for('market.browse.product.cart', slug=p.slug) }}"
             hx-target="#cart-mini"
             hx-swap="outerHTML"
           >

suma_browser/templates/_types/root/_nav.html

@@ -1,4 +1,4 @@
-{% set _app_slugs = {'market': market_url('/'), 'cart': cart_url('/')} %}
+{% set _app_slugs = {'cart': cart_url('/')} %}
 <div class="flex flex-col sm:flex-row sm:items-center gap-2 border-r border-stone-200 mr-2 sm:max-w-2xl"
      id="menu-items-nav-wrapper">
   {% from 'macros/scrolling_menu.html' import scrolling_menu with context %}