orders search query also working now

assets/i18n/en/main.ftl

@@ -209,6 +209,14 @@ product = Product
 name = Name
 price = Price
 sale-price = Sale price
+variants-options = Variants / options
+add-option = Add option
+option-label = Option label
+optional = optional
+stock-untracked-hint = Leave blank = available without stock tracking
+available = Available
+choose-option = Choose an option
+from-price = from { $price }
 admin-discounts = Discounts
 admin-discounts-desc = Set discounted product prices. A discount shows up as a sale in the shop.
 business-discount-desc = A baseline discount for all business accounts (off the regular price). Profiles and negotiated prices apply on top (lowest price wins).
@@ -277,6 +285,10 @@ currency = Currency
 category = Category
 no-category = No category
 image = Image
+images = Images
+main-image = Main
+gallery-hint = The first image is the main one. Drag to reorder, click ✕ to remove.
+add-images = Add images
 slug = URL slug
 slug-auto = generated automatically
 position = Position
@@ -295,6 +307,32 @@ confirm-delete = Delete this for good?
 shop-title = Shop
 shop-subtitle = browse our products.
 shop-empty = There are no products here yet.
+search-placeholder = Search products…
+order-search-placeholder = Search orders…
+search-empty = Nothing matched your search:
+results-count = { $count } products
+sort-label = Sort
+sort-relevance = Relevance
+sort-newest = Newest
+sort-price_asc = Price: low to high
+sort-price_desc = Price: high to low
+sort-name_asc = Name: A–Z
+sort-name_desc = Name: Z–A
+filter-category = Category
+filter-all-categories = All categories
+filter-uncategorized = Uncategorized
+filter-price = Price
+filter-price-from = Price from
+filter-price-to = Price to
+filter-in-stock = In stock only
+filter-apply = Apply
+filter-clear = Clear
+pagination = Pagination
+page-of = Page { $page } of { $pages }
+prev = Previous
+next = Next
+view-grid = Grid view
+view-list = List view
 categories = Categories
 all-products = All products
 uncategorized = Uncategorized

assets/i18n/sk/main.ftl

@@ -209,6 +209,14 @@ product = Produkt
 name = Názov
 price = Cena
 sale-price = Zľavnená cena
+variants-options = Varianty / možnosti
+add-option = Pridať možnosť
+option-label = Označenie možnosti
+optional = voliteľné
+stock-untracked-hint = Nechajte prázdne = dostupné bez sledovania zásob
+available = Dostupné
+choose-option = Vyberte možnosť
+from-price = od { $price }
 admin-discounts = Zľavy
 admin-discounts-desc = Nastavte zľavnené ceny produktov. Zľava sa v obchode zobrazí ako akcia.
 business-discount-desc = Základná zľava pre všetky firemné účty (z bežnej ceny). Profily a dohodnuté ceny sa uplatnia navyše (platí najnižšia cena).
@@ -277,6 +285,10 @@ currency = Mena
 category = Kategória
 no-category = Bez kategórie
 image = Obrázok
+images = Obrázky
+main-image = Hlavný
+gallery-hint = Prvý obrázok je hlavný. Potiahnutím zmeníte poradie, krížikom obrázok odstránite.
+add-images = Pridať obrázky
 slug = URL adresa
 slug-auto = vygeneruje sa automaticky
 position = Poradie
@@ -295,6 +307,32 @@ confirm-delete = Naozaj zmazať?
 shop-title = Obchod
 shop-subtitle = prezrite si našu ponuku produktov.
 shop-empty = Zatiaľ tu nie sú žiadne produkty.
+search-placeholder = Hľadať produkty…
+order-search-placeholder = Hľadať objednávky…
+search-empty = Pre váš výraz sme nič nenašli:
+results-count = { $count } produktov
+sort-label = Zoradiť
+sort-relevance = Relevancia
+sort-newest = Najnovšie
+sort-price_asc = Cena: od najnižšej
+sort-price_desc = Cena: od najvyššej
+sort-name_asc = Názov: A–Z
+sort-name_desc = Názov: Z–A
+filter-category = Kategória
+filter-all-categories = Všetky kategórie
+filter-uncategorized = Bez kategórie
+filter-price = Cena
+filter-price-from = Cena od
+filter-price-to = Cena do
+filter-in-stock = Len skladom
+filter-apply = Použiť
+filter-clear = Zrušiť
+pagination = Stránkovanie
+page-of = Strana { $page } z { $pages }
+prev = Predchádzajúce
+next = Ďalšie
+view-grid = Zobrazenie v mriežke
+view-list = Zobrazenie v zozname
 categories = Kategórie
 all-products = Všetky produkty
 uncategorized = Bez kategórie

assets/views/account/order_detail.html

@@ -29,7 +29,7 @@
     <ul class="space-y-2 pb-3 text-sm">
       {% for item in items %}
       <li class="flex justify-between gap-2">
-        <span class="text-on-surface/80 dark:text-on-surface-dark/80">{{ item.product_name }} × {{ item.quantity }}</span>
+        <span class="text-on-surface/80 dark:text-on-surface-dark/80">{{ item.product_name }}{% if item.variant_label %} · {{ item.variant_label }}{% endif %} × {{ item.quantity }}</span>
         <span class="tabular-nums">{{ item.line_total }} {{ order.currency }}</span>
       </li>
       {% endfor %}

assets/views/admin/catalog/product_form.html

@@ -18,38 +18,95 @@
   {{ ui::csrf_field() }}
 
   {% if product %}
-    {% set v_name = product.name %}{% set v_price = product.price %}{% set v_currency = product.currency %}{% set v_stock = product.stock %}{% set v_sku = product.sku | default(value="") %}{% set v_desc = product.description | default(value="") %}{% set v_pub = product.published %}
+    {% set v_name = product.name %}{% set v_currency = product.currency %}{% set v_desc = product.description | default(value="") %}{% set v_pub = product.published %}
   {% else %}
-    {% set v_name = "" %}{% set v_price = "" %}{% set v_currency = "EUR" %}{% set v_stock = 0 %}{% set v_sku = "" %}{% set v_desc = "" %}{% set v_pub = false %}
+    {% set v_name = "" %}{% set v_currency = "EUR" %}{% set v_desc = "" %}{% set v_pub = false %}
   {% endif %}
+  {% set inp = "w-full rounded-radius border border-outline bg-surface-alt px-3 py-2 text-sm text-on-surface focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark-alt/50 dark:text-on-surface-dark dark:focus-visible:outline-primary-dark" %}
+  {% set sublabel = "text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70" %}
 
   <div class="space-y-1.5">
     <label for="name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="name", lang=lang | default(value='sk')) }}</label>
     {{ ui::input(name="name", id="name", required=true, value=v_name) }}
   </div>
 
-  <div class="grid gap-5 sm:grid-cols-2">
-    <div class="space-y-1.5">
-      <label for="price" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="price", lang=lang | default(value='sk')) }}</label>
-      {{ ui::input(name="price", id="price", required=true, value=v_price, placeholder="0.00", attrs='inputmode="decimal"') }}
-    </div>
-    <div class="space-y-1.5">
-      <label for="currency" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="currency", lang=lang | default(value='sk')) }}</label>
-      {{ ui::input(name="currency", id="currency", value=v_currency, attrs='maxlength="3"', extra="uppercase") }}
-    </div>
+  <div class="space-y-1.5 sm:max-w-[10rem]">
+    <label for="currency" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="currency", lang=lang | default(value='sk')) }}</label>
+    {{ ui::input(name="currency", id="currency", value=v_currency, attrs='maxlength="3"', extra="uppercase") }}
   </div>
 
-  <div class="grid gap-5 sm:grid-cols-2">
-    <div class="space-y-1.5">
-      <label for="stock" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="stock", lang=lang | default(value='sk')) }}</label>
-      {{ ui::input(name="stock", id="stock", type="number", value=v_stock, attrs='min="0"') }}
-    </div>
-    <div class="space-y-1.5">
-      <label for="sku" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="sku", lang=lang | default(value='sk')) }}</label>
-      {{ ui::input(name="sku", id="sku", value=v_sku) }}
+  {# --- Variants / options editor ------------------------------------------- #}
+  {# Each product is sold as one or more variants (a free-text label such as     #}
+  {# "10cm x 13cm" or "5ml" plus its own price). Price is required. Stock is      #}
+  {# optional — leave it blank ("∞") to mark the option simply available (not     #}
+  {# inventory-tracked). SKU and business price are optional too. Rows are        #}
+  {# managed client-side; names are indexed (variants[i][…]) and read back by     #}
+  {# the controller.                                                              #}
+  {% set opt = " (" ~ t(key="optional", lang=lang | default(value='sk')) ~ ")" %}
+  <script id="variants-data" type="application/json">{{ variants | json_encode() | safe }}</script>
+  <div class="space-y-3" x-data="variantEditor(JSON.parse(document.getElementById('variants-data').textContent))">
+    <div class="flex items-center justify-between">
+      <span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="variants-options", lang=lang | default(value='sk')) }}</span>
+      <button type="button" @click="add()"
+        class="rounded-radius border border-outline px-3 py-1.5 text-sm font-medium text-on-surface hover:bg-surface-alt dark:border-outline-dark dark:text-on-surface-dark dark:hover:bg-surface-dark-alt/50">
+        + {{ t(key="add-option", lang=lang | default(value='sk')) }}
+      </button>
     </div>
+
+    <template x-for="(row, i) in rows" :key="i">
+      <div class="flex items-end gap-3 rounded-radius border border-outline bg-surface-alt/40 p-3 dark:border-outline-dark dark:bg-surface-dark-alt/30">
+        <input type="hidden" :name="`variants[${i}][id]`" :value="row.id">
+
+        {# items-end bottom-aligns every input regardless of how many lines each
+           label takes, so the row stays aligned even with the "(optional)" notes. #}
+        <div class="grid flex-1 grid-cols-2 gap-3 sm:grid-cols-12 sm:items-end">
+          <div class="space-y-1 col-span-2 sm:col-span-4">
+            <label class="{{ sublabel }} block truncate">{{ t(key="option-label", lang=lang | default(value='sk')) }}{{ opt }}</label>
+            <input :name="`variants[${i}][label]`" x-model="row.label" class="{{ inp }}" placeholder="napr. 10cm x 13cm">
+          </div>
+          <div class="space-y-1 sm:col-span-2">
+            <label class="{{ sublabel }} block truncate">{{ t(key="sku", lang=lang | default(value='sk')) }}{{ opt }}</label>
+            <input :name="`variants[${i}][sku]`" x-model="row.sku" class="{{ inp }}">
+          </div>
+          <div class="space-y-1 sm:col-span-2">
+            <label class="{{ sublabel }} block truncate">{{ t(key="stock", lang=lang | default(value='sk')) }}{{ opt }}</label>
+            <input type="number" min="0" :name="`variants[${i}][stock]`" x-model="row.stock" class="{{ inp }}" placeholder="∞" title="{{ t(key='stock-untracked-hint', lang=lang | default(value='sk')) }}">
+          </div>
+          <div class="space-y-1 sm:col-span-2">
+            <label class="{{ sublabel }} block truncate">{{ t(key="price", lang=lang | default(value='sk')) }}</label>
+            <input :name="`variants[${i}][price]`" x-model="row.price" inputmode="decimal" required class="{{ inp }}" placeholder="0.00">
+          </div>
+          <div class="space-y-1 sm:col-span-2">
+            <label class="{{ sublabel }} block truncate">{{ t(key="business-price", lang=lang | default(value='sk')) }}{{ opt }}</label>
+            <input :name="`variants[${i}][business_sale]`" x-model="row.business_sale" inputmode="decimal" class="{{ inp }}" placeholder="—">
+          </div>
+        </div>
+
+        <button type="button" @click="remove(i)"
+          class="mb-1 shrink-0 rounded-radius px-2 py-2 text-sm text-danger hover:bg-danger/10" title="{{ t(key='delete', lang=lang | default(value='sk')) }}">✕</button>
+      </div>
+    </template>
   </div>
 
+  <script>
+    function variantEditor(initial) {
+      const blank = () => ({ id: '', label: '', sku: '', stock: '', price: '', business_sale: '' });
+      return {
+        rows: (initial || []).map(r => ({
+          id: r.id || '',
+          label: r.label || '',
+          sku: r.sku || '',
+          stock: (r.stock === null || r.stock === undefined) ? '' : r.stock,
+          price: r.price || '',
+          business_sale: r.business_sale || '',
+        })),
+        init() { if (this.rows.length === 0) this.add(); },
+        add() { this.rows.push(blank()); },
+        remove(i) { this.rows.splice(i, 1); if (this.rows.length === 0) this.add(); },
+      };
+    }
+  </script>
+
   <div class="space-y-1.5">
     <label for="category_id" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="category", lang=lang | default(value='sk')) }}</label>
     <div class="relative">
@@ -69,12 +126,86 @@
     {{ ui::textarea(name="description", id="description", rows="5", value=v_desc) }}
   </div>
 
-  <div class="space-y-1.5">
-    <label for="image" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="image", lang=lang | default(value='sk')) }}</label>
-    {% if product and product.image %}
-    <img src="/images/{{ product.image }}" alt="" class="size-24 rounded-radius object-cover">
-    {% endif %}
-    {{ ui::file_input(name="image", id="image", accept="image/*") }}
+  {# --- Images gallery ------------------------------------------------------- #}
+  {# Unified drag-orderable gallery: existing images (with id) and new uploads       #}
+  {# (placeholder blobs) live in a single list. The full order is submitted as        #}
+  {# repeated `image_order` fields — an integer id for kept images or `new` for       #}
+  {# each uploaded file. The DataTransfer backing the hidden `image` file input       #}
+  {# is rebuilt after every reorder / add / remove so the file-part order matches     #}
+  {# the relative order of `new` slots in `image_order`.                              #}
+  <script id="images-data" type="application/json">{% if product %}{{ product.images | json_encode() | safe }}{% else %}[]{% endif %}</script>
+  <div class="space-y-2" x-data="{
+        init() {
+          const existing = JSON.parse(document.getElementById('images-data').textContent);
+          this.items = existing.map(im => ({ type: 'existing', id: im.id, image_id: im.image_id }));
+        },
+        items: [],
+        dt: new DataTransfer(),
+        dragIndex: null,
+
+        rebuildDt() {
+          this.dt = new DataTransfer();
+          for (const it of this.items) {
+            if (it.type === 'new') this.dt.items.add(it.file);
+          }
+          this.$refs.holder.files = this.dt.files;
+        },
+
+        onDrop(i) {
+          if (this.dragIndex === null || this.dragIndex === i) { this.dragIndex = null; return; }
+          this.items.splice(i, 0, this.items.splice(this.dragIndex, 1)[0]);
+          this.dragIndex = null;
+          this.rebuildDt();
+        },
+
+        addFiles(e) {
+          for (const f of e.target.files) {
+            this.items.push({ type: 'new', file: f, url: URL.createObjectURL(f) });
+          }
+          this.rebuildDt();
+          e.target.value = '';
+        },
+
+        remove(i) {
+          const it = this.items[i];
+          if (it.type === 'new') URL.revokeObjectURL(it.url);
+          this.items.splice(i, 1);
+          this.rebuildDt();
+        },
+      }">
+    <span class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="images", lang=lang | default(value='sk')) }}</span>
+    <p class="{{ sublabel }}">{{ t(key="gallery-hint", lang=lang | default(value='sk')) }}</p>
+
+    <div class="flex flex-wrap gap-3" x-show="items.length">
+      <template x-for="(it, i) in items" :key="it.type === 'existing' ? it.id : it.url">
+        <div draggable="true"
+          @dragstart="dragIndex = i"
+          @dragover.prevent
+          @drop.prevent="onDrop(i)"
+          :class="dragIndex === i ? 'opacity-50' : ''"
+          class="group relative size-24 cursor-move overflow-hidden rounded-radius border border-outline dark:border-outline-dark">
+
+          <input type="hidden" name="image_order" :value="it.type === 'existing' ? it.id : 'new'">
+
+          <img :src="it.type === 'existing' ? `/images/${it.image_id}` : it.url" alt="" class="size-full object-cover">
+
+          <span x-show="i === 0"
+            class="absolute left-1 top-1 rounded-radius bg-primary px-1.5 py-0.5 text-[10px] font-semibold text-on-primary dark:bg-primary-dark dark:text-on-primary-dark">{{ t(key="main-image", lang=lang | default(value='sk')) }}</span>
+          <button type="button" @click="remove(i)"
+            class="absolute right-1 top-1 flex size-5 items-center justify-center rounded-full bg-surface/70 text-xs text-danger opacity-0 transition group-hover:opacity-100 dark:bg-surface-dark/70"
+            title="{{ t(key='delete', lang=lang | default(value='sk')) }}">✕</button>
+        </div>
+      </template>
+    </div>
+
+    {# Hidden input carries the accumulated files on submit; the visible picker   #}
+    {# only feeds addFiles() and is reset after each pick so selections stack.     #}
+    <input type="file" name="image" multiple class="hidden" x-ref="holder">
+    <input type="file" accept="image/*" multiple class="hidden" x-ref="picker" @change="addFiles($event)">
+    <button type="button" @click="$refs.picker.click()"
+      class="rounded-radius border border-outline px-3 py-1.5 text-sm font-medium text-on-surface hover:bg-surface-alt dark:border-outline-dark dark:text-on-surface-dark dark:hover:bg-surface-dark-alt/50">
+      + {{ t(key="add-images", lang=lang | default(value='sk')) }}
+    </button>
   </div>
 
   {{ ui::checkbox(name="published", id="published", label=t(key="published", lang=lang | default(value='sk')), checked=v_pub) }}

assets/views/admin/catalog/products.html

@@ -7,6 +7,8 @@
 
 {% block content %}
 {% set business = audience == "business" %}
+{% set L = lang | default(value='sk') %}
+{% set q_enc = query | default(value='') | urlencode %}
 <div class="flex flex-wrap items-end justify-between gap-3">
   <div>
     <h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="admin-products", lang=lang | default(value='sk')) }}</h1>
@@ -15,20 +17,34 @@
   {{ ui::button(label=t(key="new-product", lang=lang | default(value='sk')), href="/admin/catalog/products/new") }}
 </div>
 
-<!-- audience tabs -->
-<div class="mt-4 inline-flex rounded-radius border border-outline p-1 dark:border-outline-dark">
-  <a href="/admin/catalog/products?audience=personal"
-    class="rounded-radius px-4 py-1.5 text-sm font-medium {% if not business %}bg-primary/10 text-on-surface-strong dark:bg-primary-dark/10 dark:text-on-surface-dark-strong{% else %}text-on-surface/70 dark:text-on-surface-dark/70{% endif %}">
-    {{ t(key="audience-personal", lang=lang | default(value='sk')) }}
-  </a>
-  <a href="/admin/catalog/products?audience=business"
-    class="rounded-radius px-4 py-1.5 text-sm font-medium {% if business %}bg-primary/10 text-on-surface-strong dark:bg-primary-dark/10 dark:text-on-surface-dark-strong{% else %}text-on-surface/70 dark:text-on-surface-dark/70{% endif %}">
-    {{ t(key="audience-business", lang=lang | default(value='sk')) }}
-  </a>
+<div class="mt-4 flex flex-wrap items-center justify-between gap-3">
+  <!-- audience tabs -->
+  <div class="inline-flex rounded-radius border border-outline p-1 dark:border-outline-dark">
+    <a href="/admin/catalog/products?audience=personal&q={{ q_enc }}"
+      class="rounded-radius px-4 py-1.5 text-sm font-medium {% if not business %}bg-primary/10 text-on-surface-strong dark:bg-primary-dark/10 dark:text-on-surface-dark-strong{% else %}text-on-surface/70 dark:text-on-surface-dark/70{% endif %}">
+      {{ t(key="audience-personal", lang=L) }}
+    </a>
+    <a href="/admin/catalog/products?audience=business&q={{ q_enc }}"
+      class="rounded-radius px-4 py-1.5 text-sm font-medium {% if business %}bg-primary/10 text-on-surface-strong dark:bg-primary-dark/10 dark:text-on-surface-dark-strong{% else %}text-on-surface/70 dark:text-on-surface-dark/70{% endif %}">
+      {{ t(key="audience-business", lang=L) }}
+    </a>
+  </div>
+
+  <!-- product search (drafts included); keeps the active audience + category -->
+  <form method="get" action="/admin/catalog/products" role="search" class="relative w-full max-w-xs">
+    <input type="hidden" name="audience" value="{{ audience }}">
+    <input type="hidden" name="category" value="{{ selected_category }}">
+    <span class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-on-surface/50 dark:text-on-surface-dark/50">
+      {{ ui::icon(name="search", size="size-5") }}
+    </span>
+    <input type="search" name="q" value="{{ query | default(value='') }}" autocomplete="off"
+      placeholder="{{ t(key='search-placeholder', lang=L) }}" aria-label="{{ t(key='search-placeholder', lang=L) }}"
+      class="w-full rounded-radius border border-outline bg-surface py-2 pl-10 pr-3 text-sm text-on-surface placeholder:text-on-surface/50 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50 dark:focus-visible:outline-primary-dark">
+  </form>
 </div>
 
 {% set category_base = "/admin/catalog/products" %}
-{% set category_suffix = "&audience=" ~ audience %}
+{% set category_suffix = "&audience=" ~ audience ~ "&q=" ~ q_enc %}
 <div class="mt-4 flex flex-col gap-6 md:flex-row md:items-start">
   {% include "admin/partials/category_filter.html" %}
 
@@ -83,7 +99,7 @@
       <tr>
         {{ ui::th(label=t(key="product", lang=lang | default(value='sk'))) }}
         {{ ui::th(label=t(key="price", lang=lang | default(value='sk'))) }}
-        {{ ui::th(label=t(key="sale-price", lang=lang | default(value='sk'))) }}
+        {{ ui::th(label=t(key="variants-options", lang=lang | default(value='sk'))) }}
         {{ ui::th(label=t(key="effective-price", lang=lang | default(value='sk'))) }}
         {{ ui::th(label=t(key="stock", lang=lang | default(value='sk'))) }}
         {{ ui::th(label=t(key="status", lang=lang | default(value='sk'))) }}
@@ -106,15 +122,8 @@
             </div>
           </div>
         </td>
-        <td class="px-4 py-3 tabular-nums">{{ product.regular_price }} {{ product.currency }}</td>
-        <td class="px-4 py-3 tabular-nums">
-          {% if product.on_sale %}
-          <span class="font-medium text-danger">{{ product.sale_price }} {{ product.currency }}</span>
-          <span class="ml-1 text-xs text-on-surface/60 dark:text-on-surface-dark/60">(−{{ product.percent_off }}%)</span>
-          {% else %}
-          <span class="text-on-surface/40 dark:text-on-surface-dark/40">—</span>
-          {% endif %}
-        </td>
+        <td class="px-4 py-3 tabular-nums">{% if product.has_options %}{{ t(key="from-price", price=product.regular_price, lang=lang | default(value='sk')) }}{% else %}{{ product.regular_price }}{% endif %} {{ product.currency }}</td>
+        <td class="px-4 py-3 tabular-nums">{{ product.variant_count }}</td>
         <td class="px-4 py-3 tabular-nums">
           <span id="eff-{{ product.id }}">{{ ui::eff_price(p=product) }}</span>
         </td>
@@ -129,14 +138,6 @@
         <td class="px-4 py-3">
           <div class="flex flex-wrap justify-end gap-2">
             {{ ui::button(variant="outline-secondary", label=t(key="edit", lang=lang | default(value='sk')), href="/admin/catalog/products/" ~ product.id ~ "/edit", size="px-3 py-1.5 text-xs") }}
-            {{ ui::button(variant="outline-secondary", label=t(key="set-discount", lang=lang | default(value='sk')), href="/admin/catalog/products/" ~ product.id ~ "/discount/edit?audience=" ~ audience, size="px-3 py-1.5 text-xs") }}
-            {% if product.on_sale %}
-            <form method="post" action="/admin/catalog/products/{{ product.id }}/discount/remove?audience={{ audience }}"
-              onsubmit="return confirm('{{ t(key="discount-remove-confirm", lang=lang | default(value='sk')) }}')">
-              {{ ui::csrf_field() }}
-              {{ ui::button(variant="outline-danger", label=t(key="remove-discount", lang=lang | default(value='sk')), type="submit", size="px-3 py-1.5 text-xs") }}
-            </form>
-            {% endif %}
             {{ ui::button(variant="outline-secondary", label=t(key="view", lang=lang | default(value='sk')), href="/shop/" ~ product.slug, size="px-3 py-1.5 text-xs") }}
             <form method="post" action="/admin/catalog/products/{{ product.id }}/delete"
               onsubmit="return confirm('{{ t(key="confirm-delete", lang=lang | default(value='sk')) }}')">

assets/views/admin/customers/price_form.html

@@ -8,7 +8,7 @@
 <div class="flex items-center justify-between gap-3">
   <div>
     <div class="flex items-center gap-2">
-      <h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</h1>
+      <h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}{% if product.variant_label %} <span class="text-on-surface/60 dark:text-on-surface-dark/60">· {{ product.variant_label }}</span>{% endif %}</h1>
       {{ ui::badge(label=t(key="negotiated-price", lang=lang | default(value='sk')), variant="info") }}
     </div>
     <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ customer.name }}</p>
@@ -20,7 +20,7 @@
 <div class="mt-4 max-w-md">{{ ui::alert_danger(message=t(key=error, lang=lang | default(value='sk'))) }}</div>
 {% endif %}
 
-<form method="post" action="/admin/customers/{{ customer.id }}/prices/{{ product.id }}"
+<form method="post" action="/admin/customers/{{ customer.id }}/prices/{{ product.variant_id }}"
   x-data="{
     price: '{{ negotiated }}',
     regular: {{ product.regular_cents }},
@@ -71,7 +71,7 @@
   <div class="flex flex-wrap gap-3 pt-2">
     {{ ui::button(variant="secondary", label=t(key="save", lang=lang | default(value='sk')), type="submit") }}
     {% if has_negotiated %}
-    {{ ui::button(variant="outline-danger", label=t(key="remove", lang=lang | default(value='sk')), type="submit", attrs=`formaction="/admin/customers/` ~ customer.id ~ `/prices/` ~ product.id ~ `/remove" onclick="return confirm('` ~ t(key="negotiated-remove-confirm", lang=lang | default(value='sk')) ~ `')"`) }}
+    {{ ui::button(variant="outline-danger", label=t(key="remove", lang=lang | default(value='sk')), type="submit", attrs=`formaction="/admin/customers/` ~ customer.id ~ `/prices/` ~ product.variant_id ~ `/remove" onclick="return confirm('` ~ t(key="negotiated-remove-confirm", lang=lang | default(value='sk')) ~ `')"`) }}
     {% endif %}
   </div>
 </form>
