Bump version to 0.27.0

CHANGELOG.md

@@ -4,6 +4,247 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [0.27.0] - 2026-09-29
+
+### Added
+- `Modules\Core\Shipping\Contracts\SupportsCashCollection` — a shipping driver
+  implements this to say a person is physically present at handoff to collect
+  cash. `AcsRateDriver` implements it (a courier can); `BoxNowRateDriver` and
+  the new `StorePickupRateDriver` don't (an unattended locker or a store
+  clerk deciding to accept cash isn't the same fact as a courier collecting
+  it on delivery). `Modules\Core\Checkout\Services\CheckoutService::
+  getPaymentMethods()` now checks this for cash-on-delivery specifically, so
+  COD is no longer offered alongside Box Now — `RequiresFulfillmentType`
+  alone couldn't distinguish "an unattended carrier" from "an attended one,"
+  both being `carrier`.
+- `Modules\Core\Shipping\Carriers\StorePickup\StorePickupRateDriver` — a
+  first-party replacement for `lunarphp/table-rate-shipping`'s own
+  `Collection` driver, following the same shape as `AcsRateDriver`/
+  `BoxNowRateDriver`. Fixes two bugs the vendor driver had: it read
+  `ShippingMethod->name` directly instead of decoding the translatable JSON
+  column, so the storefront showed the raw JSON blob instead of a
+  translated name; and it never checked product exclusions the same way
+  the vendor's own generic drivers did.
+- `Modules\Core\Shipping\Concerns\ExcludesRestrictedProducts` — shared
+  product-exclusion check (a shipping zone's configured "this product can't
+  ship via this method" list), now applied consistently by every
+  first-party driver (ACS, Box Now, Store Pickup). Previously only Lunar's
+  own generic drivers honored exclusions at all — ACS and Box Now silently
+  ignored them.
+- `Modules\Core\Localization\Database\Seeders\StorefrontTranslationsSeeder`
+  — the `storefront` translation group is now seeded the same way
+  `checkout`/`validation` already are (a dedicated, idempotent seeder run
+  from the entrypoint), rather than as a private method inside
+  `InstallLunarCommand`. `Modules\Core\Localization\Services\
+  StorefrontLabels` is removed; its ~160 lines moved into the new seeder.
+- `StoreDetailsService::bankTransferInstructionsFor()` — sanitized HTML for
+  a bank transfer order's confirmation email, gated on
+  `OrderStatusFlow::isBankTransfer()`.
+- `StoreServiceProvider::applyMailFromName()` — listens for
+  `Illuminate\Mail\Events\MessageSending` and renames the From header's
+  display name to Store Details' `mail_from_name`, when set, for every
+  outgoing email app-wide (order notifications, OTP codes, contact form
+  confirmations, etc.), no per-mailable changes needed. Only touches a
+  message whose From address still matches `config('mail.from.address')`
+  — the sending address itself is untouched (a deliverability/domain-
+  authentication concern, not a merchant-editable text field), and a
+  mailable/notification that already set its own explicit sender is left
+  alone entirely.
+- `Order.meta['locale']` — the shopper's locale at checkout, saved by
+  `CheckoutService::initiatePayment()` so every order notification renders
+  in the locale they actually checked out in (via `Notification::locale()`
+  in `NotificationRegistry::register()`), independent of whatever locale
+  happens to be active when the notification is actually sent (a payment
+  webhook, a queued job, a staff action).
+- `Order.meta['coupon_code']` — copied from the cart at checkout, so the
+  confirmation email always shows the code the order was actually placed
+  with, rather than reading the cart row (which may since have been
+  cleared/reused).
+- Contact details on the storefront and product confirmation emails now
+  accept `$order` directly (all 8 order notification views), removing two
+  workarounds: `placed.blade.php` no longer reaches the order through
+  `$lines->first()->order`, and `status-updated.blade.php` no longer
+  reverse-searches a status key from its English label.
+
+### Changed
+- The vendor's own generic shipping drivers (`free-shipping`, `flat-rate`,
+  `ship-by`, `collection`) are no longer offered at all — every shipping
+  method now uses a first-party driver (ACS, Box Now, or Store Pickup),
+  each of which declares its own fulfillment type. The `data.fulfillment_type`
+  Select on the shipping method form is removed, along with the
+  merchant-facing fallback it existed for — every registered driver now
+  hardcodes this fact about itself rather than a merchant configuring it
+  per row.
+- `OrderCapturedNotification` ("payment captured") no longer sends for any
+  payment method except bank transfer. For every other method, placing the
+  order and paying for it are the same moment from the shopper's
+  perspective — `OrderPlacedNotification` already covers it. Bank transfer
+  is the one case where payment confirmation is a genuine, later, separate
+  event (staff marking the order paid once the wire arrives).
+- `OrderStatusUpdatedNotification` no longer sends for an order's first
+  transition off `awaiting_payment`, except for a bank transfer order —
+  for every other payment method that transition happens in the same
+  request as checkout itself, so it's not new information the shopper
+  hasn't already been told.
+- `OrderStatusUpdatedNotification`'s subject line now names the order's
+  actual current status ("Your order :reference is now :status") instead
+  of a generic "has been updated."
+- The checkout page's payment methods now refresh live when the shipping
+  option changes, instead of requiring a full page reload — switching to
+  store pickup correctly drops cash-on-delivery and offers "pay in store"
+  immediately.
+
+### Fixed
+- `StoreDetailsService::bankTransferInstructionsFor()` returned the raw
+  Tiptap JSON array `bank_transfer_instructions` is stored as, instead of
+  rendering it to HTML — the order confirmation email for a bank transfer
+  order failed outright (`TypeError`, queued job marked `FAIL`) rather than
+  showing the store's payment instructions. Now converts via Filament's own
+  `RichContentRenderer`, the same converter the admin panel itself uses to
+  render a `RichEditor` field's content read-only.
+
+## [0.26.5] - 2026-09-28
+
+### Added
+- Three new fields on the "Store Details" settings page
+  (`Modules\Core\Store\Filament\Pages\ManageStoreDetails`):
+  - **Contact email** (`contact_email`) — used both as the receiver address for the
+    contact form and shown to customers as the store's contact email.
+  - **Mail from name** (`mail_from_name`) — the sender name on outgoing emails
+    (`MAIL_FROM_NAME`).
+  - **Legal name** (`legal_name`) — the registered company's legal name, distinct
+    from the storefront-facing `name`. Locale-keyed JSON, like `name`/`address`/
+    `bank_transfer_instructions`, since a registered name can legitimately differ
+    per locale.
+  `contact_email`/`mail_from_name` are plain nullable strings, matching
+  `phone`/`tax_identifier`. The migration backfills all four translatable
+  `store_details` columns with an empty per-locale array on any row where they're
+  still `NULL`, and `StoreDetailsService::firstOrCreate()` now seeds `legal_name`
+  the same way it already seeds `name`/`address`/`bank_transfer_instructions` —
+  both needed so `TranslatedText` doesn't silently drop keystrokes on a
+  NULL-starting translatable field (see that service's own docblock).
+
+## [0.26.4] - 2026-09-28
+
+### Fixed
+- Bank transfer orders were never marked placed. `BankTransferPaymentDriver::pay()` had
+  dead code after an early `return` and never dispatched `PaymentDeferred`, so nothing
+  ever set `Order::placed_at` or fired `OrderPlaced` — no order confirmation email, no
+  stock decrement, the order missing from the customer's order history, and checkout
+  erroring out instead of showing the confirmation page. `pay()` now dispatches
+  `PaymentDeferred` the same way `CashOnDeliveryPaymentDriver::pay()` does.
+- `MarkOrderPlacedOnDeferredPayment` now skips
+  `OrderPaymentResolutionService::resolveDeferredPayment()` for a bank transfer order
+  (`OrderStatusFlow::isBankTransfer()`), so it correctly stays at `awaiting_payment` /
+  unpaid until staff mark it paid, instead of being advanced past that status the moment
+  checkout completes.
+
+## [0.26.3] - 2026-09-28
+
+### Added
+- `Modules\Core\Localization\Database\Seeders\ValidationTranslationsSeeder` — moved in from
+  3dealer's own `database/seeders/`, alongside the existing
+  `Modules\Core\Checkout\Database\Seeders\CheckoutTranslationsSeeder`, so the `validation` and
+  `checkout` translation groups are seeded from core rather than duplicated per consuming app.
+  Same idempotent per-key upsert as `lunar:install`'s own seeding — a key already present (or
+  since edited via the Filament Language Lines UI) is left untouched. Both are run explicitly
+  via `php artisan db:seed --class=...`, wired into 3dealer's entrypoint right after
+  `lunar:install`.
+- `storefront.auth.captcha_failed` — was referenced by `HCaptcha`, `LoginController`, and
+  `ContactRequest` but never seeded in `StorefrontLabels`, so it silently fell back to the raw
+  key. Re-running `lunar:install` now fills it in for any existing store.
+
+## [0.26.2] - 2026-09-28
+
+### Changed
+- Checkout line-item custom fields (`checkout/partials/line-custom-fields.blade.php`):
+  non-file fields now render inline as a single muted `Label: value` line instead of a
+  separate `<dt>`/`<dd>` pair. File fields keep the stacked label/link layout, with a
+  colon after the label and a small top margin on the value.
+
+### Fixed
+- Wishlist routes are now registered inside the `web` middleware group
+  (`WishlistServiceProvider`). Before, `loadRoutesFrom()` loaded them with no middleware,
+  so they had no session, cookies, CSRF protection or authenticated user. That broke
+  anything that depends on the current guest or logged-in user.
+
+## [0.26.1] - 2026-09-28
+
+### Added
+- `Modules\Core\Order\Support\OrderReferenceDisplay` — a human-facing form of
+  `Order::reference` for emails and storefront views. `Lunar\Base\OrderReferenceGenerator`
+  zero-pads the order's own id out to a fixed length (8 characters by default), so a shop's
+  first real orders read as `#00000001` rather than `#1`. This strips leading zeros until the
+  first non-zero digit (falling back to `0` if none remain), purely for display — the raw,
+  padded `reference` is untouched everywhere else (DB lookups, the order-status API, staff
+  search, GDPR exports). Wired into the checkout confirmation page and all customer-facing
+  order notification emails.
+
+## [0.26.0] - 2026-09-28
+
+### Added
+- `Modules\Core\Store\` — a "Store Details" Filament settings page (under Settings) for a
+  shop's own contact/legal details: store name, address (both translatable), phone, tax
+  identifier (ΑΦΜ), company registration number (ΓΕΜΗ), and rich-text bank transfer
+  instructions (IBANs, formatted as a table if needed — `TranslatedText::optionRichtext()`,
+  which ships table insert/edit in its default toolbar). Backed by a single-row
+  `StoreDetails` model, read via `StoreDetailsService::current()` (forever-cached,
+  invalidated by the new `StoreDetailsUpdated` event whenever `StoreDetailsService::update()`
+  is the one write path used — never write to the model directly).
+
+### Fixed
+- `StoreDetailsService`'s singleton row was created with every translatable column
+  (`name`/`address`/`bank_transfer_instructions`) left `NULL`. Lunar's own `TranslatedText`
+  Filament component silently discards every keystroke on re-render when the field it edits
+  starts out `NULL` rather than an empty per-locale array — invisible for `PaymentMethod`'s
+  own translatable `name` (always created already-filled, through the same form), but exactly
+  the gap this brand-new singleton hits, since it's created blank and opened for editing in
+  the same visit. The row is now seeded with an empty string per configured language from
+  creation, so every translatable field is editable from the very first save.
+
+## [0.25.2] - 2026-09-28
+
+### Fixed
+- `BankTransferPaymentDriver::pay()` returned `Succeeded` and dispatched `PaymentCaptured`
+  immediately — treating a bank transfer like an instant-success gateway (Stripe), when in
+  reality no money has moved yet. Now returns `Pending` with no event dispatched, so the order
+  stays at `awaiting_payment` with `Order::paid` false, exactly like it should — checkout still
+  completes normally (`CheckoutController` already treats a `Pending` result with no
+  continuation as a placed order). `OrderStatusFlow::canMarkPaid()`/`isBankTransfer()` now also
+  recognize bank transfer, so staff can mark the order paid once the wire arrives, the same
+  "Mark Paid" action cash-on-delivery already uses — but unlike COD's version, this also
+  advances the order's status past `awaiting_payment`, since nothing else ever will.
+
+## [0.25.1] - 2026-09-28
+
+### Fixed
+- `CustomerErasureActionsExtension` (Privacy) added "Request Erasure"/"Request Export" header
+  actions to the Customer edit/view pages but left Lunar's own plain `DeleteAction` in place
+  alongside them — bypassing the grace period, cascades, and audit trail an erasure request
+  provides. That header action is now stripped whenever Privacy is installed, so "Request
+  Erasure" is the only way to remove a Customer.
+
+## [0.25.0] - 2026-09-28
+
+### Added
+- `Modules\Core\Wishlist\` — extracted the wishlist feature's business logic from 3dealer:
+  `WishlistService` (guest cookie / logged-in `wishlist_items` toggle, merge-on-login),
+  `WishlistItem` model, the `wishlist.toggle` route/controller, `MergeGuestWishlistOnLogin`
+  (listens on `Auth\Events\UserAuthenticated`, same pattern as `ClaimGuestOrdersOnLogin`), and
+  the `wishlist-controller.js` Stimulus controller (exported as `registerWishlist()` from this
+  package's JS entry point). Page rendering (the account/guest wishlist list views, and their
+  product-card presentation) stays app-specific, since it depends on each app's own UI
+  components. The `wishlist_items` migration checks `Schema::hasTable()` first, so a consumer
+  that already had its own copy of this table (e.g. 3dealer) isn't broken by this package now
+  also shipping it.
+
+## [0.24.1] - 2026-09-28
+
+### Fixed
+- `CheckoutTranslationsSeeder` was missing five `checkout.page.*` lines actually referenced by
+  the checkout views — `logged_in_as`, `login_prompt`, `login_link`, `wants_invoice`, and
+  `confirmation_login_hint` — left blank on any storefront until seeded by hand.
+
 ## [0.24.0] - 2026-09-28
 
 ### Added

composer.json

@@ -2,7 +2,7 @@
   "name": "boboko/core",
   "description": "Core module — authentication and shared panel behaviour",
   "type": "library",
-  "version": "0.24.0",
+  "version": "0.27.0",
   "autoload": {
     "psr-4": {
       "Modules\\Core\\": "src/"
@@ -47,7 +47,9 @@
         "Modules\\Core\\Providers\\FileServiceProvider",
         "Modules\\Core\\Providers\\ShippingServiceProvider",
         "Modules\\Core\\Providers\\OrderServiceProvider",
-        "Modules\\Core\\Providers\\PrivacyServiceProvider"
+        "Modules\\Core\\Providers\\PrivacyServiceProvider",
+        "Modules\\Core\\Providers\\WishlistServiceProvider",
+        "Modules\\Core\\Providers\\StoreServiceProvider"
       ]
     }
   },

database/migrations/2026_09_28_000001_create_wishlist_items_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * One product on a logged-in user's wishlist. A guest's wishlist lives in a
+ * cookie instead (see Modules\Core\Wishlist\Services\Wishlist) — nothing is
+ * written here until Modules\Core\Wishlist\Listeners\MergeGuestWishlistOnLogin
+ * moves the cookie's ids across on login.
+ *
+ * hasTable() guard: this table previously lived in each consuming app's own
+ * migrations (e.g. 3dealer's create_wishlist_items_table, extracted here) —
+ * Laravel's migrations table tracks by filename, so a consumer that already
+ * ran its own copy would otherwise hit "table already exists" the first time
+ * this migration runs. Skips creation entirely if the table is already
+ * there; a fresh install with no prior wishlist table gets it created here.
+ */
+return new class extends Migration
+{
+    public function up(): void
+    {
+        if (Schema::hasTable('wishlist_items')) {
+            return;
+        }
+
+        Schema::create('wishlist_items', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('product_id')->constrained('lunar_products')->cascadeOnDelete();
+            $table->timestamps();
+
+            $table->unique(['user_id', 'product_id']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('wishlist_items');
+    }
+};

database/migrations/2026_09_28_000002_create_store_details_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * A single-row table for the store's own contact/legal details — edited via
+ * the Filament "Store Details" settings page (Modules\Core\Store\Filament\
+ * Pages\ManageStoreDetails) and read via Modules\Core\Store\Services\
+ * StoreDetailsService. Not config, since a shop owner needs to change these
+ * (e.g. a new IBAN, a new address) without a code deploy.
+ *
+ * name/address/bank_transfer_instructions are locale-keyed JSON — same
+ * shape/resolution as Modules\Core\Payment\Models\PaymentMethod::$name (see
+ * that model's own docblock): $storeDetails->translate('name'). tax_identifier
+ * (ΑΦΜ) and registration_number (ΓΕΜΗ) are legal identifiers, not
+ * locale-dependent text, so they stay plain strings — same for phone.
+ *
+ * No seeder inserting the singleton row — StoreDetailsService::current()
+ * lazily creates it (all-null) on first read, same shape as any other
+ * firstOrCreate()-backed singleton in this codebase.
+ */
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('store_details', function (Blueprint $table) {
+            $table->id();
+            $table->json('name')->nullable();
+            $table->json('address')->nullable();
+            $table->string('phone')->nullable();
+            $table->string('tax_identifier')->nullable();
+            $table->string('registration_number')->nullable();
+            $table->json('bank_transfer_instructions')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('store_details');
+    }
+};

database/migrations/2026_09_28_000003_add_contact_and_legal_fields_to_store_details_table.php

@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Lunar\Models\Language;
+
+/**
+ * contact_email/mail_from_name join tax_identifier/registration_number/
+ * phone as plain, non-locale-dependent strings on the store_details
+ * singleton (see that table's own migration docblock).
+ *
+ * legal_name is locale-keyed JSON instead — same shape/resolution as
+ * name/address/bank_transfer_instructions (HasTranslations, see
+ * StoreDetails's own docblock) — since a registered company name can
+ * legitimately differ per locale (e.g. a transliterated/translated legal
+ * form). Distinct from the storefront-facing brand name in `name`.
+ *
+ * Backfills every translatable column (name/address/
+ * bank_transfer_instructions/legal_name) with an empty per-locale array
+ * on any row that's still genuinely NULL there — StoreDetailsService::
+ * firstOrCreate() only seeds columns on INSERT, so an existing singleton
+ * row (or one created before a Language row existed, leaving
+ * emptyPerLocale() an empty array at the time) could otherwise keep a
+ * translatable column NULL forever. That's the exact condition
+ * TranslatedText breaks on (see StoreDetailsService's own docblock: a
+ * NULL-starting translatable field silently drops every keystroke and
+ * never persists) — backfilled here for all four columns, not just the
+ * new one, so the same fix covers however the existing row got there.
+ */
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('store_details', function (Blueprint $table) {
+            $table->string('contact_email')->nullable()->after('phone');
+            $table->string('mail_from_name')->nullable()->after('contact_email');
+            $table->json('legal_name')->nullable()->after('registration_number');
+        });
+
+        $emptyPerLocale = json_encode(
+            Language::query()->pluck('code')->mapWithKeys(fn (string $code) => [$code => ''])->all()
+        );
+
+        foreach (['name', 'address', 'bank_transfer_instructions', 'legal_name'] as $column) {
+            DB::table('store_details')->whereNull($column)->update([$column => $emptyPerLocale]);
+        }
+    }
+
+    public function down(): void
+    {
+        Schema::table('store_details', function (Blueprint $table) {
+            $table->dropColumn(['contact_email', 'mail_from_name', 'legal_name']);
+        });
+    }
+};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@boboko/core",
-    "version": "0.24.0",
+    "version": "0.27.0",
     "private": true,
     "type": "module",
     "description": "Portable Stimulus controllers and styles for boboko-core's cart + checkout module. Installed as a real npm dependency (file:../boboko-core in dev, a tagged git install in prod) so a consuming app's `npm install` resolves this package's own dependencies (leaflet, @hotwired/stimulus) transitively, the same way `composer update boboko/*` does for PHP. See CONTRIBUTE.md's \"JS/CSS: a real npm package\" section.",

resources/css/checkout.css

@@ -223,13 +223,13 @@ a.bbk-cart-item-title:hover { text-decoration: underline; }
     font-size: 0.8125rem;
 }
 
+.bbk-line-field span,
 .bbk-line-field dt {
     color: var(--bbk-color-muted);
 }
 
 .bbk-line-field dd {
-    margin: 0;
+    margin: 3px 0 0 0;
-    white-space: pre-line;
     overflow-wrap: anywhere;
 }
 

resources/js/checkout/bbk-checkout-form-controller.js

@@ -192,6 +192,16 @@ export default class extends Controller {
                 detail: { html: data.summaryHtml },
             }))
         }
+
+        // bbk-payment is a sibling controller (both sit on
+        // .bbk-checkout-main), not a target of this one — dispatched as an
+        // event rather than reached into directly, same shape as
+        // bbk-cart:changed above.
+        if (data.paymentMethodsHtml != null) {
+            window.dispatchEvent(new CustomEvent('bbk-checkout:payment-methods-changed', {
+                detail: { html: data.paymentMethodsHtml },
+            }))
+        }
     }
 
     applyErrors(errors) {

resources/js/checkout/bbk-payment-controller.js

@@ -17,7 +17,7 @@ const POLL_TIMEOUT = 30000
 //                                    poll /order-status until the webhook places it
 //     { status:'failed'|'invalid'|'stale', message } -> show inline, re-enable
 export default class extends Controller {
-    static targets = ['element', 'terms', 'error', 'submit', 'processing', 'processingText']
+    static targets = ['element', 'terms', 'error', 'submit', 'processing', 'processingText', 'methods']
 
     static values = {
         selectUrl: String,
@@ -56,11 +56,26 @@ export default class extends Controller {
         }
         window.addEventListener('bbk-cart:updated', this.onSummaryUpdate)
 
+        // Fired by bbk-checkout-form after a shipping-option change —
+        // getPaymentMethods() filters by fulfillment type, so the offered
+        // methods (and which one, if any, is still validly selected) can
+        // change without this controller's own element ever reconnecting.
+        this.onPaymentMethodsChanged = (event) => {
+            const html = event.detail?.html
+            if (html == null || !this.hasMethodsTarget) return
+
+            this.methodsTarget.innerHTML = html
+
+            if (!this.selectedIsStripe()) this.unmountStripe()
+        }
+        window.addEventListener('bbk-checkout:payment-methods-changed', this.onPaymentMethodsChanged)
+
         if (this.selectedIsStripe()) this.mountStripe()
     }
 
     disconnect() {
         window.removeEventListener('bbk-cart:updated', this.onSummaryUpdate)
+        window.removeEventListener('bbk-checkout:payment-methods-changed', this.onPaymentMethodsChanged)
         this.unmountStripe()
     }
 

resources/js/index.js

@@ -7,3 +7,4 @@
 // stoic_embed.js is not re-exported here: per its own docblock, it's a
 // standalone vendored script meant to be included directly, not imported.
 export { registerCheckout } from './checkout/index.js'
+export { registerWishlist } from './wishlist/index.js'

resources/js/wishlist/index.js

@@ -0,0 +1,10 @@
+import WishlistController from './wishlist-controller'
+
+// Registers the wishlist module's Stimulus controller onto the host app's
+// Stimulus application. Call once from the host's JS entry point:
+//
+//     import { registerWishlist } from '@boboko/core'
+//     registerWishlist(application)
+export function registerWishlist(application) {
+    application.register('wishlist', WishlistController)
+}

resources/js/wishlist/wishlist-controller.js

@@ -0,0 +1,42 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Heart toggle. Posts the form with fetch and reflects the server's answer on
+// aria-pressed, which the consuming app's own CSS uses to swap the outline
+// and filled heart. If the request fails, falls back to a normal form submit.
+export default class extends Controller {
+    static targets = ['button', 'status']
+
+    static values = {
+        addLabel: String,
+        removeLabel: String,
+        addedMessage: String,
+        removedMessage: String,
+    }
+
+    async toggle(event) {
+        event.preventDefault()
+
+        if (this.busy) return
+        this.busy = true
+
+        try {
+            const response = await fetch(this.element.action, {
+                method: 'POST',
+                headers: { Accept: 'application/json', 'X-Requested-With': 'XMLHttpRequest' },
+                body: new FormData(this.element),
+            })
+
+            if (!response.ok) throw new Error(`Wishlist toggle failed: ${response.status}`)
+
+            const { active } = await response.json()
+
+            this.buttonTarget.setAttribute('aria-pressed', active ? 'true' : 'false')
+            this.buttonTarget.setAttribute('aria-label', active ? this.removeLabelValue : this.addLabelValue)
+            this.statusTarget.textContent = active ? this.addedMessageValue : this.removedMessageValue
+        } catch {
+            this.element.submit()
+        } finally {
+            this.busy = false
+        }
+    }
+}

resources/views/checkout/confirmation.blade.php

@@ -14,7 +14,7 @@
         <dl class="bbk-confirmation-meta">
             <div class="bbk-confirmation-meta-row">
                 <dt>{{ __('checkout.page.confirmation_order_number') }}</dt>
-                <dd>{{ $order->reference }}</dd>
+                <dd>{{ \Modules\Core\Order\Support\OrderReferenceDisplay::resolve($order) }}</dd>
             </div>
 
             @if ($order->billingAddress?->contact_email)

resources/views/checkout/page.blade.php

@@ -219,7 +219,7 @@
                 <section class="bbk-checkout-section">
                     <h2 class="bbk-checkout-section-heading">{{ __('checkout.page.payment_heading') }}</h2>
 
-                    <div id="bbk-payment-methods">
+                    <div id="bbk-payment-methods" data-bbk-payment-target="methods">
                         @include('checkout::partials.payment-methods', [
                             'paymentMethods' => $paymentMethods,
                             'cart' => $cart,

resources/views/checkout/partials/line-custom-fields.blade.php

@@ -19,9 +19,9 @@
     <dl class="bbk-line-fields">
         @foreach ($fields as $field)
             <div class="bbk-line-field">
-                <dt>{{ $field['label'] }}</dt>
-                <dd>
                 @if ($field['type'] === 'file')
+                    <dt>{{ $field['label'] }}:</dt>
+                    <dd>
                         @php
                             $file = \Modules\Core\File\Models\File::find($field['file_id'] ?? null);
                         @endphp
@@ -39,11 +39,12 @@
                                 @endif
                                 <span>{{ $file->original_name }}</span>
                             </a>
-                        @endif
+
-                    @else
-                        {{ $field['value'] }}
                         @endif
                     </dd>
+                @else
+                    <span>{{ $field['label'] }}: {{ $field['value'] }}</span>
+                @endif
             </div>
         @endforeach
     </dl>

src/Checkout/Database/Seeders/CheckoutTranslationsSeeder.php

@@ -83,6 +83,12 @@ class CheckoutTranslationsSeeder extends Seeder
                 "Email me a reminder if I don't finish my order",
                 'Στείλε μου μια υπενθύμιση αν δεν ολοκληρώσω την παραγγελία μου',
             ],
+            'page.logged_in_as' => ['Logged in as', 'Συνδεδεμένος/η ως'],
+            'page.login_prompt' => [
+                'Already have an account?',
+                'Έχεις ήδη λογαριασμό;',
+            ],
+            'page.login_link' => ['Log in', 'Σύνδεση'],
             'page.login_email_label' => ['Email', 'Email'],
             'page.send_code' => ['Send code', 'Αποστολή κωδικού'],
             'page.login_coming_soon' => [
@@ -95,6 +101,7 @@ class CheckoutTranslationsSeeder extends Seeder
             'page.first_name' => ['First name', 'Όνομα'],
             'page.last_name' => ['Last name', 'Επώνυμο'],
             'page.company_name' => ['Company name', 'Επωνυμία εταιρείας'],
+            'page.wants_invoice' => ['I need an invoice', 'Θέλω τιμολόγιο'],
             'page.tax_identifier' => ['Tax ID', 'ΑΦΜ'],
             'page.address_line_one' => ['Address', 'Διεύθυνση'],
             'page.address_line_two' => ['Address line 2', 'Διεύθυνση (γραμμή 2)'],
@@ -178,6 +185,10 @@ class CheckoutTranslationsSeeder extends Seeder
                 'Θα λάβεις email επιβεβαίωσης σύντομα.',
             ],
             'page.confirmation_shipping_to' => ['Shipping to', 'Αποστολή σε'],
+            'page.confirmation_login_hint' => [
+                'Want to track this order? Create an account or',
+                'Θέλεις να παρακολουθείς την παραγγελία σου; Δημιούργησε λογαριασμό ή',
+            ],
             'page.confirmation_billing' => ['Billing', 'Χρέωση'],
             'page.confirmation_continue' => ['Continue shopping', 'Συνέχεια αγορών'],
             'page.box_now_locker_label' => [

src/Checkout/Http/Controllers/CheckoutController.php

@@ -646,6 +646,18 @@ class CheckoutController extends Controller
             ])->render(),
             // Composer (Providers\CheckoutModuleServiceProvider) fills $cart / $lines.
             'summaryHtml' => $options === null ? null : view('checkout::partials.cart-body')->render(),
+            // getPaymentMethods() filters by the cart's CURRENT fulfillment
+            // type (Modules\Core\Checkout\Services\CheckoutService's own
+            // docblock) — a shipping-option change can change that filter's
+            // result (e.g. switching to store pickup should drop
+            // cash-on-delivery and offer "pay in store" instead), so this
+            // needs to be re-rendered every time shipping options are,
+            // otherwise the payment section silently goes stale until a
+            // full page reload.
+            'paymentMethodsHtml' => $options === null ? null : view('checkout::partials.payment-methods', [
+                'paymentMethods' => $this->checkout->getPaymentMethods(),
+                'cart' => $cart,
+            ])->render(),
         ]);
     }
 

src/Checkout/Services/CheckoutService.php

@@ -5,6 +5,7 @@ namespace Modules\Core\Checkout\Services;
 use Lunar\Exceptions\FingerprintMismatchException;
 use Lunar\Exceptions\Carts\CartException;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Event;
 use Lunar\Base\Addressable;
 use Lunar\DataTypes\ShippingOption;
@@ -21,11 +22,13 @@ use Modules\Core\Checkout\Exceptions\InvalidShippingOptionException;
 use Modules\Core\Checkout\Exceptions\NoShippingAddressException;
 use Modules\Core\Checkout\Exceptions\TermsNotAcceptedException;
 use Modules\Core\Checkout\Exceptions\UnknownPaymentTypeException;
+use Lunar\Shipping\Facades\Shipping;
 use Modules\Core\Payment\Contracts\RequiresFulfillmentType;
 use Modules\Core\Payment\DTOs\PaymentResult;
 use Modules\Core\Payment\Models\PaymentMethod;
 use Modules\Core\Payment\Services\PaymentDriverRegistry;
 use Modules\Core\Payment\Services\PaymentMethodCache;
+use Modules\Core\Shipping\Contracts\SupportsCashCollection;
 use Modules\Core\Shipping\Support\FulfillmentType;
 
 /**
@@ -253,42 +256,59 @@ class CheckoutService
      *      a courier delivery makes no sense (no staff member present at
      *      handoff to take cash), and cash-on-delivery alongside store
      *      pickup is equally meaningless (OfflinePaymentDriver already
-     *      covers that in-person moment). A cart with no shipping option
+     *      covers that in-person moment).
-     *      selected yet imposes no constraint here — every method is
+     *   5. for cash-on-delivery specifically, the cart's currently selected
-     *      offered until a fulfillment type is actually known, the same
+     *      shipping method's own driver implements Modules\Core\Shipping\
-     *      leniency setShippingAddress()'s own docblock describes for
+     *      Contracts\SupportsCashCollection — "carrier" alone
-     *      required-field enforcement happening at the payment gate, not
+     *      (RequiresFulfillmentType) isn't precise enough, since an
-     *      mid-checkout.
+     *      unattended parcel locker network (Modules\Core\Shipping\
+     *      Carriers\BoxNow\BoxNowRateDriver) is a carrier delivery with
+     *      nobody there to collect cash, unlike an actual courier
+     *      (Modules\Core\Shipping\Carriers\Acs\AcsRateDriver).
+     *   Checks 4 and 5 both impose no constraint when the cart has no
+     *   shipping option selected yet — every method is offered until a
+     *   shipping method is actually known, the same leniency
+     *   setShippingAddress()'s own docblock describes for required-field
+     *   enforcement happening at the payment gate, not mid-checkout.
      *
      * @return Collection<int, PaymentMethod>
      */
     public function getPaymentMethods(): Collection
     {
-        $fulfillmentType = $this->currentFulfillmentType();
+        $shippingMethod = $this->currentShippingMethod();
+        $fulfillmentType = $shippingMethod ? FulfillmentType::resolve($shippingMethod) : null;
 
         return $this->paymentMethods->all()
             ->filter(fn (PaymentMethod $method) => $method->enabled && $method->driver_missing_at === null)
-            ->filter(function (PaymentMethod $method) use ($fulfillmentType) {
+            ->filter(function (PaymentMethod $method) use ($fulfillmentType, $shippingMethod) {
                 $driver = $this->paymentDrivers->resolve($method->driver);
 
                 if (! $driver?->isConfigured()) {
                     return false;
                 }
 
-                if ($fulfillmentType === null || ! $driver instanceof RequiresFulfillmentType) {
+                if ($fulfillmentType !== null && $driver instanceof RequiresFulfillmentType
-                    return true;
+                    && $driver->requiredFulfillmentType() !== $fulfillmentType) {
+                    return false;
                 }
 
-                return $driver->requiredFulfillmentType() === $fulfillmentType;
+                // collect(...)->get() rather than Shipping::driver(), which
+                // throws for an unregistered key — a stale ShippingMethod
+                // row (e.g. still pointing at a removed generic driver)
+                // must fail this check quietly, the same as any other
+                // driver this module doesn't recognize.
+                if ($shippingMethod !== null && $method->driver === 'cash-on-delivery') {
+                    $shippingDriver = collect(Shipping::getSupportedDrivers())->get($shippingMethod->driver);
+
+                    return $shippingDriver instanceof SupportsCashCollection && $shippingDriver->collectsCash();
+                }
+
+                return true;
             })
             ->values();
     }
 
-    /**
+    private function currentShippingMethod(): ?ShippingMethod
-     * @return 'carrier'|'store_pickup'|null null when the cart has no
-     *   shipping option selected yet
-     */
-    private function currentFulfillmentType(): ?string
     {
         $identifier = $this->cart->currentOrCreate()->shippingAddress?->shipping_option;
 
@@ -296,9 +316,7 @@ class CheckoutService
             return null;
         }
 
-        $method = ShippingMethod::where('code', $identifier)->first();
+        return ShippingMethod::where('code', $identifier)->first();
-
-        return $method ? FulfillmentType::resolve($method) : null;
     }
 
     /**
@@ -431,6 +449,22 @@ class CheckoutService
             'terms_accepted' => true,
             'terms_accepted_at' => now()->toIso8601String(),
             'terms_accepted_policy_version' => $policyVersion,
+            // Order.locale doesn't exist as a column — saved here so every
+            // order notification (OrderPaymentResolutionService/
+            // MarkOrderPlacedOnDeferredPayment fire OrderPlaced synchronously
+            // in THIS request, but a later one — e.g. a Stripe 3-D Secure
+            // webhook, or a staff status change from Filament — has no
+            // request-scoped locale of its own) can render in the locale the
+            // shopper actually checked out in, not whatever locale (or none)
+            // happens to be active when the notification is sent. See
+            // NotificationRegistry::register(), which reads this back.
+            'locale' => App::getLocale(),
+            // Lunar copies the discount onto Order.discount_breakdown but not
+            // the coupon CODE itself — that stays on the cart row, which may
+            // since have been cleared/reused for a new cart. Copied here so
+            // the confirmation email always shows what code THIS order was
+            // actually placed with.
+            'coupon_code' => $cart->coupon_code,
         ];
         $order->save();
 

src/Command/InstallLunarCommand.php

@@ -18,9 +18,6 @@ use Lunar\Models\Product;
 use Lunar\Models\ProductType;
 use Lunar\Models\TaxClass;
 use Lunar\Models\TaxZone;
-use Modules\Core\Localization\Models\LanguageLine;
-use Modules\Core\Localization\Services\StorefrontLabels;
-use Modules\Core\Localization\Services\TranslationService;
 use Modules\Core\Payment\Models\PaymentMethod;
 
 /**
@@ -35,7 +32,7 @@ class InstallLunarCommand extends Command
 
     protected $description = 'Seed the default Lunar store data (countries, channel, currency, tax zone, attributes, product type)';
 
-    public function handle(TranslationService $translations): void
+    public function handle(): void
     {
         $this->components->info('Seeding default Lunar store data...');
 
@@ -255,9 +252,6 @@ class InstallLunarCommand extends Command
             }
         });
 
-        $this->components->info('Seeding storefront label translations');
-        $this->seedStorefrontLabels($translations);
-
         $this->components->info('Seeding payment method settings');
         $this->seedPaymentMethods();
 
@@ -267,32 +261,6 @@ class InstallLunarCommand extends Command
         $this->components->info('Lunar default data seeded.');
     }
 
-    /**
-     * Per-key upsert, not an all-or-nothing "only seed if the group is empty" guard —
-     * a key already present in the database (including one an admin has since edited
-     * via the Filament Languages resource) is left untouched; only keys missing
-     * entirely are created. This is what makes it safe to add new keys to
-     * StorefrontLabels later and re-run this on an already-installed store without
-     * either skipping the new keys (the old all-or-nothing guard) or reverting an
-     * admin's edits back to the hardcoded default (a naive updateOrCreate would).
-     */
-    private function seedStorefrontLabels(TranslationService $translations): void
-    {
-        $labels = StorefrontLabels::all();
-
-        $existingKeys = LanguageLine::where('group', 'storefront')
-            ->whereIn('key', array_keys($labels))
-            ->pluck('key');
-
-        foreach ($labels as $key => $text) {
-            if ($existingKeys->contains($key)) {
-                continue;
-            }
-
-            $translations->create('storefront', $key, $text);
-        }
-    }
-
     /**
      * A single, deliberately opinionated starter row on fresh install —
      * `PaymentMethod` is now fully admin-creatable/deletable (see
@@ -304,7 +272,7 @@ class InstallLunarCommand extends Command
      * order status should be called; that's a merchant decision.
      *
      * Skip-if-exists on `type`, same idempotent convention as
-     * seedStorefrontLabels() — an admin who has since edited or deleted
+     * StorefrontTranslationsSeeder — an admin who has since edited or deleted
      * this row (via the Filament Payment Methods resource) is left alone;
      * re-running lunar:install never recreates a deleted starter row.
      *

src/CorePlugin.php

@@ -50,6 +50,7 @@ use Modules\Core\Shipping\Extensions\ShippingMethodListExtension;
 use Modules\Core\Shipping\Extensions\ShippingMethodResourceExtension;
 use Modules\Core\Shipping\Filament\Resources\ManifestResource;
 use Modules\Core\Shipping\Filament\Resources\ShipmentResource;
+use Modules\Core\Store\Filament\Pages\ManageStoreDetails;
 
 class CorePlugin implements Plugin
 {
@@ -74,6 +75,9 @@ class CorePlugin implements Plugin
                 ShipmentResource::class,
                 ManifestResource::class,
             ])
+            ->pages([
+                ManageStoreDetails::class,
+            ])
             ->plugin(ShippingPlugin::make());
 
         LunarPanel::extensions([

src/Localization/Database/Seeders/StorefrontTranslationsSeeder.php

@@ -0,0 +1,314 @@
+<?php
+
+namespace Modules\Core\Localization\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Modules\Core\Localization\Services\TranslationService;
+use Spatie\TranslationLoader\LanguageLine;
+
+/**
+ * Default `storefront` translation lines — nav, cart, product, shop, auth,
+ * account, orders, contact, reviews, wishlist (see the storefront views
+ * under resources/views for where each is used).
+ *
+ * Additive and idempotent: a group/key that already exists is left untouched,
+ * so anything edited in the Filament Language Lines UI wins on a re-run. Runs
+ * explicitly — `php artisan db:seed --class="Modules\Core\Localization\
+ * Database\Seeders\StorefrontTranslationsSeeder"` — it is not wired into any
+ * app's own DatabaseSeeder.
+ *
+ * Greek copy uses an informal register (εσύ/σου) — a consuming app with a
+ * different house style overrides individual lines from the Filament
+ * Language Lines UI same as any other translation, rather than forking
+ * this class.
+ */
+class StorefrontTranslationsSeeder extends Seeder
+{
+    public function run(): void
+    {
+        $translations = app(TranslationService::class);
+
+        foreach ($this->lines() as $key => [$en, $el]) {
+            $exists = LanguageLine::query()
+                ->where('group', 'storefront')
+                ->where('key', $key)
+                ->exists();
+
+            if ($exists) {
+                $this->command?->warn("storefront.{$key} already exists — skipped");
+
+                continue;
+            }
+
+            $translations->create('storefront', $key, ['en' => $en, 'el' => $el]);
+            $this->command?->info("storefront.{$key} added");
+        }
+    }
+
+    /**
+     * key => [English, Greek].
+     *
+     * @return array<string, array{0: string, 1: string}>
+     */
+    private function lines(): array
+    {
+        return [
+            // ── Navigation ──────────────────────────────────────────────
+            'nav.home' => ['Home', 'Αρχική'],
+            'nav.products' => ['Products', 'Προϊόντα'],
+            'nav.cart' => ['Cart', 'Καλάθι'],
+            'nav.account' => ['Account', 'Λογαριασμός'],
+            'nav.back' => ['Back', 'Πίσω'],
+            'nav.contact' => ['Contact', 'Επικοινωνία'],
+            'nav.close' => ['Close', 'Κλείσιμο'],
+
+            // ── Cart ────────────────────────────────────────────────────
+            'cart.empty' => ['Your cart is empty', 'Το καλάθι σας είναι άδειο'],
+            'cart.checkout' => ['Checkout', 'Ολοκλήρωση Παραγγελίας'],
+            'cart.total' => ['Total', 'Σύνολο'],
+            'cart.remove' => ['Remove', 'Αφαίρεση'],
+
+            // ── Product ─────────────────────────────────────────────────
+            'product.add_to_cart' => ['Add to Cart', 'Προσθήκη στο Καλάθι'],
+            'product.out_of_stock' => ['Out of Stock', 'Εξαντλήθηκε'],
+            'product.sold' => ['Sold', 'Εξαντλήθηκε'],
+            'product.price' => ['Price', 'Τιμή'],
+            'product.description' => ['Description', 'Περιγραφή'],
+            'product.no_image' => ['No image', 'Χωρίς εικόνα'],
+            'product.read_more' => ['Read more', 'Περισσότερα'],
+            'product.reviews' => ['Reviews', 'Αξιολογήσεις'],
+            'product.related' => ['You may also like', 'Μπορεί επίσης να σου αρέσει'],
+
+            // ── Auth (login link) ───────────────────────────────────────
+            'auth.login' => ['Log In', 'Σύνδεση'],
+            'auth.logout' => ['Log Out', 'Αποσύνδεση'],
+
+            // ── Search ──────────────────────────────────────────────────
+            'search.placeholder' => ['Search products…', 'Αναζήτηση προϊόντων…'],
+            'search.results_for' => ['Search results for ', 'Αποτελέσματα αναζήτησης για '],
+
+            'customer_reviews' => [
+                '{0} No customer reviews|{1} :count customer review|[2,*] :count customer reviews',
+                '{0} Καμία αξιολόγηση πελάτη|{1} :count αξιολόγηση πελάτη|[2,*] :count αξιολογήσεις πελατών',
+            ],
+
+            // ── Pagination ──────────────────────────────────────────────
+            'pagination.nav_label' => ['Pagination', 'Σελιδοποίηση'],
+            'pagination.next' => ['Next page', 'Επόμενη σελίδα'],
+            'pagination.previous' => ['Previous page', 'Προηγούμενη σελίδα'],
+            'pagination.page' => ['Page :page', 'Σελίδα :page'],
+
+            // ── Reviews ─────────────────────────────────────────────────
+            'review.rating' => ['Rating', 'Βαθμολογία'],
+            'review.write_label' => ['Write a review', 'Γράψε μια αξιολόγηση'],
+            'review.name' => ['Name', 'Όνομα'],
+            'review.name_optional' => ['Optional', 'Προαιρετικό'],
+            'review.email' => ['Email', 'Email'],
+            'review.email_not_published' => ['Will not be published', 'Δεν θα δημοσιευτεί'],
+            'review.save_info' => [
+                'Save my name and email for the next time I comment.',
+                'Αποθήκευσε το όνομα και το email μου για την επόμενη φορά που θα σχολιάσω.',
+            ],
+            'review.submit' => ['Submit', 'Υποβολή'],
+            'review.stars_count' => ['{1} :count star|[2,*] :count stars', '{1} :count αστέρι|[2,*] :count αστέρια'],
+            'review.no_reviews_yet' => ['No reviews yet.', 'Δεν υπάρχουν αξιολογήσεις ακόμα.'],
+            'review.write_first' => ['Write the first review', 'Γράψε την πρώτη'],
+            'review.write_new' => ['Add a review', 'Πρόσθεσε μια'],
+            'review.for_product' => ['review for ":name"', 'αξιολόγηση για το «:name»'],
+            'review.rating_required' => ['Please select a rating.', 'Παρακαλούμε επίλεξε βαθμολογία.'],
+            'review.reply' => ['Reply', 'Απάντηση'],
+            'review.thank_you' => ['Thanks for your review!', 'Ευχαριστούμε για την αξιολόγησή σου!'],
+
+            // ── Shop / listing page ─────────────────────────────────────
+            'shop.showing_results' => [
+                '{0} No products found|{1} Showing :first–:last of :total result|[2,*] Showing :first–:last of :total results',
+                '{0} Δεν βρέθηκαν προϊόντα|{1} Εμφάνιση :first–:last από :total αποτέλεσμα|[2,*] Εμφάνιση :first–:last από :total αποτελέσματα',
+            ],
+            'shop.all_products' => ['All Products', 'Όλα τα Προϊόντα'],
+            'shop.sort_label' => ['Sort products', 'Ταξινόμηση προϊόντων'],
+            'shop.sort_default' => ['Default sorting', 'Προεπιλεγμένη ταξινόμηση'],
+            'shop.sort_popularity' => ['Popularity', 'Δημοφιλή'],
+            'shop.sort_price_asc' => ['Price: Low to High', 'Τιμή: Αύξουσα'],
+            'shop.sort_price_desc' => ['Price: High to Low', 'Τιμή: Φθίνουσα'],
+            'shop.sort_newest' => ['Newest', 'Νεότερα'],
+            'shop.no_products' => ['No products found in this category.', 'Δεν βρέθηκαν προϊόντα σε αυτή την κατηγορία.'],
+            'shop.search_label' => ['Search products', 'Αναζήτηση προϊόντων'],
+            'shop.search_placeholder' => ['Search products…', 'Αναζήτησε προϊόντα…'],
+            'shop.filter_price' => ['Filter by price', 'Φίλτρο τιμής'],
+            'shop.price_min' => ['Min price', 'Ελάχιστη τιμή'],
+            'shop.price_max' => ['Max price', 'Μέγιστη τιμή'],
+            'shop.reset' => ['Reset', 'Επαναφορά'],
+            'shop.apply' => ['Apply', 'Εφαρμογή'],
+            'shop.availability' => ['Availability', 'Διαθεσιμότητα'],
+            'shop.in_stock_only' => ['In-stock products only', 'Μόνο διαθέσιμα προϊόντα'],
+
+            // ── Passwordless login (Auth\Services\UserOtpService) ───────
+            'auth.login_intro' => [
+                'Enter your email and we\'ll send you a code to sign in — no password needed.',
+                'Γράψε το email σου και θα σου στείλουμε έναν κωδικό σύνδεσης — δεν χρειάζεται κωδικός πρόσβασης.',
+            ],
+            'auth.email' => ['Email', 'Email'],
+            'auth.terms_notice' => [
+                'By continuing, you accept the <a href=":terms">Terms of Use</a> and have read the <a href=":privacy">Privacy Policy</a>.',
+                'Συνεχίζοντας, αποδέχεσαι τους <a href=":terms">Όρους Χρήσης</a> και έχεις διαβάσει την <a href=":privacy">Πολιτική Απορρήτου</a>.',
+            ],
+            'auth.send_code' => ['Send code', 'Αποστολή κωδικού'],
+            'auth.enter_code' => ['Enter the code', 'Εισάγετε τον κωδικό'],
+            'auth.code_sent_to' => ['We sent a code to', 'Στείλαμε έναν κωδικό στο'],
+            'auth.code' => ['Code', 'Κωδικός'],
+            'auth.resend_code' => ['Resend code', 'Επαναποστολή κωδικού'],
+            'auth.code_resent' => ['A new code was sent.', 'Στάλθηκε νέος κωδικός.'],
+            'auth.change_email' => ['Use a different email', 'Χρήση διαφορετικού email'],
+            'auth.invalid_code' => ['That code is invalid or has expired.', 'Ο κωδικός δεν είναι έγκυρος ή έχει λήξει.'],
+            'auth.too_many_codes' => [
+                'Too many attempts. Please wait a few minutes and try again.',
+                'Πολλές προσπάθειες. Περίμενε λίγα λεπτά και ξαναδοκίμασε.',
+            ],
+            'auth.captcha_failed' => [
+                'Please complete the captcha and try again.',
+                'Παρακαλούμε ολοκλήρωσε το captcha και ξαναδοκίμασε.',
+            ],
+
+            // ── Account profile page (account/show.blade.php) ───────────
+            'account.nav_profile' => ['Profile', 'Προφίλ'],
+            'account.nav_orders' => ['Orders', 'Παραγγελίες'],
+            'account.nav_wishlist' => ['Wishlist', 'Λίστα επιθυμιών'],
+            'account.email_heading' => ['Login email', 'Email σύνδεσης'],
+            'account.email_change' => ['Change email', 'Αλλαγή email'],
+            'account.details_heading' => ['Your details', 'Τα στοιχεία σου'],
+            'account.first_name' => ['First name', 'Όνομα'],
+            'account.last_name' => ['Last name', 'Επώνυμο'],
+            'account.invoice' => ['I need an invoice', 'Χρειάζομαι τιμολόγιο'],
+            'account.company_name' => ['Company name', 'Επωνυμία εταιρείας'],
+            'account.tax_identifier' => ['Tax ID (VAT)', 'ΑΦΜ'],
+            'account.address_heading' => ['Address', 'Διεύθυνση'],
+            'account.line_one' => ['Address', 'Διεύθυνση'],
+            'account.city' => ['City', 'Πόλη'],
+            'account.postcode' => ['Postcode', 'Ταχυδρομικός κώδικας'],
+            'account.state' => ['Region', 'Περιοχή'],
+            'account.state_placeholder' => ['Select a region', 'Επίλεξε περιοχή'],
+            'account.phone' => ['Phone', 'Τηλέφωνο'],
+            'account.emails_heading' => ['Emails', 'Ειδοποιήσεις email'],
+            'account.recovery_consent' => [
+                'Email me a reminder if I don\'t finish my order',
+                'Στείλε μου υπενθύμιση αν δεν ολοκληρώσω την παραγγελία μου',
+            ],
+            'account.save' => ['Save changes', 'Αποθήκευση'],
+            'account.saved' => ['Your details were saved.', 'Τα στοιχεία σου αποθηκεύτηκαν.'],
+            'account.delete_heading' => ['Delete account', 'Διαγραφή λογαριασμού'],
+            'account.delete_text' => [
+                'This permanently deletes your account and personal data. This cannot be undone.',
+                'Αυτό διαγράφει οριστικά τον λογαριασμό και τα προσωπικά σου δεδομένα. Δεν μπορεί να αναιρεθεί.',
+            ],
+            'account.delete' => ['Delete my account', 'Διαγραφή λογαριασμού'],
+            'account.delete_confirm_heading' => ['Are you sure?', 'Είσαι σίγουρος/η;'],
+            'account.delete_confirm_text' => [
+                'This cannot be undone. Your account and personal data will be permanently deleted.',
+                'Αυτό δεν μπορεί να αναιρεθεί. Ο λογαριασμός και τα προσωπικά σου δεδομένα θα διαγραφούν οριστικά.',
+            ],
+            'account.delete_confirm' => ['Yes, delete my account', 'Ναι, διαγραφή λογαριασμού'],
+            'account.delete_cancel' => ['Cancel', 'Ακύρωση'],
+            'account.deletion_requested' => [
+                'Your account deletion has been requested.',
+                'Ζητήθηκε η διαγραφή του λογαριασμού σου.',
+            ],
+
+            // ── Account email-change flow (account/email.blade.php, account/email-code.blade.php) ──
+            'account.email_change_heading' => ['Change your email', 'Αλλαγή email'],
+            'account.email_current' => ['Your current email is', 'Το τρέχον email σου είναι'],
+            'account.email_new' => ['New email', 'Νέο email'],
+            'account.email_new_hint' => [
+                'We\'ll send a code to this address to confirm it\'s yours.',
+                'Θα στείλουμε έναν κωδικό σε αυτή τη διεύθυνση για να επιβεβαιώσουμε ότι είναι δική σου.',
+            ],
+            'account.email_confirm' => ['Confirm', 'Επιβεβαίωση'],
+            'account.email_same' => ['That\'s already your current email.', 'Αυτό είναι ήδη το τρέχον email σου.'],
+            'account.email_taken' => [
+                'That email address is already in use.',
+                'Αυτή η διεύθυνση email χρησιμοποιείται ήδη.',
+            ],
+            'account.email_changed' => ['Your email was changed.', 'Το email σου άλλαξε.'],
+
+            // ── Order history (account/orders/index.blade.php, account/orders/show.blade.php) ──
+            'orders.empty' => ['You have no orders yet.', 'Δεν έχεις παραγγελίες ακόμα.'],
+            'orders.shop_now' => ['Shop now', 'Αγόρασε τώρα'],
+            'orders.date' => ['Date', 'Ημερομηνία'],
+            'orders.number' => ['Order', 'Παραγγελία'],
+            'orders.status' => ['Status', 'Κατάσταση'],
+            'orders.total' => ['Total', 'Σύνολο'],
+            'orders.view' => ['View', 'Προβολή'],
+            'orders.view_order' => ['View order :number', 'Προβολή παραγγελίας :number'],
+            'orders.order_title' => ['Order :number', 'Παραγγελία :number'],
+            'orders.back' => ['Back to orders', 'Πίσω στις παραγγελίες'],
+            'orders.payment' => ['Payment method', 'Τρόπος πληρωμής'],
+            'orders.shipping_method' => ['Shipping method', 'Τρόπος αποστολής'],
+            'orders.tracking' => ['Tracking', 'Παρακολούθηση αποστολής'],
+            'orders.items' => ['Items', 'Προϊόντα'],
+            'orders.subtotal' => ['Subtotal', 'Μερικό σύνολο'],
+            'orders.discount' => ['Discount', 'Έκπτωση'],
+            'orders.shipping' => ['Shipping', 'Μεταφορικά'],
+            'orders.tax' => ['Tax', 'ΦΠΑ'],
+            'orders.shipping_to' => ['Shipping to', 'Αποστολή σε'],
+            'orders.billing' => ['Billing details', 'Στοιχεία τιμολόγησης'],
+
+            // ── Contact details (components/contact-details.blade.php) ──
+            'contact.address' => ['Address', 'Διεύθυνση'],
+            'contact.phone' => ['Phone', 'Τηλέφωνο'],
+
+            // ── Contact form (contact.blade.php, ContactController, emails.contact-confirmation) ──
+            'contact.sent' => [
+                'Your message was sent — we\'ll get back to you soon.',
+                'Το μήνυμά σου στάλθηκε — θα σου απαντήσουμε σύντομα.',
+            ],
+            'contact.send_failed' => [
+                'Something went wrong sending your message. Please try again.',
+                'Κάτι πήγε στραβά κατά την αποστολή. Παρακαλούμε δοκίμασε ξανά.',
+            ],
+            'contact.too_many' => [
+                'Too many messages sent. Please wait a while before trying again.',
+                'Στάλθηκαν πολλά μηνύματα. Περίμενε λίγο πριν ξαναδοκιμάσεις.',
+            ],
+            'contact.confirmation_subject' => ['We received your message', 'Λάβαμε το μήνυμά σου'],
+            'contact.confirmation_preheader' => [
+                'Thanks for reaching out — here\'s a copy of your message.',
+                'Ευχαριστούμε για την επικοινωνία — εδώ είναι ένα αντίγραφο του μηνύματός σου.',
+            ],
+            'contact.confirmation_heading' => ['We received your message', 'Λάβαμε το μήνυμά σου'],
+            'contact.confirmation_body' => [
+                'Thanks for getting in touch. We\'ll reply as soon as we can.',
+                'Ευχαριστούμε που επικοινώνησες μαζί μας. Θα απαντήσουμε το συντομότερο δυνατό.',
+            ],
+            'contact.confirmation_footer' => [
+                'This is a copy of the message you sent us.',
+                'Αυτό είναι ένα αντίγραφο του μηνύματος που μας έστειλες.',
+            ],
+
+            // ── Product page — custom fields, add-to-cart failure (product/show.blade.php,
+            //    components/product-custom-fields.blade.php) ─────────────
+            'product.personalize' => ['Personalize', 'Εξατομίκευση'],
+            'product.custom_field_photo_hint' => ['Max file size: :size MB.', 'Μέγιστο μέγεθος αρχείου: :size MB.'],
+            'product.custom_field_uploading' => ['Uploading…', 'Μεταφόρτωση…'],
+            'product.custom_field_upload_failed' => [
+                'Upload failed. Please try again.',
+                'Η μεταφόρτωση απέτυχε. Παρακαλούμε δοκίμασε ξανά.',
+            ],
+            'product.add_to_cart_failed' => [
+                '{0} Sorry, that\'s out of stock|{1} Only :count left in stock|[2,*] Only :count left in stock',
+                '{0} Λυπούμαστε, εξαντλήθηκε|{1} Απομένει μόνο :count κομμάτι|[2,*] Απομένουν μόνο :count κομμάτια',
+            ],
+
+            // ── Wishlist (components/wishlist-button.blade.php, wishlist/guest.blade.php, wishlist/list.blade.php) ──
+            'wishlist.add' => ['Add to wishlist', 'Προσθήκη στη λίστα επιθυμιών'],
+            'wishlist.remove' => ['Remove from wishlist', 'Αφαίρεση από τη λίστα επιθυμιών'],
+            'wishlist.added' => ['Added to wishlist', 'Προστέθηκε στη λίστα επιθυμιών'],
+            'wishlist.removed' => ['Removed from wishlist', 'Αφαιρέθηκε από τη λίστα επιθυμιών'],
+            'wishlist.empty' => ['Your wishlist is empty.', 'Η λίστα επιθυμιών σου είναι άδεια.'],
+            'wishlist.guest_hint' => [
+                'Log in to keep your wishlist across devices.',
+                'Συνδέσου για να κρατήσεις τη λίστα επιθυμιών σου σε όλες τις συσκευές.',
+            ],
+            'wishlist.remove_named' => ['Remove :name from wishlist', 'Αφαίρεση :name από τη λίστα επιθυμιών'],
+            'wishlist.remove_short' => ['Remove', 'Αφαίρεση'],
+        ];
+    }
+}

src/Localization/Database/Seeders/ValidationTranslationsSeeder.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Modules\Core\Localization\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Modules\Core\Localization\Services\TranslationService;
+use Spatie\TranslationLoader\LanguageLine;
+
+/**
+ * Default `validation` translation lines — Laravel's own error-message group
+ * (`validation.required`, `validation.email`, `validation.attributes.*`, …),
+ * resolved by every `Validator::make()`/`$request->validate()` call in a
+ * consuming app (checkout addresses, cart, product reviews, stock checks).
+ *
+ * Spatie's DB loader (spatie/laravel-translation-loader, wired in
+ * LocalizationServiceProvider) merges this group over Laravel's file-based
+ * validation.php — without this, Greek requests fall back to Laravel's
+ * untranslated English defaults. Only the rule keys and field attributes
+ * actually in use are seeded; add more as new rules/fields show up.
+ *
+ * Additive and idempotent: a key that already exists is left untouched, so
+ * anything edited in the Filament Language Lines UI wins on a re-run. Runs
+ * explicitly — `php artisan db:seed --class="Modules\Core\Localization\
+ * Database\Seeders\ValidationTranslationsSeeder"` — it is not wired into any
+ * app's own DatabaseSeeder.
+ *
+ * Greek copy uses the project's informal register (εσύ/σου).
+ */
+class ValidationTranslationsSeeder extends Seeder
+{
+    public function run(): void
+    {
+        $translations = app(TranslationService::class);
+
+        foreach ($this->lines() as $key => [$en, $el]) {
+            $exists = LanguageLine::query()
+                ->where('group', 'validation')
+                ->where('key', $key)
+                ->exists();
+
+            if ($exists) {
+                $this->command?->warn("validation.{$key} already exists — skipped");
+
+                continue;
+            }
+
+            $translations->create('validation', $key, ['en' => $en, 'el' => $el]);
+            $this->command?->info("validation.{$key} added");
+        }
+    }
+
+    /**
+     * key => [English, Greek].
+     *
+     * @return array<string, array{0: string, 1: string}>
+     */
+    private function lines(): array
+    {
+        return [
+            // ── Rule messages ─────────────────────────────────────────────
+            'required' => ['The :attribute field is required.', 'Το πεδίο :attribute είναι υποχρεωτικό.'],
+            'email' => ['The :attribute field must be a valid email address.', 'Το πεδίο :attribute πρέπει να είναι έγκυρη διεύθυνση email.'],
+            'string' => ['The :attribute field must be a string.', 'Το πεδίο :attribute πρέπει να είναι κείμενο.'],
+            'integer' => ['The :attribute field must be an integer.', 'Το πεδίο :attribute πρέπει να είναι ακέραιος αριθμός.'],
+            'boolean' => ['The :attribute field must be true or false.', 'Το πεδίο :attribute πρέπει να είναι true ή false.'],
+            'min.numeric' => ['The :attribute field must be at least :min.', 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min.'],
+            'max.string' => ['The :attribute field must not be greater than :max characters.', 'Το πεδίο :attribute δεν πρέπει να ξεπερνά τους :max χαρακτήρες.'],
+            'between.numeric' => ['The :attribute field must be between :min and :max.', 'Το πεδίο :attribute πρέπει να είναι μεταξύ :min και :max.'],
+            'exists' => ['The selected :attribute is invalid.', 'Η επιλεγμένη τιμή για το πεδίο :attribute δεν είναι έγκυρη.'],
+            // Product custom-field photo uploads (CustomFieldUploadController, CartController).
+            'file' => ['The :attribute field must be a file.', 'Το πεδίο :attribute πρέπει να είναι αρχείο.'],
+            'mimes' => ['The :attribute field must be a file of type: :values.', 'Το πεδίο :attribute πρέπει να είναι αρχείο τύπου: :values.'],
+            'max.file' => ['The :attribute field must not be greater than :max kilobytes.', 'Το αρχείο στο πεδίο :attribute δεν πρέπει να ξεπερνά τα :max kilobytes.'],
+            'uploaded' => ['The :attribute failed to upload.', 'Η μεταφόρτωση στο πεδίο :attribute απέτυχε.'],
+
+            // ── Field names (checkout: billing/shipping address) ──────────
+            'attributes.contact_email' => ['email', 'email'],
+            'attributes.billing_first_name' => ['first name', 'όνομα'],
+            'attributes.billing_last_name' => ['last name', 'επώνυμο'],
+            'attributes.billing_company_name' => ['company name', 'επωνυμία εταιρείας'],
+            'attributes.billing_tax_identifier' => ['tax ID', 'ΑΦΜ'],
+            'attributes.billing_line_one' => ['address', 'διεύθυνση'],
+            'attributes.billing_line_two' => ['address line 2', 'διεύθυνση (γραμμή 2)'],
+            'attributes.billing_city' => ['city', 'πόλη'],
+            'attributes.billing_state' => ['region', 'νομό / περιοχή'],
+            'attributes.billing_postcode' => ['postcode', 'ταχυδρομικό κώδικα'],
+            'attributes.billing_country_id' => ['country', 'χώρα'],
+            'attributes.billing_contact_phone' => ['phone', 'τηλέφωνο'],
+            'attributes.shipping_first_name' => ['first name', 'όνομα'],
+            'attributes.shipping_last_name' => ['last name', 'επώνυμο'],
+            'attributes.shipping_company_name' => ['company name', 'επωνυμία εταιρείας'],
+            'attributes.shipping_line_one' => ['address', 'διεύθυνση'],
+            'attributes.shipping_line_two' => ['address line 2', 'διεύθυνση (γραμμή 2)'],
+            'attributes.shipping_city' => ['city', 'πόλη'],
+            'attributes.shipping_state' => ['region', 'νομό / περιοχή'],
+            'attributes.shipping_postcode' => ['postcode', 'ταχυδρομικό κώδικα'],
+            'attributes.shipping_country_id' => ['country', 'χώρα'],
+            'attributes.shipping_contact_phone' => ['phone', 'τηλέφωνο'],
+            'attributes.shipping_delivery_instructions' => ['delivery notes', 'σχόλια για την παράδοση'],
+
+            // ── Field names (cart) ─────────────────────────────────────────
+            'attributes.purchasable_id' => ['product', 'προϊόν'],
+            'attributes.quantity' => ['quantity', 'ποσότητα'],
+            'attributes.code' => ['coupon code', 'κωδικό κουπονιού'],
+
+            // ── Field names (product reviews / stock check) ────────────────
+            'attributes.variant' => ['variant', 'παραλλαγή'],
+            'attributes.rating' => ['rating', 'βαθμολογία'],
+            'attributes.content' => ['review text', 'κείμενο κριτικής'],
+            'attributes.name' => ['name', 'όνομα'],
+            'attributes.email' => ['email', 'email'],
+        ];
+    }
+}

src/Localization/Services/StorefrontLabels.php

@@ -1,264 +0,0 @@
-<?php
-
-namespace Modules\Core\Localization\Services;
-
-/**
- * Default storefront UI label translations (group `storefront`), seeded by
- * Modules\Core\Command\InstallLunarCommand. Kept as its own class, separate from
- * the seeding logic, so the actual label list can be scanned/diffed without wading
- * through the upsert mechanics — see InstallLunarCommand::seedStorefrontLabels()
- * for how (and how safely) these get written.
- */
-class StorefrontLabels
-{
-    /**
-     * @return array<string, array<string, string>> keyed by `group.key` dot-notation,
-     *   each value a locale => text map (`en`/`el`).
-     */
-    public static function all(): array
-    {
-        return [
-            'nav.home' => ['en' => 'Home', 'el' => 'Αρχική'],
-            'nav.products' => ['en' => 'Products', 'el' => 'Προϊόντα'],
-            'nav.cart' => ['en' => 'Cart', 'el' => 'Καλάθι'],
-            'nav.account' => ['en' => 'Account', 'el' => 'Λογαριασμός'],
-            'nav.back' => ['en' => 'Back', 'el' => 'Πίσω'],
-            'nav.contact' => ['en' => 'Contact', 'el' => 'Επικοινωνία'],
-            'nav.close' => ['en' => 'Close', 'el' => 'Κλείσιμο'],
-            'cart.empty' => ['en' => 'Your cart is empty', 'el' => 'Το καλάθι σας είναι άδειο'],
-            'cart.checkout' => ['en' => 'Checkout', 'el' => 'Ολοκλήρωση Παραγγελίας'],
-            'cart.total' => ['en' => 'Total', 'el' => 'Σύνολο'],
-            'cart.remove' => ['en' => 'Remove', 'el' => 'Αφαίρεση'],
-            'product.add_to_cart' => ['en' => 'Add to Cart', 'el' => 'Προσθήκη στο Καλάθι'],
-            'product.out_of_stock' => ['en' => 'Out of Stock', 'el' => 'Εξαντλήθηκε'],
-            'product.price' => ['en' => 'Price', 'el' => 'Τιμή'],
-            'product.description' => ['en' => 'Description', 'el' => 'Περιγραφή'],
-            'product.no_image' => ['en' => 'No image', 'el' => 'Χωρίς εικόνα'],
-            'product.read_more' => ['en' => 'Read more', 'el' => 'Περισσότερα'],
-            'product.reviews' => ['en' => 'Reviews', 'el' => 'Αξιολογήσεις'],
-            'auth.login' => ['en' => 'Log In', 'el' => 'Σύνδεση'],
-            'auth.logout' => ['en' => 'Log Out', 'el' => 'Αποσύνδεση'],
-            'search.placeholder' => ['en' => 'Search products…', 'el' => 'Αναζήτηση προϊόντων…'],
-            'search.results_for' => ['en' => 'Search results for ', 'el' => 'Αποτελέσματα αναζήτησης για '],
-            'customer_reviews' => [
-                'en' => '{0} No customer reviews|{1} :count customer review|[2,*] :count customer reviews',
-                'el' => '{0} Καμία αξιολόγηση πελάτη|{1} :count αξιολόγηση πελάτη|[2,*] :count αξιολογήσεις πελατών',
-            ],
-            'pagination.nav_label' => ['en' => 'Pagination', 'el' => 'Σελιδοποίηση'],
-            'pagination.next' => ['en' => 'Next page', 'el' => 'Επόμενη σελίδα'],
-            'pagination.previous' => ['en' => 'Previous page', 'el' => 'Προηγούμενη σελίδα'],
-            'pagination.page' => ['en' => 'Page :page', 'el' => 'Σελίδα :page'],
-            'review.rating' => ['en' => 'Rating', 'el' => 'Βαθμολογία'],
-            'review.write_label' => ['en' => 'Write a review', 'el' => 'Γράψε μια αξιολόγηση'],
-            'review.name' => ['en' => 'Name', 'el' => 'Όνομα'],
-            'review.name_optional' => ['en' => 'Optional', 'el' => 'Προαιρετικό'],
-            'review.email' => ['en' => 'Email', 'el' => 'Email'],
-            'review.email_not_published' => ['en' => 'Will not be published', 'el' => 'Δεν θα δημοσιευτεί'],
-            'review.save_info' => [
-                'en' => 'Save my name and email for the next time I comment.',
-                'el' => 'Αποθήκευσε το όνομα και το email μου για την επόμενη φορά που θα σχολιάσω.',
-            ],
-            'review.submit' => ['en' => 'Submit', 'el' => 'Υποβολή'],
-            'review.stars_count' => ['en' => '{1} :count star|[2,*] :count stars', 'el' => '{1} :count αστέρι|[2,*] :count αστέρια'],
-            'review.no_reviews_yet' => ['en' => 'No reviews yet.', 'el' => 'Δεν υπάρχουν αξιολογήσεις ακόμα.'],
-            'review.write_first' => ['en' => 'Write the first review', 'el' => 'Γράψε την πρώτη'],
-            'review.write_new' => ['en' => 'Add a review', 'el' => 'Πρόσθεσε μια'],
-            'review.for_product' => ['en' => 'review for ":name"', 'el' => 'αξιολόγηση για το «:name»'],
-            'shop.showing_results' => [
-                'en' => '{0} No products found|{1} Showing :first–:last of :total result|[2,*] Showing :first–:last of :total results',
-                'el' => '{0} Δεν βρέθηκαν προϊόντα|{1} Εμφάνιση :first–:last από :total αποτέλεσμα|[2,*] Εμφάνιση :first–:last από :total αποτελέσματα',
-            ],
-            'shop.all_products' => ['en' => 'All Products', 'el' => 'Όλα τα Προϊόντα'],
-            'shop.sort_label' => ['en' => 'Sort products', 'el' => 'Ταξινόμηση προϊόντων'],
-            'shop.sort_default' => ['en' => 'Default sorting', 'el' => 'Προεπιλεγμένη ταξινόμηση'],
-            'shop.sort_popularity' => ['en' => 'Popularity', 'el' => 'Δημοφιλή'],
-            'shop.sort_price_asc' => ['en' => 'Price: Low to High', 'el' => 'Τιμή: Αύξουσα'],
-            'shop.sort_price_desc' => ['en' => 'Price: High to Low', 'el' => 'Τιμή: Φθίνουσα'],
-            'shop.sort_newest' => ['en' => 'Newest', 'el' => 'Νεότερα'],
-            'shop.no_products' => ['en' => 'No products found in this category.', 'el' => 'Δεν βρέθηκαν προϊόντα σε αυτή την κατηγορία.'],
-            'shop.search_label' => ['en' => 'Search products', 'el' => 'Αναζήτηση προϊόντων'],
-            'shop.search_placeholder' => ['en' => 'Search products…', 'el' => 'Αναζήτησε προϊόντα…'],
-            'shop.filter_price' => ['en' => 'Filter by price', 'el' => 'Φίλτρο τιμής'],
-            'shop.price_min' => ['en' => 'Min price', 'el' => 'Ελάχιστη τιμή'],
-            'shop.price_max' => ['en' => 'Max price', 'el' => 'Μέγιστη τιμή'],
-            'shop.reset' => ['en' => 'Reset', 'el' => 'Επαναφορά'],
-            'shop.apply' => ['en' => 'Apply', 'el' => 'Εφαρμογή'],
-            'shop.availability' => ['en' => 'Availability', 'el' => 'Διαθεσιμότητα'],
-            'shop.in_stock_only' => ['en' => 'In-stock products only', 'el' => 'Μόνο διαθέσιμα προϊόντα'],
-
-            // Passwordless login (Auth\Services\UserOtpService)
-            'auth.login_intro' => [
-                'en' => 'Enter your email and we\'ll send you a code to sign in — no password needed.',
-                'el' => 'Γράψε το email σου και θα σου στείλουμε έναν κωδικό σύνδεσης — δεν χρειάζεται κωδικός πρόσβασης.',
-            ],
-            'auth.email' => ['en' => 'Email', 'el' => 'Email'],
-            'auth.terms_notice' => [
-                'en' => 'By continuing, you accept the <a href=":terms">Terms of Use</a> and have read the <a href=":privacy">Privacy Policy</a>.',
-                'el' => 'Συνεχίζοντας, αποδέχεσαι τους <a href=":terms">Όρους Χρήσης</a> και έχεις διαβάσει την <a href=":privacy">Πολιτική Απορρήτου</a>.',
-            ],
-            'auth.send_code' => ['en' => 'Send code', 'el' => 'Αποστολή κωδικού'],
-            'auth.enter_code' => ['en' => 'Enter the code', 'el' => 'Εισάγετε τον κωδικό'],
-            'auth.code_sent_to' => ['en' => 'We sent a code to', 'el' => 'Στείλαμε έναν κωδικό στο'],
-            'auth.code' => ['en' => 'Code', 'el' => 'Κωδικός'],
-            'auth.resend_code' => ['en' => 'Resend code', 'el' => 'Επαναποστολή κωδικού'],
-            'auth.code_resent' => ['en' => 'A new code was sent.', 'el' => 'Στάλθηκε νέος κωδικός.'],
-            'auth.change_email' => ['en' => 'Use a different email', 'el' => 'Χρήση διαφορετικού email'],
-            'auth.invalid_code' => ['en' => 'That code is invalid or has expired.', 'el' => 'Ο κωδικός δεν είναι έγκυρος ή έχει λήξει.'],
-            'auth.too_many_codes' => [
-                'en' => 'Too many attempts. Please wait a few minutes and try again.',
-                'el' => 'Πολλές προσπάθειες. Περίμενε λίγα λεπτά και ξαναδοκίμασε.',
-            ],
-
-            // Account profile page (account/show.blade.php)
-            'account.nav_profile' => ['en' => 'Profile', 'el' => 'Προφίλ'],
-            'account.nav_orders' => ['en' => 'Orders', 'el' => 'Παραγγελίες'],
-            'account.nav_wishlist' => ['en' => 'Wishlist', 'el' => 'Λίστα επιθυμιών'],
-            'account.email_heading' => ['en' => 'Login email', 'el' => 'Email σύνδεσης'],
-            'account.email_change' => ['en' => 'Change email', 'el' => 'Αλλαγή email'],
-            'account.details_heading' => ['en' => 'Your details', 'el' => 'Τα στοιχεία σου'],
-            'account.first_name' => ['en' => 'First name', 'el' => 'Όνομα'],
-            'account.last_name' => ['en' => 'Last name', 'el' => 'Επώνυμο'],
-            'account.invoice' => ['en' => 'I need an invoice', 'el' => 'Χρειάζομαι τιμολόγιο'],
-            'account.company_name' => ['en' => 'Company name', 'el' => 'Επωνυμία εταιρείας'],
-            'account.tax_identifier' => ['en' => 'Tax ID (VAT)', 'el' => 'ΑΦΜ'],
-            'account.address_heading' => ['en' => 'Address', 'el' => 'Διεύθυνση'],
-            'account.line_one' => ['en' => 'Address', 'el' => 'Διεύθυνση'],
-            'account.city' => ['en' => 'City', 'el' => 'Πόλη'],
-            'account.postcode' => ['en' => 'Postcode', 'el' => 'Ταχυδρομικός κώδικας'],
-            'account.state' => ['en' => 'Region', 'el' => 'Περιοχή'],
-            'account.state_placeholder' => ['en' => 'Select a region', 'el' => 'Επίλεξε περιοχή'],
-            'account.phone' => ['en' => 'Phone', 'el' => 'Τηλέφωνο'],
-            'account.emails_heading' => ['en' => 'Emails', 'el' => 'Ειδοποιήσεις email'],
-            'account.recovery_consent' => [
-                'en' => 'Email me a reminder if I don\'t finish my order',
-                'el' => 'Στείλε μου υπενθύμιση αν δεν ολοκληρώσω την παραγγελία μου',
-            ],
-            'account.save' => ['en' => 'Save changes', 'el' => 'Αποθήκευση'],
-            'account.saved' => ['en' => 'Your details were saved.', 'el' => 'Τα στοιχεία σου αποθηκεύτηκαν.'],
-            'account.delete_heading' => ['en' => 'Delete account', 'el' => 'Διαγραφή λογαριασμού'],
-            'account.delete_text' => [
-                'en' => 'This permanently deletes your account and personal data. This cannot be undone.',
-                'el' => 'Αυτό διαγράφει οριστικά τον λογαριασμό και τα προσωπικά σου δεδομένα. Δεν μπορεί να αναιρεθεί.',
-            ],
-            'account.delete' => ['en' => 'Delete my account', 'el' => 'Διαγραφή λογαριασμού'],
-            'account.delete_confirm_heading' => ['en' => 'Are you sure?', 'el' => 'Είσαι σίγουρος/η;'],
-            'account.delete_confirm_text' => [
-                'en' => 'This cannot be undone. Your account and personal data will be permanently deleted.',
-                'el' => 'Αυτό δεν μπορεί να αναιρεθεί. Ο λογαριασμός και τα προσωπικά σου δεδομένα θα διαγραφούν οριστικά.',
-            ],
-            'account.delete_confirm' => ['en' => 'Yes, delete my account', 'el' => 'Ναι, διαγραφή λογαριασμού'],
-            'account.delete_cancel' => ['en' => 'Cancel', 'el' => 'Ακύρωση'],
-            'account.deletion_requested' => [
-                'en' => 'Your account deletion has been requested.',
-                'el' => 'Ζητήθηκε η διαγραφή του λογαριασμού σου.',
-            ],
-
-            // Account email-change flow (account/email.blade.php, account/email-code.blade.php)
-            'account.email_change_heading' => ['en' => 'Change your email', 'el' => 'Αλλαγή email'],
-            'account.email_current' => ['en' => 'Your current email is', 'el' => 'Το τρέχον email σου είναι'],
-            'account.email_new' => ['en' => 'New email', 'el' => 'Νέο email'],
-            'account.email_new_hint' => [
-                'en' => 'We\'ll send a code to this address to confirm it\'s yours.',
-                'el' => 'Θα στείλουμε έναν κωδικό σε αυτή τη διεύθυνση για να επιβεβαιώσουμε ότι είναι δική σου.',
-            ],
-            'account.email_confirm' => ['en' => 'Confirm', 'el' => 'Επιβεβαίωση'],
-            'account.email_same' => [
-                'en' => 'That\'s already your current email.',
-                'el' => 'Αυτό είναι ήδη το τρέχον email σου.',
-            ],
-            'account.email_taken' => [
-                'en' => 'That email address is already in use.',
-                'el' => 'Αυτή η διεύθυνση email χρησιμοποιείται ήδη.',
-            ],
-            'account.email_changed' => ['en' => 'Your email was changed.', 'el' => 'Το email σου άλλαξε.'],
-
-            // Order history (account/orders/index.blade.php, account/orders/show.blade.php)
-            'orders.empty' => ['en' => 'You have no orders yet.', 'el' => 'Δεν έχεις παραγγελίες ακόμα.'],
-            'orders.shop_now' => ['en' => 'Shop now', 'el' => 'Αγόρασε τώρα'],
-            'orders.date' => ['en' => 'Date', 'el' => 'Ημερομηνία'],
-            'orders.number' => ['en' => 'Order', 'el' => 'Παραγγελία'],
-            'orders.status' => ['en' => 'Status', 'el' => 'Κατάσταση'],
-            'orders.total' => ['en' => 'Total', 'el' => 'Σύνολο'],
-            'orders.view' => ['en' => 'View', 'el' => 'Προβολή'],
-            'orders.view_order' => ['en' => 'View order :number', 'el' => 'Προβολή παραγγελίας :number'],
-            'orders.order_title' => ['en' => 'Order :number', 'el' => 'Παραγγελία :number'],
-            'orders.back' => ['en' => 'Back to orders', 'el' => 'Πίσω στις παραγγελίες'],
-            'orders.payment' => ['en' => 'Payment method', 'el' => 'Τρόπος πληρωμής'],
-            'orders.shipping_method' => ['en' => 'Shipping method', 'el' => 'Τρόπος αποστολής'],
-            'orders.tracking' => ['en' => 'Tracking', 'el' => 'Παρακολούθηση αποστολής'],
-            'orders.items' => ['en' => 'Items', 'el' => 'Προϊόντα'],
-            'orders.subtotal' => ['en' => 'Subtotal', 'el' => 'Μερικό σύνολο'],
-            'orders.discount' => ['en' => 'Discount', 'el' => 'Έκπτωση'],
-            'orders.shipping' => ['en' => 'Shipping', 'el' => 'Μεταφορικά'],
-            'orders.tax' => ['en' => 'Tax', 'el' => 'ΦΠΑ'],
-            'orders.shipping_to' => ['en' => 'Shipping to', 'el' => 'Αποστολή σε'],
-            'orders.billing' => ['en' => 'Billing details', 'el' => 'Στοιχεία τιμολόγησης'],
-
-            // Contact form (contact.blade.php, ContactController, emails.contact-confirmation)
-            'contact.sent' => [
-                'en' => 'Your message was sent — we\'ll get back to you soon.',
-                'el' => 'Το μήνυμά σου στάλθηκε — θα σου απαντήσουμε σύντομα.',
-            ],
-            'contact.send_failed' => [
-                'en' => 'Something went wrong sending your message. Please try again.',
-                'el' => 'Κάτι πήγε στραβά κατά την αποστολή. Παρακαλούμε δοκίμασε ξανά.',
-            ],
-            'contact.too_many' => [
-                'en' => 'Too many messages sent. Please wait a while before trying again.',
-                'el' => 'Στάλθηκαν πολλά μηνύματα. Περίμενε λίγο πριν ξαναδοκιμάσεις.',
-            ],
-            'contact.confirmation_subject' => ['en' => 'We received your message', 'el' => 'Λάβαμε το μήνυμά σου'],
-            'contact.confirmation_preheader' => [
-                'en' => 'Thanks for reaching out — here\'s a copy of your message.',
-                'el' => 'Ευχαριστούμε για την επικοινωνία — εδώ είναι ένα αντίγραφο του μηνύματός σου.',
-            ],
-            'contact.confirmation_heading' => ['en' => 'We received your message', 'el' => 'Λάβαμε το μήνυμά σου'],
-            'contact.confirmation_body' => [
-                'en' => 'Thanks for getting in touch. We\'ll reply as soon as we can.',
-                'el' => 'Ευχαριστούμε που επικοινώνησες μαζί μας. Θα απαντήσουμε το συντομότερο δυνατό.',
-            ],
-            'contact.confirmation_footer' => [
-                'en' => 'This is a copy of the message you sent us.',
-                'el' => 'Αυτό είναι ένα αντίγραφο του μηνύματος που μας έστειλες.',
-            ],
-
-            // Product page — custom fields, add-to-cart failure (product/show.blade.php,
-            // components/product-custom-fields.blade.php)
-            'product.personalize' => ['en' => 'Personalize', 'el' => 'Εξατομίκευση'],
-            'product.custom_field_photo_hint' => [
-                'en' => 'Max file size: :size MB.',
-                'el' => 'Μέγιστο μέγεθος αρχείου: :size MB.',
-            ],
-            'product.custom_field_uploading' => ['en' => 'Uploading…', 'el' => 'Μεταφόρτωση…'],
-            'product.custom_field_upload_failed' => [
-                'en' => 'Upload failed. Please try again.',
-                'el' => 'Η μεταφόρτωση απέτυχε. Παρακαλούμε δοκίμασε ξανά.',
-            ],
-            'product.add_to_cart_failed' => [
-                'en' => '{0} Sorry, that\'s out of stock|{1} Only :count left in stock|[2,*] Only :count left in stock',
-                'el' => '{0} Λυπούμαστε, εξαντλήθηκε|{1} Απομένει μόνο :count κομμάτι|[2,*] Απομένουν μόνο :count κομμάτια',
-            ],
-
-            // Reviews (components/review-form.blade.php, review-card.blade.php, product/show.blade.php)
-            'review.rating_required' => ['en' => 'Please select a rating.', 'el' => 'Παρακαλούμε επίλεξε βαθμολογία.'],
-            'review.reply' => ['en' => 'Reply', 'el' => 'Απάντηση'],
-            'review.thank_you' => [
-                'en' => 'Thanks for your review!',
-                'el' => 'Ευχαριστούμε για την αξιολόγησή σου!',
-            ],
-
-            // Wishlist (components/wishlist-button.blade.php, wishlist/guest.blade.php, wishlist/list.blade.php)
-            'wishlist.add' => ['en' => 'Add to wishlist', 'el' => 'Προσθήκη στη λίστα επιθυμιών'],
-            'wishlist.remove' => ['en' => 'Remove from wishlist', 'el' => 'Αφαίρεση από τη λίστα επιθυμιών'],
-            'wishlist.added' => ['en' => 'Added to wishlist', 'el' => 'Προστέθηκε στη λίστα επιθυμιών'],
-            'wishlist.removed' => ['en' => 'Removed from wishlist', 'el' => 'Αφαιρέθηκε από τη λίστα επιθυμιών'],
-            'wishlist.empty' => ['en' => 'Your wishlist is empty.', 'el' => 'Η λίστα επιθυμιών σου είναι άδεια.'],
-            'wishlist.guest_hint' => [
-                'en' => 'Log in to keep your wishlist across devices.',
-                'el' => 'Συνδέσου για να κρατήσεις τη λίστα επιθυμιών σου σε όλες τις συσκευές.',
-            ],
-            'wishlist.remove_named' => ['en' => 'Remove :name from wishlist', 'el' => 'Αφαίρεση :name από τη λίστα επιθυμιών'],
-            'wishlist.remove_short' => ['en' => 'Remove', 'el' => 'Αφαίρεση'],
-        ];
-    }
-}

src/Notification/NotificationRegistry.php

@@ -44,6 +44,17 @@ class NotificationRegistry
                     if (isset($event->delaySeconds) && $event->delaySeconds > 0) {
                         $notification->delay($event->delaySeconds);
                     }
+                    // Every order-notification event carries ->order, whose
+                    // ->meta['locale'] was saved at checkout (Checkout\
+                    // Services\CheckoutService::initiatePayment()) — the
+                    // request that actually sends this may have no locale of
+                    // its own (a payment webhook, a queued job, a staff
+                    // action from Filament), so this is the only reliable
+                    // source. Falls back to the app default for an order
+                    // placed before this existed.
+                    if (isset($event->order) && $locale = $event->order->meta['locale'] ?? null) {
+                        $notification->locale($locale);
+                    }
                     $notification->notifiable()->notify($notification);
                 } catch (Throwable $e) {
                     report($e);

src/Order/Listeners/MarkOrderPlacedOnDeferredPayment.php

@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Event;
 use Lunar\Models\Order;
 use Modules\Core\Checkout\Events\OrderPlaced;
 use Modules\Core\Order\Services\OrderPaymentResolutionService;
+use Modules\Core\Order\Services\OrderStatusFlow;
 use Modules\Core\Payment\Events\PaymentDeferred;
 
 /**
@@ -36,11 +37,18 @@ use Modules\Core\Payment\Events\PaymentDeferred;
  * visibility and stock decrement, but nothing ever moved `status` off its
  * initial value, since resolveCaptureOrAuthorization() only does that for
  * an actual capture. Caught and fixed after the fact.
+ *
+ * The status advance is skipped for a bank transfer order
+ * (OrderStatusFlow::isBankTransfer()) — unlike COD, it genuinely has
+ * something to await at 'awaiting_payment': the wire itself. Only
+ * OrderFulfillmentService::markPaid() ever advances it past that point
+ * (see BankTransferPaymentDriver's own docblock).
  */
 class MarkOrderPlacedOnDeferredPayment
 {
     public function __construct(
         private readonly OrderPaymentResolutionService $resolution,
+        private readonly OrderStatusFlow $flow,
     ) {}
 
     public function handle(PaymentDeferred $event): void
@@ -53,7 +61,9 @@ class MarkOrderPlacedOnDeferredPayment
 
         $order = Order::findOrFail($orderId);
 
+        if (! $this->flow->isBankTransfer($order)) {
             $this->resolution->resolveDeferredPayment($order, self::class);
+        }
 
         if (! blank($order->placed_at)) {
             return;

src/Order/Notifications/OrderCapturedNotification.php

@@ -7,7 +7,23 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderCaptured;
+use Modules\Core\Order\Services\OrderStatusFlow;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
+/**
+ * "Payment captured" is only a meaningful, distinct update for a bank
+ * transfer order — placing that order and paying for it are genuinely two
+ * separate moments (Order::paid stays false at checkout; a shopper is
+ * told their order is confirmed and awaiting a wire, then separately told
+ * once staff mark it paid). For every other payment method (card,
+ * authorize-then-capture, COD), placing the order already means the
+ * shopper did everything they need to on their end — a card payment is
+ * captured in the very same request that places the order, so a second
+ * "payment captured" email would just repeat what OrderPlacedNotification
+ * already said. See OrderStatusFlow's own docblock for why payment method
+ * never affects the order's status SEQUENCE, only this kind of business
+ * decision about which events actually matter to the shopper.
+ */
 class OrderCapturedNotification extends BaseNotification
 {
     public function __construct(private readonly OrderCaptured $event) {}
@@ -24,6 +40,10 @@ class OrderCapturedNotification extends BaseNotification
 
     public function via(object $notifiable): array
     {
+        if (! app(OrderStatusFlow::class)->isBankTransfer($this->event->order)) {
+            return [];
+        }
+
         return ['mail'];
     }
 
@@ -40,10 +60,13 @@ class OrderCapturedNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('Payment captured for your order :reference', ['reference' => $order->reference]))
+            ->subject(__('Payment captured for your order :reference', ['reference' => $reference]))
             ->view('core::order.notifications.captured', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
                 'amount' => $this->event->transaction->amount->formatted,
             ]);
     }

src/Order/Notifications/OrderCompletedNotification.php

@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderCompleted;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 class OrderCompletedNotification extends BaseNotification
 {
@@ -40,10 +41,13 @@ class OrderCompletedNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('Your order :reference is complete', ['reference' => $order->reference]))
+            ->subject(__('Your order :reference is complete', ['reference' => $reference]))
             ->view('core::order.notifications.completed', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
             ]);
     }
 }

