color in sidebar

assets/css/app.css

@@ -39,17 +39,24 @@
 @theme {
   /* light mode — Catppuccin Latte (https://catppuccin.com/palette)
    * Base #eff1f5, Mantle #e6e9ef, Surface1 #bcc0cc, Subtext1 #5c5f77,
-   * Subtext0 #6c6f85, Text #4c4f69, Blue #1e66f5. */
+   * Subtext0 #6c6f85, Text #4c4f69. Primary is the KOMPRESS logo blue
+   * (sampled from logo.jpg) rather than the Latte blue. */
   --color-surface: #eff1f5;            /* Base */
   --color-surface-alt: #e6e9ef;        /* Mantle */
   --color-on-surface: #5c5f77;         /* Subtext1 */
   --color-on-surface-strong: #4c4f69;  /* Text */
-  --color-primary: #1e66f5;            /* Blue */
+  --color-primary: #1600ff;            /* KOMPRESS logo blue */
   --color-on-primary: #eff1f5;         /* Base */
   --color-secondary: #6c6f85;          /* Subtext0 */
   --color-on-secondary: #eff1f5;       /* Base */
   --color-outline: #bcc0cc;            /* Surface1 */
   --color-outline-strong: #4c4f69;     /* Text */
+  /* CTA: solid fill for large/filled buttons + the contact block. The vivid
+   * logo blue (--color-primary) is reserved for tiny accents (links, hover
+   * tints, badges); the CTA color is the logo blue itself, just with alpha so
+   * big buttons read as a translucent tint rather than the full vivid fill. */
+  --color-cta: rgba(22, 0, 255, 0.85);
+  --color-on-cta: #eff1f5;
 
   /* dark mode — Gruvbox dark palette (https://github.com/morhetz/gruvbox)
    * bg0 #282828, bg1 #3c3836, bg2 #504945, fg0 #fbf1c7, fg1 #ebdbb2,
@@ -64,6 +71,9 @@
   --color-on-secondary-dark: #1d2021;       /* bg0_h */
   --color-outline-dark: #504945;            /* bg2 */
   --color-outline-dark-strong: #bdae93;     /* fg3 */
+  /* CTA in dark mode tracks the existing primary so dark buttons are unchanged. */
+  --color-cta-dark: #83a598;                /* = primary-dark */
+  --color-on-cta-dark: #1d2021;             /* = on-primary-dark */
 
   /* shared status colors (same in both modes) */
   --color-info: var(--color-sky-500);
@@ -181,6 +191,8 @@
 [data-theme="dark"] .rich-content a { color: var(--color-primary-dark); }
 .rich-content :first-child { margin-top: 0; }
 .rich-content :last-child { margin-bottom: 0; }
+.rich-summary :where(p) { display: inline; margin: 0; }
+.rich-summary .product-more-link { margin-left: 0.25rem; }
 
 /* Compact rich blurb for product cards: neutralize block spacing so the
  * line-clamp truncation stays tidy regardless of the authored markup. */

assets/i18n/en-US/main.ftl

@@ -152,6 +152,7 @@ artist = Artist
 release-date = Release date
 cover-image = Cover image
 description = Description
+product-more = more
 songs-in-album = Songs in this album
 admin-new-album-desc = Fill in the details, then tick the songs to include.
 cover-help = Optional - png, jpg, webp or gif; shown on the album page.

assets/i18n/en/main.ftl

@@ -172,6 +172,7 @@ artist = Artist
 release-date = Release date
 cover-image = Cover image
 description = Description
+product-more = more
 short-description = Short description
 short-description-hint = Shown on product cards. Keep it short.
 songs-in-album = Songs in this album
@@ -218,7 +219,7 @@ option-label = Option label
 optional = optional
 stock-untracked-hint = Leave blank = available without stock tracking
 available = Available
-choose-option = Choose an option
+choose-option = Options
 from-price = from { $price }
 admin-discounts = Discounts
 admin-discounts-desc = Set discounted product prices. A discount shows up as a sale in the shop.
@@ -300,7 +301,7 @@ position-hint = Sort order in the menu (lowest first). Leave blank to add it las
 parent-category = Parent category
 no-parent = — None (top level) —
 quantity = Quantity
-add-to-cart = Add to cart
+add-to-cart = To cart
 cart-added = Added to cart
 in-stock = In stock
 out-of-stock = Out of stock
@@ -350,7 +351,9 @@ cart-update = Update
 cart-continue = Continue shopping
 checkout-title = Checkout
 checkout-contact = Contact details
-checkout-shipping = Shipping address
+checkout-shipping = Delivery address
+checkout-residence-address = Residence address
+checkout-delivery-same = Delivery address is the same as residence address
 checkout-email = Email
 checkout-name = Full name
 checkout-phone = Phone
@@ -365,7 +368,8 @@ country-de = Germany
 country-pl = Poland
 country-hu = Hungary
 checkout-note = Order note
-checkout-save-profile = Save this address to my profile
+checkout-save-profile = Save residence address to my profile
+payment-none = No payment method is currently available.
 account-type = Account type
 account-personal = Individual
 account-company = Company
@@ -481,6 +485,12 @@ bank-variable-symbol = Variable symbol
 bank-amount = Amount
 admin-shipping = Shipping
 admin-shipping-desc = set the price and availability of each delivery option.
+shipping-packeta-missing-settings = Packeta can be enabled after PACKETA_API_KEY, PACKETA_API_PASSWORD and PACKETA_SENDER_LABEL are configured.
+admin-payments = Payments
+admin-payments-desc = enable or disable payment methods and edit bank-transfer details.
+payment-methods = Payment methods
+payment-enabled = Active
+payment-bank-settings = Bank transfer details
 shipping-enabled = Active
 admin-currency = Exchange rate
 admin-currency-desc = set the exchange rate for the currencies customers can switch between. You always enter prices in EUR.
@@ -533,6 +543,8 @@ page-stores-address = Nádražná 328/62, 015 01 Rajec nad Rajčankou
 page-stores-photo-caption = Our production facility in Rajec nad Rajčankou
 page-stores-map = Where to find us
 page-stores-map-open = Open in Google Maps ›
+home-bestsellers = Best sellers
+home-bestsellers-all = All best sellers ›
 home-contact-title = Contact us
 home-contact-text = Our hotline is available 24/7. We're happy to help you choose.
 home-contact-cta = Contact the hotline

assets/i18n/sk/main.ftl

@@ -172,6 +172,7 @@ artist = Interpret
 release-date = Dátum vydania
 cover-image = Obrázok obalu
 description = Popis
+product-more = viac
 short-description = Krátky popis
 short-description-hint = Zobrazuje sa na kartách produktov. Najlepšie krátke.
 songs-in-album = Skladby v albume
@@ -218,7 +219,7 @@ 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ť
+choose-option = Options
 from-price = od { $price }
 admin-discounts = Zľavy
 admin-discounts-desc = Nastavte zľavnené ceny produktov. Zľava sa v obchode zobrazí ako akcia.
@@ -300,7 +301,7 @@ position-hint = Poradie v menu (najnižšie ako prvé). Nechajte prázdne a prid
 parent-category = Nadradená kategória
 no-parent = — Žiadna (najvyššia úroveň) —
 quantity = Množstvo
-add-to-cart = Pridať do košíka
+add-to-cart = Do košíka
 cart-added = Pridané do košíka
 in-stock = Na sklade
 out-of-stock = Vypredané
@@ -351,6 +352,8 @@ cart-continue = Pokračovať v nákupe
 checkout-title = Pokladňa
 checkout-contact = Kontaktné údaje
 checkout-shipping = Dodacia adresa
+checkout-residence-address = Adresa bydliska
+checkout-delivery-same = Dodacia adresa je rovnaká ako adresa bydliska
 checkout-email = E-mail
 checkout-name = Meno a priezvisko
 checkout-phone = Telefón
@@ -365,7 +368,8 @@ country-de = Nemecko
 country-pl = Poľsko
 country-hu = Maďarsko
 checkout-note = Poznámka k objednávke
-checkout-save-profile = Uložiť túto adresu do môjho profilu
+checkout-save-profile = Uložiť adresu bydliska do môjho profilu
+payment-none = Momentálne nie je dostupný žiadny spôsob platby.
 account-type = Typ účtu
 account-personal = Súkromná osoba
 account-company = Firma
@@ -481,6 +485,12 @@ bank-variable-symbol = Variabilný symbol
 bank-amount = Suma
 admin-shipping = Doprava
 admin-shipping-desc = nastaviť cenu a dostupnosť jednotlivých možností dopravy.
+shipping-packeta-missing-settings = Packeta sa dá zapnúť až po nastavení PACKETA_API_KEY, PACKETA_API_PASSWORD a PACKETA_SENDER_LABEL.
+admin-payments = Platby
+admin-payments-desc = zapnite alebo vypnite spôsoby platby a upravte údaje pre prevod na účet.
+payment-methods = Spôsoby platby
+payment-enabled = Aktívne
+payment-bank-settings = Údaje pre prevod na účet
 shipping-enabled = Aktívne
 admin-currency = Kurz
 admin-currency-desc = nastaviť výmenný kurz pre meny, medzi ktorými môžu zákazníci prepínať. Ceny zadávate vždy v EUR.
@@ -533,6 +543,8 @@ page-stores-address = Nádražná 328/62, 015 01 Rajec nad Rajčankou
 page-stores-photo-caption = Naša výrobná prevádzka v Rajci nad Rajčankou
 page-stores-map = Kde nás nájdete
 page-stores-map-open = Otvoriť v Google Mapách ›
+home-bestsellers = Najpredávanejšie
+home-bestsellers-all = Všetko najpredávanejšie ›
 home-contact-title = Kontaktujte nás
 home-contact-text = Naša horúca linka je dostupná 24/7. Radi vám poradíme s výberom.
 home-contact-cta = Kontaktujte hotline

assets/views/account/order_detail.html

@@ -55,10 +55,21 @@
   {% endif %}
 
   <div class="rounded-radius border border-outline bg-surface p-6 text-sm dark:border-outline-dark dark:bg-surface-dark-alt">
-    <h2 class="mb-2 font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</h2>
+    <div class="space-y-4">
-    <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.customer_name }}</p>
+      {% if order.residence_address %}
-    {% if order.address %}<p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.address }}</p>{% endif %}
+      <div>
-    <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.zip }} {{ order.city }}{% if order.country %}, {{ order.country }}{% endif %}</p>
+        <h2 class="mb-2 font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-residence-address", lang=lang | default(value='sk')) }}</h2>
+        <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.residence_address }}</p>
+        <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.residence_zip }} {{ order.residence_city }}{% if order.residence_country %}, {{ order.residence_country }}{% endif %}</p>
+      </div>
+      {% endif %}
+      <div>
+        <h2 class="mb-2 font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</h2>
+        <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.customer_name }}</p>
+        {% if order.address %}<p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.address }}</p>{% endif %}
+        <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.zip }} {{ order.city }}{% if order.country %}, {{ order.country }}{% endif %}</p>
+      </div>
+    </div>
   </div>
 
   {% if order.payment_method == "bank_transfer" and order.status == "pending" %}

assets/views/account/profile.html

@@ -107,7 +107,7 @@
     </fieldset>
 
     <fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
-      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</legend>
+      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-residence-address", lang=lang | default(value='sk')) }}</legend>
       {{ self::field(label=t(key="checkout-address", lang=lang | default(value='sk')), value=address) }}
       <div class="grid gap-4 sm:grid-cols-3">
         {{ self::field(label=t(key="checkout-city", lang=lang | default(value='sk')), value=city) }}
@@ -211,9 +211,9 @@
       </div>
     </fieldset>
 
-    <!-- default shipping address -->
+    <!-- residence address -->
     <fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
-      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</legend>
+      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-residence-address", lang=lang | default(value='sk')) }}</legend>
       <div class="space-y-1.5">
         <label for="address" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-address", lang=lang | default(value='sk')) }}</label>
         {{ ui::input(name="address", id="address", value=address | default(value=''), autocomplete="street-address") }}

assets/views/admin/base.html

@@ -105,6 +105,10 @@
           class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
           {{ t(key="admin-shipping", lang=lang | default(value='sk')) }}
         </a>
+        <a href="/admin/payments" data-nav="/admin/payments"
+          class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
+          {{ t(key="admin-payments", lang=lang | default(value='sk')) }}
+        </a>
         <a href="/admin/currencies" data-nav="/admin/currencies"
           class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
           {{ t(key="admin-currency", lang=lang | default(value='sk')) }}

assets/views/admin/orders/show.html

@@ -69,6 +69,10 @@
         {% if order.vat_id %}<p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ t(key="company-icdph", lang=lang | default(value='sk')) }}: {{ order.vat_id }}</p>{% endif %}
       </div>
       {% endif %}
+      <div>
+        <p class="text-xs uppercase tracking-wide text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="checkout-residence-address", lang=lang | default(value='sk')) }}</p>
+        <p class="text-on-surface/80 dark:text-on-surface-dark/80">{% if order.residence_address %}{{ order.residence_address }}<br>{{ order.residence_zip }} {{ order.residence_city }}<br>{{ order.residence_country }}{% else %}{{ t(key="profile-not-set", lang=lang | default(value='sk')) }}{% endif %}</p>
+      </div>
       <div>
         <p class="text-xs uppercase tracking-wide text-on-surface/60 dark:text-on-surface-dark/60">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</p>
         <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.address }}<br>{{ order.zip }} {{ order.city }}<br>{{ order.country }}</p>

assets/views/admin/payments/index.html

@@ -0,0 +1,47 @@
+{% extends "admin/base.html" %}
+{% import "macros/ui.html" as ui %}
+
+{% block title %}{{ t(key="admin-payments", lang=lang | default(value='sk')) }}{% endblock title %}
+{% block crumb %}{{ t(key="admin-payments", lang=lang | default(value='sk')) }}{% endblock crumb %}
+
+{% block content %}
+<header class="space-y-1">
+  <h1 class="text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="admin-payments", lang=lang | default(value='sk')) }}</h1>
+  <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="admin-payments-desc", lang=lang | default(value='sk')) }}</p>
+</header>
+
+<section class="mt-6 space-y-4">
+  <h2 class="text-lg font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="payment-methods", lang=lang | default(value='sk')) }}</h2>
+  {% for method in methods %}
+  <form method="post" action="/admin/payments/methods/{{ method.id }}"
+    class="flex flex-wrap items-center gap-4 rounded-radius border border-outline bg-surface p-5 dark:border-outline-dark dark:bg-surface-dark-alt">
+  {{ ui::csrf_field() }}
+    <div class="min-w-40">
+      <p class="font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key=method.label_key, lang=lang | default(value='sk')) }}</p>
+      <p class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ method.code }}</p>
+    </div>
+    <div class="pb-1">{{ ui::checkbox(name="enabled", label=t(key="payment-enabled", lang=lang | default(value='sk')), checked=method.enabled) }}</div>
+    {{ ui::button(label=t(key="save", lang=lang | default(value='sk')), type="submit", extra="ml-auto") }}
+  </form>
+  {% endfor %}
+</section>
+
+<section class="mt-8 space-y-4">
+  <h2 class="text-lg font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="payment-bank-settings", lang=lang | default(value='sk')) }}</h2>
+  <form method="post" action="/admin/payments/bank"
+    class="space-y-4 rounded-radius border border-outline bg-surface p-5 dark:border-outline-dark dark:bg-surface-dark-alt">
+  {{ ui::csrf_field() }}
+    <div class="space-y-1.5">
+      <label for="bank_account_name" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="bank-account-name", lang=lang | default(value='sk')) }}</label>
+      {{ ui::input(name="bank_account_name", id="bank_account_name", value=bank_account_name) }}
+    </div>
+    <div class="space-y-1.5">
+      <label for="bank_iban" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">IBAN</label>
+      {{ ui::input(name="bank_iban", id="bank_iban", value=bank_iban) }}
+    </div>
+    <div class="flex justify-end">
+      {{ ui::button(label=t(key="save", lang=lang | default(value='sk')), type="submit") }}
+    </div>
+  </form>
+</section>
+{% endblock content %}