@@ -83,7 +83,7 @@
     <h2 class="text-lg font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="automated-price", lang=lang | default(value='sk')) }}</h2>
     {{ ui::badge(label=t(key="collision", lang=lang | default(value='sk')), variant="warning") }}
   </div>
-  <form method="post" action="/admin/customers/{{ customer.id }}/resolutions/{{ product.id }}" class="mt-3 flex items-center gap-2">
+  <form method="post" action="/admin/customers/{{ customer.id }}/resolutions/{{ product.variant_id }}" class="mt-3 flex items-center gap-2">
     {{ ui::csrf_field() }}
     <select name="profile_id" class="rounded-radius border border-outline bg-surface-alt px-2 py-1.5 text-sm dark:border-outline-dark dark:bg-surface-dark-alt/50 dark:text-on-surface-dark">
       {% for c in covering %}

assets/views/admin/customers/show.html

@@ -5,6 +5,8 @@
 {% block crumb %}{{ t(key="admin-customers", lang=lang | default(value='sk')) }}{% endblock crumb %}
 
 {% block content %}
+{% set L = lang | default(value='sk') %}
+{% set q_enc = query | default(value='') | urlencode %}
 <div class="flex items-center justify-between gap-3">
   <div>
     <h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ customer.name }}</h1>
@@ -41,10 +43,23 @@
   {% endif %}
 </section>
 
-<p class="mt-6 text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="negotiated-prices-hint", lang=lang | default(value='sk')) }}</p>
+<div class="mt-6 flex flex-wrap items-center justify-between gap-3">
+  <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="negotiated-prices-hint", lang=L) }}</p>
+
+  <!-- product search (drafts included); keeps the active category -->
+  <form method="get" action="/admin/customers/{{ customer.id }}" role="search" class="relative w-full max-w-xs">
+    <input type="hidden" name="category" value="{{ selected_category }}">
+    <span class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-on-surface/50 dark:text-on-surface-dark/50">
+      {{ ui::icon(name="search", size="size-5") }}
+    </span>
+    <input type="search" name="q" value="{{ query | default(value='') }}" autocomplete="off"
+      placeholder="{{ t(key='search-placeholder', lang=L) }}" aria-label="{{ t(key='search-placeholder', lang=L) }}"
+      class="w-full rounded-radius border border-outline bg-surface py-2 pl-10 pr-3 text-sm text-on-surface placeholder:text-on-surface/50 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50 dark:focus-visible:outline-primary-dark">
+  </form>
+</div>
 
 {% set category_base = "/admin/customers/" ~ customer.id %}
-{% set category_suffix = "" %}
+{% set category_suffix = "&q=" ~ q_enc %}
 <div class="mt-3 flex flex-col gap-6 md:flex-row md:items-start">
   {% include "admin/partials/category_filter.html" %}
   <div class="min-w-0 flex-1 {{ ui::table_wrap_cls() }}">
@@ -61,7 +76,10 @@
     <tbody class="{{ ui::tbody_cls() }}">
       {% for product in products %}
       <tr class="{{ ui::row_cls() }}">
-        <td class="px-4 py-3 font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</td>
+        <td class="px-4 py-3 font-medium text-on-surface-strong dark:text-on-surface-dark-strong">
+          {{ product.name }}
+          {% if product.variant_label %}<span class="block text-xs font-normal text-on-surface/60 dark:text-on-surface-dark/60">{{ product.variant_label }}</span>{% endif %}
+        </td>
         <td class="px-4 py-3 tabular-nums">
           {% if product.business_reduced %}
           <span class="font-medium text-danger">{{ product.business_price }} {{ product.currency }}</span>
@@ -76,9 +94,9 @@
         </td>
         <td class="px-4 py-3">
           <div class="flex flex-wrap justify-end gap-2">
-            {{ ui::button(variant="outline-secondary", label=t(key="set-negotiated-price", lang=lang | default(value='sk')), href="/admin/customers/" ~ customer.id ~ "/prices/" ~ product.product_id ~ "/edit", size="px-3 py-1.5 text-xs") }}
+            {{ ui::button(variant="outline-secondary", label=t(key="set-negotiated-price", lang=lang | default(value='sk')), href="/admin/customers/" ~ customer.id ~ "/prices/" ~ product.variant_id ~ "/edit", size="px-3 py-1.5 text-xs") }}
             {% if product.has_negotiated %}
-            <form method="post" action="/admin/customers/{{ customer.id }}/prices/{{ product.product_id }}/remove"
+            <form method="post" action="/admin/customers/{{ customer.id }}/prices/{{ product.variant_id }}/remove"
               onsubmit="return confirm('{{ t(key="negotiated-remove-confirm", lang=lang | default(value='sk')) }}')">
               {{ ui::csrf_field() }}
               {{ ui::button(variant="outline-danger", label=t(key="remove", lang=lang | default(value='sk')), type="submit", size="px-3 py-1.5 text-xs") }}

assets/views/admin/orders/index.html

@@ -5,7 +5,24 @@
 {% block crumb %}{{ t(key="admin-orders", lang=lang | default(value='sk')) }}{% endblock crumb %}
 
 {% block content %}
-<h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="admin-orders", lang=lang | default(value='sk')) }}</h1>
+{% set L = lang | default(value='sk') %}
+<div class="flex flex-wrap items-center justify-between gap-3">
+  <h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="admin-orders", lang=L) }}</h1>
+
+  <!-- order search: order number, customer, email, company, phone, tracking -->
+  <form method="get" action="/admin/orders" role="search" class="relative w-full max-w-xs">
+    <span class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-on-surface/50 dark:text-on-surface-dark/50">
+      {{ ui::icon(name="search", size="size-5") }}
+    </span>
+    <input type="search" name="q" value="{{ query | default(value='') }}" autocomplete="off"
+      placeholder="{{ t(key='order-search-placeholder', lang=L) }}" aria-label="{{ t(key='order-search-placeholder', lang=L) }}"
+      class="w-full rounded-radius border border-outline bg-surface py-2 pl-10 pr-3 text-sm text-on-surface placeholder:text-on-surface/50 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50 dark:focus-visible:outline-primary-dark">
+  </form>
+</div>
+
+{% if query and query != "" %}
+<p class="mt-2 text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="results-count", lang=L, count=total) }} · “{{ query }}”</p>
+{% endif %}
 
 <div class="mt-6 {{ ui::table_wrap_cls() }}">
   {% if orders | length > 0 %}

assets/views/admin/orders/show.html

@@ -36,7 +36,7 @@
         <tbody class="{{ ui::tbody_cls() }}">
           {% for item in items %}
           <tr>
-            <td class="px-4 py-3">{{ item.product_name }}</td>
+            <td class="px-4 py-3">{{ item.product_name }}{% if item.variant_label %} <span class="text-on-surface/60 dark:text-on-surface-dark/60">· {{ item.variant_label }}</span>{% endif %}</td>
             <td class="px-4 py-3 tabular-nums">{{ item.quantity }}</td>
             <td class="px-4 py-3 text-right tabular-nums">{{ item.line_total }} {{ order.currency }}</td>
           </tr>

assets/views/macros/ui.html

@@ -83,6 +83,8 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="{{ size }}{% if extra %} {{ extra }}{% endif %}" aria-hidden="true" {{ attrs | safe }}><path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" /></svg>
 {%- elif name == "chevron-double-left" -%}
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="{{ size }}{% if extra %} {{ extra }}{% endif %}" aria-hidden="true" {{ attrs | safe }}><path stroke-linecap="round" stroke-linejoin="round" d="m18.75 4.5-7.5 7.5 7.5 7.5m-6-15L5.25 12l7.5 7.5" /></svg>
+{%- elif name == "search" -%}
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="{{ size }}{% if extra %} {{ extra }}{% endif %}" aria-hidden="true" {{ attrs | safe }}><path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" /></svg>
 {%- else -%}
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="{{ size }}{% if extra %} {{ extra }}{% endif %}" aria-hidden="true" {{ attrs | safe }}><path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" /></svg>
 {%- endif -%}

assets/views/shop/_card.html

@@ -1,40 +1,53 @@
+{# Imported locally (not just inherited from base.html) so the card also renders
+   inside standalone htmx fragments like shop/_results.html, where Tera's import
+   chain from the layout isn't present. #}
+{% import "macros/ui.html" as ui %}
 {# Adapted from the vendored Penguin UI component
    (penguinui-components/card/ecommerce-product-card.html):
    wired to our product data + i18n + htmx add-to-cart + toast. The demo rating
    stars, hardcoded title/price/description/image and the `max-w-sm` (which fights
    the shop grid) are dropped; the whole card links to the product page. #}
+{# Layout adapts to the `view` Alpine state set by _product_grid.html:
+   'grid' (default) → vertical card; 'list' → horizontal row. On pages without
+   that state (e.g. home) `view` is undefined, so the grid layout applies. #}
 <article
-  class="group flex flex-col overflow-hidden rounded-radius border border-outline bg-surface-alt text-on-surface transition hover:border-primary dark:border-outline-dark dark:bg-surface-dark-alt dark:text-on-surface-dark dark:hover:border-primary-dark">
-  <a href="/shop/{{ product.slug }}" class="flex flex-1 flex-col">
+  class="group flex overflow-hidden rounded-radius border border-outline bg-surface-alt text-on-surface transition hover:border-primary dark:border-outline-dark dark:bg-surface-dark-alt dark:text-on-surface-dark dark:hover:border-primary-dark"
+  :class="view === 'list' ? 'flex-row flex-wrap' : 'flex-col'">
+  <a href="/shop/{{ product.slug }}" class="flex min-w-0 flex-1"
+    :class="view === 'list' ? 'flex-row' : 'flex-col'">
     <!-- Image -->
-    <div class="h-44 overflow-hidden bg-surface-alt md:h-64 dark:bg-surface-dark">
+    <div class="overflow-hidden bg-surface-alt dark:bg-surface-dark"
+      :class="view === 'list' ? 'size-28 shrink-0 sm:size-40' : 'h-44 md:h-64'">
       {% if product.image %}
       <img src="/images/{{ product.image }}" alt="{{ product.name }}" class="size-full object-cover transition duration-700 ease-out group-hover:scale-105">
       {% endif %}
     </div>
     <!-- Content -->
-    <div class="flex flex-1 flex-col gap-1 p-6 pb-2">
-      <!-- Header: Title & Price -->
-      <div class="flex justify-between gap-4">
-        <h3 class="text-lg font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</h3>
-        {% if product.on_sale %}
-        <span class="flex flex-col items-end whitespace-nowrap leading-tight">
-          <span class="text-sm text-on-surface/50 line-through dark:text-on-surface-dark/50">{{ product.regular_price }} {{ product.currency }}</span>
-          <span class="text-xl font-semibold text-danger"><span class="sr-only">Price</span>{{ product.price }} {{ product.currency }}</span>
-        </span>
-        {% else %}
-        <span class="whitespace-nowrap text-xl"><span class="sr-only">Price</span>{{ product.price }} {{ product.currency }}</span>
-        {% endif %}
+    <div class="flex min-w-0 flex-1 flex-col gap-1"
+      :class="view === 'list' ? 'p-4 sm:p-5' : 'p-6 pb-2'">
+      <!-- Header: Title & Price (stacked so neither overflows the narrow card) -->
+      <h3 class="break-words text-lg font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</h3>
+      {% if product.on_sale %}
+      <div class="flex flex-wrap items-baseline gap-x-2 leading-tight">
+        <span class="text-xl font-semibold text-danger"><span class="sr-only">Price</span>{% if product.has_options %}{{ t(key="from-price", price=product.price, lang=lang | default(value='sk')) }}{% else %}{{ product.price }}{% endif %} {{ product.currency }}</span>
+        <span class="text-sm text-on-surface/50 line-through dark:text-on-surface-dark/50">{{ product.regular_price }} {{ product.currency }}</span>
       </div>
+      {% else %}
+      <span class="break-words text-xl"><span class="sr-only">Price</span>{% if product.has_options %}{{ t(key="from-price", price=product.price, lang=lang | default(value='sk')) }}{% else %}{{ product.price }}{% endif %} {{ product.currency }}</span>
+      {% endif %}
     </div>
   </a>
-  <div class="flex flex-col gap-2 p-6 pt-0">
-    {% if product.stock > 0 %}
-    <p class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="in-stock", lang=lang | default(value='sk')) }}: {{ product.stock }}</p>
+  <div class="flex flex-col gap-2"
+    :class="view === 'list' ? 'w-full justify-center p-4 sm:w-56 sm:p-5' : 'p-6 pt-0'">
+    {% if product.has_options %}
+    {# Multiple variants: customer must pick on the product page. #}
+    {{ ui::button(label=t(key="choose-option", lang=lang | default(value='sk')), href="/shop/" ~ product.slug, extra="w-full") }}
+    {% elif product.in_stock %}
+    <p class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{% if product.tracked %}{{ t(key="in-stock", lang=lang | default(value='sk')) }}: {{ product.stock }}{% else %}{{ t(key="available", lang=lang | default(value='sk')) }}{% endif %}</p>
     <form method="post" action="/cart/add" hx-post="/cart/add" hx-swap="none"
       hx-on::after-request="if (event.detail.successful) toast('{{ t(key='cart-added', lang=lang | default(value='sk')) }}')">
   <input type="hidden" name="_csrf" value="{{ csrf_token() }}">
-      <input type="hidden" name="product_id" value="{{ product.id }}">
+      <input type="hidden" name="variant_id" value="{{ product.variant_id }}">
       <input type="hidden" name="quantity" value="1">
       {{ ui::button(label=t(key="add-to-cart", lang=lang | default(value='sk')), type="submit", extra="w-full", icon='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true" class="size-3.5"><path fill-rule="evenodd" d="M5 4a3 3 0 0 1 6 0v1h.643a1.5 1.5 0 0 1 1.492 1.35l.7 7A1.5 1.5 0 0 1 12.342 15H3.657a1.5 1.5 0 0 1-1.492-1.65l.7-7A1.5 1.5 0 0 1 4.357 5H5V4Zm4.5 0v1h-3V4a1.5 1.5 0 0 1 3 0Zm-3 3.75a.75.75 0 0 0-1.5 0v1a3 3 0 1 0 6 0v-1a.75.75 0 0 0-1.5 0v1a1.5 1.5 0 1 1-3 0v-1Z" clip-rule="evenodd" /></svg>') }}
     </form>

assets/views/shop/_cart_body.html

@@ -19,6 +19,7 @@
       <tr>
         <td class="px-4 py-3">
           <a href="/shop/{{ item.slug }}" class="font-medium text-on-surface-strong hover:text-primary dark:text-on-surface-dark-strong dark:hover:text-primary-dark">{{ item.name }}</a>
+          {% if item.variant_label %}<span class="block text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ item.variant_label }}</span>{% endif %}
         </td>
         <td class="px-4 py-3 tabular-nums">
           {% if item.on_sale %}
@@ -35,8 +36,8 @@
           <form method="post" action="/cart/update"
             hx-post="/cart/update" hx-trigger="cartchange" hx-target="#cart-body" hx-swap="innerHTML">
   {{ ui::csrf_field() }}
-            <input type="hidden" name="product_id" value="{{ item.id }}">
-            <input type="number" name="quantity" min="0" max="{{ item.stock }}" value="{{ item.quantity }}"
+            <input type="hidden" name="variant_id" value="{{ item.id }}">
+            <input type="number" name="quantity" min="0" {% if item.stock %}max="{{ item.stock }}"{% endif %} value="{{ item.quantity }}"
               @change="
                 if (parseInt($el.value || '0') <= 0 && !window.confirm('{{ t(key='cart-remove-confirm', lang=lang | default(value='sk')) }}')) {
                   $el.value = '{{ item.quantity }}';
@@ -52,7 +53,7 @@
           <form method="post" action="/cart/remove"
             hx-post="/cart/remove" hx-target="#cart-body" hx-swap="innerHTML">
   {{ ui::csrf_field() }}
-            <input type="hidden" name="product_id" value="{{ item.id }}">
+            <input type="hidden" name="variant_id" value="{{ item.id }}">
             {{ ui::button(variant="ghost-danger", label=t(key="cart-remove", lang=lang | default(value='sk')), type="submit", size="px-2 py-1 text-xs") }}
           </form>
         </td>

assets/views/shop/_cart_preview.html

@@ -8,6 +8,7 @@
   <div class="flex items-start gap-3 px-4 py-3">
     <div class="min-w-0 flex-1">
       <a href="/shop/{{ item.slug }}" class="block truncate text-sm font-medium text-on-surface-strong hover:text-primary dark:text-on-surface-dark-strong dark:hover:text-primary-dark">{{ item.name }}</a>
+      {% if item.variant_label %}<span class="block truncate text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ item.variant_label }}</span>{% endif %}
       <p class="mt-0.5 text-xs tabular-nums text-on-surface dark:text-on-surface-dark">{{ item.quantity }} × {{ item.price }} {{ item.currency }}</p>
     </div>
     <span class="shrink-0 text-sm font-semibold tabular-nums text-on-surface-strong dark:text-on-surface-dark-strong">{{ item.line_total }} {{ item.currency }}</span>

assets/views/shop/_product_grid.html

@@ -0,0 +1,39 @@
+{# Product collection with a grid / list view toggle.
+   The chosen view is held in Alpine and persisted to localStorage so it
+   survives navigation; `_card.html` reads the same `view` state to switch
+   its own layout between a vertical card and a horizontal row. #}
+<div x-data="{ view: localStorage.getItem('shopView') === 'list' ? 'list' : 'grid' }"
+  x-init="$watch('view', v => localStorage.setItem('shopView', v))"
+  class="space-y-4">
+  <!-- View toggle -->
+  <div class="flex justify-end">
+    <div class="inline-flex gap-0.5 rounded-radius border border-outline p-0.5 dark:border-outline-dark" role="group"
+      aria-label="{{ t(key='view-grid', lang=lang | default(value='sk')) }} / {{ t(key='view-list', lang=lang | default(value='sk')) }}">
+      <button type="button" @click="view = 'grid'" :aria-pressed="view === 'grid'"
+        class="inline-flex size-8 items-center justify-center rounded-radius transition"
+        :class="view === 'grid' ? 'bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark' : 'text-on-surface hover:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark'"
+        aria-label="{{ t(key='view-grid', lang=lang | default(value='sk')) }}"
+        title="{{ t(key='view-grid', lang=lang | default(value='sk')) }}">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="size-4">
+          <path d="M3 3h6v6H3V3Zm8 0h6v6h-6V3ZM3 11h6v6H3v-6Zm8 0h6v6h-6v-6Z" />
+        </svg>
+      </button>
+      <button type="button" @click="view = 'list'" :aria-pressed="view === 'list'"
+        class="inline-flex size-8 items-center justify-center rounded-radius transition"
+        :class="view === 'list' ? 'bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark' : 'text-on-surface hover:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark'"
+        aria-label="{{ t(key='view-list', lang=lang | default(value='sk')) }}"
+        title="{{ t(key='view-list', lang=lang | default(value='sk')) }}">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="size-4">
+          <path d="M3 4h14v2.5H3V4Zm0 4.75h14v2.5H3v-2.5ZM3 13.5h14V16H3v-2.5Z" />
+        </svg>
+      </button>
+    </div>
+  </div>
+
+  <!-- Products -->
+  <div :class="view === 'list' ? 'flex flex-col gap-5' : 'grid grid-cols-2 gap-5 sm:grid-cols-3 xl:grid-cols-4'">
+    {% for product in products %}
+    {% include "shop/_card.html" %}
+    {% endfor %}
+  </div>
+</div>

assets/views/shop/_results.html

@@ -0,0 +1,46 @@
+{# Results region: swapped in by htmx on each query/filter change and rendered
+   server-side on first load. Holds the result summary, the product grid and
+   pagination. #}
+{% set L = lang | default(value='sk') %}
+<div class="space-y-4">
+  <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70" aria-live="polite">
+    {{ t(key="results-count", lang=L, count=total) }}{% if query and query != "" %} · “{{ query }}”{% endif %}
+  </p>
+
+  {% if products | length > 0 %}
+  {% include "shop/_product_grid.html" %}
+
+  {% if pages > 1 %}
+  <nav class="flex items-center justify-center gap-2 pt-2" aria-label="{{ t(key='pagination', lang=L) }}">
+    {% if has_prev %}
+    <button type="button"
+      hx-get="/search?{% if query_base %}{{ query_base }}&{% endif %}page={{ prev_page }}"
+      hx-target="#shop-results" hx-swap="innerHTML" hx-push-url="true"
+      class="rounded-radius border border-outline px-3 py-1.5 text-sm font-medium text-on-surface transition hover:bg-primary/5 hover:text-primary dark:border-outline-dark dark:text-on-surface-dark dark:hover:text-primary-dark">
+      {{ t(key="prev", lang=L) }}
+    </button>
+    {% endif %}
+    <span class="px-2 text-sm text-on-surface/70 dark:text-on-surface-dark/70">
+      {{ t(key="page-of", lang=L, page=page, pages=pages) }}
+    </span>
+    {% if has_next %}
+    <button type="button"
+      hx-get="/search?{% if query_base %}{{ query_base }}&{% endif %}page={{ next_page }}"
+      hx-target="#shop-results" hx-swap="innerHTML" hx-push-url="true"
+      class="rounded-radius border border-outline px-3 py-1.5 text-sm font-medium text-on-surface transition hover:bg-primary/5 hover:text-primary dark:border-outline-dark dark:text-on-surface-dark dark:hover:text-primary-dark">
+      {{ t(key="next", lang=L) }}
+    </button>
+    {% endif %}
+  </nav>
+  {% endif %}
+
+  {% elif query and query != "" %}
+  <div class="rounded-radius border border-outline px-6 py-16 text-center text-on-surface/70 dark:border-outline-dark dark:text-on-surface-dark/70">
+    {{ t(key="search-empty", lang=L) }} <span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ query }}</span>
+  </div>
+  {% else %}
+  <div class="rounded-radius border border-outline px-6 py-16 text-center text-on-surface/70 dark:border-outline-dark dark:text-on-surface-dark/70">
+    {{ t(key="shop-empty", lang=L) }}
+  </div>
+  {% endif %}
+</div>

assets/views/shop/_search.html

@@ -0,0 +1,102 @@
+{# Shared storefront search + filter toolbar and results region, used by the shop
+   index and every category page. One form drives the whole listing: htmx re-runs
+   /search and swaps only #shop-results; the toolbar keeps its own DOM state.
+   Triggers: live (debounced) typing in the search box, immediate on any
+   select/checkbox change, and submit (Enter / Apply) for the price band. Degrades
+   to a plain GET form without JS.
+   Expects: query, category_groups, selected_category, selected_category_id,
+   uncategorized_count, sort, min_price, max_price, price_floor, price_ceil,
+   in_stock, plus the result vars consumed by _results.html. #}
+{% set L = lang | default(value='sk') %}
+<div class="space-y-6">
+  <form action="/search" method="get" role="search"
+    hx-get="/search" hx-target="#shop-results" hx-swap="innerHTML"
+    hx-push-url="true" hx-indicator="#search-spinner"
+    hx-trigger="submit, change, keyup changed delay:350ms from:input[name='q']"
+    class="space-y-3">
+
+    <!-- search box -->
+    <div class="relative max-w-xl">
+      <span class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-on-surface/50 dark:text-on-surface-dark/50">
+        {{ ui::icon(name="search", size="size-5") }}
+      </span>
+      <input type="search" name="q" value="{{ query | default(value='') }}" autocomplete="off"
+        placeholder="{{ t(key='search-placeholder', lang=L) }}"
+        aria-label="{{ t(key='search-placeholder', lang=L) }}"
+        class="w-full rounded-radius border border-outline bg-surface py-2 pl-10 pr-10 text-sm text-on-surface placeholder:text-on-surface/50 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50 dark:focus-visible:outline-primary-dark" />
+      <span id="search-spinner" class="htmx-indicator pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3 text-on-surface/50 dark:text-on-surface-dark/50">
+        <svg class="size-4 animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" aria-hidden="true">
+          <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+          <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 0 1 8-8V0C5.4 0 0 5.4 0 12h4Z"></path>
+        </svg>
+      </span>
+    </div>
+
+    <!-- filter toolbar -->
+    <div class="flex flex-wrap items-end gap-3 rounded-radius border border-outline bg-surface-alt p-3 dark:border-outline-dark dark:bg-surface-dark-alt">
+      <!-- category -->
+      <label class="flex flex-col gap-1 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
+        {{ t(key="filter-category", lang=L) }}
+        <select name="category"
+          class="rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark">
+          <option value="all"{% if selected_category == "all" %} selected{% endif %}>{{ t(key="filter-all-categories", lang=L) }}</option>
+          {% for g in category_groups %}
+          <option value="{{ g.id }}"{% if selected_category_id == g.id %} selected{% endif %}>{{ g.name }} ({{ g.count }})</option>
+          {% for ch in g.children %}
+          <option value="{{ ch.id }}"{% if selected_category_id == ch.id %} selected{% endif %}>&nbsp;&nbsp;— {{ ch.name }} ({{ ch.count }})</option>
+          {% endfor %}
+          {% endfor %}
+          {% if uncategorized_count > 0 %}
+          <option value="none"{% if selected_category == "none" %} selected{% endif %}>{{ t(key="filter-uncategorized", lang=L) }} ({{ uncategorized_count }})</option>
+          {% endif %}
+        </select>
+      </label>
+
+      <!-- sort -->
+      <label class="flex flex-col gap-1 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
+        {{ t(key="sort-label", lang=L) }}
+        <select name="sort"
+          class="rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark">
+          {% for opt in ["newest", "relevance", "price_asc", "price_desc", "name_asc", "name_desc"] %}
+          <option value="{{ opt }}"{% if sort == opt %} selected{% endif %}>{{ t(key="sort-" ~ opt, lang=L) }}</option>
+          {% endfor %}
+        </select>
+      </label>
+
+      <!-- price band -->
+      <label class="flex flex-col gap-1 text-xs font-medium text-on-surface/70 dark:text-on-surface-dark/70">
+        {{ t(key="filter-price", lang=L) }}
+        <span class="flex items-center gap-1">
+          <input type="number" name="min_price" min="0" step="0.01" inputmode="decimal"
+            value="{{ min_price | default(value='') }}" placeholder="{{ price_floor }}"
+            aria-label="{{ t(key='filter-price-from', lang=L) }}"
+            class="w-24 rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark" />
+          <span class="text-on-surface/50 dark:text-on-surface-dark/50">–</span>
+          <input type="number" name="max_price" min="0" step="0.01" inputmode="decimal"
+            value="{{ max_price | default(value='') }}" placeholder="{{ price_ceil }}"
+            aria-label="{{ t(key='filter-price-to', lang=L) }}"
+            class="w-24 rounded-radius border border-outline bg-surface px-2 py-1.5 text-sm text-on-surface dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark" />
+        </span>
+      </label>
+
+      <!-- in stock -->
+      <label class="flex items-center gap-2 pb-1.5 text-sm text-on-surface dark:text-on-surface-dark">
+        <input type="checkbox" name="in_stock" value="1"{% if in_stock %} checked{% endif %}
+          class="size-4 rounded border-outline text-primary focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:text-primary-dark" />
+        {{ t(key="filter-in-stock", lang=L) }}
+      </label>
+
+      <div class="ml-auto flex items-end gap-2">
+        {{ ui::button(label=t(key="filter-apply", lang=L), type="submit", variant="secondary") }}
+        <a href="/shop" hx-get="/search" hx-target="#shop-results" hx-push-url="true"
+          class="self-end pb-1.5 text-sm font-medium text-on-surface/70 underline-offset-2 transition hover:text-primary hover:underline dark:text-on-surface-dark/70 dark:hover:text-primary-dark">
+          {{ t(key="filter-clear", lang=L) }}
+        </a>
+      </div>
+    </div>
+  </form>
+
+  <div id="shop-results">
+    {% include "shop/_results.html" %}
+  </div>
+</div>

assets/views/shop/category.html

@@ -4,10 +4,11 @@
 {% block title %}{{ category.name }}{% endblock title %}
 
 {% block content %}
-<div class="space-y-8">
+{% set L = lang | default(value='sk') %}
+<div class="space-y-6">
   <header class="space-y-2">
     <nav class="text-sm text-on-surface/60 dark:text-on-surface-dark/60">
-      <a href="/shop" class="hover:text-primary dark:hover:text-primary-dark">{{ t(key="nav-shop", lang=lang | default(value='sk')) }}</a>
+      <a href="/shop" class="hover:text-primary dark:hover:text-primary-dark">{{ t(key="nav-shop", lang=L) }}</a>
       {% for crumb in breadcrumbs %}
       <span class="px-1">/</span>
       <a href="/category/{{ crumb.slug }}" class="hover:text-primary dark:hover:text-primary-dark">{{ crumb.name }}</a>
@@ -28,16 +29,7 @@
     {% endif %}
   </header>
 
-  {% if products | length > 0 %}
-  <div class="grid grid-cols-2 gap-5 sm:grid-cols-3 xl:grid-cols-4">
-    {% for product in products %}
-    {% include "shop/_card.html" %}
-    {% endfor %}
-  </div>
-  {% else %}
-  <div class="rounded-radius border border-outline px-6 py-16 text-center text-on-surface/70 dark:border-outline-dark dark:text-on-surface-dark/70">
-    {{ t(key="shop-empty", lang=lang | default(value='sk')) }}
-  </div>
-  {% endif %}
+  {# Same search + filters as the shop, with this category preselected. #}
+  {% include "shop/_search.html" %}
 </div>
 {% endblock content %}

assets/views/shop/index.html

@@ -4,22 +4,13 @@
 {% block title %}{{ t(key="nav-shop", lang=lang | default(value='sk')) }}{% endblock title %}
 
 {% block content %}
-<div class="space-y-8">
-  <header class="space-y-2">
-    <h1 class="text-3xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="shop-title", lang=lang | default(value='sk')) }}</h1>
-    <p class="text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="shop-subtitle", lang=lang | default(value='sk')) }}</p>
+{% set L = lang | default(value='sk') %}
+<div class="space-y-6">
+  <header class="space-y-1">
+    <h1 class="text-3xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="shop-title", lang=L) }}</h1>
+    <p class="text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="shop-subtitle", lang=L) }}</p>
   </header>
 
-  {% if products | length > 0 %}
-  <div class="grid grid-cols-2 gap-5 sm:grid-cols-3 xl:grid-cols-4">
-    {% for product in products %}
-    {% include "shop/_card.html" %}
-    {% endfor %}
-  </div>
-  {% else %}
-  <div class="rounded-radius border border-outline px-6 py-16 text-center text-on-surface/70 dark:border-outline-dark dark:text-on-surface-dark/70">
-    {{ t(key="shop-empty", lang=lang | default(value='sk')) }}
-  </div>
-  {% endif %}
+  {% include "shop/_search.html" %}
 </div>
 {% endblock content %}

assets/views/shop/order_confirmed.html

@@ -29,7 +29,7 @@
     <ul class="space-y-2 py-3 text-sm">
       {% for item in items %}
       <li class="flex justify-between gap-2">
-        <span class="text-on-surface/80 dark:text-on-surface-dark/80">{{ item.product_name }} × {{ item.quantity }}</span>
+        <span class="text-on-surface/80 dark:text-on-surface-dark/80">{{ item.product_name }}{% if item.variant_label %} · {{ item.variant_label }}{% endif %} × {{ item.quantity }}</span>
         <span class="tabular-nums">{{ item.line_total }} {{ order.currency }}</span>
       </li>
       {% endfor %}

assets/views/shop/show.html

@@ -49,39 +49,85 @@
   </div>
 
   <!-- details -->
-  <div class="space-y-6">
+  {% set fld = "w-full rounded-radius border border-outline bg-surface-alt px-3 py-2 text-sm text-on-surface focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:border-outline-dark dark:bg-surface-dark-alt/50 dark:text-on-surface-dark dark:focus-visible:outline-primary-dark" %}
+  {% set btn = "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-radius px-5 py-2 text-sm text-center font-medium tracking-wide transition hover:opacity-75 focus-visible:outline-2 focus-visible:outline-offset-2 active:opacity-100 active:outline-offset-0 disabled:cursor-not-allowed disabled:opacity-75 border border-primary bg-primary text-on-primary focus-visible:outline-primary dark:border-primary-dark dark:bg-primary-dark dark:text-on-primary-dark dark:focus-visible:outline-primary-dark" %}
+  <script id="variant-data" type="application/json">{{ variants | json_encode() | safe }}</script>
+  <div class="space-y-6" x-data="productBuy(JSON.parse(document.getElementById('variant-data').textContent))">
     {% if category %}
     <a href="/category/{{ category.slug }}" class="text-sm font-medium text-primary dark:text-primary-dark">{{ category.name }}</a>
     {% endif %}
     <h1 class="text-3xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</h1>
-    {% if product.on_sale %}
-    <div class="flex items-baseline gap-3">
-      <p class="text-2xl font-semibold text-danger">{{ product.price }} {{ product.currency }}</p>
-      <p class="text-lg text-on-surface/50 line-through dark:text-on-surface-dark/50">{{ product.regular_price }} {{ product.currency }}</p>
-    </div>
-    {% else %}
-    <p class="text-2xl font-semibold text-primary dark:text-primary-dark">{{ product.price }} {{ product.currency }}</p>
-    {% endif %}
 
-    {% if product.description %}
-    <div class="whitespace-pre-line leading-relaxed text-on-surface/80 dark:text-on-surface-dark/80">{{ product.description }}</div>
-    {% endif %}
+    <template x-if="current">
+      <div class="space-y-6">
+        <!-- option picker (only when there's a real choice); first option is
+             selected by default and switching it updates the price + buy form -->
+        <template x-if="variants.length > 1">
+          <div class="max-w-sm space-y-1.5">
+            <label for="variant-select" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="choose-option", lang=lang | default(value='sk')) }}</label>
+            <select id="variant-select" x-model.number="sel" class="{{ fld }}">
+              <template x-for="(v, i) in variants" :key="v.id">
+                <option :value="i" x-text="(v.label || '—') + ' · ' + v.price + ' {{ product.currency }}' + (v.in_stock ? '' : ' ({{ t(key='out-of-stock', lang=lang | default(value='sk')) }})')"></option>
+              </template>
+            </select>
+          </div>
+        </template>
 
-    {% if product.stock > 0 %}
-    <form method="post" action="/cart/add" hx-post="/cart/add" hx-swap="none" class="flex flex-wrap items-end gap-3"
-      hx-on::after-request="if (event.detail.successful) toast('{{ t(key='cart-added', lang=lang | default(value='sk')) }}')">
-  {{ ui::csrf_field() }}
-      <input type="hidden" name="product_id" value="{{ product.id }}">
-      <div class="space-y-1.5">
-        <label for="quantity" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="quantity", lang=lang | default(value='sk')) }}</label>
-        {{ ui::input(name="quantity", id="quantity", type="number", value="1", width="w-24", attrs='min="1" max="' ~ product.stock ~ '"') }}
+        <div class="flex items-baseline gap-3">
+          <p class="text-2xl font-semibold" :class="current.on_sale ? 'text-danger' : 'text-primary dark:text-primary-dark'">
+            <span x-text="current.price"></span> {{ product.currency }}
+          </p>
+          <template x-if="current.on_sale">
+            <p class="text-lg text-on-surface/50 line-through dark:text-on-surface-dark/50"><span x-text="current.regular_price"></span> {{ product.currency }}</p>
+          </template>
+        </div>
+
+        {% if product.description %}
+        <div class="whitespace-pre-line leading-relaxed text-on-surface/80 dark:text-on-surface-dark/80">{{ product.description }}</div>
+        {% endif %}
+
+        <template x-if="current.in_stock">
+          <div class="space-y-2">
+            <form method="post" action="/cart/add" hx-post="/cart/add" hx-swap="none" class="flex flex-wrap items-end gap-3"
+              hx-on::after-request="if (event.detail.successful) toast('{{ t(key='cart-added', lang=lang | default(value='sk')) }}')">
+              {{ ui::csrf_field() }}
+              <input type="hidden" name="variant_id" :value="current.id">
+              <div class="space-y-1.5">
+                <label for="quantity" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="quantity", lang=lang | default(value='sk')) }}</label>
+                <input type="number" id="quantity" name="quantity" value="1" min="1" :max="current.stock" class="{{ fld }} w-24">
+              </div>
+              <button type="submit" class="{{ btn }}">{{ t(key="add-to-cart", lang=lang | default(value='sk')) }}</button>
+            </form>
+            <p class="text-sm text-on-surface/60 dark:text-on-surface-dark/60">
+              <template x-if="current.tracked">
+                <span>{{ t(key="in-stock", lang=lang | default(value='sk')) }}: <span x-text="current.stock"></span></span>
+              </template>
+              <template x-if="!current.tracked">
+                <span>{{ t(key="available", lang=lang | default(value='sk')) }}</span>
+              </template>
+            </p>
+          </div>
+        </template>
+        <template x-if="!current.in_stock">
+          <p class="inline-flex rounded-radius bg-danger/10 px-3 py-2 text-sm font-medium text-danger">{{ t(key="out-of-stock", lang=lang | default(value='sk')) }}</p>
+        </template>
       </div>