src/Order/Notifications/OrderDeliveredNotification.php

@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderDelivered;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 class OrderDeliveredNotification extends BaseNotification
 {
@@ -40,10 +41,13 @@ class OrderDeliveredNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('Your order :reference has been delivered', ['reference' => $order->reference]))
+            ->subject(__('Your order :reference has been delivered', ['reference' => $reference]))
             ->view('core::order.notifications.delivered', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
             ]);
     }
 }

src/Order/Notifications/OrderDispatchedNotification.php

@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderDispatched;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 /**
  * Fills a real, previously-unfilled customer-communication gap — before
@@ -45,10 +46,13 @@ class OrderDispatchedNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('Your order :reference is on its way', ['reference' => $order->reference]))
+            ->subject(__('Your order :reference is on its way', ['reference' => $reference]))
             ->view('core::order.notifications.dispatched', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
             ]);
     }
 }

src/Order/Notifications/OrderPickupReadyNotification.php

@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderReadyForPickup;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 /**
  * "Your order is ready to collect" — listens to the specific
@@ -50,10 +51,13 @@ class OrderPickupReadyNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('Your order :reference is ready for pickup', ['reference' => $order->reference]))
+            ->subject(__('Your order :reference is ready for pickup', ['reference' => $reference]))
             ->view('core::order.notifications.pickup-ready', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
             ]);
     }
 }

src/Order/Notifications/OrderPlacedNotification.php

@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Checkout\Events\OrderPlaced;
 use Modules\Core\Notification\BaseNotification;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 /**
  * The order confirmation email — fires once, for every capture_mode and
@@ -51,10 +52,13 @@ class OrderPlacedNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('Your order :reference is confirmed', ['reference' => $order->reference]))
+            ->subject(__('Your order :reference is confirmed', ['reference' => $reference]))
             ->view('core::order.notifications.placed', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
                 'total' => $order->total->formatted,
                 'lines' => $order->lines,
             ]);

src/Order/Notifications/OrderRefundedNotification.php

@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderRefunded;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 class OrderRefundedNotification extends BaseNotification
 {
@@ -40,10 +41,13 @@ class OrderRefundedNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+
         return (new MailMessage)
-            ->subject(__('A refund has been issued for your order :reference', ['reference' => $order->reference]))
+            ->subject(__('A refund has been issued for your order :reference', ['reference' => $reference]))
             ->view('core::order.notifications.refunded', [
-                'reference' => $order->reference,
+                'order' => $order,
+                'reference' => $reference,
                 'amount' => $this->event->transaction->amount->formatted,
             ]);
     }

src/Order/Notifications/OrderStatusUpdatedNotification.php

@@ -7,6 +7,8 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Notification as NotificationFacade;
 use Modules\Core\Notification\BaseNotification;
 use Modules\Core\Order\Events\OrderStatusUpdated;
+use Modules\Core\Order\Services\OrderStatusFlow;
+use Modules\Core\Order\Support\OrderReferenceDisplay;
 
 class OrderStatusUpdatedNotification extends BaseNotification
 {
@@ -29,6 +31,22 @@ class OrderStatusUpdatedNotification extends BaseNotification
      * NotificationRegistry, so without this the customer would get two
      * emails for that one transition. Returning no channels is the
      * standard Laravel way to suppress a notification outright.
+     *
+     * Also suppressed for the order's very first transition off
+     * 'awaiting_payment' — for every payment method except bank transfer,
+     * that transition happens in the SAME request as checkout itself
+     * (Modules\Core\Order\Services\OrderPaymentResolutionService::
+     * resolveCaptureOrAuthorization()/resolveDeferredPayment(), both
+     * called synchronously alongside Checkout\Events\OrderPlaced), so it's
+     * not new information — the shopper was already told their order is
+     * confirmed by Modules\Core\Order\Notifications\
+     * OrderPlacedNotification moments earlier. A bank transfer order is
+     * the one genuine exception: it sits at 'awaiting_payment' until
+     * staff separately mark it paid (Modules\Core\Order\Services\
+     * OrderFulfillmentService::markPaid()), a real, later event the
+     * shopper does need to hear about — see OrderStatusFlow's own
+     * docblock for why bank transfer is the only payment method where
+     * placement and payment aren't the same moment.
      */
     public function via(object $notifiable): array
     {
@@ -36,6 +54,11 @@ class OrderStatusUpdatedNotification extends BaseNotification
             return [];
         }
 