assets/views/admin/shipping/index.html

@@ -18,12 +18,21 @@
     <div class="min-w-40">
       <p class="font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ method.name }}</p>
       <p class="text-xs text-on-surface/60 dark:text-on-surface-dark/60">{{ method.carrier | upper }}{% if method.requires_pickup_point %} · {{ t(key="checkout-pickup-point", lang=lang | default(value='sk')) }}{% endif %}</p>
+      {% if method.packeta_not_ready %}
+      <p class="mt-1 text-xs text-warning">{{ t(key=method.lock_reason, lang=lang | default(value='sk')) }}</p>
+      {% endif %}
     </div>
     <div class="space-y-1.5">
       <label for="price-{{ method.id }}" 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-" ~ method.id, value=method.price, width="w-28", attrs='inputmode="decimal"') }}
     </div>
-    <div class="pb-2">{{ ui::checkbox(name="enabled", label=t(key="shipping-enabled", lang=lang | default(value='sk')), checked=method.enabled) }}</div>
+    <div class="pb-2">
+      {% if method.locked %}
+      {{ ui::checkbox(name="enabled", label=t(key="shipping-enabled", lang=lang | default(value='sk')), checked=method.enabled, attrs='disabled') }}
+      {% else %}
+      {{ ui::checkbox(name="enabled", label=t(key="shipping-enabled", lang=lang | default(value='sk')), checked=method.enabled) }}
+      {% endif %}
+    </div>
     {{ ui::button(label=t(key="save", lang=lang | default(value='sk')), type="submit", extra="ml-auto") }}
   </form>
   {% endfor %}

assets/views/base.html

@@ -92,31 +92,32 @@
 
     <header
       class="sticky top-0 z-30 border-b border-outline bg-surface/95 backdrop-blur dark:border-outline-dark dark:bg-surface-dark/95">
-      <nav x-data="{ mobile: false }" class="mx-auto flex max-w-7xl items-center gap-3 px-4 py-3 sm:gap-4">
+      <nav class="mx-auto flex max-w-7xl items-center gap-3 px-4 py-3 sm:gap-4">
         <!-- category sidebar toggle (mobile only) -->
         {% set hamburger_icon = ui::icon(name="hamburger", size="size-6") %}
         {{ ui::icon_button(aria_label=t(key='categories', lang=lang | default(value='sk')), attrs='@click="cats = !cats" :aria-expanded="cats"', extra="lg:hidden", icon=hamburger_icon) }}
 
-        <!-- real KOMPRESS logo from www.e-shop.kompress.sk -->
+        <!-- real KOMPRESS logo from www.e-shop.kompress.sk (hidden on mobile;
-        <a href="/" class="flex shrink-0 items-center">
+             the category drawer carries navigation there) -->
+        <a href="/" class="hidden shrink-0 items-center sm:flex">
           <img src="/static/img/logo.jpg" alt="{{ t(key='brand', lang=lang | default(value='sk')) }}" width="260" height="52" class="h-8 w-auto dark:rounded-radius dark:bg-white dark:px-1.5 dark:py-0.5" />
         </a>
 
-        <!-- in-header search → existing GET /search (q param). Only on the home
+        <!-- in-header search → existing GET /search (q param). Hidden on small
-             page; elsewhere the shop's own toolbar carries the search box. Hidden
+             screens; the shop page keeps its compact mobile search row there. -->
-             on small screens (a compact copy lives in the mobile menu below). -->
+        <form action="/search" method="get" role="search" class="hidden min-w-0 flex-1 md:flex md:max-w-sm lg:max-w-md">
-        {% if on_home | default(value=false) %}
+          {% if selected_category and selected_category != "all" %}
-        <form action="/search" method="get" role="search" class="hidden min-w-0 flex-1 md:flex md:max-w-xl">
+          <input type="hidden" name="category" value="{{ selected_category }}" />
+          {% endif %}
           <div class="flex min-w-0 flex-1 overflow-hidden rounded-radius border border-outline transition focus-within:border-primary dark:border-outline-dark dark:focus-within:border-primary-dark">
             <span class="pointer-events-none flex items-center bg-surface-alt pl-3.5 text-on-surface/40 dark:bg-surface-dark-alt dark:text-on-surface-dark/40">{{ ui::icon(name="search", size="size-[18px]") }}</span>
-            <input type="search" name="q" autocomplete="off"
+            <input type="search" name="q" value="{{ query | default(value='') }}" autocomplete="off"
               placeholder="{{ t(key='search-placeholder', lang=lang | default(value='sk')) }}"
               aria-label="{{ t(key='search-placeholder', lang=lang | default(value='sk')) }}"
               class="min-w-0 flex-1 border-0 bg-surface-alt px-2.5 py-2.5 text-sm text-on-surface placeholder:text-on-surface/50 focus:outline-none dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50" />
-            <button type="submit" class="shrink-0 bg-primary px-5 text-sm font-bold text-on-primary transition hover:opacity-90 dark:bg-primary-dark dark:text-on-primary-dark">{{ t(key="search-button", lang=lang | default(value='sk')) }}</button>
+            <button type="submit" class="shrink-0 bg-cta px-5 text-sm font-bold text-on-cta transition hover:opacity-90 dark:bg-cta-dark dark:text-on-cta-dark">{{ t(key="search-button", lang=lang | default(value='sk')) }}</button>
           </div>
         </form>
-        {% endif %}
 
         <!-- right side: kurz + account + cart + settings + mobile toggle -->
         <div class="ml-auto flex items-center gap-2 sm:gap-3">
@@ -134,7 +135,7 @@
           <!-- account area: admin quick links / customer profile dropdown /
                guest two-line "Vitajte · Prihláste sa" button (Kompress design) -->
           {% if logged_in_admin %}
-          <div class="hidden items-center gap-3 sm:flex">
+          <div class="flex items-center gap-3">
             {{ ui::nav_link(label=t(key="admin-title", lang=lang | default(value='sk')), href="/admin/dashboard", data_nav="/admin", variant="warning", attrs='hx-boost="false"') }}
             <form method="post" action="/logout" hx-boost="false">
   {{ ui::csrf_field() }}
@@ -144,9 +145,9 @@
           {% elif logged_in_customer %}
           {% include "partials/profile_menu.html" %}
           {% else %}
-          <a href="/login" data-nav="/login" class="hidden items-center gap-2.5 rounded-radius px-2.5 py-1.5 text-on-surface transition hover:bg-surface-alt sm:inline-flex dark:text-on-surface-dark dark:hover:bg-surface-dark-alt">
+          <a href="/login" data-nav="/login" class="inline-flex items-center gap-2.5 rounded-radius px-2.5 py-1.5 text-on-surface transition hover:bg-surface-alt dark:text-on-surface-dark dark:hover:bg-surface-dark-alt">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" class="size-5 shrink-0" aria-hidden="true"><circle cx="12" cy="8" r="4"></circle><path d="M5 20a7 7 0 0 1 14 0"></path></svg>
-            <span class="flex flex-col items-start leading-tight">
+            <span class="hidden flex-col items-start leading-tight sm:flex">
               <span class="text-[11px] text-on-surface/50 dark:text-on-surface-dark/50">{{ t(key="welcome", lang=lang | default(value='sk')) }}</span>
               <span class="text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="nav-login", lang=lang | default(value='sk')) }}</span>
             </span>
@@ -193,55 +194,24 @@
 
           <!-- settings (language + theme) dropdown (self-contained Alpine state) -->
           {% include "partials/settings_dropdown.html" %}
-
-          <!-- mobile hamburger — Penguin animated icon swap (bars ↔ X), kept in
-               our ghost-square icon-button shell for consistency with cart/gear -->
-          <button type="button" @click="mobile = !mobile" :aria-expanded="mobile" aria-label="{{ t(key='menu', lang=lang | default(value='sk')) }}"
-            class="inline-flex size-9 shrink-0 items-center justify-center rounded-radius bg-transparent text-secondary transition hover:opacity-75 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-secondary active:opacity-100 active:outline-offset-0 md:hidden dark:text-secondary-dark dark:focus-visible:outline-secondary-dark">
-            {{ ui::icon(name="hamburger", size="size-6", attrs='x-show="!mobile"') }}
-            {{ ui::icon(name="close", size="size-6", attrs='x-cloak x-show="mobile"') }}
-          </button>
         </div>
-
-        <!-- mobile menu panel — Penguin sidebar-style menu rows (hover:bg-primary/5,
-             underline focus), active state via data-nav + markActiveNav() -->
-        <ul x-show="mobile" x-cloak @click.outside="mobile = false" x-transition
-          class="absolute inset-x-0 top-full mx-4 mt-2 flex flex-col gap-1 rounded-radius border border-outline bg-surface p-2 shadow-lg md:hidden dark:border-outline-dark dark:bg-surface-dark-alt">
-          {% if on_home | default(value=false) %}
-          <li class="mb-1">
-            <form action="/search" method="get" role="search" class="flex overflow-hidden rounded-radius border border-outline dark:border-outline-dark">
-              <input type="search" name="q" autocomplete="off"
-                placeholder="{{ t(key='search-placeholder', lang=lang | default(value='sk')) }}"
-                aria-label="{{ t(key='search-placeholder', lang=lang | default(value='sk')) }}"
-                class="min-w-0 flex-1 border-0 bg-surface-alt px-3 py-2 text-sm text-on-surface placeholder:text-on-surface/50 focus:outline-none dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50" />
-              <button type="submit" class="shrink-0 bg-primary px-4 text-sm font-bold text-on-primary dark:bg-primary-dark dark:text-on-primary-dark">{{ t(key="search-button", lang=lang | default(value='sk')) }}</button>
-            </form>
-          </li>
-          {% endif %}
-          <li><a href="/" data-nav="/" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-home", lang=lang | default(value='sk')) }}</a></li>
-          <li><a href="/shop" data-nav="/shop" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-shop", lang=lang | default(value='sk')) }}</a></li>
-          {% if logged_in_admin %}
-          <li><a href="/admin/dashboard" hx-boost="false" data-nav="/admin" class="block rounded-radius px-3 py-2 text-sm font-medium text-warning underline-offset-2 transition hover:bg-primary/5 focus:outline-hidden focus-visible:underline">{{ t(key="admin-title", lang=lang | default(value='sk')) }}</a></li>
-          <li>
-            <form method="post" action="/logout" hx-boost="false">
-  {{ ui::csrf_field() }}
-              <button type="submit" class="block w-full rounded-radius px-3 py-2 text-left text-sm font-medium text-danger underline-offset-2 transition hover:bg-primary/5 focus:outline-hidden focus-visible:underline">{{ t(key="logout", lang=lang | default(value='sk')) }}</button>
-            </form>
-          </li>
-          {% elif logged_in_customer %}
-          <li><a href="/account/profile" data-nav="/account" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-profile", lang=lang | default(value='sk')) }}</a></li>
-          <li>
-            <form method="post" action="/logout" hx-boost="false">
-  {{ ui::csrf_field() }}
-              <button type="submit" class="block w-full rounded-radius px-3 py-2 text-left text-sm font-medium text-danger underline-offset-2 transition hover:bg-primary/5 focus:outline-hidden focus-visible:underline">{{ t(key="logout", lang=lang | default(value='sk')) }}</button>
-            </form>
-          </li>
-          {% else %}
-          <li><a href="/login" data-nav="/login" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-login", lang=lang | default(value='sk')) }}</a></li>
-          <li><a href="/register" data-nav="/register" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-register", lang=lang | default(value='sk')) }}</a></li>
-          {% endif %}
-        </ul>
       </nav>
+      {% set mobile_search_category = selected_category | default(value="") %}
+      {% if on_home | default(value=false) or mobile_search_category %}
+      <form action="/search" method="get" role="search" class="px-4 pb-3 md:hidden">
+        {% if mobile_search_category and mobile_search_category != "all" %}
+        <input type="hidden" name="category" value="{{ mobile_search_category }}" />
+        {% endif %}
+        <div class="flex min-w-0 overflow-hidden rounded-radius border border-outline transition focus-within:border-primary dark:border-outline-dark dark:focus-within:border-primary-dark">
+          <span class="pointer-events-none flex items-center bg-surface-alt pl-3.5 text-on-surface/40 dark:bg-surface-dark-alt dark:text-on-surface-dark/40">{{ ui::icon(name="search", size="size-[18px]") }}</span>
+          <input type="search" name="q" value="{{ query | default(value='') }}" autocomplete="off"
+            placeholder="{{ t(key='search-placeholder', lang=lang | default(value='sk')) }}"
+            aria-label="{{ t(key='search-placeholder', lang=lang | default(value='sk')) }}"
+            class="min-w-0 flex-1 border-0 bg-surface-alt px-2.5 py-2.5 text-sm text-on-surface placeholder:text-on-surface/50 focus:outline-none dark:bg-surface-dark-alt dark:text-on-surface-dark dark:placeholder:text-on-surface-dark/50" />
+          <button type="submit" class="shrink-0 bg-cta px-4 text-sm font-bold text-on-cta transition hover:opacity-90 dark:bg-cta-dark dark:text-on-cta-dark">{{ t(key="search-button", lang=lang | default(value='sk')) }}</button>
+        </div>
+      </form>
+      {% endif %}
     </header>
 
     <!-- dark overlay behind the category drawer on small screens -->
@@ -286,19 +256,10 @@
       </div>
     </div>
 
-    <!-- site footer (Kompress design): brand blurb + Informácie / Účet / Kontakt
+    <!-- site footer (Kompress design): Informácie / Účet / Kontakt link columns
-         link columns + copyright bar. Static links; reuses the nav i18n keys. -->
+         + copyright bar. Static links; reuses the nav i18n keys. -->
     <footer class="border-t border-outline bg-surface dark:border-outline-dark dark:bg-surface-dark">
