multilingual content, change in how we show header categories and homepage hero products

app/Http/Controllers/ContactController.php

@@ -5,6 +5,7 @@
 use App\Http\Requests\ContactRequest;
 use App\Mail\ContactConfirmationMail;
 use App\Mail\ContactMessageMail;
+use App\Models\StoicPage;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
@@ -15,7 +16,7 @@
 
 /**
  * Contact form. Nothing is stored: the message is emailed to the store
- * (CONTACT_EMAIL) and the sender gets a generic confirmation. Both are sent
+ * (Store Details' contact email) and the sender gets a generic confirmation. Both are sent
  * synchronously so a failed store email can be reported back on the form.
  *
  * Limited per IP in here rather than with throttle middleware, so the limit
@@ -28,11 +29,15 @@ class ContactController extends Controller
 
     public function index(string $locale): View
     {
-        // Address and phone come from Store Details; the email is still
-        // CONTACT_EMAIL until Store Details has an email field.
+        $page = StoicPage::localized('contact');
+
+        if (! $page) {
+            abort(404);
+        }
+
         return view('contact', [
+            'page' => $page,
             'store' => app(StoreDetailsService::class)->current(),
-            'contactEmail' => config('services.contact.email'),
         ]);
     }
 
@@ -47,11 +52,11 @@ public function send(string $locale, ContactRequest $request): RedirectResponse
         RateLimiter::hit($key, self::SEND_DECAY_SECONDS);
 
         $data = $request->validated();
-        $to = config('services.contact.email');
+        $to = app(StoreDetailsService::class)->current()->contact_email;
 
         try {
             if (blank($to)) {
-                throw new \RuntimeException('CONTACT_EMAIL is not set.');
+                throw new \RuntimeException('Store Details has no contact email.');
             }
 
             Mail::to($to)->send(new ContactMessageMail(

app/Http/Controllers/HomeController.php

@@ -4,11 +4,23 @@
 
 use App\Catalog\ProductCard;
 use App\Models\StoicPage;
+use Modules\Core\Catalog\DTOs\ProductFilters;
+use Modules\Core\Catalog\Services\CollectionService;
 use Modules\Core\Catalog\Services\ProductService;
 
 class HomeController extends Controller
 {
-    public function __construct(private readonly ProductService $products) {}
+    /** Slug of the hero collection in the "Homepage" collection group. */
+    private const HERO_COLLECTION_SLUG = 'hero';
+
+    private const HERO_FALLBACK_COUNT = 5;
+
+    private const CLASSICS_COUNT = 8;
+
+    public function __construct(
+        private readonly ProductService $products,
+        private readonly CollectionService $collections,
+    ) {}
 
     public function index(string $locale)
     {
@@ -18,13 +30,46 @@ public function index(string $locale)
             abort(404);
         }
 
-        $products = collect($this->products->random(13))
-            ->map(fn (array $product) => ProductCard::fromIndexed($product));
+        // Random pool for the classics carousel, and for the hero too when the
+        // hero collection is missing or empty. Oversized so hero products can be
+        // excluded from it and still leave enough.
+        $random = collect($this->products->random(self::HERO_FALLBACK_COUNT + self::CLASSICS_COUNT));
+
+        $hero = collect($this->heroCollectionProducts());
+
+        if ($hero->isEmpty()) {
+            $hero = $random->take(self::HERO_FALLBACK_COUNT);
+        }
+
+        $heroIds = $hero->pluck('id')->all();
+
+        $classics = $random
+            ->reject(fn (array $product) => in_array($product['id'], $heroIds))
+            ->take(self::CLASSICS_COUNT);
 
         return view('home', [
             'page' => $page,
-            'heroProducts' => $products->take(5)->values(),
-            'classicsProducts' => $products->slice(5)->values(),
+            'heroProducts' => $hero->map(fn (array $product) => ProductCard::fromIndexed($product))->values(),
+            'classicsProducts' => $classics->map(fn (array $product) => ProductCard::fromIndexed($product))->values(),
         ]);
     }