-      {{ ui::button(label=t(key="add-to-cart", lang=lang | default(value='sk')), type="submit", size="px-5 py-2 text-sm") }}
-    </form>
-    <p class="text-sm text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="in-stock", lang=lang | default(value='sk')) }}: {{ product.stock }}</p>
-    {% else %}
-    <p class="inline-flex rounded-radius bg-danger/10 px-3 py-2 text-sm font-medium text-danger">{{ t(key="out-of-stock", lang=lang | default(value='sk')) }}</p>
-    {% endif %}
+    </template>
+
+    <template x-if="!current">
+      <p class="inline-flex rounded-radius bg-danger/10 px-3 py-2 text-sm font-medium text-danger">{{ t(key="out-of-stock", lang=lang | default(value='sk')) }}</p>
+    </template>
   </div>
+
+  <script>
+    function productBuy(variants) {
+      return {
+        variants: variants || [],
+        // Default to the first in-stock variant, else the first.
+        sel: Math.max(0, (variants || []).findIndex(v => v.in_stock)),
+        get current() { return this.variants[this.sel] || null; },
+      };
+    }
+  </script>
 </div>
 {% endblock content %}

migration/src/lib.rs

@@ -40,6 +40,11 @@ mod m20260621_000002_account_product_prices;
 mod m20260621_000003_discount_profiles;
 mod m20260621_000004_add_business_sale_price_to_products;
 mod m20260622_000001_audience_discount_profiles;
+mod m20260622_000002_product_variants;
+mod m20260622_000003_variant_stock_nullable;
+mod m20260622_000004_product_search;
+mod m20260622_000005_product_search_aggregate;
+mod m20260622_000006_order_search_indexes;
 pub struct Migrator;
 
 #[async_trait::async_trait]
@@ -84,6 +89,11 @@ impl MigratorTrait for Migrator {
             Box::new(m20260621_000003_discount_profiles::Migration),
             Box::new(m20260621_000004_add_business_sale_price_to_products::Migration),
             Box::new(m20260622_000001_audience_discount_profiles::Migration),
+            Box::new(m20260622_000002_product_variants::Migration),
+            Box::new(m20260622_000003_variant_stock_nullable::Migration),
+            Box::new(m20260622_000004_product_search::Migration),
+            Box::new(m20260622_000005_product_search_aggregate::Migration),
+            Box::new(m20260622_000006_order_search_indexes::Migration),
             // inject-above (do not remove this comment)
         ]
     }

migration/src/m20260622_000002_product_variants.rs

@@ -0,0 +1,204 @@
+//! Introduce product variants as the purchasable unit.
+//!
+//! A product becomes a presentation grouping (name, description, images,
+//! category, tags, percentage discount profiles). Each product owns one or more
+//! `product_variants`, and the variant is what carries the things that actually
+//! differ between options: a free-text `label` (e.g. "rolovaná 90cm x 10m",
+//! "5ml"), its own `sku`, `stock`, regular `price_cents`, and its own optional
+//! public/business quick-sale prices.
+//!
+//! This migration:
+//!   1. creates `product_variants`,
+//!   2. backfills one variant per existing product from the product's current
+//!      price/stock/sku/sale columns,
+//!   3. moves the per-account negotiated price and collision-resolution tables
+//!      from keying on `product_id` to `variant_id`,
+//!   4. snapshots the variant onto `order_items`,
+//!   5. drops the now-moved purchasable columns from `products`.
+
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        let db = m.get_connection();
+
+        // 1. The variants table.
+        db.execute_unprepared(
+            r#"
+            CREATE TABLE product_variants (
+                id          SERIAL PRIMARY KEY,
+                created_at  TIMESTAMPTZ NOT NULL DEFAULT now(),
+                updated_at  TIMESTAMPTZ NOT NULL DEFAULT now(),
+                product_id  INTEGER NOT NULL REFERENCES products(id) ON DELETE CASCADE,
+                label       VARCHAR NOT NULL DEFAULT '',
+                position    INTEGER NOT NULL DEFAULT 0,
+                sku         VARCHAR,
+                stock       INTEGER NOT NULL DEFAULT 0,
+                price_cents BIGINT NOT NULL,
+                sale_price_cents          BIGINT,
+                business_sale_price_cents BIGINT
+            );
+            CREATE INDEX idx_product_variants_product ON product_variants (product_id);
+            "#,
+        )
+        .await?;
+
+        // 2. One variant per existing product, carrying its current pricing.
+        db.execute_unprepared(
+            r#"
+            INSERT INTO product_variants
+                (product_id, label, position, sku, stock,
+                 price_cents, sale_price_cents, business_sale_price_cents)
+            SELECT id, '', 0, sku, stock,
+                   price_cents, sale_price_cents, business_sale_price_cents
+            FROM products;
+            "#,
+        )
+        .await?;
+
+        // 3a. Negotiated prices: product_id -> variant_id.
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE account_product_prices ADD COLUMN variant_id INTEGER;
+            UPDATE account_product_prices a
+                SET variant_id = pv.id
+                FROM product_variants pv
+                WHERE pv.product_id = a.product_id;
+            DROP INDEX IF EXISTS idx_account_product_prices_user_product_unique;
+            ALTER TABLE account_product_prices DROP COLUMN product_id;
+            ALTER TABLE account_product_prices ALTER COLUMN variant_id SET NOT NULL;
+            ALTER TABLE account_product_prices
+                ADD CONSTRAINT fk_account_product_prices_variant
+                FOREIGN KEY (variant_id) REFERENCES product_variants(id) ON DELETE CASCADE;
+            CREATE UNIQUE INDEX idx_account_product_prices_user_variant_unique
+                ON account_product_prices (user_id, variant_id);
+            "#,
+        )
+        .await?;
+
+        // 3b. Collision resolutions: product_id -> variant_id.
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE account_product_resolutions ADD COLUMN variant_id INTEGER;
+            UPDATE account_product_resolutions a
+                SET variant_id = pv.id
+                FROM product_variants pv
+                WHERE pv.product_id = a.product_id;
+            DROP INDEX IF EXISTS idx_account_product_resolutions_unique;
+            ALTER TABLE account_product_resolutions DROP COLUMN product_id;
+            ALTER TABLE account_product_resolutions ALTER COLUMN variant_id SET NOT NULL;
+            ALTER TABLE account_product_resolutions
+                ADD CONSTRAINT fk_account_product_resolutions_variant
+                FOREIGN KEY (variant_id) REFERENCES product_variants(id) ON DELETE CASCADE;
+            CREATE UNIQUE INDEX idx_account_product_resolutions_unique
+                ON account_product_resolutions (user_id, variant_id);
+            "#,
+        )
+        .await?;
+
+        // 4. Snapshot the variant on order lines (label is frozen at order time;
+        //    the FK is nullable + SET NULL so deleting a variant keeps history).
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE order_items ADD COLUMN variant_label VARCHAR NOT NULL DEFAULT '';
+            ALTER TABLE order_items ADD COLUMN variant_id INTEGER
+                REFERENCES product_variants(id) ON DELETE SET NULL;
+            "#,
+        )
+        .await?;
+
+        // 5. Drop the purchasable columns now owned by the variant.
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE products DROP COLUMN price_cents;
+            ALTER TABLE products DROP COLUMN sale_price_cents;
+            ALTER TABLE products DROP COLUMN business_sale_price_cents;
+            ALTER TABLE products DROP COLUMN sku;
+            ALTER TABLE products DROP COLUMN stock;
+            "#,
+        )
+        .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        let db = m.get_connection();
+
+        // Restore product columns from each product's first variant.
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE products ADD COLUMN price_cents BIGINT NOT NULL DEFAULT 0;
+            ALTER TABLE products ADD COLUMN sale_price_cents BIGINT;
+            ALTER TABLE products ADD COLUMN business_sale_price_cents BIGINT;
+            ALTER TABLE products ADD COLUMN sku VARCHAR;
+            ALTER TABLE products ADD COLUMN stock INTEGER NOT NULL DEFAULT 0;
+            UPDATE products p SET
+                price_cents = pv.price_cents,
+                sale_price_cents = pv.sale_price_cents,
+                business_sale_price_cents = pv.business_sale_price_cents,
+                sku = pv.sku,
+                stock = pv.stock
+            FROM (
+                SELECT DISTINCT ON (product_id) product_id, price_cents,
+                       sale_price_cents, business_sale_price_cents, sku, stock
+                FROM product_variants ORDER BY product_id, position, id
+            ) pv
+            WHERE pv.product_id = p.id;
+            "#,
+        )
+        .await?;
+
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE order_items DROP COLUMN variant_id;
+            ALTER TABLE order_items DROP COLUMN variant_label;
+            "#,
+        )
+        .await?;
+
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE account_product_resolutions ADD COLUMN product_id INTEGER;
+            UPDATE account_product_resolutions a
+                SET product_id = pv.product_id
+                FROM product_variants pv WHERE pv.id = a.variant_id;
+            DROP INDEX IF EXISTS idx_account_product_resolutions_unique;
+            ALTER TABLE account_product_resolutions DROP COLUMN variant_id;
+            ALTER TABLE account_product_resolutions ALTER COLUMN product_id SET NOT NULL;
+            ALTER TABLE account_product_resolutions
+                ADD CONSTRAINT fk_account_product_resolutions_product
+                FOREIGN KEY (product_id) REFERENCES products(id) ON DELETE CASCADE;
+            CREATE UNIQUE INDEX idx_account_product_resolutions_unique
+                ON account_product_resolutions (user_id, product_id);
+            "#,
+        )
+        .await?;
+
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE account_product_prices ADD COLUMN product_id INTEGER;
+            UPDATE account_product_prices a
+                SET product_id = pv.product_id
+                FROM product_variants pv WHERE pv.id = a.variant_id;
+            DROP INDEX IF EXISTS idx_account_product_prices_user_variant_unique;
+            ALTER TABLE account_product_prices DROP COLUMN variant_id;
+            ALTER TABLE account_product_prices ALTER COLUMN product_id SET NOT NULL;
+            ALTER TABLE account_product_prices
+                ADD CONSTRAINT fk_account_product_prices_product
+                FOREIGN KEY (product_id) REFERENCES products(id) ON DELETE CASCADE;
+            CREATE UNIQUE INDEX idx_account_product_prices_user_product_unique
+                ON account_product_prices (user_id, product_id);
+            "#,
+        )
+        .await?;
+
+        db.execute_unprepared("DROP TABLE product_variants;").await?;
+
+        Ok(())
+    }
+}

migration/src/m20260622_000003_variant_stock_nullable.rs

@@ -0,0 +1,36 @@
+//! Make `product_variants.stock` nullable: a NULL stock means the variant is
+//! "available" but not inventory-tracked — always purchasable, no quantity cap,
+//! and never decremented on order. A numeric stock is tracked/capped as before.
+
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        m.get_connection()
+            .execute_unprepared(
+                r#"
+                ALTER TABLE product_variants ALTER COLUMN stock DROP DEFAULT;
+                ALTER TABLE product_variants ALTER COLUMN stock DROP NOT NULL;
+                "#,
+            )
+            .await?;
+        Ok(())
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        m.get_connection()
+            .execute_unprepared(
+                r#"
+                UPDATE product_variants SET stock = 0 WHERE stock IS NULL;
+                ALTER TABLE product_variants ALTER COLUMN stock SET DEFAULT 0;
+                ALTER TABLE product_variants ALTER COLUMN stock SET NOT NULL;
+                "#,
+            )
+            .await?;
+        Ok(())
+    }
+}

migration/src/m20260622_000004_product_search.rs

@@ -0,0 +1,92 @@
+//! Full-text + fuzzy search over the product catalog.
+//!
+//! Storefront search has to cope with Slovak text (diacritics, ad-hoc spelling)
+//! and customer typos, while staying entirely inside Postgres — the catalog is
+//! small (hundreds of products), so a separate search engine would be pure
+//! operational overhead. This migration sets up:
+//!
+//!   1. `unaccent` + `pg_trgm` extensions, and an IMMUTABLE `f_unaccent` wrapper
+//!      (the stock `unaccent` is only STABLE, so it can't be used in an index
+//!      expression without wrapping it).
+//!   2. a `sk_unaccent` text-search configuration: the `simple` dictionary
+//!      (no English stemming, which would mangle Slovak) folded through
+//!      `unaccent` so "kompresor" and "kompresór" tokenize identically.
+//!   3. a STORED generated `products.search_vector`, weighting the name above
+//!      the description, with a GIN index for `@@` matching.
+//!   4. a trigram GIN index on the (unaccented) name for fuzzy matching.
+//!
+//! The matching query itself lives in `products::Entity::search`.
+
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        let db = m.get_connection();
+
+        db.execute_unprepared(
+            r#"
+            CREATE EXTENSION IF NOT EXISTS unaccent;
+            CREATE EXTENSION IF NOT EXISTS pg_trgm;
+
+            -- IMMUTABLE wrapper so unaccent() can be used in generated columns
+            -- and index expressions (the extension's own unaccent() is STABLE).
+            CREATE OR REPLACE FUNCTION f_unaccent(text)
+            RETURNS text
+            LANGUAGE sql IMMUTABLE PARALLEL SAFE STRICT AS
+            $func$ SELECT public.unaccent('public.unaccent', $1) $func$;
+
+            -- 'simple' (no stemming) + unaccent: a good fit for Slovak, where
+            -- English stemming is wrong and accents are typed inconsistently.
+            DROP TEXT SEARCH CONFIGURATION IF EXISTS sk_unaccent;
+            CREATE TEXT SEARCH CONFIGURATION sk_unaccent ( COPY = simple );
+            ALTER TEXT SEARCH CONFIGURATION sk_unaccent
+                ALTER MAPPING FOR hword, hword_part, word
+                WITH unaccent, simple;
+            "#,
+        )
+        .await?;
+
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE products
+                ADD COLUMN search_vector tsvector
+                GENERATED ALWAYS AS (
+                    setweight(to_tsvector('sk_unaccent', COALESCE(name, '')), 'A') ||
+                    setweight(to_tsvector('sk_unaccent', COALESCE(description, '')), 'B')
+                ) STORED;
+
+            CREATE INDEX idx_products_search_vector
+                ON products USING GIN (search_vector);
+            CREATE INDEX idx_products_name_trgm
+                ON products USING GIN (f_unaccent(name) gin_trgm_ops);
+            "#,
+        )
+        .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        let db = m.get_connection();
+
+        // Drop the trigram index (it depends on f_unaccent) before the function;
+        // dropping the column takes its own GIN index with it.
+        db.execute_unprepared(
+            r#"
+            DROP INDEX IF EXISTS idx_products_name_trgm;
+            ALTER TABLE products DROP COLUMN IF EXISTS search_vector;
+            DROP TEXT SEARCH CONFIGURATION IF EXISTS sk_unaccent;
+            DROP FUNCTION IF EXISTS f_unaccent(text);
+            "#,
+        )
+        .await?;
+
+        // The unaccent / pg_trgm extensions are left installed: other objects may
+        // rely on them and they are harmless on their own.
+        Ok(())
+    }
+}

migration/src/m20260622_000005_product_search_aggregate.rs