+        if ($this->event->previousStatus === 'awaiting_payment'
+            && ! app(OrderStatusFlow::class)->isBankTransfer($this->event->order)) {
+            return [];
+        }
+
         return ['mail'];
     }
 
@@ -52,11 +75,18 @@ class OrderStatusUpdatedNotification extends BaseNotification
     {
         $order = $this->event->order;
 
+        $reference = OrderReferenceDisplay::resolve($order);
+        $statusLabel = config("lunar.orders.statuses.{$order->status}.label", $order->status);
+
         return (new MailMessage)
-            ->subject(__('Your order :reference has been updated', ['reference' => $order->reference]))
+            ->subject(__('Your order :reference is now :status', [
+                'reference' => $reference,
+                'status' => $statusLabel,
+            ]))
             ->view('core::order.notifications.status-updated', [
-                'reference' => $order->reference,
+                'order' => $order,
-                'statusLabel' => config("lunar.orders.statuses.{$order->status}.label", $order->status),
+                'reference' => $reference,
+                'statusLabel' => $statusLabel,
             ]);
     }
 }

src/Order/Services/OrderFulfillmentService.php

@@ -34,6 +34,7 @@ class OrderFulfillmentService
         private readonly OrderStatusWriter $writer,
         private readonly OrderStatusFlow $flow,
         private readonly TransactionRecorder $transactions,