+
+    /**
+     * Products the store owner picked for the hero, via the Lunar collection
+     * with slug "hero". Not in the owner's drag order yet: the product index
+     * doesn't carry per-collection position (pending a boboko-core task).
+     */
+    private function heroCollectionProducts(): array
+    {
+        $collection = $this->collections->getBySlug(self::HERO_COLLECTION_SLUG);
+
+        if ($collection === null) {
+            return [];
+        }
+
+        return $this->products
+            ->list(new ProductFilters(collectionId: $collection['id']))
+            ->products
+            ->items();
+    }
 }

app/Http/Controllers/LegalPageController.php

@@ -15,6 +15,8 @@ class LegalPageController extends Controller
         '{store_name}' => 'name',
         '{store_address}' => 'address',
         '{store_phone}' => 'phone',
+        '{store_contact_email}' => 'contact_email',
+        '{store_legal_name}' => 'legal_name',
         '{store_tax_identifier}' => 'tax_identifier',
         '{store_registration_number}' => 'registration_number',
     ];

app/Mail/ContactMessageMail.php

@@ -8,7 +8,7 @@
 use Illuminate\Mail\Mailables\Envelope;
 
 /**
- * A contact-form message, sent to the store's CONTACT_EMAIL. Reply-To is the
+ * A contact-form message, sent to Store Details' contact email. Reply-To is the
  * sender, so replying from the inbox goes straight to them.
  */
 class ContactMessageMail extends Mailable

app/Providers/AppServiceProvider.php

@@ -6,15 +6,20 @@
 use App\Models\Staff;
 use App\Services\StoicSettings;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Mail\Events\MessageSending;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\View as ViewInstance;
 use Lunar\Facades\ModelManifest;
 use Lunar\Facades\Telemetry;
+use Lunar\Models\CollectionGroup;
 use Modules\Core\Catalog\DTOs\CollectionFilters;
 use Modules\Core\Catalog\Enums\CollectionSort;
 use Modules\Core\Catalog\Services\CollectionService;
+use Modules\Core\Store\Services\StoreDetailsService;
+use Symfony\Component\Mime\Address;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -27,12 +32,17 @@ public function boot(): void
     {
         Telemetry::optOut();
 
-        // header.blade.php's category dropdown — root collections only, resolved
-        // per-request so the composer runs after `locale` middleware has already
-        // set App::getLocale(), which CollectionService's name resolution depends on.
+        // header.blade.php's category dropdown — root collections of the catalog
+        // group only, so merchandising groups (e.g. "Homepage") stay out of the
+        // nav. Resolved per-request so the composer runs after `locale` middleware
+        // has already set App::getLocale(), which CollectionService's name
+        // resolution depends on. The group is looked up by handle, not id, since
+        // ids can differ between environments.
         View::composer('components.header', function (ViewInstance $view) {
-            $view->with('categories', app(CollectionService::class)->list(
-                filters: new CollectionFilters(rootOnly: true),
+            $groupId = CollectionGroup::where('handle', 'shopify')->value('id');
+
+            $view->with('categories', $groupId === null ? [] : app(CollectionService::class)->list(
+                filters: new CollectionFilters(groupId: $groupId, rootOnly: true),
                 perPage: 100,
                 sort: CollectionSort::Position,
             )->items());
@@ -45,6 +55,29 @@ public function boot(): void
             fn (ViewInstance $view) => $view->with('stoicSettings', app(StoicSettings::class)),
         );
 
+        // INTERIM, belongs in boboko-core's Store module: the sender name on
+        // outgoing emails comes from Store Details' "Mail from name", with
+        // MAIL_FROM_NAME as the fallback when it's empty. Done per message
+        // rather than by setting config at boot, so a long-running queue
+        // worker picks up a changed name without a restart. Only the default
+        // from address is renamed; a mailable with its own from is left alone.
+        Event::listen(MessageSending::class, function (MessageSending $event) {
+            $name = app(StoreDetailsService::class)->current()->mail_from_name;
+
+            if (blank($name)) {
+                return;
+            }
+
+            $defaultAddress = config('mail.from.address');
+
+            $event->message->from(...array_map(
+                fn (Address $from) => $from->getAddress() === $defaultAddress
+                    ? new Address($from->getAddress(), $name)
+                    : $from,
+                $event->message->getFrom(),
+            ));
+        });
+
         if ($this->app->environment('production')) {
             URL::forceScheme('https');
         }