@@ -0,0 +1,232 @@
+//! Broaden product search to the whole purchasable surface.
+//!
+//! The `product_search` migration could only index columns living on `products`
+//! itself (name, description), because a STORED generated column may not read
+//! other tables. To also match by tag, variant label and SKU, `search_vector`
+//! becomes a plain column maintained by triggers:
+//!
+//!   * `kompress_build_product_search(name, description, id)` builds the weighted
+//!     vector for one product, pulling tags + variant labels + SKUs by id
+//!     (name = A, tags + labels = B, description + SKU = C).
+//!   * a BEFORE trigger on `products` keeps a product's own row in sync, and
+//!   * AFTER triggers on `product_variants`, `product_product_tags` and tag
+//!     renames refresh the affected product(s).
+//!
+//! The result is one `products.search_vector` that every search query can reuse,
+//! always consistent with the catalog.
+
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        let db = m.get_connection();
+
+        // Swap the generated column (name + description only) for a plain column
+        // the triggers can own. Dropping it takes its GIN index with it.
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE products DROP COLUMN IF EXISTS search_vector;
+            ALTER TABLE products ADD COLUMN search_vector tsvector;
+            "#,
+        )
+        .await?;
+
+        // Single source of truth for a product's search document.
+        db.execute_unprepared(
+            r#"
+            CREATE OR REPLACE FUNCTION kompress_build_product_search(
+                p_name text, p_description text, p_id integer
+            ) RETURNS tsvector
+            LANGUAGE sql STABLE AS $func$
+                SELECT
+                    setweight(to_tsvector('sk_unaccent', COALESCE(p_name, '')), 'A')
+                  || setweight(to_tsvector('sk_unaccent', COALESCE((
+                        SELECT string_agg(t.name, ' ')
+                        FROM product_product_tags ppt
+                        JOIN product_tags t ON t.id = ppt.product_tag_id
+                        WHERE ppt.product_id = p_id
+                     ), '')), 'B')
+                  || setweight(to_tsvector('sk_unaccent', COALESCE((
+                        SELECT string_agg(v.label, ' ')
+                        FROM product_variants v
+                        WHERE v.product_id = p_id
+                     ), '')), 'B')
+                  || setweight(to_tsvector('sk_unaccent', COALESCE(p_description, '')), 'C')
+                  || setweight(to_tsvector('sk_unaccent', COALESCE((
+                        SELECT string_agg(v.sku, ' ')
+                        FROM product_variants v
+                        WHERE v.product_id = p_id AND v.sku IS NOT NULL
+                     ), '')), 'C');
+            $func$;
+
+            -- Refresh one product's stored vector (used by the satellite triggers).
+            CREATE OR REPLACE FUNCTION kompress_refresh_product_search(p_id integer)
+            RETURNS void LANGUAGE sql AS $func$
+                UPDATE products
+                   SET search_vector = kompress_build_product_search(name, description, id)
+                 WHERE id = p_id;
+            $func$;
+            "#,
+        )
+        .await?;
+
+        // BEFORE trigger on products: recompute on its own writes. When a refresh
+        // only touches search_vector (name + description unchanged) it skips the
+        // recompute and keeps the supplied value — which also breaks recursion.
+        db.execute_unprepared(
+            r#"
+            CREATE OR REPLACE FUNCTION kompress_products_search_tg() RETURNS trigger
+            LANGUAGE plpgsql AS $func$
+            BEGIN
+                IF TG_OP = 'UPDATE'
+                   AND NEW.name IS NOT DISTINCT FROM OLD.name
+                   AND NEW.description IS NOT DISTINCT FROM OLD.description
+                   AND NEW.search_vector IS DISTINCT FROM OLD.search_vector THEN
+                    RETURN NEW;
+                END IF;
+                NEW.search_vector :=
+                    kompress_build_product_search(NEW.name, NEW.description, NEW.id);
+                RETURN NEW;
+            END;
+            $func$;
+
+            DROP TRIGGER IF EXISTS products_search_tg ON products;
+            CREATE TRIGGER products_search_tg
+                BEFORE INSERT OR UPDATE ON products
+                FOR EACH ROW EXECUTE FUNCTION kompress_products_search_tg();
+            "#,
+        )
+        .await?;
+
+        // Variants: any change refreshes the owning product (both, on reparent).
+        db.execute_unprepared(
+            r#"
+            CREATE OR REPLACE FUNCTION kompress_variants_search_tg() RETURNS trigger
+            LANGUAGE plpgsql AS $func$
+            BEGIN
+                IF TG_OP = 'DELETE' THEN
+                    PERFORM kompress_refresh_product_search(OLD.product_id);
+                    RETURN OLD;
+                END IF;
+                PERFORM kompress_refresh_product_search(NEW.product_id);
+                IF TG_OP = 'UPDATE' AND NEW.product_id IS DISTINCT FROM OLD.product_id THEN
+                    PERFORM kompress_refresh_product_search(OLD.product_id);
+                END IF;
+                RETURN NEW;
+            END;
+            $func$;
+
+            DROP TRIGGER IF EXISTS product_variants_search_tg ON product_variants;
+            CREATE TRIGGER product_variants_search_tg
+                AFTER INSERT OR UPDATE OR DELETE ON product_variants
+                FOR EACH ROW EXECUTE FUNCTION kompress_variants_search_tg();
+            "#,
+        )
+        .await?;
+
+        // Tag links: attaching/detaching a tag refreshes the product.
+        db.execute_unprepared(
+            r#"
+            CREATE OR REPLACE FUNCTION kompress_product_tags_link_search_tg() RETURNS trigger
+            LANGUAGE plpgsql AS $func$
+            BEGIN
+                IF TG_OP = 'DELETE' THEN
+                    PERFORM kompress_refresh_product_search(OLD.product_id);
+                    RETURN OLD;
+                END IF;
+                PERFORM kompress_refresh_product_search(NEW.product_id);
+                RETURN NEW;
+            END;
+            $func$;
+
+            DROP TRIGGER IF EXISTS product_product_tags_search_tg ON product_product_tags;
+            CREATE TRIGGER product_product_tags_search_tg
+                AFTER INSERT OR UPDATE OR DELETE ON product_product_tags
+                FOR EACH ROW EXECUTE FUNCTION kompress_product_tags_link_search_tg();
+            "#,
+        )
+        .await?;
+
+        // Renaming a tag refreshes every product carrying it.
+        db.execute_unprepared(
+            r#"
+            CREATE OR REPLACE FUNCTION kompress_tag_rename_search_tg() RETURNS trigger
+            LANGUAGE plpgsql AS $func$
+            BEGIN
+                UPDATE products p
+                   SET search_vector =
+                       kompress_build_product_search(p.name, p.description, p.id)
+                 WHERE p.id IN (
+                     SELECT ppt.product_id FROM product_product_tags ppt
+                     WHERE ppt.product_tag_id = NEW.id
+                 );
+                RETURN NEW;
+            END;
+            $func$;
+
+            DROP TRIGGER IF EXISTS product_tags_rename_search_tg ON product_tags;
+            CREATE TRIGGER product_tags_rename_search_tg
+                AFTER UPDATE OF name ON product_tags
+                FOR EACH ROW EXECUTE FUNCTION kompress_tag_rename_search_tg();
+            "#,
+        )
+        .await?;
+
+        // Backfill existing rows, then (re)create the GIN index for `@@`.
+        db.execute_unprepared(
+            r#"
+            UPDATE products
+               SET search_vector = kompress_build_product_search(name, description, id);
+
+            CREATE INDEX idx_products_search_vector
+                ON products USING GIN (search_vector);
+            "#,
+        )
+        .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        let db = m.get_connection();
+
+        db.execute_unprepared(
+            r#"
+            DROP TRIGGER IF EXISTS product_tags_rename_search_tg ON product_tags;
+            DROP TRIGGER IF EXISTS product_product_tags_search_tg ON product_product_tags;
+            DROP TRIGGER IF EXISTS product_variants_search_tg ON product_variants;
+            DROP TRIGGER IF EXISTS products_search_tg ON products;
+            DROP FUNCTION IF EXISTS kompress_tag_rename_search_tg();
+            DROP FUNCTION IF EXISTS kompress_product_tags_link_search_tg();
+            DROP FUNCTION IF EXISTS kompress_variants_search_tg();
+            DROP FUNCTION IF EXISTS kompress_products_search_tg();
+            DROP FUNCTION IF EXISTS kompress_refresh_product_search(integer);
+            DROP FUNCTION IF EXISTS kompress_build_product_search(text, text, integer);
+            ALTER TABLE products DROP COLUMN IF EXISTS search_vector;
+            "#,
+        )
+        .await?;
+
+        // Restore the name + description generated column from the prior migration.
+        db.execute_unprepared(
+            r#"
+            ALTER TABLE products
+                ADD COLUMN search_vector tsvector
+                GENERATED ALWAYS AS (
+                    setweight(to_tsvector('sk_unaccent', COALESCE(name, '')), 'A') ||
+                    setweight(to_tsvector('sk_unaccent', COALESCE(description, '')), 'B')
+                ) STORED;
+
+            CREATE INDEX idx_products_search_vector
+                ON products USING GIN (search_vector);
+            "#,
+        )
+        .await?;
+
+        Ok(())
+    }
+}

migration/src/m20260622_000006_order_search_indexes.rs

@@ -0,0 +1,48 @@
+//! Trigram indexes so the admin order search stays fast as orders pile up.
+//!
+//! Order search is a plain substring (`ILIKE`) match over the high-signal,
+//! free-text order fields — order number, email, customer/company name — run
+//! through `f_unaccent` so diacritics and case never matter (see
+//! `orders::Entity::search`). These `pg_trgm` GIN indexes let those `ILIKE`
+//! lookups use an index instead of scanning every row. `pg_trgm` + `f_unaccent`
+//! already exist from the product-search migration.
+
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        m.get_connection()
+            .execute_unprepared(
+                r#"
+                CREATE INDEX idx_orders_number_trgm
+                    ON orders USING GIN (f_unaccent(order_number) gin_trgm_ops);
+                CREATE INDEX idx_orders_email_trgm
+                    ON orders USING GIN (f_unaccent(email) gin_trgm_ops);
+                CREATE INDEX idx_orders_customer_name_trgm
+                    ON orders USING GIN (f_unaccent(COALESCE(customer_name, '')) gin_trgm_ops);
+                CREATE INDEX idx_orders_company_name_trgm
+                    ON orders USING GIN (f_unaccent(COALESCE(company_name, '')) gin_trgm_ops);
+                "#,
+            )
+            .await?;
+        Ok(())
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        m.get_connection()
+            .execute_unprepared(
+                r#"
+                DROP INDEX IF EXISTS idx_orders_company_name_trgm;
+                DROP INDEX IF EXISTS idx_orders_customer_name_trgm;
+                DROP INDEX IF EXISTS idx_orders_email_trgm;
+                DROP INDEX IF EXISTS idx_orders_number_trgm;
+                "#,
+            )
+            .await?;
+        Ok(())
+    }
+}

src/controllers/admin_categories.rs