+        private readonly OrderPaymentResolutionService $resolution,
     ) {}
 
     public function markReady(Order $order): OrderFulfillmentResult
@@ -114,9 +115,13 @@ class OrderFulfillmentService
     }
 
     /**
-     * Independent of `status` entirely — offered by the single "Update
+     * For a COD order, independent of `status` entirely — offered by the
-     * Status" action regardless of current status (see
+     * single "Update Status" action regardless of current status (see
-     * OrderStatusFlow::canMarkPaid()).
+     * OrderStatusFlow::canMarkPaid()). For a bank transfer order, status
+     * genuinely does advance here too (see below) — unlike COD, a bank
+     * transfer order has been sitting at 'awaiting_payment' since checkout
+     * (BankTransferPaymentDriver::pay() deliberately never advances it),
+     * and this click is the only thing that ever will.
      */
     public function markPaid(Order $order): OrderFulfillmentResult
     {
@@ -125,18 +130,20 @@ class OrderFulfillmentService
         }
 
         // canMarkPaid() only ever returns true for an order whose payment
-        // method resolves to the cash-on-delivery DRIVER (see
+        // method resolves to the cash-on-delivery or bank-transfer DRIVER
-        // OrderStatusFlow::isCod(), which checks PaymentMethod::driver,
+        // (see OrderStatusFlow::isCod()/isBankTransfer(), which check
-        // never the merchant-chosen `type` slug directly — a store could
+        // PaymentMethod::driver, never the merchant-chosen `type` slug
-        // name that method "cod", "pay-on-delivery", anything). Such an
+        // directly — a store could name that method "cod", "pay-on-delivery",
-        // order never runs through Payment's pay()/authorize() flow at
+        // "wire", anything). Neither ever runs a Transaction-recording event
-        // checkout, so nothing else records a Transaction for it. Money
+        // through to completion at checkout (COD dispatches nothing capture-
-        // changes hands right here, at this click, so this is the one
+        // shaped at all; bank transfer's pay() returns Pending with no event
-        // place that write can happen; there is no earlier Payment event
+        // dispatched — see that driver's own docblock). Money changes hands
-        // to hang it off of the way Modules\Core\Order\Listeners\
+        // right here, at this click, so this is the one place that write can
-        // RecordPaymentTransaction does for a gateway driver. See
+        // happen; there is no earlier Payment event to hang it off of the way
-        // TransactionRecorder's own docblock — it already anticipated
+        // Modules\Core\Order\Listeners\RecordPaymentTransaction does for a
-        // exactly this "manually-triggered ... from Filament" call site.
+        // gateway driver. See TransactionRecorder's own docblock — it already
+        // anticipated exactly this "manually-triggered ... from Filament"
+        // call site.
         //
         // $driver below is the payment method's own `type` slug (whatever
         // the merchant named it, e.g. 'cash-on-delivery' or 'cod') —