-      <div class="mx-auto grid max-w-7xl grid-cols-2 gap-8 px-4 py-10 md:grid-cols-4 md:px-8">
+      <div class="mx-auto grid max-w-7xl grid-cols-1 gap-8 px-4 py-10 sm:w-fit sm:grid-cols-3 sm:gap-x-32 md:gap-x-36 md:px-8 lg:gap-x-40">
-        <div class="col-span-2 md:col-span-1">
-          <div class="flex items-center gap-2.5">
-            <span class="inline-flex size-8 items-center justify-center rounded-radius bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark">
-              <svg width="17" height="17" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><rect x="10" y="3" width="4" height="18" rx="1.5"></rect><rect x="3" y="10" width="18" height="4" rx="1.5"></rect></svg>
-            </span>
-            <span class="text-lg font-extrabold tracking-tight text-primary dark:text-primary-dark">{{ t(key="brand", lang=lang | default(value='sk')) }}</span>
-          </div>
-          <p class="mt-3 max-w-xs text-sm leading-relaxed text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="footer-tagline", lang=lang | default(value='sk')) }}</p>
-        </div>
         <div class="flex flex-col gap-2.5">
           <div class="text-xs font-bold uppercase tracking-wider text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="footer-info", lang=lang | default(value='sk')) }}</div>
           <a href="/obchodne-podmienky" class="text-sm text-on-surface/70 transition hover:text-primary dark:text-on-surface-dark/70 dark:hover:text-primary-dark">{{ t(key="footer-terms", lang=lang | default(value='sk')) }}</a>

assets/views/home/index.html

@@ -18,10 +18,39 @@
    area is split into a featured product grid + a right rail (bestsellers /
    our stores / contact). All colors use the design tokens so light + dark
    both work; the brand accent is the medical blue set in app.css. #}
-<div class="grid grid-cols-1 gap-6 lg:grid-cols-[minmax(0,1fr)_19rem]">
+<div class="grid grid-cols-1 gap-6 lg:grid-cols-[minmax(0,1fr)_19rem] lg:grid-rows-[auto_1fr] lg:items-start">
+
+  <!-- bestsellers (reuses the featured products). DOM-first so it stacks above
+       the product grid on mobile; placed in the right rail's top cell on lg. -->
+  {% if products | length > 0 %}
+  <section class="overflow-hidden rounded-radius border border-outline bg-surface-alt lg:col-start-2 lg:row-start-1 dark:border-outline-dark dark:bg-surface-dark-alt">
+    <h2 class="border-b border-outline px-4 py-3.5 text-xs font-bold uppercase tracking-wider text-on-surface-strong dark:border-outline-dark dark:text-on-surface-dark-strong">{{ t(key="home-bestsellers", lang=L) }}</h2>
+    <ol class="p-2">
+      {% for product in products | slice(end=5) %}
+      <li>
+        <a href="/shop/{{ product.slug }}" class="flex items-center gap-3 rounded-radius px-2 py-2 transition hover:bg-primary/5">
+          <span class="inline-flex size-6 shrink-0 items-center justify-center rounded-md bg-primary/10 text-xs font-extrabold text-primary dark:bg-primary-dark/15 dark:text-primary-dark">{{ loop.index }}</span>
+          <span class="flex size-11 shrink-0 items-center justify-center overflow-hidden rounded-md border border-outline bg-surface dark:border-outline-dark dark:bg-surface-dark">
+            {% if product.image %}
+            <img src="/images/{{ product.image }}" alt="{{ product.name }}" class="size-full object-cover">
+            {% else %}
+            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" class="text-on-surface/30 dark:text-on-surface-dark/30"><rect x="3" y="4" width="18" height="16" rx="2"></rect><circle cx="8.5" cy="9" r="1.6"></circle><path d="M21 16l-5-5L5 20"></path></svg>
+            {% endif %}
+          </span>
+          <span class="flex min-w-0 flex-col gap-0.5">
+            <span class="line-clamp-2 text-[13px] font-semibold leading-tight text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</span>
+            <span class="text-sm font-extrabold text-on-surface-strong dark:text-on-surface-dark-strong">{% if product.has_options %}{{ t(key="from-price", price=product.price, lang=lang | default(value='sk')) }}{% else %}{{ product.price }}{% endif %} {{ currency_symbol }}</span>
+          </span>
+        </a>
+      </li>
+      {% endfor %}
+    </ol>
+    <a href="/shop" class="block border-t border-outline px-4 py-3 text-center text-[13px] font-semibold text-primary transition hover:bg-primary/5 dark:border-outline-dark dark:text-primary-dark">{{ t(key="home-bestsellers-all", lang=L) }}</a>
+  </section>
+  {% endif %}
 
   <!-- center column -->
-  <div class="flex min-w-0 flex-col gap-6">
+  <div class="flex min-w-0 flex-col gap-6 lg:col-start-1 lg:row-span-2 lg:row-start-1">
     <!-- hero / heading -->
     <section>
       <h1 class="text-3xl font-extrabold tracking-tight text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="shop-title", lang=lang | default(value='sk')) }}</h1>
@@ -35,7 +64,12 @@
         <h2 class="text-xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="nav-shop", lang=lang | default(value='sk')) }}</h2>
         <a href="/shop" class="text-sm font-semibold text-primary dark:text-primary-dark">{{ t(key="cart-continue", lang=lang | default(value='sk')) }} →</a>
       </div>