@@ -198,7 +198,7 @@ async fn create(
     guard::current_admin(auth, &ctx).await?;
     let form = read_multipart_form(multipart).await?;
     let fields = parse_category_fields(&ctx, &form, None).await?;
-    let image_id = match form.image {
+    let image_id = match form.single_image() {
         Some(data) => Some(store_image(&ctx, data).await?),
         None => None,
     };
@@ -252,7 +252,7 @@ async fn update(
     category.position = Set(fields.position);
     category.published = Set(fields.published);
     category.parent_id = Set(fields.parent_id);
-    if let Some(data) = form.image {
+    if let Some(data) = form.single_image() {
         category.image_id = Set(Some(store_image(&ctx, data).await?));
     }
     category.update(&ctx.db).await?;

src/controllers/admin_customers.rs

@@ -21,7 +21,7 @@ use crate::{
     controllers::i18n::current_lang,
     models::{
         account_discount_profiles, account_product_prices, account_product_resolutions,
-        categories, discount_profiles, products, _entities::users,
+        categories, discount_profiles, product_variants, products, _entities::users,
     },
     shared::{
         guard,
@@ -138,20 +138,20 @@ async fn show(
         .all(&ctx.db)
         .await?;
 
-    let list = products::Entity::find()
-        .order_by_asc(products::Column::Name)
-        .all(&ctx.db)
-        .await?;
-    // Two prices per product:
-    // - the generic business price a freshly-registered company sees (business
-    //   baseline + business-audience profiles, no per-company deals), and
-    // - this company's effective price (its negotiated price + assigned profiles).
-    // The effective price is highlighted only when it differs from the generic one.
-    let business = pricing::audience_price_many(&ctx, &list, BUSINESS_AUDIENCE).await?;
-    let details = pricing::detail_many(&ctx, &list, Some(&company)).await?;
+    // Optional text search (drafts included), otherwise the whole catalog by
+    // name. Reuses the storefront's hybrid full-text + fuzzy product search.
+    let query = params.get("q").map(String::as_str).unwrap_or("").trim().to_string();
+    let list = if query.is_empty() {
+        products::Entity::find()
+            .order_by_asc(products::Column::Name)
+            .all(&ctx.db)
+            .await?
+    } else {
+        products::Entity::search(&ctx.db, &query, 1000, false).await?
+    };
 
-    // Category sidebar tree (counts over the full, unfiltered list) plus the
-    // active `?category=` filter applied to the rows.
+    // Category sidebar tree (counts over the full, unfiltered product list) plus
+    // the active `?category=` filter applied to the rows.
     let category_ids: Vec<Option<i32>> = list.iter().map(|p| p.category_id).collect();
     let category_groups = view::admin_category_groups(&all_categories, &category_ids);
     let selected_category = params
@@ -161,15 +161,43 @@ async fn show(
         .to_string();
     let filter = view::category_filter_ids(&all_categories, &selected_category);
 
-    let rows: Vec<serde_json::Value> = list
+    // Pricing is per variant. Flatten the (filtered) products into their variants
+    // in product-name then variant-position order, carrying each variant's
+    // product for the row's display name.
+    let product_ids: Vec<i32> = list.iter().map(|p| p.id).collect();
+    let grouped = product_variants::Entity::grouped_for_products(&ctx.db, &product_ids).await?;
+    let mut variant_rows: Vec<(&products::Model, product_variants::Model)> = Vec::new();
+    for product in &list {
+        if !view::category_filter_keep(&filter, product.category_id) {
+            continue;
+        }
+        if let Some(variants) = grouped.get(&product.id) {
+            for variant in variants {
+                variant_rows.push((product, variant.clone()));
+            }
+        }
+    }
+
+    // Two prices per variant:
+    // - the generic business price a freshly-registered company sees (business
+    //   baseline + business-audience profiles, no per-company deals), and
+    // - this company's effective price (its negotiated price + assigned profiles).
+    // The effective price is highlighted only when it differs from the generic one.
+    let variants_only: Vec<product_variants::Model> =
+        variant_rows.iter().map(|(_, v)| v.clone()).collect();
+    let business = pricing::audience_price_variants(&ctx, &variants_only, BUSINESS_AUDIENCE).await?;
+    let details = pricing::detail_variants(&ctx, &variants_only, Some(&company)).await?;
+
+    let rows: Vec<serde_json::Value> = variant_rows
         .iter()
         .zip(business.iter())
         .zip(details.iter())
-        .filter(|((product, _), _)| view::category_filter_keep(&filter, product.category_id))
-        .map(|((product, b), d)| {
+        .map(|(((product, variant), b), d)| {
             json!({
                 "product_id": product.id,
+                "variant_id": variant.id,
                 "name": product.name,
+                "variant_label": variant.label,
                 "currency": product.currency,
                 "regular_price": format_price(d.regular_cents),
                 "business_price": format_price(b.price_cents),
@@ -191,6 +219,7 @@ async fn show(
             "products": rows,
             "category_groups": category_groups,
             "selected_category": selected_category,
+            "query": query,
             "total_count": list.len(),
             "uncategorized_count": category_ids.iter().filter(|c| c.is_none()).count(),
             "error": params.get("error"),
@@ -207,22 +236,27 @@ async fn price_edit(
     auth: auth::JWT,
     jar: CookieJar,
     ViewEngine(v): ViewEngine<TeraView>,
-    Path((id, product_id)): Path<(i32, i32)>,
+    Path((id, variant_id)): Path<(i32, i32)>,
     Query(params): Query<HashMap<String, String>>,
     State(ctx): State<AppContext>,
 ) -> Result<Response> {
     guard::current_admin(auth, &ctx).await?;
     let company = company_by_id(&ctx, id).await?;
-    let product = products::Entity::find_by_id(product_id)
+    let variant = product_variants::Entity::find_by_id(variant_id)
+        .one(&ctx.db)
+        .await?
+        .ok_or_else(|| Error::NotFound)?;
+    let product = products::Entity::find_by_id(variant.product_id)
         .one(&ctx.db)
         .await?
         .ok_or_else(|| Error::NotFound)?;
 
     let business =
-        pricing::audience_price_many(&ctx, std::slice::from_ref(&product), BUSINESS_AUDIENCE)
+        pricing::audience_price_variants(&ctx, std::slice::from_ref(&variant), BUSINESS_AUDIENCE)
             .await?;
     let business_cents = business[0].price_cents;
-    let detail = pricing::detail_many(&ctx, std::slice::from_ref(&product), Some(&company)).await?;
+    let detail =
+        pricing::detail_variants(&ctx, std::slice::from_ref(&variant), Some(&company)).await?;
     let d = &detail[0];
 
     // Names for the covering profiles, used by the collision resolution selector.
@@ -248,7 +282,9 @@ async fn price_edit(
             "customer": { "id": company.id, "name": company.name },
             "product": {
                 "id": product.id,
+                "variant_id": variant.id,
                 "name": product.name,
+                "variant_label": variant.label,
                 "currency": product.currency,
                 "regular_price": format_price(d.regular_cents),
                 "regular_cents": d.regular_cents,
@@ -271,7 +307,7 @@ async fn price_edit(
 #[debug_handler]
 async fn set_price(
     auth: auth::JWT,
-    Path((id, product_id)): Path<(i32, i32)>,
+    Path((id, variant_id)): Path<(i32, i32)>,
     State(ctx): State<AppContext>,
     Form(form): Form<PriceForm>,
 ) -> Result<Response> {
@@ -280,7 +316,7 @@ async fn set_price(
 
     let entered = form.price.trim().to_string();
     if entered.is_empty() {
-        account_product_prices::Model::clear(&ctx.db, company.id, product_id).await?;
+        account_product_prices::Model::clear(&ctx.db, company.id, variant_id).await?;
         return format::redirect(&format!("/admin/customers/{id}"));
     }
 
@@ -288,23 +324,23 @@ async fn set_price(
         Ok(cents) if cents > 0 => cents,
         _ => {
             return format::redirect(&format!(
-                "/admin/customers/{id}/prices/{product_id}/edit?error=discount-must-be-positive"
+                "/admin/customers/{id}/prices/{variant_id}/edit?error=discount-must-be-positive"
             ))
         }
     };
-    account_product_prices::Model::upsert(&ctx.db, company.id, product_id, cents).await?;
+    account_product_prices::Model::upsert(&ctx.db, company.id, variant_id, cents).await?;
     format::redirect(&format!("/admin/customers/{id}"))
 }
 
 #[debug_handler]
 async fn remove_price(
     auth: auth::JWT,
-    Path((id, product_id)): Path<(i32, i32)>,
+    Path((id, variant_id)): Path<(i32, i32)>,
     State(ctx): State<AppContext>,
 ) -> Result<Response> {
     guard::current_admin(auth, &ctx).await?;
     let company = company_by_id(&ctx, id).await?;
-    account_product_prices::Model::clear(&ctx.db, company.id, product_id).await?;
+    account_product_prices::Model::clear(&ctx.db, company.id, variant_id).await?;
     format::redirect(&format!("/admin/customers/{id}"))
 }
 
@@ -347,7 +383,7 @@ async fn sync_profiles(
 #[debug_handler]
 async fn set_resolution(
     auth: auth::JWT,
-    Path((id, product_id)): Path<(i32, i32)>,
+    Path((id, variant_id)): Path<(i32, i32)>,
     State(ctx): State<AppContext>,
     Form(form): Form<ResolutionForm>,
 ) -> Result<Response> {
@@ -356,14 +392,14 @@ async fn set_resolution(
 
     let existing = account_product_resolutions::Entity::find()
         .filter(account_product_resolutions::Column::UserId.eq(company.id))
-        .filter(account_product_resolutions::Column::ProductId.eq(product_id))
+        .filter(account_product_resolutions::Column::VariantId.eq(variant_id))
         .one(&ctx.db)
         .await?;
     let mut active = match existing {
         Some(row) => row.into_active_model(),
         None => account_product_resolutions::ActiveModel {
             user_id: Set(company.id),
-            product_id: Set(product_id),
+            variant_id: Set(variant_id),
             ..Default::default()
         },
     };
@@ -378,16 +414,16 @@ pub fn routes() -> Routes {
         .add("/admin/customers/{id}", get(show))
         .add("/admin/customers/{id}/profiles", post(sync_profiles))
         .add(
-            "/admin/customers/{id}/prices/{product_id}/edit",
+            "/admin/customers/{id}/prices/{variant_id}/edit",
             get(price_edit),
         )
-        .add("/admin/customers/{id}/prices/{product_id}", post(set_price))
+        .add("/admin/customers/{id}/prices/{variant_id}", post(set_price))
         .add(
-            "/admin/customers/{id}/prices/{product_id}/remove",
+            "/admin/customers/{id}/prices/{variant_id}/remove",
             post(remove_price),
         )
         .add(
-            "/admin/customers/{id}/resolutions/{product_id}",
+            "/admin/customers/{id}/resolutions/{variant_id}",
             post(set_resolution),
         )
 }

src/controllers/admin_form.rs

@@ -1,8 +1,11 @@
 //! Multipart form handling shared by the product and category admin forms.
 //!
-//! Both forms submit a mix of text fields and an optional `image` file part;
-//! this collects them into an easy-to-query [`MultipartForm`] and stores any
-//! uploaded image through the configured storage driver.
+//! Both forms submit a mix of text fields and `image` file part(s); this
+//! collects them into an easy-to-query [`MultipartForm`] and stores any
+//! uploaded image through the configured storage driver. The product form can
+//! upload several images at once and submits a unified gallery order as
+//! repeated `image_order` fields — each either an existing image's id or the
+//! literal `new` (a placeholder consumed, in order, from the uploaded files).
 
 use std::collections::HashMap;
 
@@ -18,11 +21,24 @@ fn normalize_empty(value: Option<String>) -> Option<String> {
     })
 }
 
-/// Collected multipart form: text fields keyed by name, plus the raw bytes of
-/// an `image` file part if one was uploaded (an empty file input is ignored).
+/// One slot in the unified gallery order submitted by the product form.
+#[derive(Debug, Clone)]
+pub(crate) enum ImageSlot {
+    /// An existing image kept in the gallery.
+    Existing(i32),
+    /// A placeholder for one newly-uploaded file, consumed from [`MultipartForm::images`]
+    /// in the order these slots appear.
+    New,
+}
+
+/// Collected multipart form: text fields keyed by name, the raw bytes of every
+/// `image` file part uploaded (empty file inputs are ignored, submission order
+/// preserved), and the full gallery order as repeated `image_order` fields —
+/// each either an existing image's id or the literal `new`.
 pub(crate) struct MultipartForm {
     fields: HashMap<String, String>,
-    pub(crate) image: Option<Vec<u8>>,
+    pub(crate) images: Vec<Vec<u8>>,
+    pub(crate) image_order: Vec<ImageSlot>,
 }
 
 impl MultipartForm {
@@ -31,6 +47,12 @@ impl MultipartForm {
         normalize_empty(self.fields.get(key).cloned())
     }
 
+    /// The single uploaded image, for forms (like categories) that accept only
+    /// one. Consumes the first uploaded part; any extras are ignored.
+    pub(crate) fn single_image(self) -> Option<Vec<u8>> {
+        self.images.into_iter().next()
+    }
+
     /// Whether a checkbox-style field is checked.
     pub(crate) fn checked(&self, key: &str) -> bool {
         matches!(
@@ -38,11 +60,29 @@ impl MultipartForm {
             Some("on" | "true" | "1")
         )
     }
+
+    /// The distinct row indices `N` present among `variants[N][...]` fields,
+    /// sorted ascending. Used to read the repeated variant rows of the product
+    /// form (each row's fields are uniquely keyed, so the HashMap keeps them all).
+    pub(crate) fn variant_indices(&self) -> Vec<usize> {
+        let mut idx: Vec<usize> = self
+            .fields
+            .keys()
+            .filter_map(|k| {
+                let rest = k.strip_prefix("variants[")?;
+                rest.split(']').next()?.parse::<usize>().ok()
+            })
+            .collect();
+        idx.sort_unstable();
+        idx.dedup();
+        idx
+    }
 }
 
 pub(crate) async fn read_multipart_form(mut multipart: Multipart) -> Result<MultipartForm> {
     let mut fields = HashMap::new();
-    let mut image = None;
+    let mut images = Vec::new();
+    let mut image_order = Vec::new();
 
     while let Some(mut field) = multipart
         .next_field()
@@ -65,8 +105,20 @@ pub(crate) async fn read_multipart_form(mut multipart: Multipart) -> Result<Mult
                     )));
                 }
             }
+            // An empty file part (no file chosen in a slot) is ignored.
             if !data.is_empty() {
-                image = Some(data);
+                images.push(data);
+            }
+        } else if name == "image_order" {
+            let value = field
+                .text()
+                .await
+                .map_err(|err| Error::BadRequest(format!("invalid multipart field: {err}")))?;
+            let trimmed = value.trim();
+            if trimmed == "new" {
+                image_order.push(ImageSlot::New);
+            } else if let Ok(id) = trimmed.parse::<i32>() {
+                image_order.push(ImageSlot::Existing(id));
             }
         } else {
             let value = field
@@ -77,7 +129,11 @@ pub(crate) async fn read_multipart_form(mut multipart: Multipart) -> Result<Mult
         }
     }
 
-    Ok(MultipartForm { fields, image })
+    Ok(MultipartForm {
+        fields,
+        images,
+        image_order,
+    })
 }
 
 /// Store an uploaded image's bytes and return its generated filename.

src/controllers/admin_orders.rs

@@ -1,5 +1,8 @@
 //! Admin order list, detail, status updates, and manual carrier dispatch.
 
+use std::collections::HashMap;
+
+use axum::extract::Query;
 use axum_extra::extract::cookie::CookieJar;
 use loco_rs::prelude::*;
 use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, QueryOrder, Set};
@@ -30,18 +33,31 @@ async fn index(
     auth: auth::JWT,
     jar: CookieJar,
     ViewEngine(v): ViewEngine<TeraView>,
+    Query(params): Query<HashMap<String, String>>,
     State(ctx): State<AppContext>,
 ) -> Result<Response> {
     guard::current_admin(auth, &ctx).await?;
-    let list = orders::Entity::find()
-        .order_by_desc(orders::Column::CreatedAt)
-        .all(&ctx.db)
-        .await?;
+    // Optional search over order number / customer / email / etc., otherwise the
+    // full list newest first.
+    let query = params.get("q").map(String::as_str).unwrap_or("").trim().to_string();
+    let list = if query.is_empty() {
+        orders::Entity::find()
+            .order_by_desc(orders::Column::CreatedAt)
+            .all(&ctx.db)
+            .await?
+    } else {
+        orders::Entity::search(&ctx.db, &query, 500).await?
+    };
     let rows: Vec<serde_json::Value> = list.iter().map(view::summary).collect();
     format::view(
         &v,
         "admin/orders/index.html",
-        json!({ "orders": rows, "lang": current_lang(&jar) }),
+        json!({
+            "orders": rows,
+            "query": query,
+            "total": list.len(),
+            "lang": current_lang(&jar),
+        }),
     )
 }
 

src/controllers/admin_products.rs

@@ -1,4 +1,11 @@
 //! Admin product CRUD.
+//!
+//! A product is a presentation grouping; its purchasable options live in
+//! `product_variants` (each with its own label, sku, stock, regular price and
+//! optional public/business quick-sale prices), edited inline on the product
+//! form. The products list and the per-audience percentage discount profiles
+//! operate at the product level, previewing prices on each product's
+//! representative (first) variant.
 
 use std::collections::{HashMap, HashSet};
 
@@ -9,23 +16,23 @@ use sea_orm::{
     ActiveModelTrait, ColumnTrait, EntityTrait, ModelTrait, PaginatorTrait, QueryFilter,
     QueryOrder, Set, TransactionTrait,
 };
-use serde::Deserialize;
 use serde_json::json;
 
 use crate::{
     controllers::{
-        admin_form::{read_multipart_form, store_image, MultipartForm},
+        admin_form::{read_multipart_form, store_image, ImageSlot, MultipartForm},
         i18n::current_lang,
         media::IMAGE_MAX_BYTES,
     },
     shared::{
         guard,
-        money::{format_bp, format_price, parse_percent, parse_price_to_cents},
+        money::{format_bp, format_price, parse_price_to_cents},
         pricing,
         slug::{slugify, unique_slug},
     },
     models::{
-        audience_discount_profiles, categories, discount_profiles, product_images, products,
+        audience_discount_profiles, categories, discount_profiles, product_images,
+        product_variants, products,
     },
     views::shop as view,
 };
@@ -45,10 +52,7 @@ struct ProductFields {
     name: String,
     slug: String,
     description: Option<String>,
-    price_cents: i64,
     currency: String,
-    sku: Option<String>,
-    stock: i32,
     category_id: Option<i32>,
     published: bool,
 }
@@ -61,19 +65,8 @@ async fn parse_product_fields(
     let name = form
         .text("name")
         .ok_or_else(|| Error::BadRequest("product name is required".to_string()))?;
-    let price_cents = parse_price_to_cents(
-        form.text("price")
-            .ok_or_else(|| Error::BadRequest("price is required".to_string()))?
-            .as_str(),
-    )?;
     let currency = form.text("currency").unwrap_or_else(|| "EUR".to_string());
     let description = form.text("description");
-    let sku = form.text("sku");
-    let stock = form
-        .text("stock")
-        .and_then(|s| s.parse::<i32>().ok())
-        .filter(|n| *n >= 0)
-        .unwrap_or(0);
     let category_id = form.text("category_id").and_then(|s| s.parse::<i32>().ok());
     let published = form.checked("published");
 
@@ -98,15 +91,155 @@ async fn parse_product_fields(
         name,
         slug,
         description,
-        price_cents,
         currency,
-        sku,
-        stock,
         category_id,
         published,
     })
 }
 
+/// One variant row parsed from the product form.
+struct VariantInput {
+    id: Option<i32>,
+    label: String,
+    sku: Option<String>,
+    /// `None` = available but not inventory-tracked.
+    stock: Option<i32>,
+    price_cents: i64,
+    business_sale_cents: Option<i64>,
+    position: i32,
+}
+
+/// The optional business-sale price field on a variant row: blank means "no
+/// business quick-sale", a value must parse and be below the regular price.
+fn parse_optional_sale(
+    form: &MultipartForm,
+    i: usize,
+    key: &str,
+    price_cents: i64,
+) -> Result<Option<i64>> {
+    let Some(raw) = form.text(&format!("variants[{i}][{key}]")) else {
+        return Ok(None);
+    };
+    let cents = parse_price_to_cents(&raw)?;
+    if cents <= 0 || cents >= price_cents {
+        return Err(Error::BadRequest(
+            "a sale price must be positive and below the regular price".to_string(),
+        ));
+    }
+    Ok(Some(cents))
+}
+
+/// Parse the repeated variant rows from the form, in submission order. Blank
+/// rows (no price and no label) are skipped; at least one valid row is required.
+fn parse_variants(form: &MultipartForm) -> Result<Vec<VariantInput>> {
+    let mut out = Vec::new();
+    for i in form.variant_indices() {
+        let label = form
+            .text(&format!("variants[{i}][label]"))
+            .unwrap_or_default();
+        let price_raw = form.text(&format!("variants[{i}][price]"));
+
+        let Some(price_raw) = price_raw else {
+            // A completely empty leftover row is ignored; a labelled row without
+            // a price is a mistake worth reporting.
+            if label.is_empty() {
+                continue;
+            }
+            return Err(Error::BadRequest(
+                "each option needs a price".to_string(),
+            ));
+        };
+        let price_cents = parse_price_to_cents(&price_raw)?;
+        if price_cents <= 0 {
+            return Err(Error::BadRequest(
+                "an option price must be positive".to_string(),
+            ));
+        }
+
+        let sku = form.text(&format!("variants[{i}][sku]"));
+        // Stock is optional: blank means "available, not tracked". A value must
+        // be a non-negative integer.
+        let stock = match form.text(&format!("variants[{i}][stock]")) {
+            None => None,
+            Some(raw) => Some(
+                raw.parse::<i32>()
+                    .ok()
+                    .filter(|n| *n >= 0)
+                    .ok_or_else(|| Error::BadRequest("stock must be 0 or more".to_string()))?,
+            ),
+        };
+        let business_sale_cents = parse_optional_sale(form, i, "business_sale", price_cents)?;
+        let id = form
+            .text(&format!("variants[{i}][id]"))
+            .and_then(|s| s.parse::<i32>().ok());
+
+        out.push(VariantInput {
+            id,
+            label,
+            sku,
+            stock,
+            price_cents,
+            business_sale_cents,
+            position: out.len() as i32,
+        });
+    }
+    if out.is_empty() {
+        return Err(Error::BadRequest(
+            "add at least one option with a price".to_string(),
+        ));
+    }
+    Ok(out)
+}
+
+/// Apply a parsed variant row onto a (new or existing) active model.
+fn apply_variant(active: &mut product_variants::ActiveModel, input: &VariantInput) {
+    active.label = Set(input.label.clone());
+    active.sku = Set(input.sku.clone());
+    active.stock = Set(input.stock);
+    active.price_cents = Set(input.price_cents);
+    // The per-variant public sale price was removed from the UI; keep it cleared.
+    active.sale_price_cents = Set(None);
+    active.business_sale_price_cents = Set(input.business_sale_cents);
+    active.position = Set(input.position);
+}
+
+/// Reconcile the product's variants with the submitted rows inside `txn`: update
+/// rows carrying an id, insert rows without one, and delete existing variants no
+/// longer present.
+async fn sync_variants<C: ConnectionTrait>(
+    txn: &C,
+    product_id: i32,
+    inputs: &[VariantInput],
+) -> Result<()> {
+    let existing = product_variants::Entity::for_product(txn, product_id).await?;
+    let keep: HashSet<i32> = inputs.iter().filter_map(|v| v.id).collect();
+    for variant in &existing {
+        if !keep.contains(&variant.id) {
+            variant.clone().delete(txn).await?;
+        }
+    }
+    let by_id: HashMap<i32, product_variants::Model> =
+        existing.into_iter().map(|v| (v.id, v)).collect();
+    for input in inputs {
+        match input.id.and_then(|id| by_id.get(&id)) {
+            Some(model) => {
+                let mut active = model.clone().into_active_model();
+                apply_variant(&mut active, input);
+                active.update(txn).await?;
+            }
+            None => {
+                let mut active = product_variants::ActiveModel {
+                    product_id: Set(product_id),
+                    ..Default::default()
+                };
+                apply_variant(&mut active, input);
+                active.insert(txn).await?;
+            }
+        }
+    }
+    Ok(())
+}
+
 async fn form_context(ctx: &AppContext, jar: &CookieJar) -> Result<serde_json::Value> {
     let categories = categories::Entity::find()
         .order_by_asc(categories::Column::Position)
@@ -116,6 +249,18 @@ async fn form_context(ctx: &AppContext, jar: &CookieJar) -> Result<serde_json::V
     Ok(json!({ "categories": categories, "lang": current_lang(jar) }))
 }
 
+/// Variant shape used to pre-fill a row of the product form's variant editor.
+fn variant_form_json(variant: &product_variants::Model) -> serde_json::Value {
+    json!({
+        "id": variant.id,
+        "label": variant.label,
+        "sku": variant.sku,
+        "stock": variant.stock,
+        "price": format_price(variant.price_cents),
+        "business_sale": variant.business_sale_price_cents.map(format_price),
+    })
+}
+
 #[debug_handler]
 async fn index(
     auth: auth::JWT,
@@ -136,13 +281,19 @@ async fn index(
         .map(|c| (c.id, c.name.clone()))
         .collect();
 
-    let list = products::Entity::find()
-        .order_by_desc(products::Column::CreatedAt)
-        .all(&ctx.db)
-        .await?;
-    // Effective price each product carries for the active audience, after the
-    // global per-product discount and any profiles assigned to that audience.
-    let effective = pricing::audience_price_many(&ctx, &list, audience).await?;
+    // Optional text search (drafts included), otherwise the full catalog newest
+    // first. Reuses the storefront's hybrid full-text + fuzzy product search.
+    let query = params.get("q").map(String::as_str).unwrap_or("").trim().to_string();
+    let list = if query.is_empty() {
+        products::Entity::find()
+            .order_by_desc(products::Column::CreatedAt)
+            .all(&ctx.db)
+            .await?
+    } else {
+        products::Entity::search(&ctx.db, &query, 1000, false).await?
+    };
+    let ids: Vec<i32> = list.iter().map(|p| p.id).collect();
+    let grouped = product_variants::Entity::grouped_for_products(&ctx.db, &ids).await?;
 
     // Category sidebar tree (counts over the full, unfiltered list) plus the
     // active `?category=` filter applied to the rows.
@@ -155,16 +306,48 @@ async fn index(
         .to_string();
     let filter = view::category_filter_ids(&all_categories, &selected_category);
 
-    let mut rows = Vec::new();
-    for (product, priced) in list.iter().zip(effective.iter()) {
+    // The kept products with their representative (first) variant, priced in one
+    // batch for the active audience.
+    let mut kept: Vec<(&products::Model, &Vec<product_variants::Model>)> = Vec::new();
+    for product in &list {
         if !view::category_filter_keep(&filter, product.category_id) {
             continue;
         }
+        if let Some(variants) = grouped.get(&product.id) {
+            if !variants.is_empty() {
+                kept.push((product, variants));
+            }
+        }
+    }
+    let reps: Vec<product_variants::Model> =
+        kept.iter().map(|(_, vs)| vs[0].clone()).collect();
+    let effective = pricing::audience_price_variants(&ctx, &reps, audience).await?;
+
+    let mut rows = Vec::new();
+    for ((product, variants), priced) in kept.iter().zip(effective.iter()) {
         let image = product_images::first_for(&ctx, product.id).await?;
         let category_name = product
             .category_id
             .and_then(|id| category_name.get(&id).cloned());
-        rows.push(product_row(product, priced, image, category_name, audience));
+        // Stock column: total across tracked variants, or "∞" when any option is
+        // untracked (always available).
+        let stock_display = if variants.iter().any(|v| !v.tracked()) {
+            "∞".to_string()
+        } else {
+            variants
+                .iter()
+                .filter_map(|v| v.stock)
+                .sum::<i32>()
+                .to_string()
+        };
+        rows.push(product_row(
+            product,
+            priced,
+            variants.len(),
+            stock_display,
+            image,
+            category_name,
+        ));
     }
 
     format::view(
@@ -176,6 +359,7 @@ async fn index(
             "audience": audience,
             "category_groups": category_groups,
             "selected_category": selected_category,
+            "query": query,
             "total_count": list.len(),
             "uncategorized_count": category_ids.iter().filter(|c| c.is_none()).count(),
             "lang": current_lang(&jar),
@@ -183,32 +367,32 @@ async fn index(
     )
 }
 
-/// List-row shape: the product card fields plus the active audience's per-product
-/// discount and its resolved effective price (after profiles).
+/// List-row shape: the product card fields plus its representative variant's
+/// resolved effective price (after the active audience's profiles) and the count
+/// of options.
 fn product_row(
     product: &products::Model,
     effective: &pricing::PricedProduct,
+    variant_count: usize,
+    stock_display: String,
     image: Option<String>,
     category_name: Option<String>,
-    audience: &str,
 ) -> serde_json::Value {
-    let sale = current_value(product, audience);
     json!({
         "id": product.id,
         "name": product.name,
         "slug": product.slug,
         "currency": product.currency,
-        "stock": product.stock,
+        "stock": stock_display,
+        "variant_count": variant_count,
+        "has_options": variant_count > 1,
         "published": product.published,
         "image": image,
         "category_name": category_name,
-        "regular_price": format_price(product.price_cents),
-        "on_sale": sale.is_some(),
-        "sale_price": sale.map(format_price),
-        "percent_off": sale.map(|s| percent_off(product.price_cents, s)),
+        "regular_price": format_price(effective.regular_cents),
         "effective_price": format_price(effective.price_cents),
         "effective_reduced": effective.is_reduced(),
-        "effective_percent_off": percent_off(product.price_cents, effective.price_cents),
+        "effective_percent_off": percent_off(effective.regular_cents, effective.price_cents),
     })
 }
 
@@ -252,6 +436,7 @@ async fn new(
     guard::current_admin(auth, &ctx).await?;
     let mut context = form_context(&ctx, &jar).await?;
     context["product"] = serde_json::Value::Null;
+    context["variants"] = json!([]);
     format::view(&v, "admin/catalog/product_form.html", context)
 }
 
@@ -264,40 +449,90 @@ async fn create(
     guard::current_admin(auth, &ctx).await?;
     let form = read_multipart_form(multipart).await?;
     let fields = parse_product_fields(&ctx, &form, None).await?;
+    let variants = parse_variants(&form)?;
 
+    let txn = ctx.db.begin().await?;
     let product = products::ActiveModel {
         name: Set(fields.name),
         slug: Set(fields.slug),
         description: Set(fields.description),
-        price_cents: Set(fields.price_cents),
         currency: Set(fields.currency),
-        sku: Set(fields.sku),
-        stock: Set(fields.stock),
         view_count: Set(0),
         published: Set(fields.published),
         published_at: Set(fields.published.then(|| chrono::Utc::now().into())),
         category_id: Set(fields.category_id),
         ..Default::default()
     }
-    .insert(&ctx.db)
+    .insert(&txn)
     .await?;
-
-    if let Some(data) = form.image {
-        let filename = store_image(&ctx, data).await?;
-        product_images::ActiveModel {
-            product_id: Set(product.id),
-            image_id: Set(filename),
-            position: Set(0),
-            alt: Set(None),
-            ..Default::default()
-        }
-        .insert(&ctx.db)
-        .await?;
-    }
+    sync_variants(&txn, product.id, &variants).await?;
+    sync_images(&ctx, &txn, product.id, &form.image_order, &form.images).await?;
+    txn.commit().await?;
 
     format::redirect("/admin/catalog/products")
 }
 
+/// Reconcile a product's images inside `txn` with the submitted unified
+/// `image_order`: for each [`ImageSlot::Existing`] entry re-number the
+/// corresponding image to its slot position; for each [`ImageSlot::New`]
+/// consume the next freshly uploaded file from `new_images`, storing and
+/// inserting it at that position. Any existing image not referenced in
+/// `image_order` is deleted.
+async fn sync_images<C: ConnectionTrait>(
+    ctx: &AppContext,
+    txn: &C,
+    product_id: i32,
+    image_order: &[ImageSlot],
+    new_images: &[Vec<u8>],
+) -> Result<()> {
+    let existing = product_images::for_product(txn, product_id).await?;
+    let by_id: HashMap<i32, product_images::Model> =
+        existing.iter().map(|m| (m.id, m.clone())).collect();
+    let keep: HashSet<i32> = image_order
+        .iter()
+        .filter_map(|slot| match slot {
+            ImageSlot::Existing(id) => Some(*id),
+            ImageSlot::New => None,
+        })
+        .collect();
+
+    for image in &existing {
+        if !keep.contains(&image.id) {
+            image.clone().delete(txn).await?;
+        }
+    }
+
+    let mut new_iter = new_images.iter();
+    let mut position = 0i32;
+    for slot in image_order {
+        match slot {
+            ImageSlot::Existing(id) => {
+                if let Some(model) = by_id.get(id) {
+                    let mut active = model.clone().into_active_model();
+                    active.position = Set(position);
+                    active.update(txn).await?;
+                }
+            }
+            ImageSlot::New => {
+                if let Some(data) = new_iter.next() {
+                    let filename = store_image(ctx, data.clone()).await?;
+                    product_images::ActiveModel {
+                        product_id: Set(product_id),
+                        image_id: Set(filename),
+                        position: Set(position),
+                        alt: Set(None),
+                        ..Default::default()
+                    }
+                    .insert(txn)
+                    .await?;
+                }
+            }
+        }
+        position += 1;
+    }
+    Ok(())
+}
+
 #[debug_handler]
 async fn edit(
     auth: auth::JWT,
@@ -308,9 +543,11 @@ async fn edit(
 ) -> Result<Response> {
     guard::current_admin(auth, &ctx).await?;
     let product = product_by_id(&ctx, id).await?;
-    let image = product_images::first_for(&ctx, id).await?;
+    let images = product_images::for_product(&ctx.db, id).await?;
+    let variants = product_variants::Entity::for_product(&ctx.db, id).await?;
     let mut context = form_context(&ctx, &jar).await?;
-    context["product"] = view::product_form(&product, image);
+    context["product"] = view::product_form(&product, &images);
+    context["variants"] = json!(variants.iter().map(variant_form_json).collect::<Vec<_>>());
     format::view(&v, "admin/catalog/product_form.html", context)
 }
 
@@ -326,15 +563,14 @@ async fn update(
     let was_published = existing.published;
     let form = read_multipart_form(multipart).await?;
     let fields = parse_product_fields(&ctx, &form, Some(id)).await?;
+    let variants = parse_variants(&form)?;
 
+    let txn = ctx.db.begin().await?;
     let mut product = existing.into_active_model();
     product.name = Set(fields.name);
     product.slug = Set(fields.slug);
     product.description = Set(fields.description);
-    product.price_cents = Set(fields.price_cents);
     product.currency = Set(fields.currency);
-    product.sku = Set(fields.sku);
-    product.stock = Set(fields.stock);
     product.category_id = Set(fields.category_id);
     product.published = Set(fields.published);
     if fields.published && !was_published {
@@ -342,21 +578,10 @@ async fn update(
     } else if !fields.published {
         product.published_at = Set(None);
     }
-    product.update(&ctx.db).await?;
-
-    if let Some(data) = form.image {
-        let filename = store_image(&ctx, data).await?;
-        let next_position = product_images::count_for(&ctx, id).await?;
-        product_images::ActiveModel {
-            product_id: Set(id),
-            image_id: Set(filename),
-            position: Set(next_position),
-            alt: Set(None),
-            ..Default::default()
-        }
-        .insert(&ctx.db)
-        .await?;
-    }
+    product.update(&txn).await?;
+    sync_variants(&txn, id, &variants).await?;
+    sync_images(&ctx, &txn, id, &form.image_order, &form.images).await?;
+    txn.commit().await?;
 
     format::redirect("/admin/catalog/products")
 }
@@ -372,23 +597,16 @@ async fn delete(
     format::redirect("/admin/catalog/products")
 }
 
-// --- Discounts -------------------------------------------------------------
+// --- Discount profiles -----------------------------------------------------
 //
 // Two audiences, switched by an `?audience=` tab on the products page:
-// - **personal** (default): the public sale price (`products.sale_price_cents`)
-//   everyone sees.
-// - **business**: a baseline discount for all company accounts
-//   (`products.business_sale_price_cents`). Per-company profiles/negotiated
-//   prices still layer on top (lowest price wins). Both are off the regular price.
-
-#[derive(Debug, Deserialize)]
-struct DiscountForm {
-    /// "fixed" (enter the new price) or "percent" (enter % off). Defaults to
-    /// fixed for older/JSON callers.
-    mode: Option<String>,
-    sale_price: Option<String>,
-    percent: Option<String>,
-}
+// - **personal** (default): what everyone sees.
+// - **business**: what company accounts see (per-company profiles/negotiated
+//   prices still layer on top; lowest price wins).
+//
+// Per-product absolute quick-sale prices live on each variant and are edited in
+// the product form. This section is only the reusable *percentage* discount
+// profiles assigned to an audience.
 
 fn read_audience(params: &HashMap<String, String>) -> &'static str {
     match params.get("audience").map(String::as_str) {
@@ -397,32 +615,10 @@ fn read_audience(params: &HashMap<String, String>) -> &'static str {
     }
 }
 
-fn current_value(product: &products::Model, audience: &str) -> Option<i64> {
-    if audience == BUSINESS {
-        product.business_sale_price_cents
-    } else {
-        product.sale_price_cents
-    }
-}
-
-fn set_value(active: &mut products::ActiveModel, audience: &str, value: Option<i64>) {
-    if audience == BUSINESS {
-        active.business_sale_price_cents = Set(value);
-    } else {
-        active.sale_price_cents = Set(value);
-    }
-}
-
 fn list_redirect(audience: &str) -> Result<Response> {
     format::redirect(&format!("/admin/catalog/products?audience={audience}"))
 }
 
-/// Resolve a percentage off the regular price into a fixed sale price in cents.
-fn percent_to_sale_cents(regular_cents: i64, percent: f64) -> i64 {
-    let off = (regular_cents as f64 * percent / 100.0).round() as i64;
-    regular_cents - off
-}
-
 /// Percent off the regular price, rounded to a whole number.
 fn percent_off(regular_cents: i64, sale_cents: i64) -> i64 {
     if regular_cents <= 0 {
@@ -432,6 +628,28 @@ fn percent_off(regular_cents: i64, sale_cents: i64) -> i64 {
     off.round() as i64
 }
 
+/// Representative (first) variant for each product in `list`, in the same order,
+/// dropping products with no variants. Returns the products kept alongside their
+/// representative variant.
+async fn representatives<'a>(
+    ctx: &AppContext,
+    list: &'a [products::Model],
+) -> Result<(Vec<&'a products::Model>, Vec<product_variants::Model>)> {
+    let ids: Vec<i32> = list.iter().map(|p| p.id).collect();
+    let grouped = product_variants::Entity::grouped_for_products(&ctx.db, &ids).await?;
+    let mut products_kept = Vec::new();
+    let mut reps = Vec::new();
+    for product in list {
+        if let Some(variants) = grouped.get(&product.id) {
+            if let Some(first) = variants.first() {
+                products_kept.push(product);
+                reps.push(first.clone());
+            }
+        }
+    }
+    Ok((products_kept, reps))
+}
+
 /// Preview the effective prices that the submitted (unsaved) checkbox set would
 /// produce, without persisting anything. Returns OOB `<span>`s that htmx swaps
 /// into the effective-price column so the admin sees the effect before Save.
@@ -461,14 +679,15 @@ async fn profiles_preview(
         .order_by_desc(products::Column::CreatedAt)
         .all(&ctx.db)
         .await?;
+    let (products_kept, reps) = representatives(&ctx, &list).await?;
     let effective =
-        pricing::audience_price_many_preview(&ctx, &list, audience, profile_ids).await?;
+        pricing::audience_price_variants_preview(&ctx, &reps, audience, profile_ids).await?;
 
     let selected_category = params.get("category").map(String::as_str).unwrap_or("all");
     let filter = view::category_filter_ids(&all_categories, selected_category);
 
     let mut rows = Vec::new();
-    for (product, priced) in list.iter().zip(effective.iter()) {
+    for (product, priced) in products_kept.iter().zip(effective.iter()) {
         if !view::category_filter_keep(&filter, product.category_id) {
             continue;
         }
@@ -477,7 +696,7 @@ async fn profiles_preview(
             "currency": product.currency,
             "effective_price": format_price(priced.price_cents),
             "effective_reduced": priced.is_reduced(),
-            "effective_percent_off": percent_off(product.price_cents, priced.price_cents),
+            "effective_percent_off": percent_off(priced.regular_cents, priced.price_cents),
         }));
     }
 
@@ -523,162 +742,10 @@ async fn sync_profiles(
     list_redirect(audience)
 }
 
-/// What to pre-fill the discount form with: the chosen input mode and the raw
-/// values for each field, so a rejected submit (or a re-edit) shows what the
-/// admin had.
-#[derive(Default)]
-struct FormPrefill {
-    mode: String,
-    fixed: String,
-    percent: String,
-}
-
-fn render_discount_form(
-    v: &TeraView,
-    jar: &CookieJar,
-    product: &products::Model,
-    audience: &str,
-    prefill: &FormPrefill,
-    error: Option<&str>,
-) -> Result<Response> {
-    let mode = if prefill.mode == "percent" { "percent" } else { "fixed" };
-    format::view(
-        v,
-        "admin/catalog/discount_form.html",
-        json!({
-            "product": {
-                "id": product.id,
-                "name": product.name,
-                "currency": product.currency,
-                "regular_price": format_price(product.price_cents),
-                "regular_cents": product.price_cents,
-            },
-            "audience": audience,
-            "has_discount": current_value(product, audience).is_some(),
-            "mode": mode,
-            "fixed": prefill.fixed,
-            "percent": prefill.percent,
-            "error": error,
-            "lang": current_lang(jar),
-        }),
-    )
-}
-
-#[debug_handler]
-async fn discount_edit(
-    auth: auth::JWT,
-    jar: CookieJar,
-    ViewEngine(v): ViewEngine<TeraView>,
-    Path(id): Path<i32>,
-    Query(params): Query<HashMap<String, String>>,
-    State(ctx): State<AppContext>,
-) -> Result<Response> {
-    guard::current_admin(auth, &ctx).await?;
-    let audience = read_audience(&params);
-    let product = product_by_id(&ctx, id).await?;
-    // Re-editing always opens in fixed mode showing the current price.
-    let prefill = FormPrefill {
-        mode: "fixed".to_string(),
-        fixed: current_value(&product, audience)
-            .map(format_price)
-            .unwrap_or_default(),
-        percent: String::new(),
-    };
-    render_discount_form(&v, &jar, &product, audience, &prefill, None)
-}
-
-#[debug_handler]
-async fn discount_update(
-    auth: auth::JWT,
-    jar: CookieJar,
-    ViewEngine(v): ViewEngine<TeraView>,
-    Path(id): Path<i32>,
-    Query(params): Query<HashMap<String, String>>,
-    State(ctx): State<AppContext>,
-    Form(form): Form<DiscountForm>,
-) -> Result<Response> {
-    guard::current_admin(auth, &ctx).await?;
-    let audience = read_audience(&params);
-    let product = product_by_id(&ctx, id).await?;
-
-    let mode = match form.mode.as_deref() {
-        Some("percent") => "percent",
-        _ => "fixed",
-    };
-    let fixed = form.sale_price.unwrap_or_default().trim().to_string();
-    let percent = form.percent.unwrap_or_default().trim().to_string();
-
-    let prefill = FormPrefill {
-        mode: mode.to_string(),
-        fixed: fixed.clone(),
-        percent: percent.clone(),
-    };
-    let render_err =
-        |key: &str| render_discount_form(&v, &jar, &product, audience, &prefill, Some(key));
-
-    // Resolve the entered discount into a fixed sale price in cents. An empty
-    // input in the active mode clears the discount (same as the Remove action).
-    let sale_cents = if mode == "percent" {
-        if percent.is_empty() {
-            return clear_discount(&ctx, product, audience).await;
-        }
-        let pct = match parse_percent(&percent) {
-            Some(pct) => pct,
-            None => return render_err("discount-invalid"),
-        };
-        if pct <= 0.0 || pct >= 100.0 {
-            return render_err("discount-percent-range");
-        }
-        percent_to_sale_cents(product.price_cents, pct)
-    } else {
-        if fixed.is_empty() {
-            return clear_discount(&ctx, product, audience).await;
-        }
-        match parse_price_to_cents(&fixed) {
-            Ok(cents) => cents,
-            Err(_) => return render_err("discount-invalid"),
-        }
-    };
-
-    if sale_cents <= 0 {
-        return render_err("discount-must-be-positive");
-    }
-    if sale_cents >= product.price_cents {
-        return render_err("discount-below-regular");
-    }
-
-    let mut active = product.into_active_model();
-    set_value(&mut active, audience, Some(sale_cents));
-    active.update(&ctx.db).await?;
-    list_redirect(audience)
-}
-
-async fn clear_discount(
-    ctx: &AppContext,
-    product: products::Model,
-    audience: &str,
-) -> Result<Response> {
-    let mut active = product.into_active_model();
-    set_value(&mut active, audience, None);
-    active.update(&ctx.db).await?;
-    list_redirect(audience)
-}
-
-#[debug_handler]
-async fn discount_remove(
-    auth: auth::JWT,
-    Path(id): Path<i32>,
-    Query(params): Query<HashMap<String, String>>,
-    State(ctx): State<AppContext>,
-) -> Result<Response> {
-    guard::current_admin(auth, &ctx).await?;
-    let audience = read_audience(&params);
-    let product = product_by_id(&ctx, id).await?;
-    clear_discount(&ctx, product, audience).await
-}
-
 pub fn routes() -> Routes {
-    let image_limit = DefaultBodyLimit::max(IMAGE_MAX_BYTES + 1024 * 1024);
+    // Several images may be uploaded in one submission; allow a generous total
+    // (per-file size is still capped at IMAGE_MAX_BYTES while reading).
+    let image_limit = DefaultBodyLimit::max(IMAGE_MAX_BYTES * 12 + 1024 * 1024);
     Routes::new()
         .add("/admin/catalog/products", get(index))
         .add("/admin/catalog/products/new", get(new))
@@ -697,16 +764,4 @@ pub fn routes() -> Routes {
             post(update).layer(image_limit),
         )
         .add("/admin/catalog/products/{id}/delete", post(delete))
-        .add(
-            "/admin/catalog/products/{id}/discount/edit",
-            get(discount_edit),
-        )
-        .add(
-            "/admin/catalog/products/{id}/discount",
-            post(discount_update),
-        )
-        .add(
-            "/admin/catalog/products/{id}/discount/remove",
-            post(discount_remove),
-        )
 }

src/controllers/cart.rs

@@ -1,4 +1,4 @@
-use crate::{controllers::i18n::current_lang, shared::{guard, money::format_price, pricing}, models::products};
+use crate::{controllers::i18n::current_lang, shared::{guard, money::format_price, pricing}, models::{product_variants, products}};
 use axum::{
     http::{HeaderMap, StatusCode},
     response::Redirect,
@@ -15,22 +15,22 @@ const CART_MAX_AGE_DAYS: i64 = 30;
 
 #[derive(Debug, Deserialize)]
 struct AddForm {
-    product_id: i32,
+    variant_id: i32,
     quantity: Option<i32>,
 }
 
 #[derive(Debug, Deserialize)]
 struct UpdateForm {
-    product_id: i32,
+    variant_id: i32,
     quantity: i32,
 }
 
 #[derive(Debug, Deserialize)]
 struct RemoveForm {
-    product_id: i32,
+    variant_id: i32,
 }
 
-/// Parse the `cart` cookie ("id:qty,id:qty") into `(product_id, quantity)`
+/// Parse the `cart` cookie ("id:qty,id:qty") into `(variant_id, quantity)`
 /// pairs, silently dropping malformed or non-positive entries.
 pub(crate) fn parse_cart(jar: &CookieJar) -> Vec<(i32, i32)> {
     let Some(cookie) = jar.get(CART_COOKIE) else {
@@ -64,12 +64,23 @@ fn cart_cookie(value: String) -> Cookie<'static> {
         .build()
 }
 
-/// Look up a published product, returning its current stock cap.
-async fn published_product(ctx: &AppContext, id: i32) -> Result<Option<products::Model>> {
-    Ok(products::Entity::find_by_id(id)
+/// Look up a variant whose product is published, returning the variant together
+/// with its parent product (for name/slug/currency).
+async fn published_variant(
+    ctx: &AppContext,
+    variant_id: i32,
+) -> Result<Option<(product_variants::Model, products::Model)>> {
+    let Some(variant) = product_variants::Entity::find_by_id(variant_id)
+        .one(&ctx.db)
+        .await?
+    else {
+        return Ok(None);
+    };
+    let product = products::Entity::find_by_id(variant.product_id)
         .filter(products::Column::Published.eq(true))
         .one(&ctx.db)
-        .await?)
+        .await?;
+    Ok(product.map(|p| (variant, p)))
 }
 
 #[debug_handler]
@@ -79,16 +90,16 @@ async fn add(
     headers: HeaderMap,
     Form(form): Form<AddForm>,
 ) -> Result<Response> {
-    let Some(product) = published_product(&ctx, form.product_id).await? else {
+    let Some((variant, _product)) = published_variant(&ctx, form.variant_id).await? else {
         return Err(Error::NotFound);
     };
 
     let mut items = parse_cart(&jar);
     let add_qty = form.quantity.unwrap_or(1).max(1);
-    if let Some(entry) = items.iter_mut().find(|(id, _)| *id == product.id) {
-        entry.1 = (entry.1 + add_qty).min(product.stock);
+    if let Some(entry) = items.iter_mut().find(|(id, _)| *id == variant.id) {
+        entry.1 = variant.cap(entry.1 + add_qty);
     } else {
-        items.push((product.id, add_qty.min(product.stock)));
+        items.push((variant.id, variant.cap(add_qty)));
     }
     items.retain(|(_, qty)| *qty > 0);
 
@@ -117,14 +128,15 @@ async fn update(
     headers: HeaderMap,
     Form(form): Form<UpdateForm>,
 ) -> Result<Response> {
-    let stock = published_product(&ctx, form.product_id)
-        .await?
-        .map(|p| p.stock)
-        .unwrap_or(0);
+    // Clamp the requested quantity to what's available (no cap for untracked
+    // variants); a removed variant clamps to 0 and drops out below.
+    let clamped = match published_variant(&ctx, form.variant_id).await? {
+        Some((variant, _)) => variant.cap(form.quantity),
+        None => 0,
+    };
 
     let mut items = parse_cart(&jar);
-    let clamped = form.quantity.clamp(0, stock);
-    if let Some(entry) = items.iter_mut().find(|(id, _)| *id == form.product_id) {
+    if let Some(entry) = items.iter_mut().find(|(id, _)| *id == form.variant_id) {
         entry.1 = clamped;
     }
     items.retain(|(_, qty)| *qty > 0);
@@ -142,7 +154,7 @@ async fn remove(
     Form(form): Form<RemoveForm>,
 ) -> Result<Response> {
     let mut items = parse_cart(&jar);
-    items.retain(|(id, _)| *id != form.product_id);
+    items.retain(|(id, _)| *id != form.variant_id);
 
     let jar = jar.add(cart_cookie(serialize_cart(&items)));
     cart_response(&ctx, &v, jar, &headers).await
@@ -192,38 +204,40 @@ pub(crate) async fn resolve_cart(
     // Resolve the cart entries to in-stock products first, then price them all
     // for the current viewer in one batch (the price depends on who's logged in).
     let user = guard::current_user(ctx, jar).await;
-    let mut items: Vec<(products::Model, i32)> = Vec::new();
+    let mut items: Vec<(product_variants::Model, products::Model, i32)> = Vec::new();
     for (id, qty) in parse_cart(jar) {
-        let Some(product) = published_product(ctx, id).await? else {
+        let Some((variant, product)) = published_variant(ctx, id).await? else {
             continue;
         };
-        let qty = qty.clamp(0, product.stock);
+        let qty = variant.cap(qty);
         if qty == 0 {
             continue;
         }
-        items.push((product, qty));
+        items.push((variant, product, qty));
     }
-    let products_only: Vec<products::Model> = items.iter().map(|(p, _)| p.clone()).collect();
-    let priced = pricing::price_many(ctx, &products_only, user.as_ref()).await?;
+    let variants_only: Vec<product_variants::Model> =
+        items.iter().map(|(v, _, _)| v.clone()).collect();
+    let priced = pricing::price_variants(ctx, &variants_only, user.as_ref()).await?;
 
     let mut lines = Vec::new();
     let mut valid = Vec::new();
     let mut total: i64 = 0;
-    for ((product, qty), priced) in items.iter().zip(priced.iter()) {
+    for ((variant, product, qty), priced) in items.iter().zip(priced.iter()) {
         let unit_price = priced.price_cents;
         let line_total = unit_price * i64::from(*qty);
         total += line_total;
-        valid.push((product.id, *qty));
+        valid.push((variant.id, *qty));
         lines.push(json!({
-            "id": product.id,
+            "id": variant.id,
             "name": product.name,
+            "variant_label": variant.label,
             "slug": product.slug,
             "price": format_price(unit_price),
             "regular_price": format_price(priced.regular_cents),
             "on_sale": priced.is_reduced(),
             "currency": product.currency,
             "quantity": qty,
-            "stock": product.stock,
+            "stock": variant.stock,
             "line_total": format_price(line_total),
         }));
     }

src/controllers/shop.rs

@@ -1,6 +1,10 @@
 //! Public storefront: product listings, product detail, category pages and the
 //! lazily-loaded category sidebar.
 
+use std::collections::HashMap;
+
+use axum::extract::Query;
+use axum::http::HeaderMap;
 use axum_extra::extract::cookie::CookieJar;
 use loco_rs::prelude::*;
 use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, QueryOrder, QuerySelect, Set};
@@ -8,23 +12,256 @@ use serde_json::json;
 
 use crate::{
     controllers::i18n::current_lang,
-    shared::{guard, pricing},
-    models::{categories, product_images, products, users},
+    shared::{
+        guard,
+        money::{format_price, parse_price_to_cents},
+        pricing,
+    },
+    models::{categories, product_images, product_variants, products, users},
     views::shop as view,
 };
 
-/// Shape a list of products into card rows for `user` (None = public), pricing
-/// each via [`pricing::price_many`] and loading its primary image.
+/// Results per page in the storefront listing/search.
+const PER_PAGE: usize = 24;
+/// Hard cap on candidates a single text search considers before faceting; well
+/// above any realistic page of results for this catalog.
+const SEARCH_CAP: u64 = 1000;
+
+/// All storefront listing controls: free-text query, category, price band,
+/// stock, sort and page. Everything is optional so `/shop` and `/search` share
+/// one shape.
+#[derive(Debug, Default, serde::Deserialize)]
+struct SearchParams {
+    q: Option<String>,
+    category: Option<String>,
+    min_price: Option<String>,
+    max_price: Option<String>,
+    in_stock: Option<String>,
+    sort: Option<String>,
+    page: Option<u32>,
+}
+
+/// A candidate product with everything the listing needs to filter, sort and
+/// render it: its representative (first) variant, the resolved price for the
+/// viewer, stock, variant count and original search rank (for relevance order).
+struct Candidate {
+    product: products::Model,
+    rep: product_variants::Model,
+    priced: pricing::PricedProduct,
+    in_stock: bool,
+    count: usize,
+    rank: usize,
+}
+
+/// Whether a checkbox-style param is on (present and not an explicit "off"/"0").
+fn is_on(v: &Option<String>) -> bool {
+    matches!(v.as_deref(), Some(s) if !s.is_empty() && s != "0" && s != "false" && s != "off")
+}
+
+/// Rebuild the query string from `params` minus `page`, so pagination links can
+/// preserve the active query + filters + sort.
+fn query_base(params: &SearchParams) -> String {
+    let mut ser = form_urlencoded::Serializer::new(String::new());
+    if let Some(q) = params.q.as_deref().filter(|s| !s.is_empty()) {
+        ser.append_pair("q", q);
+    }
+    if let Some(c) = params.category.as_deref().filter(|s| !s.is_empty() && *s != "all") {
+        ser.append_pair("category", c);
+    }
+    if let Some(p) = params.min_price.as_deref().filter(|s| !s.is_empty()) {
+        ser.append_pair("min_price", p);
+    }
+    if let Some(p) = params.max_price.as_deref().filter(|s| !s.is_empty()) {
+        ser.append_pair("max_price", p);
+    }
+    if is_on(&params.in_stock) {
+        ser.append_pair("in_stock", "1");
+    }
+    if let Some(s) = params.sort.as_deref().filter(|s| !s.is_empty()) {
+        ser.append_pair("sort", s);
+    }
+    ser.finish()
+}
+
+/// Run the full faceted listing pipeline for `params` and shape the template
+/// context (results page + facet data + pagination). Reused by `/shop` and
+/// `/search`; the caller adds chrome and picks the template.
+async fn run_search(
+    ctx: &AppContext,
+    user: Option<&users::Model>,
+    params: &SearchParams,
+) -> Result<serde_json::Value> {
+    let q = params.q.clone().unwrap_or_default();
+    let q_trim = q.trim().to_string();
+
+    // 1. Base candidates: ranked search hits, or the full published listing.
+    let base: Vec<products::Model> = if q_trim.is_empty() {
+        products::Entity::find()
+            .filter(products::Column::Published.eq(true))
+            .order_by_desc(products::Column::PublishedAt)
+            .all(&ctx.db)
+            .await?
+    } else {
+        products::Entity::search(&ctx.db, &q_trim, SEARCH_CAP, true).await?
+    };
+
+    // 2. Attach representative variant + resolved price to each (drop products
+    //    with no purchasable variant).
+    let ids: Vec<i32> = base.iter().map(|p| p.id).collect();
+    let grouped = product_variants::Entity::grouped_for_products(&ctx.db, &ids).await?;
+    let mut staged: Vec<(products::Model, product_variants::Model, usize, usize)> = Vec::new();
+    for (rank, product) in base.into_iter().enumerate() {
+        if let Some(vs) = grouped.get(&product.id) {
+            if let Some(rep) = vs.first() {
+                staged.push((product, rep.clone(), vs.len(), rank));
+            }
+        }
+    }
+    let reps: Vec<product_variants::Model> = staged.iter().map(|(_, r, _, _)| r.clone()).collect();
+    let priced = pricing::price_variants(ctx, &reps, user).await?;
+    let mut items: Vec<Candidate> = staged
+        .into_iter()
+        .zip(priced.iter())
+        .map(|((product, rep, count, rank), p)| Candidate {
+            in_stock: rep.in_stock(),
+            product,
+            rep,
+            priced: *p,
+            count,
+            rank,
+        })
+        .collect();
+
+    // Price band bounds across all matches, to hint the filter UI.
+    let price_floor = items.iter().map(|i| i.priced.price_cents).min().unwrap_or(0);
+    let price_ceil = items.iter().map(|i| i.priced.price_cents).max().unwrap_or(0);
+
+    // 3. Non-category filters: price band + in-stock.
+    let min_c = params.min_price.as_deref().and_then(|s| parse_price_to_cents(s).ok());
+    let max_c = params.max_price.as_deref().and_then(|s| parse_price_to_cents(s).ok());
+    let in_stock_only = is_on(&params.in_stock);
+    items.retain(|i| {
+        min_c.is_none_or(|m| i.priced.price_cents >= m)
+            && max_c.is_none_or(|m| i.priced.price_cents <= m)
+            && (!in_stock_only || i.in_stock)
+    });
+
+    // 4. Category facets: counts computed over the price/stock-filtered set
+    //    (i.e. before applying the category choice itself).
+    let all_categories = categories::published(ctx).await?;
+    let cat_ids: Vec<Option<i32>> = items.iter().map(|i| i.product.category_id).collect();
+    let category_groups = view::admin_category_groups(&all_categories, &cat_ids);
+    let uncategorized_count = cat_ids.iter().filter(|c| c.is_none()).count();
+    let category_name: HashMap<i32, String> =
+        all_categories.iter().map(|c| (c.id, c.name.clone())).collect();
+
+    // 5. Apply the category filter.
+    let selected_category = params
+        .category
+        .clone()
+        .filter(|s| !s.is_empty())
+        .unwrap_or_else(|| "all".to_string());
+    let filter = view::category_filter_ids(&all_categories, &selected_category);
+    items.retain(|i| view::category_filter_keep(&filter, i.product.category_id));
+
+    // 6. Sort. Newest-first is the default; relevance (the ranked search order)
+    //    is available explicitly via the sort control.
+    let sort = params
+        .sort
+        .clone()
+        .filter(|s| !s.is_empty())
+        .unwrap_or_else(|| "newest".to_string());
+    match sort.as_str() {
+        "price_asc" => items.sort_by(|a, b| a.priced.price_cents.cmp(&b.priced.price_cents)),
+        "price_desc" => items.sort_by(|a, b| b.priced.price_cents.cmp(&a.priced.price_cents)),
+        "name_asc" => items.sort_by(|a, b| {
+            a.product.name.to_lowercase().cmp(&b.product.name.to_lowercase())
+        }),
+        "name_desc" => items.sort_by(|a, b| {
+            b.product.name.to_lowercase().cmp(&a.product.name.to_lowercase())
+        }),
+        "newest" => items.sort_by(|a, b| b.product.published_at.cmp(&a.product.published_at)),
+        // "relevance" and anything unknown: original search rank.
+        _ => items.sort_by_key(|i| i.rank),
+    }
+
+    // 7. Paginate.
+    let total = items.len();
+    let pages = total.div_ceil(PER_PAGE).max(1);
+    let page = params.page.unwrap_or(1).clamp(1, pages as u32);
+    let start = (page as usize - 1) * PER_PAGE;
+
+    // 8. Render only the current page's cards (images fetched per row).
+    let mut rows = Vec::new();
+    for item in items.iter().skip(start).take(PER_PAGE) {
+        let image = product_images::first_for(ctx, item.product.id).await?;
+        let cat_name = item.product.category_id.and_then(|id| category_name.get(&id).cloned());
+        rows.push(view::product_card(
+            &item.product,
+            &item.rep,
+            &item.priced,
+            item.count,
+            image,
+            cat_name,
+        ));
+    }
+
+    Ok(json!({
+        "products": rows,
+        "query": q,
+        "category_groups": category_groups,
+        "selected_category": selected_category,
+        // Numeric form so the <select> can mark the active option (Tera can't
+        // compare a string param against a numeric category id).
+        "selected_category_id": selected_category.parse::<i32>().unwrap_or(-1),
+        "uncategorized_count": uncategorized_count,
+        "sort": sort,
+        "in_stock": in_stock_only,
+        "min_price": params.min_price.clone().unwrap_or_default(),
+        "max_price": params.max_price.clone().unwrap_or_default(),
+        "price_floor": format_price(price_floor),
+        "price_ceil": format_price(price_ceil),
+        "total": total,
+        "page": page,
+        "pages": pages,
+        "has_prev": page > 1,
+        "has_next": (page as usize) < pages,
+        "prev_page": page.saturating_sub(1).max(1),
+        "next_page": page + 1,
+        "query_base": query_base(params),
+    }))
+}
+
+/// Shape a list of products into card rows for `user` (None = public). Each card
+/// shows the resolved price of the product's representative (first) variant; the
+/// `variant_count` lets the template render "from {price}" for multi-variant
+/// products. Products with no variants are skipped (not purchasable).
 async fn product_rows(
     ctx: &AppContext,
     user: Option<&users::Model>,
     list: Vec<products::Model>,
 ) -> Result<Vec<serde_json::Value>> {
-    let priced = pricing::price_many(ctx, &list, user).await?;
-    let mut rows = Vec::with_capacity(list.len());
-    for (product, priced) in list.iter().zip(priced.iter()) {
+    let ids: Vec<i32> = list.iter().map(|p| p.id).collect();
+    let grouped = product_variants::Entity::grouped_for_products(&ctx.db, &ids).await?;
+
+    // Representative (first) variant per product, in list order, dropping any
+    // product that has no variants.
+    let mut entries: Vec<(&products::Model, product_variants::Model, usize)> = Vec::new();
+    for product in &list {
+        if let Some(variants) = grouped.get(&product.id) {
+            if let Some(first) = variants.first() {
+                entries.push((product, first.clone(), variants.len()));
+            }
+        }
+    }
+
+    let reps: Vec<product_variants::Model> = entries.iter().map(|(_, v, _)| v.clone()).collect();
+    let priced = pricing::price_variants(ctx, &reps, user).await?;
+
+    let mut rows = Vec::with_capacity(entries.len());
+    for ((product, rep, count), priced) in entries.iter().zip(priced.iter()) {
         let image = product_images::first_for(ctx, product.id).await?;
-        rows.push(view::product_card(product, priced, image, None));
+        rows.push(view::product_card(product, rep, priced, *count, image, None));
     }
     Ok(rows)
 }
@@ -64,32 +301,59 @@ async fn category_sidebar(
     )
 }
 
+/// Fold the page chrome (login state, names) and language into a `run_search`
+/// context so the full page can render the layout.
+fn add_chrome(ctx_value: &mut serde_json::Value, c: &guard::Chrome, lang: &str) {
+    if let Some(map) = ctx_value.as_object_mut() {
+        map.insert("logged_in_admin".into(), json!(c.logged_in_admin));
+        map.insert("logged_in_customer".into(), json!(c.logged_in_customer));
+        map.insert("customer_name".into(), json!(c.customer_name));
+        map.insert("customer_account_type".into(), json!(c.customer_account_type));
+        map.insert("lang".into(), json!(lang));
+    }
+}
+
 #[debug_handler]
 async fn index(
     jar: CookieJar,
     ViewEngine(v): ViewEngine<TeraView>,
     State(ctx): State<AppContext>,
 ) -> Result<Response> {
-    let list = products::Entity::find()
-        .filter(products::Column::Published.eq(true))
-        .order_by_desc(products::Column::PublishedAt)
-        .all(&ctx.db)
-        .await?;
-
     let user = guard::current_user(&ctx, &jar).await;
+    let mut context = run_search(&ctx, user.as_ref(), &SearchParams::default()).await?;
     let c = guard::chrome_from(&ctx, user.as_ref());
-    format::view(
-        &v,
-        "shop/index.html",
-        json!({
-            "products": product_rows(&ctx, user.as_ref(), list).await?,
-            "logged_in_admin": c.logged_in_admin,
-            "logged_in_customer": c.logged_in_customer,
-            "customer_name": c.customer_name,
-            "customer_account_type": c.customer_account_type,
-            "lang": current_lang(&jar),
-        }),
-    )
+    add_chrome(&mut context, &c, &current_lang(&jar));
+    format::view(&v, "shop/index.html", context)
+}
+
+/// Storefront search + faceted browse. Combines the hybrid full-text/fuzzy query
+/// ([`products::Entity::search`]) with category, price-band, in-stock and sort
+/// filters, ranked and paginated by [`run_search`]. A blank query falls back to
+/// the full published listing, so the same endpoint powers both "browse" and
+/// "search". htmx requests get just the results fragment (for live updates);
+/// direct navigation (or no-JS) renders the whole page.
+#[debug_handler]
+async fn search(
+    jar: CookieJar,
+    ViewEngine(v): ViewEngine<TeraView>,
+    headers: HeaderMap,
+    Query(params): Query<SearchParams>,
+    State(ctx): State<AppContext>,
+) -> Result<Response> {
+    let user = guard::current_user(&ctx, &jar).await;
+    let mut context = run_search(&ctx, user.as_ref(), &params).await?;
+    let lang = current_lang(&jar);
+
+    if headers.contains_key("HX-Request") {
+        if let Some(map) = context.as_object_mut() {
+            map.insert("lang".into(), json!(lang));
+        }
+        return format::view(&v, "shop/_results.html", context);
+    }
+
+    let c = guard::chrome_from(&ctx, user.as_ref());
+    add_chrome(&mut context, &c, &lang);
+    format::view(&v, "shop/index.html", context)
 }
 
 #[debug_handler]
@@ -121,13 +385,44 @@ async fn show(
     };
 
     let user = guard::current_user(&ctx, &jar).await;
-    let priced = pricing::price_for(&ctx, &product, user.as_ref()).await?;
+    let variants = product_variants::Entity::for_product(&ctx.db, product.id).await?;
+    let variant_prices = pricing::price_variants(&ctx, &variants, user.as_ref()).await?;
+    let options: Vec<serde_json::Value> = variants
+        .iter()
+        .zip(variant_prices.iter())
+        .map(|(variant, priced)| view::variant_option(variant, priced))
+        .collect();
+    // The card header uses the representative (first) variant for its headline
+    // price; the picker below lets the customer switch.
+    let representative = variants.first();
+    let priced = variant_prices.first().copied();
+    let card = match (representative, priced) {
+        (Some(rep), Some(priced)) => view::product_card(
+            &product,
+            rep,
+            &priced,
+            variants.len(),
+            None,
+            category.as_ref().map(|c| c.name.clone()),
+        ),
+        // A product with no variants isn't purchasable; show it without a price.
+        _ => serde_json::json!({
+            "id": product.id,
+            "name": product.name,
+            "slug": product.slug,
+            "description": product.description,
+            "currency": product.currency,
+            "variant_count": 0,
+            "has_options": false,
+        }),
+    };
     let c = guard::chrome_from(&ctx, user.as_ref());
     format::view(
         &v,
         "shop/show.html",
         json!({
-            "product": view::product_card(&product, &priced, None, category.as_ref().map(|c| c.name.clone())),
+            "product": card,
+            "variants": options,
             "images": images.iter().map(|i| i.image_id.clone()).collect::<Vec<_>>(),
             "category": category,
             "logged_in_admin": c.logged_in_admin,
@@ -139,11 +434,17 @@ async fn show(
     )
 }
 
+/// Category page: the same faceted search as the shop, but with this category
+/// preselected as the default filter (plus breadcrumbs and subcategory chips).
+/// Any other filters/sort/query on the URL are honoured; the category itself is
+/// always forced to this page's category. Interacting with the toolbar navigates
+/// to `/search` (the category stays selected there too).
 #[debug_handler]
 async fn category(
     jar: CookieJar,
     ViewEngine(v): ViewEngine<TeraView>,
     Path(slug): Path<String>,
+    Query(params): Query<SearchParams>,
     State(ctx): State<AppContext>,
 ) -> Result<Response> {
     let published = categories::published(&ctx).await?;
@@ -156,41 +457,30 @@ async fn category(
     let breadcrumbs = categories::ancestors(&published, category.parent_id);
     let children = categories::children_of(&published, category.id);
 
-    // Products listed here span this category and all of its descendants, so a
-    // parent category is never empty just because its products live in leaves.
-    let mut category_ids: Vec<i32> = categories::descendant_ids(&published, category.id)
-        .into_iter()
-        .collect();
-    category_ids.push(category.id);
-    let list = products::Entity::find()
-        .filter(products::Column::CategoryId.is_in(category_ids))
-        .filter(products::Column::Published.eq(true))
-        .order_by_desc(products::Column::PublishedAt)
-        .all(&ctx.db)
-        .await?;
+    // Force the category filter to this page's category, keeping any other params.
+    let params = SearchParams {
+        category: Some(category.id.to_string()),
+        ..params
+    };
 
     let user = guard::current_user(&ctx, &jar).await;
+    let mut context = run_search(&ctx, user.as_ref(), &params).await?;
+    if let Some(map) = context.as_object_mut() {
+        map.insert("category".into(), serde_json::to_value(&category)?);
+        map.insert("breadcrumbs".into(), serde_json::to_value(&breadcrumbs)?);
+        map.insert("children".into(), serde_json::to_value(&children)?);
+    }
     let c = guard::chrome_from(&ctx, user.as_ref());
-    format::view(
-        &v,
-        "shop/category.html",
-        json!({
-            "category": category,
-            "breadcrumbs": breadcrumbs,
-            "children": children,
-            "products": product_rows(&ctx, user.as_ref(), list).await?,
-            "logged_in_admin": c.logged_in_admin,
-            "logged_in_customer": c.logged_in_customer,
-            "customer_name": c.customer_name,
-            "customer_account_type": c.customer_account_type,
-            "lang": current_lang(&jar),
-        }),
-    )
+    add_chrome(&mut context, &c, &current_lang(&jar));
+    format::view(&v, "shop/category.html", context)
 }
 
 pub fn routes() -> Routes {
     Routes::new()
         .add("/shop", get(index))
+        // Top-level path (not /shop/search) so it never collides with the
+        // /shop/{slug} product route.
+        .add("/search", get(search))
         .add("/shop/{slug}", get(show))
         .add("/category/{slug}", get(category))
         .add("/partials/categories", get(category_sidebar))

src/models/_entities/account_discount_profiles.rs

@@ -1,5 +1,4 @@
-//! `SeaORM` Entity assigning a discount profile to a business account.
-//! Hand-written to match the `account_discount_profiles` migration.
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -17,14 +16,6 @@ pub struct Model {
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::users::Entity",
-        from = "Column::UserId",
-        to = "super::users::Column::Id",
-        on_update = "Cascade",
-        on_delete = "Cascade"
-    )]
-    Users,
     #[sea_orm(
         belongs_to = "super::discount_profiles::Entity",
         from = "Column::DiscountProfileId",
@@ -33,12 +24,14 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     DiscountProfiles,
-}
-
-impl Related<super::users::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Users.def()
-    }
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::UserId",
+        to = "super::users::Column::Id",
+        on_update = "Cascade",
+        on_delete = "Cascade"
+    )]
+    Users,
 }
 
 impl Related<super::discount_profiles::Entity> for Entity {
@@ -46,3 +39,9 @@ impl Related<super::discount_profiles::Entity> for Entity {
         Relation::DiscountProfiles.def()
     }
 }
+
+impl Related<super::users::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Users.def()
+    }
+}

src/models/_entities/account_product_prices.rs

@@ -1,5 +1,4 @@
-//! `SeaORM` Entity for per-account negotiated product prices. Hand-written to
-//! match the `account_product_prices` migration (one row per (user, product)).
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -11,13 +10,21 @@ pub struct Model {
     pub updated_at: DateTimeWithTimeZone,
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub user_id: i32,
-    pub product_id: i32,
     pub price_cents: i64,
+    pub user_id: i32,
+    pub variant_id: i32,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::product_variants::Entity",
+        from = "Column::VariantId",
+        to = "super::product_variants::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    ProductVariants,
     #[sea_orm(
         belongs_to = "super::users::Entity",
         from = "Column::UserId",
@@ -26,14 +33,12 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     Users,
-    #[sea_orm(
-        belongs_to = "super::products::Entity",
-        from = "Column::ProductId",
-        to = "super::products::Column::Id",
-        on_update = "Cascade",
-        on_delete = "Cascade"
-    )]
-    Products,
+}
+
+impl Related<super::product_variants::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ProductVariants.def()
+    }
 }
 
 impl Related<super::users::Entity> for Entity {
@@ -41,9 +46,3 @@ impl Related<super::users::Entity> for Entity {
         Relation::Users.def()
     }
 }
-
-impl Related<super::products::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Products.def()
-    }
-}

src/models/_entities/account_product_resolutions.rs

@@ -1,6 +1,4 @@
-//! `SeaORM` Entity for an account's chosen profile when two assigned profiles
-//! cover one product. Hand-written to match the `account_product_resolutions`
-//! migration.
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -13,28 +11,12 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub user_id: i32,
-    pub product_id: i32,
     pub discount_profile_id: i32,
+    pub variant_id: i32,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::users::Entity",
-        from = "Column::UserId",
-        to = "super::users::Column::Id",
-        on_update = "Cascade",
-        on_delete = "Cascade"
-    )]
-    Users,
-    #[sea_orm(
-        belongs_to = "super::products::Entity",
-        from = "Column::ProductId",
-        to = "super::products::Column::Id",
-        on_update = "Cascade",
-        on_delete = "Cascade"
-    )]
-    Products,
     #[sea_orm(
         belongs_to = "super::discount_profiles::Entity",
         from = "Column::DiscountProfileId",
@@ -43,18 +25,22 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     DiscountProfiles,
-}
-
-impl Related<super::users::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Users.def()
-    }
-}
-
-impl Related<super::products::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Products.def()
-    }
+    #[sea_orm(
+        belongs_to = "super::product_variants::Entity",
+        from = "Column::VariantId",
+        to = "super::product_variants::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    ProductVariants,
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::UserId",
+        to = "super::users::Column::Id",
+        on_update = "Cascade",
+        on_delete = "Cascade"
+    )]
+    Users,
 }
 
 impl Related<super::discount_profiles::Entity> for Entity {
@@ -62,3 +48,15 @@ impl Related<super::discount_profiles::Entity> for Entity {
         Relation::DiscountProfiles.def()
     }
 }
+
+impl Related<super::product_variants::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ProductVariants.def()
+    }
+}
+
+impl Related<super::users::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Users.def()
+    }
+}

src/models/_entities/audience_discount_profiles.rs

@@ -1,6 +1,4 @@
-//! `SeaORM` Entity assigning a discount profile to a whole audience (all
-//! personal viewers or all company accounts). Hand-written to match the
-//! `audience_discount_profiles` migration.
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -12,7 +10,6 @@ pub struct Model {
     pub updated_at: DateTimeWithTimeZone,
     #[sea_orm(primary_key)]
     pub id: i32,
-    /// "personal" or "business".
     pub audience: String,
     pub discount_profile_id: i32,
 }

src/models/_entities/audit_logs.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};

src/models/_entities/categories.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -23,8 +23,6 @@ pub struct Model {
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(has_many = "super::products::Entity")]
-    Products,
     #[sea_orm(
         belongs_to = "Entity",
         from = "Column::ParentId",
@@ -32,7 +30,9 @@ pub enum Relation {
         on_update = "Cascade",
         on_delete = "SetNull"
     )]
-    Parent,
+    SelfRef,
+    #[sea_orm(has_many = "super::products::Entity")]
+    Products,
 }
 
 impl Related<super::products::Entity> for Entity {

src/models/_entities/customer_profiles.rs

@@ -1,5 +1,4 @@
-//! `SeaORM` Entity for customer shipping/contact profiles. Hand-written to match
-//! the `customer_profiles` migration (1:1 with `users` via a unique `user_id`).
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -11,18 +10,18 @@ pub struct Model {
     pub updated_at: DateTimeWithTimeZone,
     #[sea_orm(primary_key)]
     pub id: i32,
-    #[sea_orm(unique)]
-    pub user_id: i32,
-    pub company_name: Option<String>,
-    pub company_id: Option<String>,
-    pub tax_id: Option<String>,
-    pub vat_id: Option<String>,
     pub phone_prefix: Option<String>,
     pub phone: Option<String>,
     pub address: Option<String>,
     pub city: Option<String>,
     pub zip: Option<String>,
     pub country: Option<String>,
+    #[sea_orm(unique)]
+    pub user_id: i32,
+    pub company_name: Option<String>,
+    pub company_id: Option<String>,
+    pub tax_id: Option<String>,
+    pub vat_id: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/models/_entities/discount_profile_products.rs

@@ -1,5 +1,4 @@
-//! `SeaORM` Entity for a discount profile's product membership. Hand-written to
-//! match the `discount_profile_products` migration.
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};

src/models/_entities/discount_profiles.rs

@@ -1,5 +1,4 @@
-//! `SeaORM` Entity for reusable discount profiles. Hand-written to match the
-//! `discount_profiles` migration.
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -12,24 +11,20 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub name: String,
-    /// Discount in basis points (5% = 500).
     pub percent_bp: i32,
-    /// "include" (covers listed products) or "all_except" (covers all but them).
     pub scope_type: String,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(has_many = "super::discount_profile_products::Entity")]
-    DiscountProfileProducts,
     #[sea_orm(has_many = "super::account_discount_profiles::Entity")]
     AccountDiscountProfiles,
-}
-
-impl Related<super::discount_profile_products::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::DiscountProfileProducts.def()
-    }
+    #[sea_orm(has_many = "super::account_product_resolutions::Entity")]
+    AccountProductResolutions,
+    #[sea_orm(has_many = "super::audience_discount_profiles::Entity")]
+    AudienceDiscountProfiles,
+    #[sea_orm(has_many = "super::discount_profile_products::Entity")]
+    DiscountProfileProducts,
 }
 
 impl Related<super::account_discount_profiles::Entity> for Entity {
@@ -37,3 +32,21 @@ impl Related<super::account_discount_profiles::Entity> for Entity {
         Relation::AccountDiscountProfiles.def()
     }
 }