@@ -146,19 +153,25 @@ class OrderFulfillmentService
         // No fallback guess here: CheckoutService::initiatePayment() always
         // writes Order.meta['payment_method'] before charging, and
         // canMarkPaid() already guarantees this order got that far.
+        $type = (string) $order->meta['payment_method'];
+
         $this->transactions->record(
             $order,
             type: 'capture',
-            driver: (string) $order->meta['payment_method'],
+            driver: $type,
             result: new PaymentResult(
                 status: PaymentResultStatus::Succeeded,
-                reference: 'cod-manual-'.$order->id,
+                reference: "manual-{$type}-{$order->id}",
                 amount: $order->total,
             ),
         );
 
         $this->writer->markPaid($order, self::class.'::markPaid');
 
+        if ($this->flow->isBankTransfer($order)) {
+            $this->resolution->advancePastAwaitingPayment($order, self::class.'::markPaid');
+        }
+
         return OrderFulfillmentResult::success('Order marked as paid.');
     }
 

src/Order/Services/OrderPaymentResolutionService.php

@@ -92,7 +92,14 @@ class OrderPaymentResolutionService
         }
     }
 
-    private function advancePastAwaitingPayment(Order $order, string $causeClass): void
+    /**
+     * Also called directly by OrderFulfillmentService::markPaid() for a
+     * bank transfer order — unlike a COD markPaid() (which never touches
+     * status, since nothing was ever awaited), a bank transfer order
+     * genuinely sat at 'awaiting_payment' until this moment, and nothing
+     * else will ever advance it if this doesn't.
+     */
+    public function advancePastAwaitingPayment(Order $order, string $causeClass): void
     {
         if ($order->status !== 'awaiting_payment') {
             return;

src/Order/Services/OrderStatusFlow.php

@@ -54,6 +54,24 @@ class OrderStatusFlow
         return PaymentMethod::where('type', $type)->value('driver') === 'cash-on-delivery';
     }
 
+    /**
+     * Same meta-first/Transaction-fallback resolution as isCod(). Unlike COD
+     * — where nothing is ever awaited, since payment happens on delivery —
+     * a bank transfer order genuinely sits at 'awaiting_payment' until staff
+     * confirm the wire arrived (see BankTransferPaymentDriver's own
+     * docblock and OrderFulfillmentService::markPaid()).
+     */
+    public function isBankTransfer(Order $order): bool
+    {
+        $type = $order->meta['payment_method'] ?? $order->transactions()->latest('id')->value('driver');
+
+        if ($type === null) {
+            return false;
+        }
+
+        return PaymentMethod::where('type', $type)->value('driver') === 'bank-transfer';
+    }
+
     /**
      * @return array<string, string> value => label — every status in the
      *   order's own branch (carrier or pickup), plus the refund options,
@@ -124,13 +142,16 @@ class OrderStatusFlow
 
     /**
      * Whether the "mark paid" option should be offered right now —
-     * entirely independent of $order->status. True whenever this is a
+     * entirely independent of $order->status for a COD order (true whenever
-     * cash-on-delivery order and payment hasn't been recorded yet,
+     * payment hasn't been recorded yet, regardless of fulfillment progress,
-     * regardless of fulfillment progress (before OR after completed).
+     * before OR after completed). A bank transfer order is also eligible,
+     * for the same "no earlier Payment event recorded this" reason (see
+     * OrderFulfillmentService::markPaid()), but unlike COD its own status
+     * genuinely does need advancing once marked paid — see that method.
      */
     public function canMarkPaid(Order $order): bool
     {
-        return ! $order->paid && $this->isCod($order);
+        return ! $order->paid && ($this->isCod($order) || $this->isBankTransfer($order));
     }
 
     /**

src/Order/Support/OrderReferenceDisplay.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Core\Order\Support;
+
+use Lunar\Models\Order;
+
+/**
+ * A shorter, human-facing form of Order::reference for emails/views —
+ * Lunar\Base\OrderReferenceGenerator pads the order's own id out to a fixed
+ * length (config('lunar.orders.reference_format'), 8 characters/'0'-padded
+ * by default), so a shop's first real orders read as "#00000001" rather
+ * than "#1". Strips leading zeros until the first non-zero digit; if
+ * nothing but zeros remain (or the reference is empty), shows "0".
+ *
+ * $order->reference itself is untouched anywhere else (DB lookups, the
+ * order-status API, staff search) — this is purely a display helper.
+ */
+class OrderReferenceDisplay
+{
+    public static function resolve(Order $order): string
+    {
+        $reference = ltrim((string) $order->reference, '0');
+
+        return $reference !== '' ? $reference : '0';
+    }
+}

src/Payment/Drivers/BankTransferPaymentDriver.php

@@ -9,30 +9,52 @@ use Modules\Core\Payment\Contracts\SupportsPay;
 use Modules\Core\Payment\Contracts\SupportsRefunds;
 use Modules\Core\Payment\DTOs\PaymentResult;
 use Modules\Core\Payment\Enums\PaymentResultStatus;
-use Modules\Core\Payment\Events\PaymentCaptured;
+use Modules\Core\Payment\Events\PaymentDeferred;
 use Modules\Core\Payment\Events\PaymentRefunded;
 
 /**
- * Manual/attested, same trust model as OfflinePaymentDriver — there is no
+ * refund() is manual/attested, same trust model as OfflinePaymentDriver —
- * bank API to call, so both pay() and refund() decide success immediately
+ * there is no bank API to call, so it decides success immediately on a
- * on a staff member's say-so (they've already sent/received the wire
+ * staff member's say-so (they've already sent the wire outside the
- * outside the system). Distinct from OfflinePaymentDriver in intent: this
+ * system). Distinct from OfflinePaymentDriver in intent: this exists so a
- * exists so a payment taken through a DIFFERENT method (e.g.
+ * payment taken through a DIFFERENT method (e.g. cash-on-delivery) can
- * cash-on-delivery) can still be REFUNDED via bank transfer — an admin
+ * still be REFUNDED via bank transfer — an admin chooses this driver
- * chooses this driver explicitly in the refund action, independent of
+ * explicitly in the refund action, independent of which driver the
- * which driver the original payment went through (see
+ * original payment went through (see
  * Payment\Support\TransactionDriverAdapter::refundVia() and
- * Order\Filament\Extensions\OrderActionsExtension). pay() exists so
+ * Order\Filament\Extensions\OrderActionsExtension).
- * the same driver also covers receiving a payment by bank transfer, but
+ *
- * the admin UI for that (bank reference, notes, proof-of-transfer upload)
+ * pay() is the opposite trust direction from refund(): a bank transfer
- * is deliberately not built yet — see the follow-up work tracked from this
+ * payment requires the money to arrive BEFORE the order can be
- * session; pay() itself is complete and usable via the registry today.
+ * considered paid (unlike cash-on-delivery, where payment happens on
+ * delivery — see CashOnDeliveryPaymentDriver's own docblock for that
+ * driver's mirror-image reasoning). So pay() returns Pending and DOES
+ * dispatch PaymentDeferred, same as COD — without it, nothing ever sets
+ * Order::placed_at or fires OrderPlaced, leaving the order invisible in
+ * customer order history, un-decremented in stock, and the checkout
+ * confirmation page unable to find it (see PaymentDeferred's and
+ * CashOnDeliveryPaymentDriver's own docblocks for that failure mode).
+ * Unlike COD, though, a bank transfer order genuinely DOES have something
+ * to await: MarkOrderPlacedOnDeferredPayment skips
+ * OrderPaymentResolutionService::resolveDeferredPayment() for a bank
+ * transfer order (via OrderStatusFlow::isBankTransfer()), so it stays at
+ * 'awaiting_payment' with Order::paid false until staff confirm the wire
+ * arrived via OrderFulfillmentService::markPaid(), which — unlike its COD
+ * path — also advances the order's status, since nothing else ever will
+ * (see that method's own docblock). CheckoutController::placeOrder()
+ * already treats a Pending result with no continuation as a fully placed
+ * order (see its own docblock), so the order is still created and visible
+ * to the shopper immediately; only its payment/status is what's left
+ * outstanding.
  *
  * $reference is generated here for the same reason as OfflinePaymentDriver's
- * pay(): there is no gateway to hand one back. 'notes' in $context (not
+ * pay(): there is no gateway to hand one back. refund()'s 'notes' (in
- * $data — refund() has no $data parameter) is folded into
+ * $context — it has no $data parameter) is folded into PaymentResult::$meta,
- * PaymentResult::$meta, which Order\Services\TransactionRecorder::record()
+ * which Order\Services\TransactionRecorder::record() already writes straight
- * already writes straight into Transaction.meta with no extra plumbing.
+ * into Transaction.meta with no extra plumbing; pay() has no equivalent
+ * write, since nothing ever records a Transaction from its own result (see
+ * above) — any notes a shopper enters at checkout would need surfacing some
+ * other way, e.g. when staff mark the order paid.
  */
 class BankTransferPaymentDriver implements Configurable, SupportsPay, SupportsRefunds
 {
@@ -47,13 +69,12 @@ class BankTransferPaymentDriver implements Configurable, SupportsPay, SupportsRe
     public function pay(string $type, Price $amount, array $data = [], array $context = []): PaymentResult
     {
         $result = new PaymentResult(
-            status: PaymentResultStatus::Succeeded,
+            status: PaymentResultStatus::Pending,
             reference: 'bank-transfer-'.Str::uuid(),
             amount: $amount,
-            meta: array_filter(['notes' => $data['notes'] ?? null]),
         );
 
-        PaymentCaptured::dispatch($type, $result, $context);
+        PaymentDeferred::dispatch($type, $result, $context);
 
         return $result;
     }

src/Privacy/Filament/Extensions/CustomerErasureActionsExtension.php

@@ -3,6 +3,7 @@
 namespace Modules\Core\Privacy\Filament\Extensions;
 
 use Filament\Actions\Action;
+use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Checkbox;
 use Filament\Notifications\Notification;
 use Lunar\Admin\Support\Extending\BaseExtension;
@@ -20,13 +21,18 @@ use Modules\Core\Privacy\Services\PrivacyService;
  * docs/modules.md "Layering Module and App Configuration"), and this extension
  * deliberately only implements headerActions(), so it never conflicts with an
  * app's own extension for the same resource.
+ *
+ * Also strips Lunar's own plain DeleteAction from these pages — with Privacy
+ * installed, "Request Erasure" (grace period, cascades, audit trail via
+ * DataErasureRequest) is the only sanctioned way to remove a Customer; a
+ * direct delete would bypass all of that.
  */
 class CustomerErasureActionsExtension extends BaseExtension
 {
     public function headerActions(array $actions): array
     {
         return [
-            ...$actions,
+            ...array_filter($actions, fn ($action) => ! $action instanceof DeleteAction),
             Action::make('requestErasure')
                 ->label('Request Erasure')
                 ->icon('heroicon-o-shield-exclamation')

src/Providers/ShippingServiceProvider.php

@@ -10,6 +10,7 @@ use Livewire\Mechanisms\ComponentRegistry;
 use Lunar\Models\Order;
 use Lunar\Shipping\Facades\Shipping;
 use Lunar\Shipping\Filament\Resources\ShippingZoneResource\Pages\ManageShippingRates as VendorManageShippingRates;
+use Lunar\Shipping\Interfaces\ShippingMethodManagerInterface;
 use Lunar\Shipping\Models\ShippingMethod;
 use Modules\Core\Cart\Events\CartCleared;
 use Modules\Core\Cart\Events\CartLineAdded;
@@ -25,9 +26,11 @@ use Modules\Core\Shipping\Carriers\BoxNow\BoxNowFulfillmentService;
 use Modules\Core\Shipping\Carriers\BoxNow\BoxNowRateDriver;
 use Modules\Core\Shipping\Contracts\CarrierFulfillmentInterface;
 use Modules\Core\Shipping\Filament\Pages\ManageShippingRates;
+use Modules\Core\Shipping\Carriers\StorePickup\StorePickupRateDriver;
 use Modules\Core\Shipping\Jobs\PollShipmentTrackingJob;
 use Modules\Core\Shipping\Listeners\InvalidateShippingOptions;
 use Modules\Core\Shipping\Support\FulfillmentType;
+use Modules\Core\Shipping\Support\ShippingManager;
 use Modules\Core\Shipping\Models\Shipment;
 
 class ShippingServiceProvider extends ServiceProvider
@@ -81,10 +84,9 @@ class ShippingServiceProvider extends ServiceProvider
         // resolveCarrier() for the same lookup pattern already used to
         // resolve a carrier driver from it).
         //
-        // Resolves via Modules\Core\Shipping\Support\FulfillmentType (driver-
+        // Resolves via Modules\Core\Shipping\Support\FulfillmentType
-        // declared for acs/box-now, merchant-configured data['fulfillment_type']
+        // (hardcoded per driver — see that class's own docblock) rather
-        // fallback for table-rate-shipping's generic drivers) rather than
+        // than through a ShippingMethod::macro('isStorePickup', ...) —
-        // through a ShippingMethod::macro('isStorePickup', ...) —
         // Lunar\Base\Traits\HasModelExtending::__callStatic() (used by
         // Lunar\Shipping\Models\ShippingMethod via Lunar\Base\BaseModel)
         // intercepts EVERY unmatched static call, including macro()
@@ -119,10 +121,22 @@ class ShippingServiceProvider extends ServiceProvider
 
         // Deferred: the Shipping facade resolves a binding registered in
         // lunarphp/table-rate-shipping's own ShippingServiceProvider::boot(),
-        // and provider boot order between packages isn't guaranteed.
+        // and provider boot order between packages isn't guaranteed — in
+        // fact composer's package discovery registers boboko/core BEFORE
+        // lunarphp/table-rate-shipping (alphabetical), so a bind() in this
+        // provider's own register()/boot() runs first and gets silently
+        // overwritten by the vendor's own later bind() of the same
+        // abstract. booted() is the first point every provider's
+        // register()/boot() has definitely already run, so this is also
+        // where the ShippingMethodManagerInterface override belongs (must
+        // run before the Shipping::extend() calls below, which resolve —
+        // and the facade then CACHES — whatever's bound at that moment).
         $this->app->booted(function () {
+            $this->app->bind(ShippingMethodManagerInterface::class, fn ($app) => $app->make(ShippingManager::class));
+
             Shipping::extend('acs', fn ($app) => $app->make(AcsRateDriver::class));
             Shipping::extend('box-now', fn ($app) => $app->make(BoxNowRateDriver::class));
+            Shipping::extend('store-pickup', fn ($app) => $app->make(StorePickupRateDriver::class));
 
             $this->app->make(ConsoleSchedule::class)
                 ->job(new WarmAcsAreaCacheJob)

src/Providers/StoreServiceProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Modules\Core\Providers;
+
+use Illuminate\Mail\Events\MessageSending;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\ServiceProvider;
+use Modules\Core\Store\Events\StoreDetailsUpdated;
+use Modules\Core\Store\Listeners\FlushStoreDetailsCache;
+use Modules\Core\Store\Services\StoreDetailsService;
+use Symfony\Component\Mime\Address;
+
+class StoreServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Event::listen(StoreDetailsUpdated::class, FlushStoreDetailsCache::class);
+        Event::listen(MessageSending::class, [$this, 'applyMailFromName']);
+    }
+
+    /**
+     * Renames the From header's display name to the store's own Store
+     * Details setting, when filled in — leaves the address itself alone
+     * (a deliverability/domain-authentication concern, not something a
+     * merchant should freely edit via a text field) and leaves an
+     * EXPLICIT sender alone too: anything whose From address isn't
+     * config('mail.from.address') deliberately chose a different sender
+     * (e.g. a mailable/notification that calls ->from() itself), which
+     * this provider has no business second-guessing.
+     * StoreDetailsService::current() is forever-cached (see its own
+     * docblock), so this costs nothing extra per send.
+     */
+    public function applyMailFromName(MessageSending $event): void
+    {
+        $name = app(StoreDetailsService::class)->current()->mail_from_name;
+
+        if (blank($name)) {
+            return;
+        }
+
+        $from = $event->message->getFrom()[0] ?? null;
+
+        if ($from === null || $from->getAddress() !== config('mail.from.address')) {
+            return;
+        }
+
+        $event->message->from(new Address($from->getAddress(), $name));
+    }
+}

src/Providers/WishlistServiceProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Core\Providers;
+
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
+use Modules\Core\Auth\Events\UserAuthenticated;
+use Modules\Core\Wishlist\Listeners\MergeGuestWishlistOnLogin;
+use Modules\Core\Wishlist\Services\WishlistService;
+
+class WishlistServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        // One instance per request: it caches the guest cookie's ids, so a
+        // toggle and a later has() in the same request agree.
+        $this->app->scoped(WishlistService::class);
+    }
+
+    public function boot(): void
+    {
+        Route::middleware('web')->group(__DIR__.'/../Wishlist/routes/web.php');
+
+        Event::listen(UserAuthenticated::class, MergeGuestWishlistOnLogin::class);
+    }
+}

src/Shipping/Carriers/Acs/AcsRateDriver.php

@@ -9,16 +9,19 @@ use Lunar\Shipping\Interfaces\ShippingRateInterface;
 use Lunar\Shipping\Models\ShippingRate;
 use Modules\Core\Shipping\Carriers\Acs\Exceptions\AcsApiException;
 use Modules\Core\Shipping\Concerns\CachesLivePricing;
+use Modules\Core\Shipping\Concerns\ExcludesRestrictedProducts;
 use Modules\Core\Shipping\Concerns\ResolvesFixedPricing;
 use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
+use Modules\Core\Shipping\Contracts\SupportsCashCollection;
 use Modules\Core\Shipping\Contracts\SupportsLivePricing;
 use Modules\Core\Shipping\Support\ShippingMethodName;
 use Modules\Core\Shipping\Support\WeightCalculator;
 
-class AcsRateDriver implements ShippingRateInterface, SupportsLivePricing, DeclaresFulfillmentType
+class AcsRateDriver implements ShippingRateInterface, SupportsLivePricing, DeclaresFulfillmentType, SupportsCashCollection
 {
     use ResolvesFixedPricing;
     use CachesLivePricing;
+    use ExcludesRestrictedProducts;
 
     public ShippingRate $shippingRate;
 
@@ -37,6 +40,11 @@ class AcsRateDriver implements ShippingRateInterface, SupportsLivePricing, Decla
         return 'carrier';
     }
 
+    public function collectsCash(): bool
+    {
+        return true;
+    }
+
     public function description(): string
     {
         return 'Live rate quote from ACS Courier.';
@@ -48,6 +56,10 @@ class AcsRateDriver implements ShippingRateInterface, SupportsLivePricing, Decla
         $shippingMethod = $shippingRate->shippingMethod;
         $cart = $shippingOptionRequest->cart;
 
+        if ($this->cartHasExcludedProducts($shippingRate, $cart)) {
+            return null;
+        }
+
         if (($shippingMethod->data['charge_by'] ?? 'cart_total') !== 'live') {
             return $this->resolveFixedPrice($shippingRate, $shippingMethod, $cart);
         }

src/Shipping/Carriers/BoxNow/BoxNowRateDriver.php

@@ -6,6 +6,7 @@ use Lunar\DataTypes\ShippingOption;
 use Lunar\Shipping\DataTransferObjects\ShippingOptionRequest;
 use Lunar\Shipping\Interfaces\ShippingRateInterface;
 use Lunar\Shipping\Models\ShippingRate;
+use Modules\Core\Shipping\Concerns\ExcludesRestrictedProducts;
 use Modules\Core\Shipping\Concerns\ResolvesFixedPricing;
 use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
 
@@ -18,6 +19,7 @@ use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
 class BoxNowRateDriver implements ShippingRateInterface, DeclaresFulfillmentType
 {
     use ResolvesFixedPricing;
+    use ExcludesRestrictedProducts;
 
     public ShippingRate $shippingRate;
 
@@ -38,6 +40,10 @@ class BoxNowRateDriver implements ShippingRateInterface, DeclaresFulfillmentType
 
     public function resolve(ShippingOptionRequest $shippingOptionRequest): ?ShippingOption
     {
+        if ($this->cartHasExcludedProducts($shippingOptionRequest->shippingRate, $shippingOptionRequest->cart)) {
+            return null;
+        }
+
         return $this->resolveFixedPrice(
             $shippingOptionRequest->shippingRate,
             $shippingOptionRequest->shippingRate->shippingMethod,

src/Shipping/Carriers/StorePickup/StorePickupRateDriver.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace Modules\Core\Shipping\Carriers\StorePickup;
+
+use Lunar\DataTypes\ShippingOption;
+use Lunar\Shipping\DataTransferObjects\ShippingOptionRequest;
+use Lunar\Shipping\Interfaces\ShippingRateInterface;
+use Lunar\Shipping\Models\ShippingRate;
+use Modules\Core\Shipping\Concerns\ExcludesRestrictedProducts;
+use Modules\Core\Shipping\Concerns\ResolvesFixedPricing;
+use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
+
+/**
+ * First-party replacement for lunarphp/table-rate-shipping's own Collection
+ * driver — same shape as AcsRateDriver/BoxNowRateDriver, unlike the vendor
+ * generic drivers (flat-rate/ship-by/free-shipping/collection), which this
+ * module no longer registers (see ShippingServiceProvider). Two reasons
+ * this exists rather than keeping the vendor driver:
+ *
+ * 1. Collection::resolve() reads $shippingMethod->name directly instead of
+ *    through Modules\Core\Shipping\Support\ShippingMethodName::resolve() —
+ *    ShippingMethod has no cast for that locale-keyed JSON column (see
+ *    ShippingMethodName's own docblock), so the storefront showed the raw
+ *    JSON blob as the option's name instead of the translated string.
+ * 2. Unambiguously store pickup, like ACS/Box Now are unambiguously
+ *    carrier — implementing DeclaresFulfillmentType means this is a
+ *    hardcoded fact about the driver, never a merchant configuration
+ *    choice (see that contract's own docblock).
+ *
+ * No live pricing — there's no API for in-person pickup, just the method's
+ * own charge_by + price-break configuration (usually free), the same
+ * mechanism Box Now uses.
+ */
+class StorePickupRateDriver implements ShippingRateInterface, DeclaresFulfillmentType
+{
+    use ResolvesFixedPricing;
+    use ExcludesRestrictedProducts;
+
+    public ShippingRate $shippingRate;
+
+    public function name(): string
+    {
+        return 'Store Pickup';
+    }
+
+    public function fulfillmentType(): string
+    {
+        return 'store_pickup';
+    }
+
+    public function description(): string
+    {
+        return 'Collect your order in store.';
+    }
+
+    public function resolve(ShippingOptionRequest $shippingOptionRequest): ?ShippingOption
+    {
+        if ($this->cartHasExcludedProducts($shippingOptionRequest->shippingRate, $shippingOptionRequest->cart)) {
+            return null;
+        }
+
+        return $this->resolveFixedPrice(
+            $shippingOptionRequest->shippingRate,
+            $shippingOptionRequest->shippingRate->shippingMethod,
+            $shippingOptionRequest->cart,
+        );
+    }
+
+    public function on(ShippingRate $shippingRate): self
+    {
+        $this->shippingRate = $shippingRate;
+
+        return $this;
+    }
+}

src/Shipping/Concerns/ExcludesRestrictedProducts.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Modules\Core\Shipping\Concerns;
+
+use Lunar\Models\Cart;
+use Lunar\Models\Product;
+use Lunar\Shipping\Models\ShippingRate;
+
+/**
+ * A shipping zone can list specific products that can't go through it (see
+ * the Filament "Shipping Exclusions" relation manager on ShippingZoneResource)
+ * — a merchant's way of saying "this item physically can't be handled by
+ * this carrier/method," independent of price. lunarphp/table-rate-shipping's
+ * own generic drivers (FlatRate, ShipBy, FreeShipping, Collection) each
+ * check this before returning an option; every first-party driver in this
+ * module (ACS, Box Now, store pickup) shares it from here instead, so a
+ * merchant-configured exclusion is honored no matter which driver a
+ * shipping method uses — not just the vendor's generic ones. Call this
+ * FIRST in resolve(), before any pricing lookup (live or fixed): an
+ * excluded product should make the option disappear entirely, the same
+ * "return null" a driver already uses for "no rate matched."
+ */
+trait ExcludesRestrictedProducts
+{
+    private function cartHasExcludedProducts(ShippingRate $shippingRate, Cart $cart): bool
+    {
+        $productIds = $cart->lines->load('purchasable')->pluck('purchasable.product_id');
+
+        return $shippingRate->shippingZone->shippingExclusions()
+            ->whereHas('exclusions', function ($query) use ($productIds) {
+                $query->wherePurchasableType(Product::morphName())
+                    ->whereIn('purchasable_id', $productIds);
+            })->exists();
+    }
+}

src/Shipping/Contracts/DeclaresFulfillmentType.php

@@ -3,18 +3,14 @@
 namespace Modules\Core\Shipping\Contracts;
 
 /**
- * Optional contract a shipping rate driver implements to declare whether
+ * Every shipping rate driver this module registers implements this to
- * it fulfils via carrier delivery or in-store pickup — e.g.
+ * declare whether it fulfils via carrier delivery or in-store pickup —
  * Modules\Core\Shipping\Carriers\Acs\AcsRateDriver and BoxNowRateDriver
- * are unambiguously carrier-only, so this is a hardcoded fact about the
+ * are unambiguously carrier-only, Modules\Core\Shipping\Carriers\
- * driver, not something a merchant should have to configure per row.
+ * StorePickup\StorePickupRateDriver unambiguously store-pickup, so this
- *
+ * is a hardcoded fact about each driver, never something a merchant
- * table-rate-shipping's own generic drivers (flat-rate, ship-by,
+ * configures per row. See Modules\Core\Shipping\Support\FulfillmentType::
- * free-shipping) don't implement this — they're genuinely ambiguous (a
+ * resolve(), the single source of truth this feeds.
- * merchant could configure one for either carrier delivery or store
- * pickup), so Modules\Core\Shipping\Support\FulfillmentType::resolve()
- * falls back to ShippingMethod.data['fulfillment_type'] (still merchant-
- * overridable) only for drivers that don't implement this contract.
  */
 interface DeclaresFulfillmentType
 {

src/Shipping/Contracts/SupportsCashCollection.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\Core\Shipping\Contracts;
+
+/**
+ * A shipping rate driver implements this to say a person is physically
+ * present at handoff to collect cash — true for a courier like
+ * Modules\Core\Shipping\Carriers\Acs\AcsRateDriver, false for an
+ * unattended parcel locker network like Modules\Core\Shipping\Carriers\
+ * BoxNow\BoxNowRateDriver, where no one is there to take payment. Checked
+ * by Modules\Core\Checkout\Services\CheckoutService::getPaymentMethods()
+ * for cash-on-delivery specifically (Modules\Core\Payment\Drivers\
+ * CashOnDeliveryPaymentDriver) — separate from Modules\Core\Shipping\
+ * Contracts\DeclaresFulfillmentType, which only distinguishes carrier vs.
+ * store_pickup and can't tell ACS and Box Now apart (both 'carrier').
+ *
+ * Not implemented at all means "no" — a driver with no opinion here
+ * (any of table-rate-shipping's own generic drivers, if one were ever
+ * re-added) is treated as not supporting cash collection, the safer
+ * default for a driver this module knows nothing about.
+ */
+interface SupportsCashCollection
+{
+    public function collectsCash(): bool;
+}

src/Shipping/Extensions/ShippingMethodListExtension.php

@@ -48,6 +48,6 @@ class ShippingMethodListExtension extends BaseExtension
             ->label('Type')
             ->options(fn () => collect(Shipping::getSupportedDrivers())
                 ->mapWithKeys(fn ($driver, $key) => [$key => $driver->name()]))
-            ->default('flat-rate');
+            ->default('acs');
     }
 }

src/Shipping/Extensions/ShippingMethodResourceExtension.php

@@ -13,7 +13,6 @@ use Filament\Tables\Table;
 use Lunar\Admin\Support\Extending\ResourceExtension;
 use Lunar\Admin\Support\Forms\Components\TranslatedText;
 use Lunar\Shipping\Facades\Shipping;
-use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
 use Modules\Core\Shipping\Contracts\SupportsLivePricing;
 use Modules\Core\Shipping\Support\ShippingMethodName;
 
@@ -22,13 +21,11 @@ class ShippingMethodResourceExtension extends ResourceExtension
     public function extendForm(Schema $schema): Schema
     {
         return $schema->components(
-            $this->replaceFulfillmentTypeField(
             $this->replaceChargeByField(
                 $this->replaceNameField(
                     $this->replaceDriverField($schema->getComponents())
                 )
             )
-            )
         );
     }
 
@@ -98,64 +95,6 @@ class ShippingMethodResourceExtension extends ResourceExtension
         return $field;
     }
 
-    /**
-     * Inserts the `fulfillment_type` Select right after `charge_by`, in
-     * the SAME Group (vendor's own `Group::make([getChargeByFormComponent()])
-     * ->columns(2)`) — formerly appended at the very end of the whole
-     * form, disconnected from `driver`/`charge_by`, the decisions it
-     * actually relates to. Only rendered at all for a driver that DOESN'T
-     * already declare its own fulfillment type (see Modules\Core\Shipping\
-     * Contracts\DeclaresFulfillmentType, Modules\Core\Shipping\Support\
-     * FulfillmentType) — acs/box-now are unambiguously carrier-only, so
-     * asking a merchant to also pick "Carrier delivery" for every ACS/Box
-     * Now method was redundant, error-prone config with no real decision
-     * behind it. Still offered for table-rate-shipping's generic drivers
-     * (flat-rate, ship-by, free-shipping), which are genuinely ambiguous.
-     */
-    private function replaceFulfillmentTypeField(array $components): array
-    {
-        $result = [];
-
-        foreach ($components as $component) {
-            $result[] = $component;
-
-            if (method_exists($component, 'getName') && $component->getName() === 'charge_by') {
-                $result[] = $this->fulfillmentTypeSelect();
-            } elseif (in_array(HasChildComponents::class, class_uses_recursive($component), true)) {
-                $component->schema($this->replaceFulfillmentTypeField($component->getChildComponents()));
-            }
-        }
-
-        return $result;
-    }
-
-    private function fulfillmentTypeSelect(): Select
-    {
-        return Select::make('data.fulfillment_type')
-            ->label('Fulfillment type')
-            ->options([
-                'carrier' => 'Carrier delivery',
-                'store_pickup' => 'Collect in store',
-            ])
-            ->default('carrier')
-            ->required()
-            ->visible(fn (Get $get) => $this->driverIsFulfillmentAmbiguous($get('../driver')))
-            ->helperText('Whether an order using this method is handed to a carrier, or collected by the customer in person.');
-    }
-
-    private function driverIsFulfillmentAmbiguous(?string $driver): bool
-    {
-        if (! $driver) {
-            return true;
-        }
-
-        try {
-            return ! Shipping::driver($driver) instanceof DeclaresFulfillmentType;
-        } catch (InvalidArgumentException) {
-            return true;
-        }
-    }
-
     /**
      * Extend the vendor's cart_total/weight charge_by Select with a third
      * "live" option — only offered when the currently selected driver
@@ -297,7 +236,7 @@ class ShippingMethodResourceExtension extends ResourceExtension
             ->label('Type')
             ->options(fn () => collect(Shipping::getSupportedDrivers())
                 ->mapWithKeys(fn ($driver, $key) => [$key => $driver->name()]))
-            ->default('flat-rate')
+            ->default('acs')
             ->live();
     }
 }

src/Shipping/Support/FulfillmentType.php

@@ -8,20 +8,16 @@ use Modules\Core\Shipping\Contracts\DeclaresFulfillmentType;
 
 /**
  * The single source of truth for "is this ShippingMethod a carrier
- * delivery or an in-store pickup" — replaces a merchant-facing
+ * delivery or an in-store pickup" — every driver this module registers
- * data['fulfillment_type'] Select that used to exist for every method
+ * (ACS, Box Now, Modules\Core\Shipping\Carriers\StorePickup\
- * regardless of driver. Modules\Core\Shipping\Carriers\Acs\AcsRateDriver
+ * StorePickupRateDriver) implements DeclaresFulfillmentType, so this is
- * and BoxNowRateDriver are unambiguously carrier-only (see
+ * now a hardcoded fact about the driver, never a merchant choice. There
- * Modules\Core\Shipping\Contracts\DeclaresFulfillmentType's own
+ * used to be a merchant-facing data['fulfillment_type'] Select as a
- * docblock), so asking a merchant to also pick "Carrier delivery" for
+ * fallback for table-rate-shipping's own generic drivers (flat-rate,
- * every ACS/Box Now method was redundant, error-prone config with no
+ * ship-by, free-shipping, collection), which were genuinely ambiguous
- * real decision behind it.
+ * (a merchant could configure one for either purpose) — those drivers
- *
+ * are no longer offered at all (see Modules\Core\Shipping\Support\
- * table-rate-shipping's own generic drivers (flat-rate, ship-by,
+ * ShippingManager), so the fallback and the field it read from are gone.
- * free-shipping) don't implement DeclaresFulfillmentType — a merchant
- * could genuinely configure one for either purpose (e.g. "Flat Rate —
- * Athens Store Pickup") — so those still fall back to the merchant-set
- * data['fulfillment_type'], defaulting to 'carrier' when unset.
  */
 class FulfillmentType
 {
@@ -29,32 +25,11 @@ class FulfillmentType
     {
         $driver = collect(Shipping::getSupportedDrivers())->get($method->driver);
 
-        if ($driver instanceof DeclaresFulfillmentType) {
+        return $driver instanceof DeclaresFulfillmentType ? $driver->fulfillmentType() : 'carrier';
-            return $driver->fulfillmentType();
-        }
-
-        return $method->data['fulfillment_type'] ?? 'carrier';
     }
 
     public static function isStorePickup(ShippingMethod $method): bool
     {
         return static::resolve($method) === 'store_pickup';
     }
-
-    /**
-     * Whether the merchant-facing "Fulfillment type" Select should be
-     * shown at all for a given driver — hidden entirely for a driver that
-     * already declares its own fulfillment type, since there is no real
-     * decision left for the merchant to make.
-     */
-    public static function isConfigurableFor(?string $driverKey): bool
-    {
-        if ($driverKey === null) {
-            return true;
-        }
-
-        $driver = collect(Shipping::getSupportedDrivers())->get($driverKey);
-
-        return ! $driver instanceof DeclaresFulfillmentType;
-    }
 }

src/Shipping/Support/ShippingManager.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\Core\Shipping\Support;
+
+use Lunar\Shipping\Managers\ShippingManager as VendorShippingManager;
+
+/**
+ * Drops lunarphp/table-rate-shipping's own generic drivers (free-shipping,
+ * flat-rate, ship-by, collection) from getSupportedDrivers() — every
+ * shipping method in this app now uses a first-party driver (ACS, Box
+ * Now, or Modules\Core\Shipping\Carriers\StorePickup\StorePickupRateDriver,
+ * registered via Shipping::extend() in ShippingServiceProvider), each of
+ * which declares its own fulfillment type and correctly decodes
+ * ShippingMethod's translatable `name` column (see StorePickupRateDriver's
+ * own docblock for why the vendor `collection` driver specifically had to
+ * go — it read $shippingMethod->name raw, showing the storefront the raw
+ * JSON blob instead of a translated string). The generic drivers'
+ * create{X}Driver() methods still exist on the parent (harmless — nothing
+ * calls them once their key is gone from getSupportedDrivers()), so this
+ * only needs to override the one method that lists what's offered.
+ *
+ * Bound over the vendor's own ShippingMethodManagerInterface binding in
+ * ShippingServiceProvider, from inside its own $this->app->booted(...)
+ * callback — a plain register()-time bind() here runs BEFORE the
+ * vendor's own (composer discovers boboko/core before lunarphp/
+ * table-rate-shipping alphabetically), so the vendor's later bind()
+ * would silently win instead. See that provider's own comment.
+ */
+class ShippingManager extends VendorShippingManager
+{
+    public function getSupportedDrivers(): \Illuminate\Support\Collection
+    {
+        return collect($this->customCreators)
+            ->mapWithKeys(function ($creator, $key) {
+                return [$key => $this->callCustomCreator($key)];
+            });
+    }
+}

src/Store/Events/StoreDetailsUpdated.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Modules\Core\Store\Events;
+
+use Modules\Core\Store\Models\StoreDetails;
+
+/**
+ * Dispatched by StoreDetailsService — the only place StoreDetails is ever
+ * created/updated, mirroring Modules\Core\Localization\Services\
+ * TranslationService's own create()/update() shape. Modules\Core\Store\
+ * Listeners\FlushStoreDetailsCache reacts to this to invalidate
+ * StoreDetailsService::current()'s forever-cache.
+ */
+class StoreDetailsUpdated
+{
+    public function __construct(
+        public readonly StoreDetails $storeDetails,
+    ) {}
+}

src/Store/Filament/Pages/ManageStoreDetails.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Modules\Core\Store\Filament\Pages;
+
+use Filament\Actions\Action;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Notifications\Notification;
+use Filament\Pages\Page;
+use Filament\Schemas\Components\Actions;
+use Filament\Schemas\Components\EmbeddedSchema;
+use Filament\Schemas\Components\Form;
+use Filament\Schemas\Components\Section;
+use Filament\Schemas\Schema;
+use Lunar\Admin\Support\Forms\Components\TranslatedText;
+use Modules\Core\Store\Services\StoreDetailsService;
+
+/**
+ * Singleton settings page — no resource, no record list, always edits the
+ * one StoreDetails row (see that model's own docblock). Filament ships no
+ * built-in "settings page" type; this follows the same shape Filament's own
+ * password-reset-request page uses (see Filament\Auth\Pages\PasswordReset\
+ * RequestPasswordReset): a content(Schema) composed of a Form(EmbeddedSchema)
+ * with the save action(s) in its own footer(), rather than a hand-written
+ * Blade view — Filament v4 has no `x-filament-panels::form.actions` Blade
+ * component to fall back on for a plain Page.
+ */
+class ManageStoreDetails extends Page implements HasForms
+{
+    use InteractsWithForms;
+
+    protected static ?string $navigationLabel = 'Store Details';
+
+    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-building-storefront';
+
+    protected static string|\UnitEnum|null $navigationGroup = 'Settings';
+
+    public ?array $data = [];
+
+    public function mount(): void
+    {
+        $this->form->fill(
+            app(StoreDetailsService::class)->current()->attributesToArray()
+        );
+    }
+
+    public function content(Schema $schema): Schema
+    {
+        return $schema->components([
+            Form::make([EmbeddedSchema::make('form')])
+                ->id('form')
+                ->livewireSubmitHandler('save')
+                ->footer([
+                    Actions::make($this->getFormActions())
+                        ->key('form-actions'),
+                ]),
+        ]);
+    }
+
+    public function form(Schema $schema): Schema
+    {
+        return $schema
+            ->statePath('data')
+            ->components([
+                Section::make('Store')
+                    ->schema([
+                        // Deliberately not ->required(): TranslatedText's own
+                        // state is the whole locale-keyed array, and its
+                        // required-rule generation validates that array
+                        // itself rather than deferring to its per-locale
+                        // children — it fires "required" even when every
+                        // locale sub-field is genuinely filled in. The
+                        // column is nullable and nothing reads it yet, so
+                        // there's no real need to enforce this here.
+                        TranslatedText::make('name')
+                            ->label('Store name'),
+                        TranslatedText::make('address')
+                            ->label('Address'),
+                        TextInput::make('phone')
+                            ->label('Phone')
+                            ->tel(),
+                        TextInput::make('contact_email')
+                            ->label('Contact email')
+                            ->email()
+                            ->helperText('Receives the contact form, and is shown to customers as the store\'s contact email.'),
+                        TextInput::make('mail_from_name')
+                            ->label('Mail from name')
+                            ->helperText('The sender name on outgoing emails (MAIL_FROM_NAME).'),
+                    ]),
+                Section::make('Legal')
+                    ->description('Shown on invoices and terms pages.')
+                    ->schema([
+                        TranslatedText::make('legal_name')
+                            ->label('Legal name'),
+                        TextInput::make('tax_identifier')
+                            ->label('Tax ID (ΑΦΜ)'),
+                        TextInput::make('registration_number')
+                            ->label('Company registration number (ΓΕΜΗ)'),
+                    ]),
+                Section::make('Bank transfer')
+                    ->description('Shown to a shopper on the order confirmation page when they chose to pay by bank transfer.')
+                    ->schema([
+                        // Rich, not plain Textarea — a shop owner may want a
+                        // formatted table (bank name / IBAN / BIC columns) or
+                        // bold text, not just line breaks. RichEditor's
+                        // 'table' toolbar button ships in its default toolbar
+                        // (RichEditor::getDefaultToolbarButtons()), so this
+                        // needs no extra config to get table insert/edit.
+                        TranslatedText::make('bank_transfer_instructions')
+                            ->label('Instructions')
+                            ->optionRichtext(true),
+                    ]),
+            ]);
+    }
+
+    protected function getFormActions(): array
+    {
+        return [
+            Action::make('save')
+                ->label('Save')
+                ->submit('save'),
+        ];
+    }
+
+    public function save(): void
+    {
+        $state = $this->form->getState();
+
+        app(StoreDetailsService::class)->update($state);
+
+        Notification::make()
+            ->title('Store details saved')
+            ->success()
+            ->send();
+    }
+}

src/Store/Listeners/FlushStoreDetailsCache.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Core\Store\Listeners;
+
+use Illuminate\Support\Facades\Cache;
+use Modules\Core\Store\Events\StoreDetailsUpdated;
+use Modules\Core\Store\Services\StoreDetailsService;
+
+/**
+ * Same shape as Modules\Core\Localization\Listeners\FlushTranslationCache —
+ * StoreDetailsService::current() caches forever (this is read on every
+ * storefront request that shows store details, e.g. the checkout
+ * confirmation page's bank transfer instructions), so the only way it ever
+ * becomes stale is a write through this same service. Not queued: unlike
+ * FlushTranslationCache (which only affects a LATER storefront request),
+ * StoreDetailsUpdated fires from the staff member's own save action, and
+ * StoreDetailsService::current() may be called again within that same
+ * request/response cycle.
+ */
+class FlushStoreDetailsCache
+{
+    public function handle(StoreDetailsUpdated $event): void
+    {
+        Cache::forget(StoreDetailsService::CACHE_KEY);
+    }
+}

src/Store/Models/StoreDetails.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Core\Store\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Lunar\Base\Traits\HasTranslations;
+
+/**
+ * Singleton — always exactly one row, fetched/created via
+ * Modules\Core\Store\Services\StoreDetailsService::current(). See that
+ * table's own migration docblock for why name/address/
+ * bank_transfer_instructions are locale-keyed JSON and the rest are plain.
+ */
+class StoreDetails extends Model
+{
+    use HasTranslations;
+
+    protected $guarded = [];
+
+    protected $casts = [
+        'name' => 'array',
+        'address' => 'array',
+        'bank_transfer_instructions' => 'array',
+        'legal_name' => 'array',
+    ];
+}

src/Store/Services/StoreDetailsService.php

@@ -0,0 +1,112 @@
+<?php
+
+namespace Modules\Core\Store\Services;
+
+use Filament\Forms\Components\RichEditor\RichContentRenderer;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Event;
+use Lunar\Models\Language;
+use Lunar\Models\Order;
+use Modules\Core\Order\Services\OrderStatusFlow;
+use Modules\Core\Store\Events\StoreDetailsUpdated;
+use Modules\Core\Store\Models\StoreDetails;
+
+/**
+ * The only entrypoint that creates/updates the StoreDetails singleton — same
+ * shape as Modules\Core\Localization\Services\TranslationService: every
+ * write goes through here so it can dispatch StoreDetailsUpdated, which
+ * Modules\Core\Store\Listeners\FlushStoreDetailsCache reacts to. Never call
+ * StoreDetails::query()->update(...) or $storeDetails->save() directly — a
+ * write bypassing this service leaves current()'s forever-cache stale.
+ */
+class StoreDetailsService
+{
+    public const CACHE_KEY = 'store-details';
+
+    /**
+     * Forever-cached — read on every storefront request that shows store
+     * details (e.g. the checkout confirmation page's bank transfer
+     * instructions), so this should never re-query the database on a normal
+     * request. Only ever invalidated by update() below, via
+     * FlushStoreDetailsCache reacting to StoreDetailsUpdated.
+     */
+    public function current(): StoreDetails
+    {
+        return Cache::rememberForever(
+            self::CACHE_KEY,
+            fn () => $this->firstOrCreate(),
+        );
+    }
+
+    /**
+     * Null for any non-bank-transfer order — the confirmation email only
+     * shows this block when there's actually a wire to send (see
+     * BankTransferPaymentDriver's own docblock for why a bank transfer
+     * order stays at 'awaiting_payment' until staff confirm the wire
+     * arrived). Null also when the store hasn't filled the field in for
+     * $locale, so the caller's own @if($bankTransferInstructions) guard
+     * covers both cases identically.
+     *
+     * bank_transfer_instructions is a TranslatedRichEditor field (see
+     * ManageStoreDetails), so translate() returns Filament's Tiptap JSON
+     * document structure for that locale, not a plain string —
+     * RichContentRenderer::make() is Filament's own converter from that
+     * structure to sanitized HTML (the same one the admin panel itself
+     * uses to render a RichEditor's content read-only).
+     */
+    public function bankTransferInstructionsFor(Order $order, string $locale): ?string
+    {
+        if (! app(OrderStatusFlow::class)->isBankTransfer($order)) {
+            return null;
+        }
+
+        $content = $this->current()->translate('bank_transfer_instructions', $locale);
+
+        if (blank($content)) {
+            return null;
+        }
+
+        return RichContentRenderer::make($content)->toHtml();
+    }
+
+    public function update(array $attributes): StoreDetails
+    {
+        $storeDetails = $this->firstOrCreate();
+
+        $storeDetails->update($attributes);
+
+        Event::dispatch(new StoreDetailsUpdated($storeDetails));
+
+        return $storeDetails;
+    }
+
+    /**
+     * A freshly-created row must never leave a translatable column
+     * genuinely NULL — Lunar's own TranslatedText component (Modules\Core\
+     * Store\Filament\Pages\ManageStoreDetails's `name`/`address`/
+     * `bank_transfer_instructions` fields) silently drops every keystroke
+     * on re-render when the field it's editing starts out NULL rather than
+     * an empty per-locale array. Real-world precedent (PaymentMethod's own
+     * translatable `name` column) never hits this, because every
+     * PaymentMethod row is created THROUGH the same Filament form that
+     * immediately fills `name` — this singleton is instead created blank
+     * and opened for editing in the same visit, which is exactly the gap
+     * that surfaces the bug. Caught and fixed after the fact, verified via
+     * tinker: seeding a real (non-null) array made typing into the field
+     * persist correctly, confirming NULL was the trigger.
+     */
+    private function firstOrCreate(): StoreDetails
+    {
+        return StoreDetails::query()->firstOrCreate([], [
+            'name' => $this->emptyPerLocale(),
+            'address' => $this->emptyPerLocale(),
+            'bank_transfer_instructions' => $this->emptyPerLocale(),
+            'legal_name' => $this->emptyPerLocale(),
+        ]);
+    }
+
+    private function emptyPerLocale(): array
+    {
+        return Language::query()->pluck('code')->mapWithKeys(fn (string $code) => [$code => ''])->all();
+    }
+}

src/Wishlist/Http/Controllers/WishlistController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Modules\Core\Wishlist\Http\Controllers;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use Lunar\Models\Product;
+use Modules\Core\Wishlist\Services\WishlistService;
+
+/**
+ * Adds or removes a product on the current shopper's wishlist — guests and
+ * logged-in shoppers alike (see WishlistService). Page rendering (the
+ * account/guest wishlist list views, with their product-card presentation)
+ * is app-specific and stays in the consuming app; this is only the toggle
+ * action a heart button or plain form posts to.
+ */
+class WishlistController extends Controller
+{
+    public function __construct(
+        private readonly WishlistService $wishlist,
+    ) {}
+
+    /**
+     * The heart button's Stimulus controller asks for JSON; without JS the
+     * form posts normally and comes back to the same page.
+     */
+    public function toggle(Request $request, int $productId): JsonResponse|RedirectResponse
+    {
+        abort_unless(Product::whereKey($productId)->exists(), 404);
+
+        $active = $this->wishlist->toggle($productId);
+
+        if ($request->expectsJson()) {
+            return response()->json(['active' => $active]);
+        }
+
+        return back();
+    }
+}

src/Wishlist/Listeners/MergeGuestWishlistOnLogin.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Modules\Core\Wishlist\Listeners;
+
+use Modules\Core\Auth\Events\UserAuthenticated;
+use Modules\Core\Wishlist\Services\WishlistService;
+
+/**
+ * Registered from Providers\WishlistServiceProvider — UserAuthenticated fires
+ * inside the login request, so this can read the guest wishlist cookie and
+ * queue its removal.
+ */
+class MergeGuestWishlistOnLogin
+{
+    public function __construct(
+        private readonly WishlistService $wishlist,
+    ) {}
+
+    public function handle(UserAuthenticated $event): void
+    {
+        $this->wishlist->mergeGuestInto($event->user);
+    }
+}

src/Wishlist/Models/WishlistItem.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Modules\Core\Wishlist\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * One product on a logged-in user's wishlist. Guests' wishlists live in a
+ * cookie instead — see Modules\Core\Wishlist\Services\Wishlist.
+ */
+class WishlistItem extends Model
+{
+    protected $fillable = ['user_id', 'product_id'];
+}

src/Wishlist/Services/WishlistService.php

@@ -0,0 +1,126 @@
+<?php
+
+namespace Modules\Core\Wishlist\Services;
+
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cookie;
+use Modules\Core\Wishlist\Models\WishlistItem;
+
+/**
+ * The current shopper's wishlist, product ids only.
+ *
+ * Logged in: rows in wishlist_items. Guest: a 1-year cookie holding the ids
+ * (encrypted like every cookie, by the web group's EncryptCookies), so nothing
+ * is written to the database for anonymous visitors. On login the cookie is
+ * merged into the account and cleared (MergeGuestWishlistOnLogin).
+ */
+class WishlistService
+{
+    public const COOKIE = 'wishlist';
+
+    private const COOKIE_MINUTES = 60 * 24 * 365;
+
+    // Keeps the cookie well under the 4KB browser limit.
+    private const GUEST_MAX = 100;
+
+    /** @var array<int>|null ids for this request, including a toggle just made */
+    private ?array $guestIds = null;
+
+    /** @return array<int> newest first */
+    public function ids(): array
+    {
+        if ($user = Auth::user()) {
+            return WishlistItem::where('user_id', $user->id)
+                ->latest('id')
+                ->pluck('product_id')
+                ->all();
+        }
+
+        return $this->guestIds();
+    }
+
+    public function has(int $productId): bool
+    {
+        return in_array($productId, $this->ids(), true);
+    }
+
+    /**
+     * @return bool whether the product is on the wishlist afterwards
+     */
+    public function toggle(int $productId): bool
+    {
+        if ($user = Auth::user()) {
+            $deleted = WishlistItem::where('user_id', $user->id)->where('product_id', $productId)->delete();
+
+            if ($deleted) {
+                return false;
+            }
+
+            WishlistItem::create(['user_id' => $user->id, 'product_id' => $productId]);
+
+            return true;
+        }
+
+        $ids = $this->guestIds();
+
+        if (in_array($productId, $ids, true)) {
+            $this->storeGuestIds(array_values(array_diff($ids, [$productId])));
+
+            return false;
+        }
+
+        $this->storeGuestIds(array_slice([$productId, ...$ids], 0, self::GUEST_MAX));
+
+        return true;
+    }
+
+    public function remove(int $productId): void
+    {
+        if ($this->has($productId)) {
+            $this->toggle($productId);
+        }
+    }
+
+    /**
+     * Moves the guest cookie's products onto $user's wishlist and clears it.
+     */
+    public function mergeGuestInto(Authenticatable $user): void
+    {
+        $ids = $this->guestIds();
+
+        if ($ids === []) {
+            return;
+        }
+
+        // Oldest first, so the newest cookie item also ends up newest here.
+        foreach (array_reverse($ids) as $productId) {
+            WishlistItem::firstOrCreate(['user_id' => $user->id, 'product_id' => $productId]);
+        }
+
+        $this->guestIds = [];
+        Cookie::queue(Cookie::forget(self::COOKIE));
+    }
+
+    /** @return array<int> */
+    private function guestIds(): array
+    {
+        if ($this->guestIds !== null) {
+            return $this->guestIds;
+        }
+
+        $decoded = json_decode((string) request()->cookie(self::COOKIE), true);
+
+        return $this->guestIds = is_array($decoded)
+            ? array_values(array_unique(array_filter(array_map('intval', $decoded))))
+            : [];
+    }
+
+    /** @param  array<int>  $ids */
+    private function storeGuestIds(array $ids): void
+    {
+        $this->guestIds = $ids;
+
+        Cookie::queue(self::COOKIE, json_encode($ids), self::COOKIE_MINUTES);
+    }
+}

src/Wishlist/routes/web.php

@@ -0,0 +1,9 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Core\Wishlist\Http\Controllers\WishlistController;
+
+Route::post('wishlist/{productId}', [WishlistController::class, 'toggle'])
+    ->whereNumber('productId')
+    ->middleware('throttle:60,1')
+    ->name('wishlist.toggle');