-      <div x-data="{ view: 'grid' }" class="grid grid-cols-2 gap-4 sm:grid-cols-3">
+      <div x-data="{ view: localStorage.getItem('shopView') === 'grid' ? 'grid' : 'list' }"
+        x-init="$watch('view', v => localStorage.setItem('shopView', v))"
+        {# Fixed-width cards (14rem), identical to the shop. Cards never stretch;
+           the column just fits as many as it can (home fewer, shop more), so a
+           card is the exact same width on both pages regardless of column count. #}
+        :class="view === 'list' ? 'flex flex-col gap-5' : 'grid grid-cols-2 gap-5 sm:grid-cols-[repeat(auto-fill,14rem)] sm:justify-center'">
         {% for product in products %}
         {% include "shop/_card.html" %}
         {% endfor %}
@@ -50,35 +84,7 @@
   </div>
 
   <!-- right rail -->
-  <aside class="flex flex-col gap-5">
+  <aside class="flex flex-col gap-5 lg:col-start-2 lg:row-start-2">
-
-    <!-- bestsellers (reuses the featured products) -->
-    {% if products | length > 0 %}
-    <section class="overflow-hidden rounded-radius border border-outline bg-surface-alt dark:border-outline-dark dark:bg-surface-dark-alt">
-      <h2 class="border-b border-outline px-4 py-3.5 text-xs font-bold uppercase tracking-wider text-on-surface-strong dark:border-outline-dark dark:text-on-surface-dark-strong">Najpredávanejšie</h2>
-      <ol class="p-2">
-        {% for product in products | slice(end=5) %}
-        <li>
-          <a href="/shop/{{ product.slug }}" class="flex items-center gap-3 rounded-radius px-2 py-2 transition hover:bg-primary/5">
-            <span class="inline-flex size-6 shrink-0 items-center justify-center rounded-md bg-primary/10 text-xs font-extrabold text-primary dark:bg-primary-dark/15 dark:text-primary-dark">{{ loop.index }}</span>
-            <span class="flex size-11 shrink-0 items-center justify-center overflow-hidden rounded-md border border-outline bg-surface dark:border-outline-dark dark:bg-surface-dark">
-              {% if product.image %}
-              <img src="/images/{{ product.image }}" alt="{{ product.name }}" class="size-full object-cover">
-              {% else %}
-              <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" class="text-on-surface/30 dark:text-on-surface-dark/30"><rect x="3" y="4" width="18" height="16" rx="2"></rect><circle cx="8.5" cy="9" r="1.6"></circle><path d="M21 16l-5-5L5 20"></path></svg>
-              {% endif %}
-            </span>
-            <span class="flex min-w-0 flex-col gap-0.5">
-              <span class="line-clamp-2 text-[13px] font-semibold leading-tight text-on-surface-strong dark:text-on-surface-dark-strong">{{ product.name }}</span>
-              <span class="text-sm font-extrabold text-primary dark:text-primary-dark">{% if product.has_options %}{{ t(key="from-price", price=product.price, lang=lang | default(value='sk')) }}{% else %}{{ product.price }}{% endif %} {{ currency_symbol }}</span>
-            </span>
-          </a>
-        </li>
-        {% endfor %}
-      </ol>
-      <a href="/shop" class="block border-t border-outline px-4 py-3 text-center text-[13px] font-semibold text-primary transition hover:bg-primary/5 dark:border-outline-dark dark:text-primary-dark">Všetko najpredávanejšie ›</a>
-    </section>
-    {% endif %}
 
     <!-- our stores (static) -->
     <section class="overflow-hidden rounded-radius border border-outline bg-surface-alt dark:border-outline-dark dark:bg-surface-dark-alt">
@@ -90,19 +96,6 @@
       </div>
     </section>
 
-    <!-- contact CTA (static, brand blue) -->
-    <section class="overflow-hidden rounded-radius bg-primary text-on-primary dark:bg-primary-dark dark:text-on-primary-dark">
-      <div class="p-5">
-        <div class="text-xs font-bold uppercase tracking-wider opacity-80">{{ t(key="home-contact-title", lang=L) }}</div>
-        <p class="mt-2.5 text-sm leading-relaxed opacity-90">{{ t(key="home-contact-text", lang=L) }}</p>
-        <a href="tel:+421903410476" class="mt-3.5 flex items-center gap-2.5 text-xl font-extrabold tracking-tight">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M5 4h4l2 5-3 2a12 12 0 0 0 5 5l2-3 5 2v4a2 2 0 0 1-2 2A16 16 0 0 1 3 6a2 2 0 0 1 2-2Z"></path></svg>
-          +421 903 410 476
-        </a>
-        <a href="tel:+421903410476" class="mt-3.5 block w-full rounded-radius bg-surface px-4 py-3 text-center text-sm font-bold text-primary transition hover:opacity-90 dark:bg-surface-dark dark:text-primary-dark">{{ t(key="home-contact-cta", lang=L) }}</a>
-      </div>
-    </section>
-
   </aside>
 </div>
 {% endblock content %}

assets/views/macros/ui.html

@@ -36,7 +36,7 @@
 <input type="hidden" name="_csrf" value="{{ csrf_token() }}">
 {%- endmacro %}
 
-{% macro button(label, variant="primary", type="button", href="", attrs="", extra="", icon="", size="px-4 py-2 text-sm") -%}
+{% macro button(label, variant="primary", type="button", href="", attrs="", extra="", icon="", size="px-4 py-2 text-sm", nowrap=true) -%}
 {%- if variant == "secondary" -%}{% set cls = "border border-secondary bg-secondary text-on-secondary focus-visible:outline-secondary dark:border-secondary-dark dark:bg-secondary-dark dark:text-on-secondary-dark dark:focus-visible:outline-secondary-dark" -%}
 {%- elif variant == "danger" -%}{% set cls = "border border-danger bg-danger text-on-danger focus-visible:outline-danger dark:bg-danger dark:border-danger dark:text-on-danger dark:focus-visible:outline-danger" -%}
 {%- elif variant == "success" -%}{% set cls = "border border-success bg-success text-on-success focus-visible:outline-success dark:bg-success dark:border-success dark:text-on-success dark:focus-visible:outline-success" -%}
@@ -49,9 +49,9 @@
 {%- elif variant == "ghost-primary" -%}{% set cls = "bg-transparent text-primary focus-visible:outline-primary dark:text-primary-dark dark:focus-visible:outline-primary-dark" -%}
 {%- elif variant == "ghost-secondary" -%}{% set cls = "bg-transparent text-secondary focus-visible:outline-secondary dark:text-secondary-dark dark:focus-visible:outline-secondary-dark" -%}
 {%- elif variant == "ghost-danger" -%}{% set cls = "bg-transparent text-danger focus-visible:outline-danger dark:text-danger dark:focus-visible:outline-danger" -%}
-{%- else -%}{% set cls = "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" -%}
+{%- else -%}{% set cls = "border border-cta bg-cta text-on-cta focus-visible:outline-cta dark:border-cta-dark dark:bg-cta-dark dark:text-on-cta-dark dark:focus-visible:outline-cta-dark" -%}
 {%- endif -%}
-{% if href %}<a href="{{ href }}"{% else %}<button type="{{ type }}"{% endif %} class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-radius {{ size }} 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 {{ cls }} {{ extra }}" {{ attrs | safe }}>{{ icon | safe }}{{ label }}</{% if href %}a{% else %}button{% endif %}>
+{% if nowrap %}{% set wrap = "whitespace-nowrap" %}{% else %}{% set wrap = "text-balance" %}{% endif %}{% if href %}<a href="{{ href }}"{% else %}<button type="{{ type }}"{% endif %} class="inline-flex items-center justify-center gap-2 {{ wrap }} rounded-radius {{ size }} 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 {{ cls }} {{ extra }}" {{ attrs | safe }}>{{ icon | safe }}{{ label }}</{% if href %}a{% else %}button{% endif %}>
 {%- endmacro button %}
 
 {# Icon-only button (square). Penguin ghost treatment (bg-transparent,

assets/views/shop/_card.html

@@ -12,12 +12,12 @@
    that state (e.g. home) `view` is undefined, so the grid layout applies. #}
 <article
   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'">
+  :class="view === 'list' ? 'flex-col sm:flex-row' : 'flex-col'">
   <a href="/shop/{{ product.slug }}" class="flex min-w-0 flex-1"
     :class="view === 'list' ? 'flex-row' : 'flex-col'">
     <!-- Image -->
     <div class="relative overflow-hidden bg-surface-alt dark:bg-surface-dark"
-      :class="view === 'list' ? 'size-28 shrink-0 sm:size-40' : 'h-44 md:h-64'">
+      :class="view === 'list' ? 'w-28 shrink-0 self-stretch min-h-36 sm:w-48' : 'aspect-[5/4]'">
       {% if product.on_sale and product.percent_off > 0 %}
       <span class="absolute left-2 top-2 z-10 rounded-full bg-danger px-2 py-0.5 text-[11px] font-bold text-on-danger shadow-sm">−{{ product.percent_off }} %</span>
       {% endif %}
@@ -27,7 +27,7 @@
     </div>
     <!-- Content -->
     <div class="flex min-w-0 flex-1 flex-col gap-1"
-      :class="view === 'list' ? 'p-4 sm:p-5' : 'p-6 pb-2'">
+      :class="view === 'list' ? 'justify-center p-4 sm:p-5' : 'px-4 pt-3 pb-1'">
       <!-- 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>
       {# Short blurb for the card; falls back to the full description (clamped)
@@ -62,10 +62,10 @@
     </div>
   </a>
   <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'">
+    :class="view === 'list' ? 'w-full justify-center border-t border-outline p-4 sm:w-48 sm:self-stretch sm:border-l sm:border-t-0 sm:p-5 dark:border-outline-dark' : 'px-4 pb-4 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") }}
+    {{ ui::button(label=t(key="choose-option", lang=lang | default(value='sk')), href="/shop/" ~ product.slug, extra="w-full", nowrap=false) }}
     {% 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"
@@ -73,7 +73,7 @@
   <input type="hidden" name="_csrf" value="{{ csrf_token() }}">
       <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>') }}
+      {{ ui::button(label=t(key="add-to-cart", lang=lang | default(value='sk')), type="submit", extra="w-full", nowrap=false, icon='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" aria-hidden="true" class="size-3.5 shrink-0"><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>
     {% else %}
     <p class="inline-flex justify-center rounded-radius bg-danger/10 px-3 py-2 text-xs font-medium text-danger">{{ t(key="out-of-stock", lang=lang | default(value='sk')) }}</p>

assets/views/shop/_product_grid.html

@@ -2,7 +2,10 @@
    wrapper in _search.html (it persists across htmx swaps and is shared with the
    sort + view-toggle row); `_card.html` reads the same `view` to switch its own
    layout between a vertical card and a horizontal row. #}
-<div :class="view === 'list' ? 'flex flex-col gap-5' : 'grid grid-cols-2 gap-5 sm:grid-cols-3 xl:grid-cols-4'">
+{# Fixed-width cards (14rem) — same as the home page. Cards never stretch; the row
+   just fits as many as the width allows. This keeps a card the exact same width on
+   the shop and the home page regardless of how many columns fit. #}
+<div :class="view === 'list' ? 'flex flex-col gap-5' : 'grid grid-cols-2 gap-5 sm:grid-cols-[repeat(auto-fill,14rem)] sm:justify-center'">
   {% for product in products %}
   {% include "shop/_card.html" %}
   {% endfor %}

assets/views/shop/_search.html

@@ -10,7 +10,7 @@
    Expects: query, selected_category, sort, plus the result vars consumed by
    _results.html. #}
 {% set L = lang | default(value='sk') %}
-<div x-data="{ view: localStorage.getItem('shopView') === 'list' ? 'list' : 'grid' }"
+<div x-data="{ view: localStorage.getItem('shopView') === 'grid' ? 'grid' : 'list' }"
   x-init="$watch('view', v => localStorage.setItem('shopView', v))"
   class="space-y-6">
   <form action="/search" method="get" role="search"
@@ -26,7 +26,7 @@
     <input type="hidden" name="category" value="{{ selected_category | default(value='all') }}" />
 
     <!-- search box -->
-    <div class="flex max-w-xl gap-2">
+    <div class="hidden max-w-xl gap-2">
       <div class="relative flex-1">
         <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") }}
@@ -42,7 +42,7 @@
           </svg>
         </span>
       </div>
-      <button type="submit" class="shrink-0 rounded-radius bg-primary px-5 text-sm font-bold text-on-primary transition hover:opacity-90 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary dark:bg-primary-dark dark:text-on-primary-dark dark:focus-visible:outline-primary-dark">
+      <button type="submit" class="shrink-0 rounded-radius bg-cta px-5 text-sm font-bold text-on-cta transition hover:opacity-90 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-cta dark:bg-cta-dark dark:text-on-cta-dark dark:focus-visible:outline-cta-dark">
         {{ t(key="search-button", lang=L) }}
       </button>
     </div>

assets/views/shop/_sidebar.html

@@ -16,8 +16,13 @@
   {{ t(key="categories", lang=lang | default(value='sk')) }}
 </p>
 <div class="flex flex-col gap-1">
+  {# mobile-only Home link: the navbar logo (the Home affordance) is hidden on
+     small screens, so navigation home lives here in the drawer instead. #}
+  <a href="/" data-nav="/" class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm lg:hidden dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">
+    {{ t(key="nav-home", lang=lang | default(value='sk')) }}
+  </a>
   <a href="/shop" data-nav="/shop"
-    class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
+    class="flex items-center gap-2 rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">
     {{ t(key="all-products", lang=lang | default(value='sk')) }}
   </a>
   {% for group in category_groups %}
@@ -26,7 +31,7 @@
     x-init="open = ['{{ group.slug }}'{% for child in group.children %}, '{{ child.slug }}'{% endfor %}].some(s => location.pathname === '/category/' + s)">
     <div class="flex items-stretch">
       <a href="/category/{{ group.slug }}" data-nav="/category/{{ group.slug }}"
-        class="flex flex-1 items-center gap-2 truncate rounded-l-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
+        class="flex flex-1 items-center gap-2 truncate rounded-l-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">
         {{ group.name }}
       </a>
       <button type="button" x-on:click="open = ! open" x-bind:aria-expanded="open ? 'true' : 'false'"
@@ -42,7 +47,7 @@
       {% for child in group.children %}
       <li>
         <a href="/category/{{ child.slug }}" data-nav="/category/{{ child.slug }}"
-          class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
+          class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">
           {{ child.name }}
         </a>
       </li>
@@ -51,7 +56,7 @@
   </div>
   {% else %}
   <a href="/category/{{ group.slug }}" data-nav="/category/{{ group.slug }}"
-    class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-primary/10 aria-[current=page]:text-on-surface-strong dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-primary-dark/10 dark:aria-[current=page]:text-on-surface-dark-strong">
+    class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">
     {{ group.name }}
   </a>
   {% endif %}
@@ -70,9 +75,8 @@
   </p>
   {% set L = lang | default(value='sk') %}
   <div class="flex flex-col gap-0.5">
-    <a href="/obchodne-podmienky" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong">{{ t(key="footer-terms", lang=L) }}</a>
+    <a href="/obchodne-podmienky" data-nav="/obchodne-podmienky" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">{{ t(key="footer-terms", lang=L) }}</a>
-    <a href="/o-nas" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong">{{ t(key="footer-about", lang=L) }}</a>
+    <a href="/predajne" data-nav="/predajne" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">{{ t(key="footer-stores", lang=L) }}</a>
-    <a href="/predajne" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong">{{ t(key="footer-stores", lang=L) }}</a>
+    <a href="/doprava-a-platba" data-nav="/doprava-a-platba" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline aria-[current=page]:bg-cta aria-[current=page]:text-on-cta aria-[current=page]:font-semibold aria-[current=page]:shadow-sm dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong dark:aria-[current=page]:bg-cta-dark dark:aria-[current=page]:text-on-cta-dark">{{ t(key="footer-shipping", lang=L) }}</a>
-    <a href="/doprava-a-platba" class="flex items-center gap-2 truncate rounded-radius px-2 py-1.5 text-sm text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-on-surface-strong focus:outline-hidden focus-visible:underline dark:text-on-surface-dark dark:hover:bg-primary-dark/5 dark:hover:text-on-surface-dark-strong">{{ t(key="footer-shipping", lang=L) }}</a>
   </div>
 </div>

assets/views/shop/checkout.html

@@ -12,6 +12,7 @@
   x-data="{
     paymentMethod: '',
     accountType: '{{ prefill_account_type | default(value='personal') }}',
+    deliverySame: false,
     carrier: '',
     carrierPrice: 0,
     requiresPoint: false,
@@ -128,26 +129,26 @@
       </div>
     </fieldset>
 
-    <!-- shipping address -->
+    <!-- residence address -->
     <fieldset class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
-      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</legend>
+      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-residence-address", lang=lang | default(value='sk')) }}</legend>
       <div class="space-y-1.5">
-        <label for="address" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-address", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+        <label for="residence_address" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-address", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
-        {{ ui::input(name="address", id="address", value=prefill_address | default(value=''), required=true, autocomplete="street-address") }}
+        {{ ui::input(name="residence_address", id="residence_address", value=prefill_residence_address | default(value=''), required=true, autocomplete="billing street-address") }}
       </div>
       <div class="grid gap-4 sm:grid-cols-3">
         <div class="space-y-1.5">
-          <label for="city" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-city", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+          <label for="residence_city" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-city", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
-          {{ ui::input(name="city", id="city", value=prefill_city | default(value=''), required=true, autocomplete="address-level2") }}
+          {{ ui::input(name="residence_city", id="residence_city", value=prefill_residence_city | default(value=''), required=true, autocomplete="billing address-level2") }}
         </div>
         <div class="space-y-1.5">
-          <label for="zip" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-zip", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+          <label for="residence_zip" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-zip", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
-          {{ ui::input(name="zip", id="zip", value=prefill_zip | default(value=''), required=true, autocomplete="postal-code") }}
+          {{ ui::input(name="residence_zip", id="residence_zip", value=prefill_residence_zip | default(value=''), required=true, autocomplete="billing postal-code") }}
         </div>
         <div class="space-y-1.5">
-          <label for="country" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-country", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+          <label for="residence_country" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-country", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
           <div class="relative" @click.outside="countryOpen = false"
-            x-data="{ countryOpen: false, country: '{{ prefill_country | default(value=t(key='country-sk', lang=lang | default(value='sk'))) }}', opts: [
+            x-data="{ countryOpen: false, country: '{{ prefill_residence_country | default(value=t(key='country-sk', lang=lang | default(value='sk'))) }}', opts: [
               { v: '{{ t(key='country-sk', lang=lang | default(value='sk')) }}', l: '🇸🇰 {{ t(key='country-sk', lang=lang | default(value='sk')) }}' },
               { v: '{{ t(key='country-cz', lang=lang | default(value='sk')) }}', l: '🇨🇿 {{ t(key='country-cz', lang=lang | default(value='sk')) }}' },
               { v: '{{ t(key='country-at', lang=lang | default(value='sk')) }}', l: '🇦🇹 {{ t(key='country-at', lang=lang | default(value='sk')) }}' },
@@ -155,7 +156,57 @@
               { v: '{{ t(key='country-pl', lang=lang | default(value='sk')) }}', l: '🇵🇱 {{ t(key='country-pl', lang=lang | default(value='sk')) }}' },
               { v: '{{ t(key='country-hu', lang=lang | default(value='sk')) }}', l: '🇭🇺 {{ t(key='country-hu', lang=lang | default(value='sk')) }}' }
             ], get filtered() { return this.opts.filter(o => !this.country || o.v.toLowerCase().includes(this.country.toLowerCase())) } }">
-            <input id="country" name="country" type="text" x-model="country" required @focus="countryOpen = true" @input="countryOpen = true"
+            <input id="residence_country" name="residence_country" type="text" x-model="country" required @focus="countryOpen = true" @input="countryOpen = true"
+              class="w-full rounded-radius border border-outline bg-surface py-2 pl-3 pr-8 text-sm text-on-surface focus:outline-2 focus:outline-primary dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark">
+            <button type="button" tabindex="-1" @click="countryOpen = !countryOpen"
+              class="absolute inset-y-0 right-0 flex w-8 items-center justify-center text-on-surface/60 dark:text-on-surface-dark/60">
+              <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"
+                class="size-4 transition-transform" :class="countryOpen && 'rotate-180'">
+                <path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5" />
+              </svg>
+            </button>
+            <ul x-show="countryOpen" x-cloak x-transition
+              class="absolute z-20 mt-1 max-h-56 w-full overflow-auto rounded-radius border border-outline bg-surface p-1 shadow-lg dark:border-outline-dark dark:bg-surface-dark-alt">
+              <template x-for="o in filtered" :key="o.v">
+                <li><button type="button" @click="country = o.v; countryOpen = false" x-text="o.l"
+                  class="block w-full rounded-radius px-3 py-1.5 text-left text-sm text-on-surface transition hover:bg-surface-alt dark:text-on-surface-dark dark:hover:bg-surface-dark"></button></li>
+              </template>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </fieldset>
+
+    {{ ui::checkbox(name="delivery_same_as_residence", id="delivery_same_as_residence", label=t(key="checkout-delivery-same", lang=lang | default(value='sk')), attrs='x-model="deliverySame"') }}
+
+    <!-- delivery address -->
+    <fieldset x-show="!deliverySame" x-cloak class="space-y-4 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
+      <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</legend>
+      <div class="space-y-1.5">
+        <label for="address" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-address", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+        {{ ui::input(name="address", id="address", autocomplete="shipping street-address", attrs=':required="!deliverySame"') }}
+      </div>
+      <div class="grid gap-4 sm:grid-cols-3">
+        <div class="space-y-1.5">
+          <label for="city" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-city", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+          {{ ui::input(name="city", id="city", autocomplete="shipping address-level2", attrs=':required="!deliverySame"') }}
+        </div>
+        <div class="space-y-1.5">
+          <label for="zip" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-zip", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+          {{ ui::input(name="zip", id="zip", autocomplete="shipping postal-code", attrs=':required="!deliverySame"') }}
+        </div>
+        <div class="space-y-1.5">
+          <label for="country" class="text-sm font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-country", lang=lang | default(value='sk')) }}{{ ui::req() }}</label>
+          <div class="relative" @click.outside="countryOpen = false"
+            x-data="{ countryOpen: false, country: '{{ t(key='country-sk', lang=lang | default(value='sk')) }}', opts: [
+              { v: '{{ t(key='country-sk', lang=lang | default(value='sk')) }}', l: '🇸🇰 {{ t(key='country-sk', lang=lang | default(value='sk')) }}' },
+              { v: '{{ t(key='country-cz', lang=lang | default(value='sk')) }}', l: '🇨🇿 {{ t(key='country-cz', lang=lang | default(value='sk')) }}' },
+              { v: '{{ t(key='country-at', lang=lang | default(value='sk')) }}', l: '🇦🇹 {{ t(key='country-at', lang=lang | default(value='sk')) }}' },
+              { v: '{{ t(key='country-de', lang=lang | default(value='sk')) }}', l: '🇩🇪 {{ t(key='country-de', lang=lang | default(value='sk')) }}' },
+              { v: '{{ t(key='country-pl', lang=lang | default(value='sk')) }}', l: '🇵🇱 {{ t(key='country-pl', lang=lang | default(value='sk')) }}' },
+              { v: '{{ t(key='country-hu', lang=lang | default(value='sk')) }}', l: '🇭🇺 {{ t(key='country-hu', lang=lang | default(value='sk')) }}' }
+            ], get filtered() { return this.opts.filter(o => !this.country || o.v.toLowerCase().includes(this.country.toLowerCase())) } }">
+            <input id="country" name="country" type="text" x-model="country" :required="!deliverySame" @focus="countryOpen = true" @input="countryOpen = true"
               class="w-full rounded-radius border border-outline bg-surface py-2 pl-3 pr-8 text-sm text-on-surface focus:outline-2 focus:outline-primary dark:border-outline-dark dark:bg-surface-dark dark:text-on-surface-dark">
             <button type="button" tabindex="-1" @click="countryOpen = !countryOpen"
               class="absolute inset-y-0 right-0 flex w-8 items-center justify-center text-on-surface/60 dark:text-on-surface-dark/60">