+
+impl Related<super::account_product_resolutions::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountProductResolutions.def()
+    }
+}
+
+impl Related<super::audience_discount_profiles::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AudienceDiscountProfiles.def()
+    }
+}
+
+impl Related<super::discount_profile_products::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DiscountProfileProducts.def()
+    }
+}

src/models/_entities/mod.rs

@@ -1,22 +1,23 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 pub mod prelude;
 
 pub mod account_discount_profiles;
 pub mod account_product_prices;
-pub mod audience_discount_profiles;
 pub mod account_product_resolutions;
+pub mod audience_discount_profiles;
 pub mod audit_logs;
 pub mod categories;
+pub mod customer_profiles;
 pub mod discount_profile_products;
 pub mod discount_profiles;
-pub mod customer_profiles;
 pub mod o_auth2_sessions;
 pub mod order_items;
 pub mod orders;
 pub mod product_images;
 pub mod product_product_tags;
 pub mod product_tags;
+pub mod product_variants;
 pub mod products;
 pub mod shipping_methods;
 pub mod users;

src/models/_entities/o_auth2_sessions.rs

@@ -1,6 +1,4 @@
-//! `SeaORM` Entity for loco-oauth2 sessions. Hand-written to match the
-//! `o_auth2_sessions` migration (the rest of `_entities/` is codegen; this table
-//! is owned by the loco-oauth2 integration).
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -8,12 +6,13 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "o_auth2_sessions")]
 pub struct Model {
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     #[sea_orm(primary_key)]
     pub id: i32,
+    #[sea_orm(unique)]
     pub session_id: String,
-    pub expires_at: DateTimeUtc,
+    pub expires_at: DateTimeWithTimeZone,
     pub user_id: i32,
 }
 