@@ -215,14 +266,16 @@
     <!-- payment -->
     <fieldset class="space-y-3 rounded-radius border border-outline bg-surface p-6 dark:border-outline-dark dark:bg-surface-dark-alt">
       <legend class="px-1 text-sm font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-payment", lang=lang | default(value='sk')) }}{{ ui::req() }}</legend>
+      {% if payment_methods | length > 0 %}
+      {% for method in payment_methods %}
       <label class="flex cursor-pointer items-center gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
-        {{ ui::radio(name="payment_method", value="cod", attrs='required x-model="paymentMethod"') }}
+        {{ ui::radio(name="payment_method", value=method.code, attrs='required x-model="paymentMethod"') }}
-        <span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="payment-cod", lang=lang | default(value='sk')) }}</span>
+        <span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key=method.label_key, lang=lang | default(value='sk')) }}</span>
-      </label>
-      <label class="flex cursor-pointer items-center gap-3 rounded-radius border border-outline px-4 py-3 transition has-[:checked]:border-primary dark:border-outline-dark dark:has-[:checked]:border-primary-dark">
-        {{ ui::radio(name="payment_method", value="bank_transfer", attrs='required x-model="paymentMethod"') }}
-        <span class="font-medium text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="payment-bank", lang=lang | default(value='sk')) }}</span>
       </label>
+      {% endfor %}
+      {% else %}
+      <p class="text-sm text-on-surface/70 dark:text-on-surface-dark/70">{{ t(key="payment-none", lang=lang | default(value='sk')) }}</p>
+      {% endif %}
     </fieldset>
 
     <div class="space-y-1.5">

assets/views/shop/order_confirmed.html

@@ -45,6 +45,21 @@
     </div>
   </div>
 
+  <div class="grid gap-4 text-sm sm:grid-cols-2">
+    {% if order.residence_address %}
+    <div class="rounded-radius border border-outline bg-surface p-4 dark:border-outline-dark dark:bg-surface-dark-alt">
+      <h2 class="mb-2 font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-residence-address", lang=lang | default(value='sk')) }}</h2>
+      <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.residence_address }}</p>
+      <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.residence_zip }} {{ order.residence_city }}{% if order.residence_country %}, {{ order.residence_country }}{% endif %}</p>
+    </div>
+    {% endif %}
+    <div class="rounded-radius border border-outline bg-surface p-4 dark:border-outline-dark dark:bg-surface-dark-alt">
+      <h2 class="mb-2 font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="checkout-shipping", lang=lang | default(value='sk')) }}</h2>
+      {% if order.address %}<p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.address }}</p>{% endif %}
+      <p class="text-on-surface/80 dark:text-on-surface-dark/80">{{ order.zip }} {{ order.city }}{% if order.country %}, {{ order.country }}{% endif %}</p>
+    </div>
+  </div>
+
   {% if order.payment_method == "bank_transfer" %}
   <div class="space-y-2 rounded-radius border border-primary/40 bg-primary/5 p-6 text-sm dark:border-primary-dark/40">
     <p class="font-semibold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="payment-bank-instructions", lang=lang | default(value='sk')) }}</p>

assets/views/shop/show.html

@@ -4,6 +4,7 @@
 {% block title %}{{ product.name }}{% endblock title %}
 
 {% block content %}
+<div class="space-y-12">
 <div class="grid gap-10 lg:grid-cols-2">
   <!-- gallery — prev/next arrows + opacity transitions adapted from
        penguinui/carousel/default-carousel.html; kept our product thumbnail strip
@@ -50,14 +51,34 @@
 
   <!-- details -->
   {% 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" %}
+  {% 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-cta bg-cta text-on-cta focus-visible:outline-cta dark:border-cta-dark dark:bg-cta-dark dark:text-on-cta-dark dark:focus-visible:outline-cta-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))">
+  <div class="space-y-6"
+    x-data="{
+      variants: JSON.parse(document.getElementById('variant-data').textContent) || [],
+      sel: 0,
+      get current() { return this.variants[this.sel] || null },
+      init() {
+        const firstInStock = this.variants.findIndex(v => v.in_stock);
+        this.sel = Math.max(0, firstInStock);
+      },
+    }">
     {% 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.short_description %}
+    <div class="rich-content rich-summary text-on-surface/80 dark:text-on-surface-dark/80">
+      {{ product.short_description | safe }}
+      {% if product.description %}
+      <a href="#product-description" class="product-more-link inline font-medium text-primary underline underline-offset-4 hover:opacity-75 dark:text-primary-dark">{{ t(key="product-more", lang=lang | default(value='sk')) }}</a>
+      {% endif %}
+    </div>
+    {% elif product.description %}
+    <a href="#product-description" class="inline-flex text-sm font-medium text-primary underline underline-offset-4 hover:opacity-75 dark:text-primary-dark">{{ t(key="product-more", lang=lang | default(value='sk')) }}</a>
+    {% endif %}
+
     <template x-if="current">
       <div class="space-y-6">
         <!-- option picker (only when there's a real choice); first option is
@@ -82,11 +103,6 @@
           </template>
         </div>
 
-        {% if product.description %}
-        {# Authored as rich text (Quill) in the admin; render the stored HTML. #}
-        <div class="rich-content text-on-surface/80 dark:text-on-surface-dark/80">{{ product.description | safe }}</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"
@@ -119,16 +135,13 @@
       <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>
-
+</div>
-  <script>
+{% if product.description %}
-    function productBuy(variants) {
+<section id="product-description" class="scroll-mt-28 border-t border-outline pt-8 dark:border-outline-dark">
-      return {
+  <h2 class="mb-4 text-2xl font-bold text-on-surface-strong dark:text-on-surface-dark-strong">{{ t(key="description", lang=lang | default(value='sk')) }}</h2>
-        variants: variants || [],
+  {# Authored as rich text (Quill) in the admin; render the stored HTML. #}
-        // Default to the first in-stock variant, else the first.
+  <div class="rich-content text-on-surface/80 dark:text-on-surface-dark/80">{{ product.description | safe }}</div>
-        sel: Math.max(0, (variants || []).findIndex(v => v.in_stock)),
+</section>
-        get current() { return this.variants[this.sel] || null; },
+{% endif %}
-      };
-    }
-  </script>
 </div>
 {% endblock content %}

migration/src/lib.rs

@@ -50,6 +50,9 @@ mod m20260623_000002_strip_html_from_product_search;
 mod m20260623_000003_drop_currency;
 mod m20260623_000004_currencies;
 mod m20260625_000001_add_avatar_to_users;
+mod m20260627_000001_order_residence_address;
+mod m20260627_000002_payment_settings;
+mod m20260627_000003_account_cart_items;
 pub struct Migrator;
 
 #[async_trait::async_trait]
@@ -104,7 +107,10 @@ impl MigratorTrait for Migrator {
             Box::new(m20260623_000003_drop_currency::Migration),
             Box::new(m20260623_000004_currencies::Migration),
             Box::new(m20260625_000001_add_avatar_to_users::Migration),
+            Box::new(m20260627_000001_order_residence_address::Migration),
+            Box::new(m20260627_000002_payment_settings::Migration),
+            Box::new(m20260627_000003_account_cart_items::Migration),
             // inject-above (do not remove this comment)
         ]
     }
-}
+}

migration/src/m20260627_000001_order_residence_address.rs

@@ -0,0 +1,22 @@
+use loco_rs::schema::*;
+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> {
+        add_column(m, "orders", "residence_address", ColType::StringNull).await?;
+        add_column(m, "orders", "residence_city", ColType::StringNull).await?;
+        add_column(m, "orders", "residence_zip", ColType::StringNull).await?;
+        add_column(m, "orders", "residence_country", ColType::StringNull).await
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        remove_column(m, "orders", "residence_country").await?;
+        remove_column(m, "orders", "residence_zip").await?;
+        remove_column(m, "orders", "residence_city").await?;
+        remove_column(m, "orders", "residence_address").await
+    }
+}

migration/src/m20260627_000002_payment_settings.rs

@@ -0,0 +1,41 @@
+use loco_rs::schema::*;
+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> {
+        create_table(
+            m,
+            "payment_methods",
+            &[
+                ("id", ColType::PkAuto),
+                ("code", ColType::StringUniq),
+                ("name", ColType::String),
+                ("enabled", ColType::BooleanWithDefault(true)),
+                ("position", ColType::IntegerWithDefault(0)),
+            ],
+            &[],
+        )
+        .await?;
+
+        create_table(
+            m,
+            "shop_settings",
+            &[
+                ("id", ColType::PkAuto),
+                ("key", ColType::StringUniq),
+                ("value", ColType::TextNull),
+            ],
+            &[],
+        )
+        .await
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        drop_table(m, "shop_settings").await?;
+        drop_table(m, "payment_methods").await
+    }
+}

migration/src/m20260627_000003_account_cart_items.rs

@@ -0,0 +1,48 @@
+use loco_rs::schema::*;
+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> {
+        create_table(
+            m,
+            "account_cart_items",
+            &[
+                ("id", ColType::PkAuto),
+                ("variant_id", ColType::Integer),
+                ("quantity", ColType::Integer),
+            ],
+            &[("user", "")],
+        )
+        .await?;
+
+        m.create_foreign_key(
+            ForeignKey::create()
+                .name("fk-account_cart_items-variant_id-to-product_variants")
+                .from(Alias::new("account_cart_items"), Alias::new("variant_id"))
+                .to(Alias::new("product_variants"), Alias::new("id"))
+                .on_delete(ForeignKeyAction::Cascade)
+                .on_update(ForeignKeyAction::NoAction)
+                .to_owned(),
+        )
+        .await?;
+
+        m.create_index(
+            Index::create()
+                .name("idx_account_cart_items_user_variant_unique")
+                .table(Alias::new("account_cart_items"))
+                .col(Alias::new("user_id"))
+                .col(Alias::new("variant_id"))
+                .unique()
+                .to_owned(),
+        )
+        .await
+    }
+
+    async fn down(&self, m: &SchemaManager) -> Result<(), DbErr> {
+        drop_table(m, "account_cart_items").await
+    }
+}

src/app.rs

@@ -18,7 +18,7 @@ use std::{path::Path, sync::Arc};
 use crate::{
     controllers::{
         account, admin_categories, admin_currencies, admin_customers, admin_dashboard,
-        admin_discount_profiles, admin_form, admin_orders, admin_products, admin_shipping,
+        admin_discount_profiles, admin_form, admin_orders, admin_payments, admin_products, admin_shipping,
         auth, auth_pages, cart, checkout, currency, home, i18n, media, oauth2,
         pages, shop,
     },
@@ -83,6 +83,7 @@ impl Hooks for App {
             Box::new(initializers::view_engine::ViewEngineInitializer),
             Box::new(initializers::admin_seeder::AdminSeeder),
             Box::new(initializers::shipping_seeder::ShippingSeeder),
+            Box::new(initializers::payment_seeder::PaymentSeeder),
             Box::new(initializers::currency_seeder::CurrencySeeder),
             Box::new(initializers::oauth2::OAuth2StoreInitializer),
             Box::new(initializers::oauth2_session::OAuth2SessionInitializer),
@@ -111,6 +112,7 @@ impl Hooks for App {
             .add_route(admin_discount_profiles::routes())
             .add_route(admin_categories::routes())
             .add_route(admin_orders::routes())
+            .add_route(admin_payments::routes())
             .add_route(admin_customers::routes())
             .add_route(admin_shipping::routes())
             .add_route(admin_currencies::routes())

src/controllers/account.rs

@@ -335,6 +335,7 @@ async fn order_detail_page(
         .all(&ctx.db)
         .await?;
 
+    let (bank_iban, bank_account_name) = settings::bank_details(&ctx).await?;
     format::view(
         &v,
         "account/order_detail.html",
@@ -347,8 +348,8 @@ async fn order_detail_page(
             "customer_avatar": user.avatar_id,
             "order": order_view::detail(
                 &order,
-                settings::get(&ctx, "bank_iban").unwrap_or(""),
+                &bank_iban,
-                settings::get(&ctx, "bank_account_name").unwrap_or(""),
+                &bank_account_name,
             ),
             "items": order_view::items(&items),
             "lang": current_lang(&jar),

src/controllers/admin_orders.rs

@@ -93,6 +93,7 @@ async fn render_show(
         .await?;
 
     let carrier = order_carrier(ctx, &order).await?;
+    let (bank_iban, bank_account_name) = settings::bank_details(ctx).await?;
     // The order can be sent only if it maps to a real carrier and hasn't been
     // dispatched yet.
     let can_ship = carrier != "none" && order.tracking_number.is_none();
@@ -103,8 +104,8 @@ async fn render_show(
         json!({
             "order": view::detail(
                 &order,
-                settings::get(ctx, "bank_iban").unwrap_or(""),
+                &bank_iban,
-                settings::get(ctx, "bank_account_name").unwrap_or(""),
+                &bank_account_name,
             ),
             "items": view::items(&items),
             "statuses": ORDER_STATUSES,

src/controllers/admin_payments.rs

@@ -0,0 +1,112 @@
+//! Admin management for checkout payment methods and bank-transfer details.
+
+use axum_extra::extract::cookie::CookieJar;
+use loco_rs::prelude::*;
+use sea_orm::{ActiveModelTrait, EntityTrait, QueryOrder, Set};
+use serde::Deserialize;
+use serde_json::json;
+
+use crate::{
+    controllers::i18n::current_lang,
+    models::{payment_methods, shop_settings},
+    shared::guard,
+};
+
+#[derive(Debug, Deserialize)]
+struct PaymentMethodForm {
+    enabled: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct BankSettingsForm {
+    bank_account_name: String,
+    bank_iban: String,
+}
+
+fn is_checked(value: &Option<String>) -> bool {
+    matches!(value.as_deref(), Some("on" | "true" | "1"))
+}
+
+fn trimmed(value: &str) -> Option<String> {
+    let value = value.trim();
+    (!value.is_empty()).then(|| value.to_string())
+}
+
+#[debug_handler]
+async fn index(
+    auth: auth::JWT,
+    jar: CookieJar,
+    ViewEngine(v): ViewEngine<TeraView>,
+    State(ctx): State<AppContext>,
+) -> Result<Response> {
+    guard::current_admin(auth, &ctx).await?;
+    let methods = payment_methods::Entity::find()
+        .order_by_asc(payment_methods::Column::Position)
+        .all(&ctx.db)
+        .await?;
+    let rows: Vec<serde_json::Value> = methods
+        .iter()
+        .map(|m| {
+            json!({
+                "id": m.id,
+                "code": m.code,
+                "label_key": m.label_key(),
+                "enabled": m.enabled,
+            })
+        })
+        .collect();
+    let bank_account_name = shop_settings::Entity::get(&ctx.db, "bank_account_name")
+        .await?
+        .unwrap_or_default();
+    let bank_iban = shop_settings::Entity::get(&ctx.db, "bank_iban")
+        .await?
+        .unwrap_or_default();
+
+    format::view(
+        &v,
+        "admin/payments/index.html",
+        json!({
+            "methods": rows,
+            "bank_account_name": bank_account_name,
+            "bank_iban": bank_iban,
+            "lang": current_lang(&jar),
+        }),
+    )
+}
+
+#[debug_handler]
+async fn update_method(
+    auth: auth::JWT,
+    Path(id): Path<i32>,
+    State(ctx): State<AppContext>,
+    Form(form): Form<PaymentMethodForm>,
+) -> Result<Response> {
+    guard::current_admin(auth, &ctx).await?;
+    let method = payment_methods::Entity::find_by_id(id)
+        .one(&ctx.db)
+        .await?
+        .ok_or_else(|| Error::NotFound)?;
+    let mut active = method.into_active_model();
+    active.enabled = Set(is_checked(&form.enabled));
+    active.update(&ctx.db).await?;
+    format::redirect("/admin/payments")
+}
+
+#[debug_handler]
+async fn update_bank(
+    auth: auth::JWT,
+    State(ctx): State<AppContext>,
+    Form(form): Form<BankSettingsForm>,
+) -> Result<Response> {
+    guard::current_admin(auth, &ctx).await?;
+    shop_settings::Entity::set(&ctx.db, "bank_account_name", trimmed(&form.bank_account_name)).await?;
+    shop_settings::Entity::set(&ctx.db, "bank_iban", trimmed(&form.bank_iban)).await?;
+    format::redirect("/admin/payments")
+}
+
+pub fn routes() -> Routes {
+    Routes::new()
+        .add("/admin/payments", get(index))
+        .add("/admin/payments/methods/{id}", post(update_method))
+        .add("/admin/payments/bank", post(update_bank))
+}

src/controllers/admin_shipping.rs

@@ -16,6 +16,7 @@ use crate::{
     shared::{
         guard,
         money::{format_price, parse_price_to_cents},
+        shipping as shipping_rules,
     },
 };
 
@@ -37,13 +38,17 @@ async fn index(
     State(ctx): State<AppContext>,
 ) -> Result<Response> {
     guard::current_admin(auth, &ctx).await?;
+    shipping_rules::disable_packeta_if_unconfigured(&ctx).await?;
     let methods = shipping_methods::Entity::find()
         .order_by_asc(shipping_methods::Column::Position)
         .all(&ctx.db)
         .await?;
+    let packeta_ready = shipping_rules::packeta_ready(&ctx);
     let rows: Vec<serde_json::Value> = methods
         .iter()
         .map(|m| {
+            let packeta_not_ready = m.carrier == "packeta" && !packeta_ready;
+            let locked = packeta_not_ready && !m.enabled;
             json!({
                 "id": m.id,
                 "code": m.code,
@@ -52,6 +57,9 @@ async fn index(
                 "carrier": m.carrier,
                 "requires_pickup_point": m.requires_pickup_point,
                 "enabled": m.enabled,
+                "packeta_not_ready": packeta_not_ready,
+                "locked": locked,
+                "lock_reason": if packeta_not_ready { Some("shipping-packeta-missing-settings") } else { None::<&str> },
             })
         })
         .collect();
@@ -74,9 +82,15 @@ async fn update(
         .one(&ctx.db)
         .await?
         .ok_or_else(|| Error::NotFound)?;
+    let requested_enabled = is_checked(&form.enabled);
+    if requested_enabled && method.carrier == "packeta" && !shipping_rules::packeta_ready(&ctx) {
+        return Err(Error::BadRequest(
+            "Packeta cannot be enabled until PACKETA_API_KEY, PACKETA_API_PASSWORD and PACKETA_SENDER_LABEL are configured.".to_string(),
+        ));
+    }
     let mut active = method.into_active_model();
     active.price_cents = Set(parse_price_to_cents(&form.price)?);
-    active.enabled = Set(is_checked(&form.enabled));
+    active.enabled = Set(requested_enabled);
     active.update(&ctx.db).await?;
     format::redirect("/admin/shipping")
 }

src/controllers/auth.rs

@@ -1,10 +1,11 @@
 use crate::{
+    controllers::cart,
     models::users::{self, LoginParams, RegisterParams},
     views::auth::{CurrentResponse, LoginResponse},
     mailers::auth::AuthMailer,
     shared::guard::is_admin,
 };
-use axum_extra::extract::cookie::{Cookie, SameSite};
+use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
 use loco_rs::prelude::*;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -88,6 +89,7 @@ pub struct ResendVerificationParams {
 /// welcome email to the user
 #[debug_handler]
 async fn register(
+    jar: CookieJar,
     State(ctx): State<AppContext>,
     Json(params): Json<RegisterParams>,
 ) -> Result<Response> {
@@ -109,6 +111,7 @@ async fn register(
         .into_active_model()
         .set_email_verification_sent(&ctx.db)
         .await?;
+    cart::claim_guest_cart(&ctx, &jar, user.id).await?;
 
     AuthMailer::send_welcome(&ctx, &user).await?;
 
@@ -199,8 +202,9 @@ async fn login(State(ctx): State<AppContext>, Json(params): Json<LoginParams>) -
         .generate_jwt(&jwt_secret.secret, jwt_secret.expiration)
         .or_else(|_| unauthorized("unauthorized!"))?;
 
+    let cart_cookie = cart::cart_cookie_for_user(&ctx, user.id).await?;
     format::render()
-        .cookies(&[auth_cookie(&token, jwt_secret.expiration)])?
+        .cookies(&[auth_cookie(&token, jwt_secret.expiration), cart_cookie])?
         .json(LoginResponse::new(&user, &token, is_admin(&ctx, &user)))
 }
 
@@ -212,7 +216,9 @@ async fn current(auth: auth::JWT, State(ctx): State<AppContext>) -> Result<Respo
 
 #[debug_handler]
 async fn logout() -> Result<Response> {
-    format::render().cookies(&[clear_auth_cookie()])?.json(())
+    format::render()
+        .cookies(&[clear_auth_cookie(), cart::cleared_cart_cookie()])?
+        .json(())
 }
 
 /// Magic link authentication provides a secure and passwordless way to log in to the application.
@@ -274,8 +280,9 @@ async fn magic_link_verify(
         .generate_jwt(&jwt_secret.secret, jwt_secret.expiration)
         .or_else(|_| unauthorized("unauthorized!"))?;
 
+    let cart_cookie = cart::cart_cookie_for_user(&ctx, user.id).await?;
     format::render()
-        .cookies(&[auth_cookie(&token, jwt_secret.expiration)])?
+        .cookies(&[auth_cookie(&token, jwt_secret.expiration), cart_cookie])?
         .json(LoginResponse::new(&user, &token, is_admin(&ctx, &user)))
 }
 

src/controllers/auth_pages.rs

@@ -13,6 +13,7 @@ use serde_json::json;
 
 use crate::{
     controllers::auth as auth_controller,
+    controllers::cart,
     controllers::i18n::current_lang,
     mailers::auth::AuthMailer,
     models::users::{self, LoginParams, RegisterParams},
@@ -105,9 +106,13 @@ async fn login(
     let token = user
         .generate_jwt(&jwt_secret.secret, jwt_secret.expiration)
         .or_else(|_| unauthorized("unauthorized!"))?;
+    let cart_cookie = cart::cart_cookie_for_user(&ctx, user.id).await?;
 
     format::render()
-        .cookies(&[auth_controller::auth_cookie(&token, jwt_secret.expiration)])?
+        .cookies(&[
+            auth_controller::auth_cookie(&token, jwt_secret.expiration),
+            cart_cookie,
+        ])?
         .redirect(home_for(&ctx, &user))
 }
 
@@ -185,11 +190,13 @@ async fn login_totp(
     let token = user
         .generate_jwt(&jwt_secret.secret, jwt_secret.expiration)
         .or_else(|_| unauthorized("unauthorized!"))?;
+    let cart_cookie = cart::cart_cookie_for_user(&ctx, user.id).await?;
 
     format::render()
         .cookies(&[
             auth_controller::auth_cookie(&token, jwt_secret.expiration),
             auth_controller::clear_totp_pending_cookie(),
+            cart_cookie,
         ])?
         .redirect(home_for(&ctx, &user))
 }
@@ -270,6 +277,7 @@ async fn register(
         .into_active_model()
         .set_email_verification_sent(&ctx.db)
         .await?;
+    cart::claim_guest_cart(&ctx, &jar, user.id).await?;
 
     // The account already exists; a failed email send shouldn't 500 the page —
     // log it and let the user fall back to resend-verification.
@@ -304,7 +312,9 @@ async fn verify(
     };
 
     if user.email_verified_at.is_none() {
+        let user_id = user.id;
         user.into_active_model().verified(&ctx.db).await?;
+        cart::claim_guest_cart(&ctx, &jar, user_id).await?;
     }
 
     verified_view(&v, &jar, true)
@@ -446,7 +456,10 @@ async fn set_password(
 #[debug_handler]
 async fn logout() -> Result<Response> {
     format::render()
-        .cookies(&[auth_controller::clear_auth_cookie()])?
+        .cookies(&[
+            auth_controller::clear_auth_cookie(),
+            cart::cleared_cart_cookie(),
+        ])?
         .redirect("/login")
 }
 

src/controllers/cart.rs

@@ -1,4 +1,11 @@
-use crate::{controllers::i18n::current_lang, shared::{currency::{self, Currency}, guard, pricing}, models::{product_variants, products}};
+use crate::{
+    controllers::i18n::current_lang,
+    models::{account_cart_items, product_variants, products, users},
+    shared::{
+        currency::{self, Currency},
+        guard, pricing,
+    },
+};
 use axum::{
     http::{HeaderMap, StatusCode},
     response::Redirect,
@@ -64,6 +71,75 @@ fn cart_cookie(value: String) -> Cookie<'static> {
         .build()
 }
 
+pub(crate) fn cleared_cart_cookie() -> Cookie<'static> {
+    Cookie::build((CART_COOKIE, ""))
+        .path("/")
+        .same_site(SameSite::Lax)
+        .max_age(TimeDuration::seconds(0))
+        .build()
+}
+
+fn normalize_items(items: Vec<(i32, i32)>) -> Vec<(i32, i32)> {
+    let mut normalized: Vec<(i32, i32)> = Vec::new();
+    for (id, qty) in items.into_iter().filter(|(_, qty)| *qty > 0) {
+        if let Some(existing) = normalized.iter_mut().find(|(existing_id, _)| *existing_id == id) {
+            existing.1 += qty;
+        } else {
+            normalized.push((id, qty));
+        }
+    }
+    normalized
+}
+
+async fn stored_cart(
+    ctx: &AppContext,
+    user: Option<&users::Model>,
+    jar: &CookieJar,
+) -> Result<Vec<(i32, i32)>> {
+    match user {
+        Some(user) => Ok(account_cart_items::Model::find_for_user(&ctx.db, user.id).await?),
+        None => Ok(normalize_items(parse_cart(jar))),
+    }
+}
+
+async fn persist_cart(
+    ctx: &AppContext,
+    jar: CookieJar,
+    user: Option<&users::Model>,
+    items: &[(i32, i32)],
+) -> Result<CookieJar> {
+    let items = normalize_items(items.to_vec());
+    if let Some(user) = user {
+        account_cart_items::Model::replace_for_user(&ctx.db, user.id, &items).await?;
+    }
+    Ok(jar.add(cart_cookie(serialize_cart(&items))))
+}
+
+pub(crate) async fn claim_guest_cart(
+    ctx: &AppContext,
+    jar: &CookieJar,
+    user_id: i32,
+) -> Result<()> {
+    let items = normalize_items(parse_cart(jar));
+    if !items.is_empty() {
+        account_cart_items::Model::replace_for_user(&ctx.db, user_id, &items).await?;
+    }
+    Ok(())
+}
+
+pub(crate) async fn cart_cookie_for_user(
+    ctx: &AppContext,
+    user_id: i32,
+) -> Result<Cookie<'static>> {
+    let items = account_cart_items::Model::find_for_user(&ctx.db, user_id).await?;
+    Ok(cart_cookie(serialize_cart(&items)))
+}
+
+pub(crate) async fn clear_account_cart(ctx: &AppContext, user_id: i32) -> Result<()> {
+    account_cart_items::Model::replace_for_user(&ctx.db, user_id, &[]).await?;
+    Ok(())
+}
+
 /// Look up a variant whose product is published, returning the variant together
 /// with its parent product (for name/slug).
 async fn published_variant(
@@ -94,7 +170,8 @@ async fn add(
         return Err(Error::NotFound);
     };
 
-    let mut items = parse_cart(&jar);
+    let user = guard::current_user(&ctx, &jar).await;
+    let mut items = stored_cart(&ctx, user.as_ref(), &jar).await?;
     let add_qty = form.quantity.unwrap_or(1).max(1);
     if let Some(entry) = items.iter_mut().find(|(id, _)| *id == variant.id) {
         entry.1 = variant.cap(entry.1 + add_qty);
@@ -103,7 +180,7 @@ async fn add(
     }
     items.retain(|(_, qty)| *qty > 0);
 
-    let jar = jar.add(cart_cookie(serialize_cart(&items)));
+    let jar = persist_cart(&ctx, jar, user.as_ref(), &items).await?;
 
     // Adding to the cart should never navigate away: htmx requests get an empty
     // 204 (the header cart badge updates client-side), and a no-JS submit goes
@@ -135,13 +212,14 @@ async fn update(
         None => 0,
     };
 
-    let mut items = parse_cart(&jar);
+    let user = guard::current_user(&ctx, &jar).await;
+    let mut items = stored_cart(&ctx, user.as_ref(), &jar).await?;
     if let Some(entry) = items.iter_mut().find(|(id, _)| *id == form.variant_id) {
         entry.1 = clamped;
     }
     items.retain(|(_, qty)| *qty > 0);
 
-    let jar = jar.add(cart_cookie(serialize_cart(&items)));
+    let jar = persist_cart(&ctx, jar, user.as_ref(), &items).await?;
     cart_response(&ctx, &v, jar, &headers).await
 }
 
@@ -153,10 +231,11 @@ async fn remove(
     headers: HeaderMap,
     Form(form): Form<RemoveForm>,
 ) -> Result<Response> {
-    let mut items = parse_cart(&jar);
+    let user = guard::current_user(&ctx, &jar).await;
+    let mut items = stored_cart(&ctx, user.as_ref(), &jar).await?;
     items.retain(|(id, _)| *id != form.variant_id);
 
-    let jar = jar.add(cart_cookie(serialize_cart(&items)));
+    let jar = persist_cart(&ctx, jar, user.as_ref(), &items).await?;
     cart_response(&ctx, &v, jar, &headers).await
 }
 
@@ -176,7 +255,8 @@ async fn cart_response(
     let cur = currency::resolve(ctx, &jar).await;
     let (lines, valid, total) = resolve_cart(ctx, &jar, &cur).await?;
     // Persist the re-validated cookie (drops now-invalid lines).
-    let jar = jar.add(cart_cookie(serialize_cart(&valid)));
+    let user = guard::current_user(ctx, &jar).await;
+    let jar = persist_cart(ctx, jar, user.as_ref(), &valid).await?;
     let response = format::view(
         v,
         "shop/_cart_body.html",
@@ -190,9 +270,9 @@ async fn cart_response(
     Ok((jar, response).into_response())
 }
 
-/// Resolve the cart cookie into priced line items, dropping anything that is no
+/// Resolve the active cart into priced line items, dropping anything that is no
-/// longer purchasable and clamping quantities to current stock. Returns the
+/// longer purchasable and clamping quantities to current stock. Guests resolve
-/// (re-validated) lines, the rebuilt cookie value, and the total in cents.
+/// from the cookie; authenticated users resolve from their account cart.
 pub(crate) async fn resolve_cart(
     ctx: &AppContext,
     jar: &CookieJar,
@@ -202,7 +282,7 @@ pub(crate) async fn resolve_cart(
     // 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<(product_variants::Model, products::Model, i32)> = Vec::new();
-    for (id, qty) in parse_cart(jar) {
+    for (id, qty) in stored_cart(ctx, user.as_ref(), jar).await? {
         let Some((variant, product)) = published_variant(ctx, id).await? else {
             continue;
         };
@@ -238,6 +318,10 @@ pub(crate) async fn resolve_cart(
         }));
     }
 
+    if let Some(user) = user.as_ref() {
+        account_cart_items::Model::replace_for_user(&ctx.db, user.id, &valid).await?;
+    }
+
     Ok((lines, valid, total))
 }
 
@@ -250,8 +334,6 @@ async fn show(
     let cur = currency::resolve(&ctx, &jar).await;
     let (lines, valid, total) = resolve_cart(&ctx, &jar, &cur).await?;
 
-    // Drop any now-invalid lines from the cookie so the badge stays accurate.
-    let rebuilt = serialize_cart(&valid);
     let c = guard::chrome(&ctx, &jar).await;
     let response = format::view(
         &v,
@@ -269,7 +351,9 @@ async fn show(
         }),
     )?;
 
-    Ok((jar.add(cart_cookie(rebuilt)), response).into_response())
+    let user = guard::current_user(&ctx, &jar).await;
+    let jar = persist_cart(&ctx, jar, user.as_ref(), &valid).await?;
+    Ok((jar, response).into_response())
 }
 
 /// Mini-cart preview for the navbar hover dropdown. Lazy-loaded via htmx from
@@ -282,7 +366,6 @@ async fn preview(
 ) -> Result<Response> {
     let cur = currency::resolve(&ctx, &jar).await;
     let (lines, valid, total) = resolve_cart(&ctx, &jar, &cur).await?;
-    let rebuilt = serialize_cart(&valid);
     let response = format::view(
         &v,
         "shop/_cart_preview.html",
@@ -293,7 +376,9 @@ async fn preview(
             "lang": current_lang(&jar),
         }),
     )?;
-    Ok((jar.add(cart_cookie(rebuilt)), response).into_response())
+    let user = guard::current_user(&ctx, &jar).await;
+    let jar = persist_cart(&ctx, jar, user.as_ref(), &valid).await?;
+    Ok((jar, response).into_response())
 }
 
 pub fn routes() -> Routes {

src/controllers/checkout.rs

@@ -2,28 +2,24 @@
 //! confirmation page.
 
 use axum::extract::Query;
-use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
+use axum_extra::extract::cookie::CookieJar;
 use loco_rs::prelude::*;
 use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, QueryOrder};
 use serde::Deserialize;
 use serde_json::json;
-use time::Duration as TimeDuration;
-
 use crate::{
-    controllers::cart::{resolve_cart, CART_COOKIE},
+    controllers::cart::{self, resolve_cart},
     mailers::auth::AuthMailer,
     models::{
         customer_profiles::{self, ProfileFields},
-        order_items, orders, shipping_methods,
+        order_items, orders, payment_methods, shipping_methods,
         users::{self, normalize_account_type},
     },
     controllers::i18n::current_lang,
-    shared::{currency::Currency, guard, money::format_price, settings},
+    shared::{currency::Currency, guard, money::format_price, settings, shipping as shipping_rules},
     views::checkout as view,
 };
 
-const PAYMENT_METHODS: [&str; 2] = ["cod", "bank_transfer"];
-
 #[derive(Debug, Deserialize)]
 struct CheckoutForm {
     email: String,
@@ -35,10 +31,15 @@ struct CheckoutForm {
     company_id: Option<String>,
     tax_id: Option<String>,
     vat_id: Option<String>,
-    address: String,
+    residence_address: String,
-    city: String,
+    residence_city: String,
-    zip: String,
+    residence_zip: String,
-    country: String,
+    residence_country: String,
+    delivery_same_as_residence: Option<String>,
+    address: Option<String>,
+    city: Option<String>,
+    zip: Option<String>,
+    country: Option<String>,
     note: Option<String>,
     payment_method: String,
     carrier_code: String,
@@ -55,20 +56,21 @@ fn trimmed(value: &str) -> Option<String> {
     (!value.is_empty()).then(|| value.to_string())
 }
 
-fn cleared_cart_cookie() -> Cookie<'static> {
-    Cookie::build((CART_COOKIE, ""))
-        .path("/")
-        .same_site(SameSite::Lax)
-        .max_age(TimeDuration::seconds(0))
-        .build()
-}
-
 async fn enabled_shipping_methods(ctx: &AppContext) -> Result<Vec<shipping_methods::Model>> {
+    shipping_rules::disable_packeta_if_unconfigured(ctx).await?;
+    let packeta_ready = shipping_rules::packeta_ready(ctx);
     Ok(shipping_methods::Entity::find()
         .filter(shipping_methods::Column::Enabled.eq(true))
         .order_by_asc(shipping_methods::Column::Position)
         .all(&ctx.db)
-        .await?)
+        .await?
+        .into_iter()
+        .filter(|method| method.carrier != "packeta" || packeta_ready)
+        .collect())
+}
+
+async fn enabled_payment_methods(ctx: &AppContext) -> Result<Vec<payment_methods::Model>> {
+    Ok(payment_methods::Entity::enabled(&ctx.db).await?)
 }
 
 #[debug_handler]
@@ -97,6 +99,16 @@ async fn checkout_page(
             })
         })
         .collect();
+    let payments: Vec<serde_json::Value> = enabled_payment_methods(&ctx)
+        .await?
+        .iter()
+        .map(|m| {
+            json!({
+                "code": m.code,
+                "label_key": m.label_key(),
+            })
+        })
+        .collect();
 
     // Prefill the form for a logged-in customer: contact name/email come from
     // the user account, the address/phone from their saved profile (if any).
@@ -110,7 +122,7 @@ async fn checkout_page(
     let p = |get: fn(&customer_profiles::Model) -> Option<String>| {
         profile.as_ref().and_then(get)
     };
-    // Whether the customer already has a shipping address on file. When they do,
+    // Whether the customer already has a residence address on file. When they do,
     // the "save this address to my profile" opt-in is pointless (the profile was
     // filled in advance), so it's hidden and the existing profile is left alone.
     let profile_filled = profile
@@ -125,6 +137,7 @@ async fn checkout_page(
             "subtotal": format_price(subtotal),
             "subtotal_cents": subtotal,
             "shipping_methods": methods,
+            "payment_methods": payments,
             "packeta_api_key": settings::get(&ctx, "packeta_api_key").unwrap_or(""),
             "logged_in_admin": is_admin,
             "logged_in_customer": is_customer,
@@ -147,10 +160,10 @@ async fn checkout_page(
             "prefill_vat_id": p(|x| x.vat_id.clone()),
             "prefill_phone_prefix": p(|x| x.phone_prefix.clone()),
             "prefill_phone": p(|x| x.phone.clone()),
-            "prefill_address": p(|x| x.address.clone()),
+            "prefill_residence_address": p(|x| x.address.clone()),
-            "prefill_city": p(|x| x.city.clone()),
+            "prefill_residence_city": p(|x| x.city.clone()),
-            "prefill_zip": p(|x| x.zip.clone()),
+            "prefill_residence_zip": p(|x| x.zip.clone()),
-            "prefill_country": p(|x| x.country.clone()),
+            "prefill_residence_country": p(|x| x.country.clone()),
             "lang": current_lang(&jar),
         }),
     )
@@ -177,16 +190,37 @@ async fn place_order(
         None => number.clone(),
     };
 
-    // Contact and shipping-address fields are mandatory (also enforced in the
+    // Contact and residence-address fields are mandatory (also enforced in the
     // browser via `required`).
     let require = |value: &str, field: &str| -> Result<String> {
         trimmed(value).ok_or_else(|| Error::BadRequest(format!("{field} is required")))
     };
+    let require_opt = |value: Option<&str>, field: &str| -> Result<String> {
+        value
+            .and_then(trimmed)
+            .ok_or_else(|| Error::BadRequest(format!("{field} is required")))
+    };
     let customer_name = require(&form.customer_name, "name")?;
-    let address = require(&form.address, "address")?;
+    let residence_address = require(&form.residence_address, "residence address")?;
-    let city = require(&form.city, "city")?;
+    let residence_city = require(&form.residence_city, "residence city")?;
-    let zip = require(&form.zip, "zip")?;
+    let residence_zip = require(&form.residence_zip, "residence zip")?;
-    let country = require(&form.country, "country")?;
+    let residence_country = require(&form.residence_country, "residence country")?;
+    let same_address = form.delivery_same_as_residence.is_some();
+    let (address, city, zip, country) = if same_address {
+        (
+            residence_address.clone(),
+            residence_city.clone(),
+            residence_zip.clone(),
+            residence_country.clone(),
+        )
+    } else {
+        (
+            require_opt(form.address.as_deref(), "delivery address")?,
+            require_opt(form.city.as_deref(), "delivery city")?,
+            require_opt(form.zip.as_deref(), "delivery zip")?,
+            require_opt(form.country.as_deref(), "delivery country")?,
+        )
+    };
 
     // The account type is fixed for a logged-in customer (taken from their
     // account, never the form); a guest picks it on the form. Admins are treated
@@ -213,7 +247,7 @@ async fn place_order(
         (None, None, None, None)
     };
 
-    if !PAYMENT_METHODS.contains(&form.payment_method.as_str()) {
+    if payment_methods::Entity::find_enabled(&ctx.db, &form.payment_method).await?.is_none() {
         return Err(Error::BadRequest("invalid payment method".to_string()));
     }
 
@@ -225,6 +259,9 @@ async fn place_order(
         .one(&ctx.db)
         .await?
         .ok_or_else(|| Error::BadRequest("invalid shipping method".to_string()))?;
+    if method.carrier == "packeta" && !shipping_rules::packeta_ready(&ctx) {
+        return Err(Error::BadRequest("invalid shipping method".to_string()));
+    }
 
     let (pickup_point_id, pickup_point_name) = if method.requires_pickup_point {
         let id = form
@@ -246,10 +283,10 @@ async fn place_order(
         vat_id: vat_id.clone(),
         phone_prefix: trimmed(&form.phone_prefix),
         phone: Some(number.clone()),
-        address: Some(address.clone()),
+        address: Some(residence_address.clone()),
-        city: Some(city.clone()),
+        city: Some(residence_city.clone()),
-        zip: Some(zip.clone()),
+        zip: Some(residence_zip.clone()),
-        country: Some(country.clone()),
+        country: Some(residence_country.clone()),
     };
 
     // Resolve the account that will own this order. A logged-in customer always
@@ -318,6 +355,10 @@ async fn place_order(
             company_id,
             tax_id,
             vat_id,
+            residence_address: Some(residence_address),
+            residence_city: Some(residence_city),
+            residence_zip: Some(residence_zip),
+            residence_country: Some(residence_country),
             address: Some(address),
             city: Some(city),
             zip: Some(zip),
@@ -337,8 +378,11 @@ async fn place_order(
     } else {
         format!("/orders/{}", order.order_number)
     };
+    if let Some(user) = logged_in_customer {
+        cart::clear_account_cart(&ctx, user.id).await?;
+    }
     format::render()
-        .cookies(&[cleared_cart_cookie()])?
+        .cookies(&[cart::cleared_cart_cookie()])?
         .redirect(&target)
 }
 
@@ -362,14 +406,15 @@ async fn order_confirmation(
     let c = guard::chrome(&ctx, &jar).await;
     let account_created = params.contains_key("account_created");
 
+    let (bank_iban, bank_account_name) = settings::bank_details(&ctx).await?;
     format::view(
         &v,
         "shop/order_confirmed.html",
         json!({
             "order": view::detail(
                 &order,
-                settings::get(&ctx, "bank_iban").unwrap_or(""),
+                &bank_iban,
-                settings::get(&ctx, "bank_account_name").unwrap_or(""),
+                &bank_account_name,
             ),
             "items": view::items(&items),
             "logged_in_admin": c.logged_in_admin,

src/controllers/mod.rs

@@ -9,6 +9,7 @@ pub mod admin_dashboard;
 pub mod admin_discount_profiles;
 pub mod admin_form;
 pub mod admin_orders;
+pub mod admin_payments;
 pub mod admin_products;
 pub mod admin_shipping;
 pub mod cart;

src/controllers/oauth2.rs

@@ -17,6 +17,7 @@ use loco_rs::prelude::*;
 
 use crate::{
     controllers::auth as auth_controller,
+    controllers::cart,
     models::{o_auth2_sessions, users, users::OAuth2UserProfile},
     shared::guard,
 };
@@ -36,8 +37,9 @@ async fn complete(State(ctx): State<AppContext>, user: GoogleCookieUser) -> Resu
     } else {
         "/"
     };
+    let cart_cookie = cart::cart_cookie_for_user(&ctx, user.id).await?;
     format::render()
-        .cookies(&[auth_controller::auth_cookie(&token, jwt_secret.expiration)])?
+        .cookies(&[auth_controller::auth_cookie(&token, jwt_secret.expiration), cart_cookie])?
         .redirect(dest)
 }
 

src/controllers/shop.rs

@@ -473,6 +473,7 @@ async fn show(
             "name": product.name,
             "slug": product.slug,
             "description": product.description,
+            "short_description": product.short_description,
             "variant_count": 0,
             "has_options": false,
         }),

src/initializers/mod.rs

@@ -2,5 +2,6 @@ pub mod admin_seeder;
 pub mod currency_seeder;
 pub mod oauth2;
 pub mod oauth2_session;
+pub mod payment_seeder;
 pub mod shipping_seeder;
 pub mod view_engine;

src/initializers/payment_seeder.rs

@@ -0,0 +1,73 @@
+//! Ensures built-in payment methods and editable bank-transfer settings exist.
+//!
+//! Payment method enabled flags and bank account details are admin-managed in the
+//! database. We seed missing rows only, so admin changes persist across restarts.
+
+use async_trait::async_trait;
+use loco_rs::prelude::*;
+use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, Set};
+
+use crate::{
+    models::{payment_methods, shop_settings},
+    shared::settings,
+};
+
+/// `(code, name, enabled, position)`
+const METHODS: [(&str, &str, bool, i32); 2] = [
+    (payment_methods::COD, "Cash on delivery", true, 0),
+    (payment_methods::BANK_TRANSFER, "Bank transfer", true, 1),
+];
+
+pub struct PaymentSeeder;
+
+#[async_trait]
+impl Initializer for PaymentSeeder {
+    fn name(&self) -> String {
+        "payment-seeder".to_string()
+    }
+
+    async fn before_run(&self, ctx: &AppContext) -> Result<()> {
+        for (code, name, enabled, position) in METHODS {
+            let exists = payment_methods::Entity::find()
+                .filter(payment_methods::Column::Code.eq(code))
+                .count(&ctx.db)
+                .await?
+                > 0;
+            if exists {
+                continue;
+            }
+            payment_methods::ActiveModel {
+                code: Set(code.to_string()),
+                name: Set(name.to_string()),
+                enabled: Set(enabled),
+                position: Set(position),
+                ..Default::default()
+            }
+            .insert(&ctx.db)
+            .await?;
+            tracing::info!(payment = code, "seeded built-in payment method");
+        }
+
+        seed_setting(ctx, "bank_iban").await?;
+        seed_setting(ctx, "bank_account_name").await
+    }
+}
+
+async fn seed_setting(ctx: &AppContext, key: &str) -> Result<()> {
+    let exists = shop_settings::Entity::find()
+        .filter(shop_settings::Column::Key.eq(key))
+        .count(&ctx.db)
+        .await?
+        > 0;
+    if exists {
+        return Ok(());
+    }
+    shop_settings::ActiveModel {
+        key: Set(key.to_string()),
+        value: Set(settings::get(ctx, key).map(str::to_string)),
+        ..Default::default()
+    }
+    .insert(&ctx.db)
+    .await?;
+    Ok(())
+}

src/initializers/shipping_seeder.rs

@@ -9,7 +9,7 @@ use async_trait::async_trait;
 use loco_rs::prelude::*;
 use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, Set};
 
-use crate::models::shipping_methods;
+use crate::{models::shipping_methods, shared::shipping as shipping_rules};
 
 /// `(code, name, carrier, requires_pickup_point, default_price_cents, position)`
 const BUILTINS: [(&str, &str, &str, bool, i64, i32); 2] = [
@@ -49,6 +49,6 @@ impl Initializer for ShippingSeeder {
             .await?;
             tracing::info!(carrier = code, "seeded built-in delivery option");
         }
-        Ok(())
+        shipping_rules::disable_packeta_if_unconfigured(ctx).await
     }
 }

src/models/_entities/account_cart_items.rs

@@ -0,0 +1,48 @@
+//! `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 = "account_cart_items")]
+pub struct Model {
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub variant_id: i32,
+    pub quantity: i32,
+    pub user_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",
+        to = "super::users::Column::Id",
+        on_update = "Cascade",
+        on_delete = "Cascade"
+    )]
+    Users,
+}
+
+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/mod.rs

@@ -2,6 +2,7 @@
 
 pub mod prelude;
 
+pub mod account_cart_items;
 pub mod account_discount_profiles;
 pub mod account_product_prices;
 pub mod account_product_resolutions;
@@ -15,10 +16,12 @@ pub mod discount_profiles;
 pub mod o_auth2_sessions;
 pub mod order_items;
 pub mod orders;
+pub mod payment_methods;
 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 shop_settings;
 pub mod users;

src/models/_entities/orders.rs

@@ -38,6 +38,10 @@ pub struct Model {
     pub tax_id: Option<String>,
     pub vat_id: Option<String>,
     pub user_id: Option<i32>,
+    pub residence_address: Option<String>,
+    pub residence_city: Option<String>,
+    pub residence_zip: Option<String>,
+    pub residence_country: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/models/_entities/payment_methods.rs

@@ -0,0 +1,21 @@
+//! `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 = "payment_methods")]
+pub struct Model {
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    #[sea_orm(unique)]
+    pub code: String,
+    pub name: String,
+    pub enabled: bool,
+    pub position: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}

src/models/_entities/prelude.rs

@@ -1,5 +1,6 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
+pub use super::account_cart_items::Entity as AccountCartItems;
 pub use super::account_discount_profiles::Entity as AccountDiscountProfiles;
 pub use super::account_product_prices::Entity as AccountProductPrices;
 pub use super::account_product_resolutions::Entity as AccountProductResolutions;
@@ -13,10 +14,12 @@ pub use super::discount_profiles::Entity as DiscountProfiles;
 pub use super::o_auth2_sessions::Entity as OAuth2Sessions;
 pub use super::order_items::Entity as OrderItems;
 pub use super::orders::Entity as Orders;
+pub use super::payment_methods::Entity as PaymentMethods;
 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::shop_settings::Entity as ShopSettings;
 pub use super::users::Entity as Users;

src/models/_entities/product_variants.rs

@@ -22,6 +22,8 @@ pub struct Model {
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
+    #[sea_orm(has_many = "super::account_cart_items::Entity")]
+    AccountCartItems,
     #[sea_orm(has_many = "super::account_product_prices::Entity")]
     AccountProductPrices,
     #[sea_orm(has_many = "super::account_product_resolutions::Entity")]
@@ -38,6 +40,12 @@ pub enum Relation {
     Products,
 }
 
+impl Related<super::account_cart_items::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccountCartItems.def()
+    }
+}
+
 impl Related<super::account_product_prices::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::AccountProductPrices.def()

src/models/_entities/shop_settings.rs

@@ -0,0 +1,20 @@
+//! `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 = "shop_settings")]
+pub struct Model {
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    #[sea_orm(unique)]
+    pub key: String,
+    #[sea_orm(column_type = "Text", nullable)]
+    pub value: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}

src/models/account_cart_items.rs

@@ -0,0 +1,55 @@
+pub use crate::models::_entities::account_cart_items::{ActiveModel, Column, Entity, Model};
+use sea_orm::entity::prelude::*;
+use sea_orm::{ActiveValue, QueryFilter, QueryOrder};
+
+pub type AccountCartItems = 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,
+    {
+        Ok(self)
+    }
+}
+
+impl Model {
+    pub async fn find_for_user(
+        db: &DatabaseConnection,
+        user_id: i32,
+    ) -> Result<Vec<(i32, i32)>, DbErr> {
+        Ok(Entity::find()
+            .filter(Column::UserId.eq(user_id))
+            .order_by_asc(Column::Id)
+            .all(db)
+            .await?
+            .into_iter()
+            .filter_map(|item| (item.quantity > 0).then_some((item.variant_id, item.quantity)))
+            .collect())
+    }
+
+    pub async fn replace_for_user(
+        db: &DatabaseConnection,
+        user_id: i32,
+        items: &[(i32, i32)],
+    ) -> Result<(), DbErr> {
+        Entity::delete_many()
+            .filter(Column::UserId.eq(user_id))
+            .exec(db)
+            .await?;
+
+        for (variant_id, quantity) in items.iter().copied().filter(|(_, qty)| *qty > 0) {
+            ActiveModel {
+                user_id: ActiveValue::set(user_id),
+                variant_id: ActiveValue::set(variant_id),
+                quantity: ActiveValue::set(quantity),
+                ..Default::default()
+            }
+            .insert(db)
+            .await?;
+        }
+
+        Ok(())
+    }
+}

src/models/mod.rs

@@ -6,6 +6,7 @@
 
 pub mod _entities;
 
+pub mod account_cart_items;
 pub mod account_discount_profiles;
 pub mod account_product_prices;
 pub mod account_product_resolutions;
@@ -19,10 +20,12 @@ pub mod customer_profiles;
 pub mod o_auth2_sessions;
 pub mod order_items;
 pub mod orders;
+pub mod payment_methods;
 pub mod product_images;
 pub mod product_product_tags;
 pub mod product_tags;
 pub mod products;
 pub mod shipping_methods;
+pub mod shop_settings;
 pub mod users;
 pub mod product_variants;

src/models/orders.rs

@@ -24,6 +24,10 @@ pub struct Checkout {
     pub company_id: Option<String>,
     pub tax_id: Option<String>,
     pub vat_id: Option<String>,
+    pub residence_address: Option<String>,
+    pub residence_city: Option<String>,
+    pub residence_zip: Option<String>,
+    pub residence_country: Option<String>,
     pub address: Option<String>,
     pub city: Option<String>,
     pub zip: Option<String>,
@@ -102,6 +106,10 @@ pub async fn place(
         company_id: Set(details.company_id),
         tax_id: Set(details.tax_id),
         vat_id: Set(details.vat_id),
+        residence_address: Set(details.residence_address),
+        residence_city: Set(details.residence_city),
+        residence_zip: Set(details.residence_zip),
+        residence_country: Set(details.residence_country),
         address: Set(details.address),
         city: Set(details.city),
         zip: Set(details.zip),

src/models/payment_methods.rs

@@ -0,0 +1,54 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{ActiveValue, ColumnTrait, EntityTrait, QueryFilter, QueryOrder};
+
+pub use crate::models::_entities::payment_methods::{ActiveModel, Column, Entity, Model};
+pub type PaymentMethods = Entity;
+
+pub const COD: &str = "cod";
+pub const BANK_TRANSFER: &str = "bank_transfer";
+
+#[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 = ActiveValue::set(chrono::Utc::now().into());
+            Ok(this)
+        } else {
+            Ok(self)
+        }
+    }
+}
+
+impl Entity {
+    pub async fn enabled<C: ConnectionTrait>(db: &C) -> Result<Vec<Model>, DbErr> {
+        Entity::find()
+            .filter(Column::Enabled.eq(true))
+            .order_by_asc(Column::Position)
+            .all(db)
+            .await
+    }
+
+    pub async fn find_enabled<C: ConnectionTrait>(db: &C, code: &str) -> Result<Option<Model>, DbErr> {
+        Entity::find()
+            .filter(Column::Code.eq(code))
+            .filter(Column::Enabled.eq(true))
+            .one(db)
+            .await
+    }
+}
+
+impl Model {
+    pub fn label_key(&self) -> &'static str {
+        match self.code.as_str() {
+            COD => "payment-cod",
+            BANK_TRANSFER => "payment-bank",
+            _ => "payment-custom",
+        }
+    }
+}
+
+impl ActiveModel {}

src/models/shop_settings.rs

@@ -0,0 +1,47 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{ActiveValue, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, TryIntoModel};
+
+pub use crate::models::_entities::shop_settings::{ActiveModel, Column, Entity, Model};
+pub type ShopSettings = 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 = ActiveValue::set(chrono::Utc::now().into());
+            Ok(this)
+        } else {
+            Ok(self)
+        }
+    }
+}
+
+impl Entity {
+    pub async fn get<C: ConnectionTrait>(db: &C, key: &str) -> Result<Option<String>, DbErr> {
+        Ok(Entity::find()
+            .filter(Column::Key.eq(key))
+            .one(db)
+            .await?
+            .and_then(|setting| setting.value))
+    }
+
+    pub async fn set<C: ConnectionTrait>(db: &C, key: &str, value: Option<String>) -> Result<Model, DbErr> {
+        let mut active = match Entity::find()
+            .filter(Column::Key.eq(key))
+            .one(db)
+            .await?
+        {
+            Some(existing) => existing.into_active_model(),
+            None => ActiveModel {
+                key: ActiveValue::set(key.to_string()),
+                ..Default::default()
+            },
+        };
+        active.value = ActiveValue::set(value);
+        active.save(db).await?.try_into_model()
+    }
+}

src/shared/mod.rs

@@ -7,4 +7,5 @@ pub mod money;
 pub mod pricing;
 pub mod rbac;
 pub mod settings;
+pub mod shipping;
 pub mod slug;

src/shared/settings.rs

@@ -2,6 +2,8 @@
 
 use loco_rs::prelude::*;
 
+use crate::models::shop_settings;
+
 /// Look up a string-valued `settings.<key>` entry, returning `None` if config
 /// has no settings map, the key is missing, or the value is not a string.
 pub fn get<'a>(ctx: &'a AppContext, key: &str) -> Option<&'a str> {
@@ -11,3 +13,20 @@ pub fn get<'a>(ctx: &'a AppContext, key: &str) -> Option<&'a str> {
         .and_then(|settings| settings.get(key))
         .and_then(|value| value.as_str())
 }
+
+/// Look up an admin-editable setting in the database, falling back to config when
+/// the row is missing. Empty DB values are returned as-is so admins can clear a
+/// setting deliberately.
+pub async fn get_editable(ctx: &AppContext, key: &str) -> Result<String> {
+    Ok(match shop_settings::Entity::get(&ctx.db, key).await? {
+        Some(value) => value,
+        None => get(ctx, key).unwrap_or("").to_string(),
+    })
+}
+
+pub async fn bank_details(ctx: &AppContext) -> Result<(String, String)> {
+    Ok((
+        get_editable(ctx, "bank_iban").await?,
+        get_editable(ctx, "bank_account_name").await?,
+    ))
+}

src/shared/shipping.rs

@@ -0,0 +1,31 @@
+use loco_rs::prelude::*;
+use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, Set};
+
+use crate::{
+    models::shipping_methods,
+    shared::settings,
+};
+
+pub fn packeta_ready(ctx: &AppContext) -> bool {
+    ["packeta_api_key", "packeta_api_password", "packeta_sender_label"]
+        .iter()
+        .all(|key| settings::get(ctx, key).is_some_and(|value| !value.trim().is_empty()))
+}
+
+pub async fn disable_packeta_if_unconfigured(ctx: &AppContext) -> Result<()> {
+    if packeta_ready(ctx) {
+        return Ok(());
+    }
+    let Some(method) = shipping_methods::Entity::find()
+        .filter(shipping_methods::Column::Carrier.eq("packeta"))
+        .filter(shipping_methods::Column::Enabled.eq(true))
+        .one(&ctx.db)
+        .await?
+    else {
+        return Ok(());
+    };
+    let mut active = method.into_active_model();
+    active.enabled = Set(false);
+    active.update(&ctx.db).await?;
+    Ok(())
+}

src/views/checkout.rs

@@ -40,6 +40,10 @@ pub fn detail(order: &orders::Model, bank_iban: &str, bank_account_name: &str) -
         "subtotal": format_price(order.total_cents - order.shipping_cents),
         "shipping": format_price(order.shipping_cents),
         "total": format_price(order.total_cents),
+        "residence_address": order.residence_address,
+        "residence_city": order.residence_city,
+        "residence_zip": order.residence_zip,
+        "residence_country": order.residence_country,
         "address": order.address,
         "city": order.city,
         "zip": order.zip,