src/models/_entities/order_items.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -15,6 +15,8 @@ pub struct Model {
     pub quantity: i32,
     pub order_id: i32,
     pub product_id: Option<i32>,
+    pub variant_label: String,
+    pub variant_id: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -27,6 +29,14 @@ pub enum Relation {
         on_delete = "Cascade"
     )]
     Orders,
+    #[sea_orm(
+        belongs_to = "super::product_variants::Entity",
+        from = "Column::VariantId",
+        to = "super::product_variants::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    ProductVariants,
     #[sea_orm(
         belongs_to = "super::products::Entity",
         from = "Column::ProductId",
@@ -43,6 +53,12 @@ impl Related<super::orders::Entity> for Entity {
     }
 }
 
+impl Related<super::product_variants::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ProductVariants.def()
+    }
+}
+
 impl Related<super::products::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::Products.def()

src/models/_entities/orders.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -13,17 +13,10 @@ pub struct Model {
     #[sea_orm(unique)]
     pub order_number: String,
     pub email: String,
-    pub phone: Option<String>,
     pub customer_name: Option<String>,
     pub status: String,
     pub total_cents: i64,
     pub currency: String,
-    pub user_id: Option<i32>,
-    pub account_type: String,
-    pub company_name: Option<String>,
-    pub company_id: Option<String>,
-    pub tax_id: Option<String>,
-    pub vat_id: Option<String>,
     pub address: Option<String>,
     pub city: Option<String>,
     pub zip: Option<String>,
@@ -39,6 +32,13 @@ pub struct Model {
     pub tracking_number: Option<String>,
     pub shipment_id: Option<String>,
     pub label_url: Option<String>,
+    pub phone: Option<String>,
+    pub account_type: String,
+    pub company_name: Option<String>,
+    pub company_id: Option<String>,
+    pub tax_id: Option<String>,
+    pub vat_id: Option<String>,
+    pub user_id: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/models/_entities/prelude.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 pub use super::account_discount_profiles::Entity as AccountDiscountProfiles;
 pub use super::account_product_prices::Entity as AccountProductPrices;
@@ -15,6 +15,7 @@ pub use super::orders::Entity as Orders;
 pub use super::product_images::Entity as ProductImages;
 pub use super::product_product_tags::Entity as ProductProductTags;
 pub use super::product_tags::Entity as ProductTags;
+pub use super::product_variants::Entity as ProductVariants;
 pub use super::products::Entity as Products;
 pub use super::shipping_methods::Entity as ShippingMethods;
 pub use super::users::Entity as Users;

src/models/_entities/product_images.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};

src/models/_entities/product_product_tags.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};

src/models/_entities/product_tags.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};

src/models/_entities/product_variants.rs

@@ -0,0 +1,63 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "product_variants")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    pub product_id: i32,
+    pub label: String,
+    pub position: i32,
+    pub sku: Option<String>,
+    pub stock: Option<i32>,
+    pub price_cents: i64,
+    pub sale_price_cents: Option<i64>,
+    pub business_sale_price_cents: Option<i64>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::account_product_prices::Entity")]
+    AccountProductPrices,
+    #[sea_orm(has_many = "super::account_product_resolutions::Entity")]
+    AccountProductResolutions,
+    #[sea_orm(has_many = "super::order_items::Entity")]
+    OrderItems,
+    #[sea_orm(
+        belongs_to = "super::products::Entity",
+        from = "Column::ProductId",
+        to = "super::products::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Products,
+}
+
+impl Related<super::account_product_prices::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountProductPrices.def()
+    }
+}
+
+impl Related<super::account_product_resolutions::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountProductResolutions.def()
+    }
+}
+
+impl Related<super::order_items::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::OrderItems.def()
+    }
+}
+
+impl Related<super::products::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Products.def()
+    }
+}

src/models/_entities/products.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -15,12 +15,7 @@ pub struct Model {
     pub slug: String,
     #[sea_orm(column_type = "Text", nullable)]
     pub description: Option<String>,
-    pub price_cents: i64,
-    pub sale_price_cents: Option<i64>,
-    pub business_sale_price_cents: Option<i64>,
     pub currency: String,
-    pub sku: Option<String>,
-    pub stock: i32,
     pub view_count: i32,
     pub published: bool,
     pub published_at: Option<DateTimeWithTimeZone>,
@@ -37,12 +32,16 @@ pub enum Relation {
         on_delete = "SetNull"
     )]
     Categories,
+    #[sea_orm(has_many = "super::discount_profile_products::Entity")]
+    DiscountProfileProducts,
     #[sea_orm(has_many = "super::order_items::Entity")]
     OrderItems,
     #[sea_orm(has_many = "super::product_images::Entity")]
     ProductImages,
     #[sea_orm(has_many = "super::product_product_tags::Entity")]
     ProductProductTags,
+    #[sea_orm(has_many = "super::product_variants::Entity")]
+    ProductVariants,
 }
 
 impl Related<super::categories::Entity> for Entity {
@@ -51,6 +50,12 @@ impl Related<super::categories::Entity> for Entity {
     }
 }
 
+impl Related<super::discount_profile_products::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DiscountProfileProducts.def()
+    }
+}
+
 impl Related<super::order_items::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::OrderItems.def()
@@ -69,6 +74,12 @@ impl Related<super::product_product_tags::Entity> for Entity {
     }
 }
 
+impl Related<super::product_variants::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ProductVariants.def()
+    }
+}
+
 impl Related<super::product_tags::Entity> for Entity {
     fn to() -> RelationDef {
         super::product_product_tags::Relation::ProductTags.def()

src/models/_entities/shipping_methods.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};

src/models/_entities/users.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.20
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -26,15 +26,45 @@ pub struct Model {
     pub magic_link_expiration: Option<DateTimeWithTimeZone>,
     pub theme: String,
     pub account_type: String,
+    #[sea_orm(column_type = "Text", nullable)]
     pub totp_secret: Option<String>,
     pub totp_enabled_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_type = "Text", nullable)]
     pub totp_backup_codes: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
+    #[sea_orm(has_many = "super::account_discount_profiles::Entity")]
+    AccountDiscountProfiles,
+    #[sea_orm(has_many = "super::account_product_prices::Entity")]
+    AccountProductPrices,
+    #[sea_orm(has_many = "super::account_product_resolutions::Entity")]
+    AccountProductResolutions,
     #[sea_orm(has_many = "super::audit_logs::Entity")]
     AuditLogs,
+    #[sea_orm(has_one = "super::customer_profiles::Entity")]
+    CustomerProfiles,
+    #[sea_orm(has_many = "super::o_auth2_sessions::Entity")]
+    OAuth2Sessions,
+}
+
+impl Related<super::account_discount_profiles::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountDiscountProfiles.def()
+    }
+}
+
+impl Related<super::account_product_prices::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountProductPrices.def()
+    }
+}
+
+impl Related<super::account_product_resolutions::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountProductResolutions.def()
+    }
 }
 
 impl Related<super::audit_logs::Entity> for Entity {
@@ -42,3 +72,15 @@ impl Related<super::audit_logs::Entity> for Entity {
         Relation::AuditLogs.def()
     }
 }
+
+impl Related<super::customer_profiles::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::CustomerProfiles.def()
+    }
+}
+
+impl Related<super::o_auth2_sessions::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::OAuth2Sessions.def()
+    }
+}

src/models/account_product_prices.rs

@@ -25,7 +25,7 @@ impl ActiveModelBehavior for ActiveModel {
 }
 
 impl Model {
-    /// All negotiated prices for one account, as a `(product_id -> cents)` map.
+    /// All negotiated prices for one account, as a `(variant_id -> cents)` map.
     pub async fn map_for_user(
         db: &DatabaseConnection,
         user_id: i32,
@@ -34,26 +34,26 @@ impl Model {
             .filter(Column::UserId.eq(user_id))
             .all(db)
             .await?;
-        Ok(rows.into_iter().map(|r| (r.product_id, r.price_cents)).collect())
+        Ok(rows.into_iter().map(|r| (r.variant_id, r.price_cents)).collect())
     }
 
-    /// Insert or update the negotiated price for `(user_id, product_id)`.
+    /// Insert or update the negotiated price for `(user_id, variant_id)`.
     pub async fn upsert(
         db: &DatabaseConnection,
         user_id: i32,
-        product_id: i32,
+        variant_id: i32,
         price_cents: i64,
     ) -> Result<Self, DbErr> {
         let existing = Entity::find()
             .filter(Column::UserId.eq(user_id))
-            .filter(Column::ProductId.eq(product_id))
+            .filter(Column::VariantId.eq(variant_id))
             .one(db)
             .await?;
         let mut active = match existing {
             Some(row) => row.into_active_model(),
             None => ActiveModel {
                 user_id: ActiveValue::set(user_id),
-                product_id: ActiveValue::set(product_id),
+                variant_id: ActiveValue::set(variant_id),
                 ..Default::default()
             },
         };
@@ -61,15 +61,15 @@ impl Model {
         active.save(db).await?.try_into_model()
     }
 
-    /// Remove the negotiated price for `(user_id, product_id)`, if any.
+    /// Remove the negotiated price for `(user_id, variant_id)`, if any.
     pub async fn clear(
         db: &DatabaseConnection,
         user_id: i32,
-        product_id: i32,
+        variant_id: i32,
     ) -> Result<(), DbErr> {
         Entity::delete_many()
             .filter(Column::UserId.eq(user_id))
-            .filter(Column::ProductId.eq(product_id))
+            .filter(Column::VariantId.eq(variant_id))
             .exec(db)
             .await?;
         Ok(())

src/models/mod.rs

@@ -24,3 +24,4 @@ pub mod product_tags;
 pub mod products;
 pub mod shipping_methods;
 pub mod users;
+pub mod product_variants;

src/models/o_auth2_sessions.rs

@@ -17,7 +17,7 @@ impl ActiveModelBehavior for ActiveModel {
     {
         if !insert && self.updated_at.is_unchanged() {
             let mut this = self;
-            this.updated_at = sea_orm::ActiveValue::Set(Utc::now());
+            this.updated_at = sea_orm::ActiveValue::Set(Utc::now().into());
             Ok(this)
         } else {
             Ok(self)
@@ -34,7 +34,7 @@ impl OAuth2SessionsTrait<users::Model> for Model {
             .one(db)
             .await?
             .ok_or_else(|| ModelError::EntityNotFound)?;
-        Ok(session.expires_at < Utc::now())
+        Ok(session.expires_at < Utc::now().fixed_offset())
     }
 
     /// Create or refresh the session row for `user` from the provider token.
@@ -58,14 +58,14 @@ impl OAuth2SessionsTrait<users::Model> for Model {
             Some(session) => {
                 let mut session: o_auth2_sessions::ActiveModel = session.into();
                 session.session_id = ActiveValue::set(session_id);
-                session.expires_at = ActiveValue::set(expires_at);
-                session.updated_at = ActiveValue::set(Utc::now());
+                session.expires_at = ActiveValue::set(expires_at.into());
+                session.updated_at = ActiveValue::set(Utc::now().into());
                 session.update(&txn).await?
             }
             None => {
                 o_auth2_sessions::ActiveModel {
                     session_id: ActiveValue::set(session_id),
-                    expires_at: ActiveValue::set(expires_at),
+                    expires_at: ActiveValue::set(expires_at.into()),
                     user_id: ActiveValue::set(user.id),
                     ..Default::default()
                 }

src/models/orders.rs

@@ -3,7 +3,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::{Set, TransactionTrait};
 use uuid::Uuid;
 
-use crate::models::_entities::{order_items, products, shipping_methods};
+use crate::models::_entities::{order_items, product_variants, products, shipping_methods};
 use crate::models::users;
 use crate::shared::pricing;
 pub use crate::models::_entities::orders::{ActiveModel, Column, Entity, Model};
@@ -40,10 +40,10 @@ fn generate_order_number() -> String {
     format!("ORD-{suffix}")
 }
 
-/// Atomically place an order for the given `(product_id, quantity)` lines:
-/// snapshot each product's price/name, decrement stock (re-checking inside the
-/// transaction so an item can't oversell between cart and pay), then write the
-/// order and its line items. Returns the persisted order.
+/// Atomically place an order for the given `(variant_id, quantity)` lines:
+/// snapshot each variant's price/name/label, decrement its stock (re-checking
+/// inside the transaction so an item can't oversell between cart and pay), then
+/// write the order and its line items. Returns the persisted order.
 pub async fn place(
     ctx: &AppContext,
     items: &[(i32, i32)],
@@ -55,30 +55,40 @@ pub async fn place(
     let mut subtotal: i64 = 0;
     let mut currency = "EUR".to_string();
     let mut snapshots = Vec::new();
-    for (product_id, qty) in items {
-        let product = products::Entity::find_by_id(*product_id)
+    for (variant_id, qty) in items {
+        let variant = product_variants::Entity::find_by_id(*variant_id)
+            .one(&txn)
+            .await?
+            .ok_or_else(|| Error::BadRequest("an item is no longer available".to_string()))?;
+        let product = products::Entity::find_by_id(variant.product_id)
             .filter(products::Column::Published.eq(true))
             .one(&txn)
             .await?
             .ok_or_else(|| Error::BadRequest("a product is no longer available".to_string()))?;
-        if product.stock < *qty {
-            return Err(Error::BadRequest(format!(
-                "not enough stock for {}",
-                product.name
-            )));
+        // Tracked variants can't oversell; untracked ones (stock = None) are
+        // always available and never decremented.
+        if let Some(on_hand) = variant.stock {
+            if on_hand < *qty {
+                return Err(Error::BadRequest(format!(
+                    "not enough stock for {}",
+                    product.name
+                )));
+            }
         }
         currency = product.currency.clone();
         // Snapshot the price the buyer actually pays — public sale or, for a
         // business account, their negotiated/lowest price (same resolver the
         // cart and storefront use).
-        let unit_price_cents = pricing::price_for(ctx, &product, user).await?.price_cents;
+        let unit_price_cents = pricing::price_variant(ctx, &variant, user).await?.price_cents;
         subtotal += unit_price_cents * i64::from(*qty);
 
-        let mut active = product.clone().into_active_model();
-        active.stock = Set(product.stock - *qty);
-        active.update(&txn).await?;
+        if let Some(on_hand) = variant.stock {
+            let mut active = variant.clone().into_active_model();
+            active.stock = Set(Some(on_hand - *qty));
+            active.update(&txn).await?;
+        }
 
-        snapshots.push((product.id, product.name, unit_price_cents, *qty));
+        snapshots.push((product.id, variant.id, product.name, variant.label, unit_price_cents, *qty));
     }
 
     let order = ActiveModel {
@@ -111,11 +121,13 @@ pub async fn place(
     .insert(&txn)
     .await?;
 
-    for (product_id, name, unit_price_cents, qty) in snapshots {
+    for (product_id, variant_id, name, variant_label, unit_price_cents, qty) in snapshots {
         order_items::ActiveModel {
             order_id: Set(order.id),
             product_id: Set(Some(product_id)),
+            variant_id: Set(Some(variant_id)),
             product_name: Set(name),
+            variant_label: Set(variant_label),
             unit_price_cents: Set(unit_price_cents),
             quantity: Set(qty),
             ..Default::default()
@@ -151,4 +163,45 @@ impl Model {}
 impl ActiveModel {}
 
 // implement your custom finders, selectors oriented logic here
-impl Entity {}
+impl Entity {
+    /// Admin order search: a diacritic- and case-insensitive substring match over
+    /// the free-text order fields an admin would actually type — order number,
+    /// email, customer name, company name, phone and tracking number. Backed by
+    /// the trigram indexes from the `order_search_indexes` migration. Newest
+    /// first, capped at `limit`. A blank query returns nothing (callers fall back
+    /// to the full list).
+    pub async fn search<C: sea_orm::ConnectionTrait>(
+        db: &C,
+        query: &str,
+        limit: u64,
+    ) -> Result<Vec<Model>, DbErr> {
+        let q = query.trim();
+        if q.is_empty() {
+            return Ok(Vec::new());
+        }
+        // Treat the query literally: escape LIKE wildcards, then wrap in %…%.
+        let escaped = q.replace('\\', "\\\\").replace('%', "\\%").replace('_', "\\_");
+        let pattern = format!("%{escaped}%");
+
+        let sql = r#"
+            SELECT * FROM orders o
+            WHERE f_unaccent(o.order_number)               ILIKE f_unaccent($1)
+               OR f_unaccent(o.email)                      ILIKE f_unaccent($1)
+               OR f_unaccent(COALESCE(o.customer_name,'')) ILIKE f_unaccent($1)
+               OR f_unaccent(COALESCE(o.company_name,''))  ILIKE f_unaccent($1)
+               OR f_unaccent(COALESCE(o.phone,''))         ILIKE f_unaccent($1)
+               OR f_unaccent(COALESCE(o.tracking_number,'')) ILIKE f_unaccent($1)
+            ORDER BY o.created_at DESC
+            LIMIT $2
+        "#;
+
+        Entity::find()
+            .from_raw_sql(sea_orm::Statement::from_sql_and_values(
+                db.get_database_backend(),
+                sql,
+                [pattern.into(), (limit as i64).into()],
+            ))
+            .all(db)
+            .await
+    }
+}

src/models/product_images.rs

@@ -37,11 +37,15 @@ pub async fn first_for(ctx: &AppContext, product_id: i32) -> Result<Option<Strin
         .map(|image| image.image_id))
 }
 
-/// Number of images already attached to a product, used to position new uploads.
-pub async fn count_for(ctx: &AppContext, product_id: i32) -> Result<i32> {
-    use sea_orm::PaginatorTrait;
+/// All of a product's images in display order (lowest position first). Takes a
+/// connection so it can run inside the update transaction.
+pub async fn for_product<C: ConnectionTrait>(
+    db: &C,
+    product_id: i32,
+) -> Result<Vec<Model>> {
     Ok(Entity::find()
         .filter(Column::ProductId.eq(product_id))
-        .count(&ctx.db)
-        .await? as i32)
+        .order_by_asc(Column::Position)
+        .all(db)
+        .await?)
 }

src/models/product_variants.rs

@@ -0,0 +1,113 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::QueryOrder;
+pub use super::_entities::product_variants::{ActiveModel, Column, Entity, Model};
+pub type ProductVariants = Entity;
+
+#[async_trait::async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    async fn before_save<C>(self, _db: &C, insert: bool) -> std::result::Result<Self, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        if !insert && self.updated_at.is_unchanged() {
+            let mut this = self;
+            this.updated_at = sea_orm::ActiveValue::Set(chrono::Utc::now().into());
+            Ok(this)
+        } else {
+            Ok(self)
+        }
+    }
+}
+
+// implement your read-oriented logic here
+impl Model {
+    /// Whether a discount is currently active: a sale price is set and is
+    /// strictly below the regular price.
+    #[must_use]
+    pub fn on_sale(&self) -> bool {
+        matches!(self.sale_price_cents, Some(sale) if sale < self.price_cents)
+    }
+
+    /// The price actually charged: the sale price when [`Model::on_sale`],
+    /// otherwise the regular price.
+    #[must_use]
+    pub fn effective_price_cents(&self) -> i64 {
+        if self.on_sale() {
+            self.sale_price_cents.unwrap_or(self.price_cents)
+        } else {
+            self.price_cents
+        }
+    }
+
+    /// Whether a baseline business discount (for all company accounts) is set and
+    /// actually below the regular price.
+    #[must_use]
+    pub fn business_on_sale(&self) -> bool {
+        matches!(self.business_sale_price_cents, Some(sale) if sale < self.price_cents)
+    }
+
+    /// Whether the variant's inventory is tracked. A `None` stock means
+    /// "available, not tracked" (always purchasable, unlimited).
+    #[must_use]
+    pub fn tracked(&self) -> bool {
+        self.stock.is_some()
+    }
+
+    /// Whether the variant can currently be bought: untracked variants are always
+    /// available; tracked ones need a positive quantity on hand.
+    #[must_use]
+    pub fn in_stock(&self) -> bool {
+        self.stock.map_or(true, |s| s > 0)
+    }
+
+    /// Clamp a desired quantity to what's available: capped at the tracked stock,
+    /// or left as-is (only floored at 0) when untracked.
+    #[must_use]
+    pub fn cap(&self, qty: i32) -> i32 {
+        match self.stock {
+            Some(s) => qty.clamp(0, s),
+            None => qty.max(0),
+        }
+    }
+}
+
+// implement your write-oriented logic here
+impl ActiveModel {}
+
+// implement your custom finders, selectors oriented logic here
+impl Entity {
+    /// All variants for one product, in display order.
+    pub async fn for_product<C: ConnectionTrait>(
+        db: &C,
+        product_id: i32,
+    ) -> Result<Vec<Model>, DbErr> {
+        Entity::find()
+            .filter(Column::ProductId.eq(product_id))
+            .order_by_asc(Column::Position)
+            .order_by_asc(Column::Id)
+            .all(db)
+            .await
+    }
+
+    /// All variants for many products in one query, grouped by `product_id` and
+    /// ordered within each group. Products with no variants are absent.
+    pub async fn grouped_for_products<C: ConnectionTrait>(
+        db: &C,
+        product_ids: &[i32],
+    ) -> Result<std::collections::HashMap<i32, Vec<Model>>, DbErr> {
+        let mut map: std::collections::HashMap<i32, Vec<Model>> = std::collections::HashMap::new();
+        if product_ids.is_empty() {
+            return Ok(map);
+        }
+        let rows = Entity::find()
+            .filter(Column::ProductId.is_in(product_ids.to_vec()))
+            .order_by_asc(Column::Position)
+            .order_by_asc(Column::Id)
+            .all(db)
+            .await?;
+        for row in rows {
+            map.entry(row.product_id).or_default().push(row);
+        }
+        Ok(map)
+    }
+}

src/models/products.rs

@@ -1,4 +1,5 @@
 use sea_orm::entity::prelude::*;
+use sea_orm::{ConnectionTrait, Statement};
 pub use crate::models::_entities::products::{ActiveModel, Column, Entity, Model};
 pub type Products = Entity;
 
@@ -19,35 +20,65 @@ impl ActiveModelBehavior for ActiveModel {
 }
 
 // implement your read-oriented logic here
-impl Model {
-    /// Whether a discount is currently active: a sale price is set and is
-    /// strictly below the regular price.
-    #[must_use]
-    pub fn on_sale(&self) -> bool {
-        matches!(self.sale_price_cents, Some(sale) if sale < self.price_cents)
-    }
-
-    /// The price actually charged: the sale price when [`Model::on_sale`],
-    /// otherwise the regular price.
-    #[must_use]
-    pub fn effective_price_cents(&self) -> i64 {
-        if self.on_sale() {
-            self.sale_price_cents.unwrap_or(self.price_cents)
-        } else {
-            self.price_cents
-        }
-    }
-
-    /// Whether a baseline business discount (for all company accounts) is set and
-    /// actually below the regular price.
-    #[must_use]
-    pub fn business_on_sale(&self) -> bool {
-        matches!(self.business_sale_price_cents, Some(sale) if sale < self.price_cents)
-    }
-}
+impl Model {}
 
 // implement your write-oriented logic here
 impl ActiveModel {}
 
 // implement your custom finders, selectors oriented logic here
-impl Entity {}
+impl Entity {
+    /// Published products matching a free-text query, best matches first.
+    ///
+    /// Hybrid Postgres search. The `tsvector` full-text match covers the whole
+    /// purchasable surface — name, description, tags, variant labels and SKUs
+    /// (kept in sync by triggers; see the `product_search_aggregate` migration) —
+    /// OR a `pg_trgm` `word_similarity` match on name/description for typo
+    /// tolerance ("komprsor" still finds "kompresor"). Both sides run through
+    /// `f_unaccent`, so diacritics never matter. Results are ranked by full-text
+    /// rank, then trigram closeness of the name, then recency. An empty/blank
+    /// query returns nothing — callers fall back to the plain listing.
+    /// `published_only` filters to the storefront-visible set; pass `false` for
+    /// admin tools that also need to find drafts.
+    pub async fn search<C: ConnectionTrait>(
+        db: &C,
+        query: &str,
+        limit: u64,
+        published_only: bool,
+    ) -> Result<Vec<Model>, DbErr> {
+        let q = query.trim();
+        if q.is_empty() {
+            return Ok(Vec::new());
+        }
+
+        // Only the model's own columns are selected; the generated `search_vector`
+        // is left out so the row maps cleanly back onto `Model`. `$1` is reused
+        // for every occurrence of the query term; `$2` caps the result set.
+        let published_clause = if published_only { "p.published = TRUE AND" } else { "" };
+        let sql = format!(
+            r#"
+            SELECT p.created_at, p.updated_at, p.id, p.name, p.slug, p.description,
+                   p.currency, p.view_count, p.published, p.published_at, p.category_id
+            FROM products p
+            WHERE {published_clause} (
+                  p.search_vector @@ websearch_to_tsquery('sk_unaccent', $1)
+                  OR word_similarity(f_unaccent($1), f_unaccent(p.name)) > 0.3
+                  OR word_similarity(f_unaccent($1), f_unaccent(COALESCE(p.description, ''))) > 0.3
+              )
+            ORDER BY
+                ts_rank(p.search_vector, websearch_to_tsquery('sk_unaccent', $1)) DESC,
+                word_similarity(f_unaccent($1), f_unaccent(p.name)) DESC,
+                p.published_at DESC NULLS LAST
+            LIMIT $2
+        "#
+        );
+
+        Entity::find()
+            .from_raw_sql(Statement::from_sql_and_values(
+                db.get_database_backend(),
+                &sql,
+                [q.into(), (limit as i64).into()],
+            ))
+            .all(db)
+            .await
+    }
+}

src/seed.rs

@@ -4,7 +4,7 @@ use loco_rs::prelude::*;
 use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, Set};
 
 use crate::{
-    models::_entities::{categories, products},
+    models::_entities::{categories, product_variants, products},
     shared::slug::slugify,
 };
 
@@ -157,14 +157,11 @@ pub async fn seed_catalog(ctx: &AppContext) -> Result<()> {
 
         let now = chrono::Utc::now();
 
-        products::ActiveModel {
+        let product = products::ActiveModel {
             name: Set(item.name.to_string()),
             slug: Set(product_slug),
             description: Set(Some(item.description.to_string())),
-            price_cents: Set(item.price_cents),
             currency: Set("EUR".to_string()),
-            sku: Set(item.sku.map(|s| s.to_string())),
-            stock: Set(item.stock),
             published: Set(true),
             published_at: Set(Some(now.into())),
             category_id: Set(category.map(|c| c.id)),
@@ -172,6 +169,20 @@ pub async fn seed_catalog(ctx: &AppContext) -> Result<()> {
         }
         .insert(&ctx.db)
         .await?;
+
+        // Each seed product ships as a single default (unlabelled) variant
+        // carrying its price/stock/sku.
+        product_variants::ActiveModel {
+            product_id: Set(product.id),
+            label: Set(String::new()),
+            position: Set(0),
+            sku: Set(item.sku.map(|s| s.to_string())),
+            stock: Set(Some(item.stock)),
+            price_cents: Set(item.price_cents),
+            ..Default::default()
+        }
+        .insert(&ctx.db)
+        .await?;
     }
 
     Ok(())

src/shared/pricing.rs

@@ -19,7 +19,8 @@ use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
 use crate::models::{
     account_discount_profiles, account_product_prices, account_product_resolutions,
-    audience_discount_profiles, discount_profile_products, discount_profiles, products, users,
+    audience_discount_profiles, discount_profile_products, discount_profiles, product_variants,
+    users,
 };
 use crate::shared::money::apply_discount_bp;
 
@@ -219,7 +220,7 @@ async fn load_b2b(ctx: &AppContext, user_id: i32) -> Result<B2bContext> {
         .all(&ctx.db)
         .await?
         .into_iter()
-        .map(|r| (r.product_id, r.discount_profile_id))
+        .map(|r| (r.variant_id, r.discount_profile_id))
         .collect();
 
     Ok(B2bContext {
@@ -236,13 +237,16 @@ struct PricingCtx {
     b2b: Option<B2bContext>,
 }
 
-/// Resolve the per-company automated price for a product: the single covering
-/// profile, the admin-resolved winner on a collision, or (unresolved) the
-/// biggest discount, flagged.
+/// Resolve the per-company automated price for a variant. Discount profiles
+/// cover the *product* (`product_id`); the admin's collision resolution is set
+/// per *variant* (`variant_id`). Result: the single covering profile, the
+/// admin-resolved winner on a collision, or (unresolved) the biggest discount,
+/// flagged.
 fn company_auto(
     b2b: &B2bContext,
     regular_cents: i64,
     product_id: i32,
+    variant_id: i32,
 ) -> (Option<i64>, Option<i32>, bool, Vec<i32>) {
     let covering = b2b.profiles.covering(product_id);
     let ids: Vec<i32> = covering.iter().map(|p| p.id).collect();
@@ -254,7 +258,7 @@ fn company_auto(
     } else {
         match b2b
             .resolutions
-            .get(&product_id)
+            .get(&variant_id)
             .and_then(|rid| covering.iter().find(|p| p.id == *rid).copied())
         {
             Some(resolved) => (resolved, false),
@@ -276,12 +280,14 @@ fn company_auto(
     )
 }
 
-fn detail_for(product: &products::Model, pc: &PricingCtx) -> PriceDetail {
-    let regular = product.price_cents;
+fn detail_for_variant(variant: &product_variants::Model, pc: &PricingCtx) -> PriceDetail {
+    let regular = variant.price_cents;
+    let product_id = variant.product_id;
 
-    // Personal price: public sale + personal-audience profiles, lowest wins.
-    let personal_sale = product.effective_price_cents();
-    let personal_profile = pc.personal.best_price(regular, product.id);
+    // Personal price: the variant's own public sale + personal-audience profiles
+    // (which cover the product), lowest wins.
+    let personal_sale = variant.effective_price_cents();
+    let personal_profile = pc.personal.best_price(regular, product_id);
     let personal_effective = personal_profile
         .map_or(personal_sale, |p| personal_sale.min(p));
 
@@ -289,12 +295,13 @@ fn detail_for(product: &products::Model, pc: &PricingCtx) -> PriceDetail {
         return PriceDetail::public_only(regular, personal_effective);
     };
 
-    // Business candidates (company accounts only).
-    let manual = b2b.manual.get(&product.id).copied();
+    // Business candidates (company accounts only). The negotiated price is keyed
+    // to the variant; the baseline business sale lives on the variant.
+    let manual = b2b.manual.get(&variant.id).copied();
     let (auto_cents, auto_profile_id, collision, covering_ids) =
-        company_auto(b2b, regular, product.id);
-    let business_global = product.business_sale_price_cents;
-    let business_profile = pc.business.best_price(regular, product.id);
+        company_auto(b2b, regular, product_id, variant.id);
+    let business_global = variant.business_sale_price_cents;
+    let business_profile = pc.business.best_price(regular, product_id);
     let business_best = lowest([manual, auto_cents, business_global, business_profile]);
 
     let priced = decide(regular, personal_effective, business_best);
@@ -328,14 +335,14 @@ async fn load_pricing_ctx(ctx: &AppContext, user: Option<&users::Model>) -> Resu
     })
 }
 
-/// Full breakdowns for many products for `user`, batching per-request lookups.
-pub async fn detail_many(
+/// Full breakdowns for many variants for `user`, batching per-request lookups.
+pub async fn detail_variants(
     ctx: &AppContext,
-    list: &[products::Model],
+    list: &[product_variants::Model],
     user: Option<&users::Model>,
 ) -> Result<Vec<PriceDetail>> {
     let pc = load_pricing_ctx(ctx, user).await?;
-    Ok(list.iter().map(|p| detail_for(p, &pc)).collect())
+    Ok(list.iter().map(|v| detail_for_variant(v, &pc)).collect())
 }
 
 /// Effective prices for a whole audience using only the global layers (the
@@ -343,9 +350,9 @@ pub async fn detail_many(
 /// no specific company's per-company deals. Used by the discounts admin page to
 /// preview what each tab's discounts produce. `audience` is "personal" or
 /// "business".
-pub async fn audience_price_many(
+pub async fn audience_price_variants(
     ctx: &AppContext,
-    list: &[products::Model],
+    list: &[product_variants::Model],
     audience: &str,
 ) -> Result<Vec<PricedProduct>> {
     let personal = load_audience(ctx, AUDIENCE_PERSONAL).await?;
@@ -367,7 +374,7 @@ pub async fn audience_price_many(
         business,
         b2b,
     };
-    Ok(list.iter().map(|p| detail_for(p, &pc).priced()).collect())
+    Ok(list.iter().map(|v| detail_for_variant(v, &pc).priced()).collect())
 }
 
 /// Like [`audience_price_many`], but prices against an *unsaved* set of profile
@@ -376,9 +383,9 @@ pub async fn audience_price_many(
 /// checkboxes, before they hit Save. For the business tab the personal layer
 /// stays the persisted one (businesses get the lower of personal/business), and
 /// only the business layer is replaced by the previewed selection.
-pub async fn audience_price_many_preview(
+pub async fn audience_price_variants_preview(
     ctx: &AppContext,
-    list: &[products::Model],
+    list: &[product_variants::Model],
     audience: &str,
     selected_profile_ids: Vec<i32>,
 ) -> Result<Vec<PricedProduct>> {
@@ -401,26 +408,26 @@ pub async fn audience_price_many_preview(
         business,
         b2b,
     };
-    Ok(list.iter().map(|p| detail_for(p, &pc).priced()).collect())
+    Ok(list.iter().map(|v| detail_for_variant(v, &pc).priced()).collect())
 }
 
-/// Price one product for `user` (`None` = anonymous/public).
-pub async fn price_for(
+/// Price one variant for `user` (`None` = anonymous/public).
+pub async fn price_variant(
     ctx: &AppContext,
-    product: &products::Model,
+    variant: &product_variants::Model,
     user: Option<&users::Model>,
 ) -> Result<PricedProduct> {
-    let detail = detail_many(ctx, std::slice::from_ref(product), user).await?;
+    let detail = detail_variants(ctx, std::slice::from_ref(variant), user).await?;
     Ok(detail[0].priced())
 }
 
-/// Price many products for `user`, batching the per-request lookups.
-pub async fn price_many(
+/// Price many variants for `user`, batching the per-request lookups.
+pub async fn price_variants(
     ctx: &AppContext,
-    list: &[products::Model],
+    list: &[product_variants::Model],
     user: Option<&users::Model>,
 ) -> Result<Vec<PricedProduct>> {
-    Ok(detail_many(ctx, list, user)
+    Ok(detail_variants(ctx, list, user)
         .await?
         .iter()
         .map(PriceDetail::priced)

src/views/checkout.rs

@@ -12,6 +12,7 @@ pub fn items(items: &[order_items::Model]) -> Vec<Value> {
         .map(|item| {
             json!({
                 "product_name": item.product_name,
+                "variant_label": item.variant_label,
                 "quantity": item.quantity,
                 "unit_price": format_price(item.unit_price_cents),
                 "line_total": format_price(item.unit_price_cents * i64::from(item.quantity)),

src/views/shop.rs

@@ -2,23 +2,28 @@
 
 use serde_json::{json, Value};
 
-use crate::models::_entities::{categories, products};
+use crate::models::_entities::{categories, product_images, product_variants, products};
 use crate::shared::money::format_price;
 use crate::shared::pricing::PricedProduct;
 
 /// Card/list shape for a product: model fields plus the viewer's resolved price
-/// (from [`crate::shared::pricing`]), its optional primary image and category.
-/// `on_sale` means "render the price as reduced" — driven by the resolved price,
-/// so it covers both public sales and business deals; `is_business` flags the
-/// latter.
+/// for its representative (first) variant, the variant count (so the template can
+/// render "from {price}" for multi-variant products), its optional primary image
+/// and category. `on_sale` means "render the price as reduced" — driven by the
+/// resolved price, so it covers both public sales and business deals;
+/// `is_business` flags the latter. `representative` is the variant whose price is
+/// shown and whose stock/sku the card exposes.
 pub fn product_card(
     product: &products::Model,
+    representative: &product_variants::Model,
     priced: &PricedProduct,
+    variant_count: usize,
     image: Option<String>,
     category_name: Option<String>,
 ) -> Value {
     json!({
         "id": product.id,
+        "variant_id": representative.id,
         "name": product.name,
         "slug": product.slug,
         "description": product.description,
@@ -27,29 +32,50 @@ pub fn product_card(
         "is_business": priced.is_business,
         "regular_price": format_price(priced.regular_cents),
         "currency": product.currency,
-        "sku": product.sku,
-        "stock": product.stock,
+        "sku": representative.sku,
+        "stock": representative.stock,
+        "tracked": representative.tracked(),
+        "in_stock": representative.in_stock(),
+        "variant_count": variant_count,
+        "has_options": variant_count > 1,
         "published": product.published,
         "image": image,
         "category_name": category_name,
     })
 }
 
+/// One priced variant row for the product detail page's option picker.
+pub fn variant_option(variant: &product_variants::Model, priced: &PricedProduct) -> Value {
+    json!({
+        "id": variant.id,
+        "label": variant.label,
+        "sku": variant.sku,
+        "stock": variant.stock,
+        "tracked": variant.tracked(),
+        "in_stock": variant.in_stock(),
+        "price": format_price(priced.price_cents),
+        "on_sale": priced.is_reduced(),
+        "regular_price": format_price(priced.regular_cents),
+        "is_business": priced.is_business,
+    })
+}
+
 /// Shape used to pre-fill the admin product form (exposes `category_id` rather
-/// than a resolved name, and the current primary image).
-pub fn product_form(product: &products::Model, image: Option<String>) -> Value {
+/// than a resolved name, and the current images in display order — first is the
+/// main one). Variants are supplied separately by the controller.
+pub fn product_form(product: &products::Model, images: &[product_images::Model]) -> Value {
     json!({
         "id": product.id,
         "name": product.name,
         "slug": product.slug,
         "description": product.description,
-        "price": format_price(product.price_cents),
         "currency": product.currency,
-        "sku": product.sku,
-        "stock": product.stock,
         "published": product.published,
         "category_id": product.category_id,
-        "image": image,
+        "images": images
+            .iter()
+            .map(|im| json!({ "id": im.id, "image_id": im.image_id }))
+            .collect::<Vec<_>>(),
     })
 }