feat: shop UX polish — password reset / order email / multi-image / customer admin

Shop password reset: - Configured 'shop_customers' password broker on the existing password_reset_tokens table - ShopCustomer::sendPasswordResetNotification overrides Laravel default to send a ShopPasswordResetMail with a tenant-subdomain reset URL - Routes /shop/password/forgot, /shop/password/email, /shop/password/reset/{token} + ShopAuthController showForgotPassword/sendResetLink/showResetPassword/ resetPassword. Forgot view stays generic ("if it exists, we sent…") to avoid email enumeration. Login view links to "Am uitat parola". Order confirmation email: - ShopOrderConfirmationMail + nicely formatted HTML email template - ShopOrderNotifier::placed now also emails customer_email (best-effort, warning-only logged on failure) alongside existing Telegram + staff push Multiple images per Part: - Part media collection switched from singleFile to multiple (max 8 in form) - imageUrls() helper for galleries; imageUrl() still returns first for cards - PartResource form: reorderable multi-upload - Shop part detail: vertical thumbnails switch the main image via vanilla JS ShopCustomerResource (tenant Filament, "Magazin" nav group): - List with name/phone/email/client_id/orders_count/last_login_at - Edit (no password field exposed) - "Trimite reset parolă" action uses the new broker - OrdersRelationManager shows the customer's orders read-only Tests (7 new): - forgot sends mail; forgot doesn't disclose unknown email; reset with valid token changes password; bad token rejected; order email when customer_email set; email skipped without it; Part has imageUrls() collection Full suite: 130 passed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-03 06:14:45 +00:00
parent fca4f75e9c
commit 3da1f5412a
20 changed files with 703 additions and 8 deletions
@@ -105,11 +105,14 @@ class PartResource extends Resource
                    \Filament\Forms\Components\SpatieMediaLibraryFileUpload::make('image')
                        ->label('Foto piesă')
                        ->collection('image')
+                        ->multiple()
+                        ->reorderable()
                        ->image()
                        ->imageEditor()
+                        ->maxFiles(8)
                        ->maxSize(2048)
                        ->columnSpanFull()
-                        ->helperText('Apare în magazinul online (catalog + pagina piesei). Max 2 MB.'),
+                        ->helperText('Galerie de până la 8 imagini. Prima e afișată în catalog. Max 2 MB / imagine.'),
                ]),
            Forms\Components\Textarea::make('notes')->label('Observații')->columnSpanFull()->rows(2),
        ]);
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Filament\Tenant\Resources;
+
+use App\Filament\Tenant\Resources\ShopCustomerResource\Pages;
+use App\Filament\Tenant\Resources\ShopCustomerResource\RelationManagers;
+use App\Models\Tenant\ShopCustomer;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Notifications\Notification;
+use Filament\Resources\Resource;
+use Filament\Schemas;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Password;
+
+class ShopCustomerResource extends Resource
+{
+    protected static ?string $model = ShopCustomer::class;
+
+    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-user-circle';
+
+    protected static ?string $navigationLabel = 'Clienți magazin';
+
+    protected static string|\UnitEnum|null $navigationGroup = 'Magazin';
+
+    protected static ?string $modelLabel = 'client magazin';
+
+    protected static ?string $pluralModelLabel = 'clienți magazin';
+
+    protected static ?int $navigationSort = 52;
+
+    public static function form(Schema $schema): Schema
+    {
+        return $schema->components([
+            Schemas\Components\Section::make()->columns(2)->schema([
+                Forms\Components\TextInput::make('name')->label('Nume')->required()->maxLength(160),
+                Forms\Components\TextInput::make('phone')->label('Telefon')->required()->maxLength(40),
+                Forms\Components\TextInput::make('email')->label('Email')->email()->maxLength(160),
+                Forms\Components\Select::make('client_id')
+                    ->label('Client legat (CRM)')
+                    ->options(fn () => \App\Models\Tenant\Client::pluck('name', 'id'))
+                    ->searchable()
+                    ->helperText('Legătura cu fișa CRM (opțional). Auto-matched la înregistrare după telefon.'),
+            ]),
+        ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')->searchable()->sortable(),
+                Tables\Columns\TextColumn::make('phone')->copyable()->searchable(),
+                Tables\Columns\TextColumn::make('email')->placeholder('—')->copyable()->toggleable(),
+                Tables\Columns\TextColumn::make('client.name')->label('Client CRM')->placeholder('—')->toggleable(),
+                Tables\Columns\TextColumn::make('orders_count')->counts('orders')->label('Comenzi')->alignRight(),
+                Tables\Columns\TextColumn::make('last_login_at')->label('Ultim login')->since()->placeholder('Niciodată'),
+                Tables\Columns\TextColumn::make('created_at')->label('Înregistrat')->date('d.m.Y')->toggleable(),
+            ])
+            ->actions([
+                Actions\Action::make('reset_password')
+                    ->label('Trimite reset parolă')
+                    ->icon('heroicon-m-key')
+                    ->color('warning')
+                    ->visible(fn (ShopCustomer $r) => ! empty($r->email))
+                    ->requiresConfirmation()
+                    ->modalDescription('Trimite emailul standard de resetare a parolei către clientul magazinului.')
+                    ->action(function (ShopCustomer $r) {
+                        $status = Password::broker('shop_customers')->sendResetLink(['email' => $r->email]);
+                        Notification::make()
+                            ->title($status === Password::RESET_LINK_SENT
+                                ? 'Link de resetare trimis la ' . $r->email
+                                : 'Eșec: ' . $status)
+                            ->{$status === Password::RESET_LINK_SENT ? 'success' : 'warning'}()
+                            ->send();
+                    }),
+                Actions\EditAction::make(),
+                Actions\DeleteAction::make(),
+            ])
+            ->emptyStateHeading('Niciun client magazin')
+            ->emptyStateDescription('Aici apar clienții care și-au creat cont în magazinul online (/shop/register).')
+            ->emptyStateIcon('heroicon-o-user-circle')
+            ->defaultSort('created_at', 'desc');
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            RelationManagers\OrdersRelationManager::class,
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListShopCustomers::route('/'),
+            'edit' => Pages\EditShopCustomer::route('/{record}/edit'),
+        ];
+    }
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\ShopCustomerResource\Pages;
+
+use App\Filament\Tenant\Resources\ShopCustomerResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditShopCustomer extends EditRecord
+{
+    protected static string $resource = ShopCustomerResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [Actions\DeleteAction::make()];
+    }
+}
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\ShopCustomerResource\Pages;
+
+use App\Filament\Tenant\Resources\ShopCustomerResource;
+use Filament\Resources\Pages\ListRecords;
+
+class ListShopCustomers extends ListRecords
+{
+    protected static string $resource = ShopCustomerResource::class;
+}
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\ShopCustomerResource\RelationManagers;
+
+use App\Models\Tenant\OnlineOrder;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class OrdersRelationManager extends RelationManager
+{
+    protected static string $relationship = 'orders';
+
+    protected static ?string $title = 'Comenzi';
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('number')
+            ->columns([
+                Tables\Columns\TextColumn::make('number')->label('Nr.'),
+                Tables\Columns\TextColumn::make('created_at')->label('Data')->dateTime('d.m.Y H:i'),
+                Tables\Columns\TextColumn::make('status')
+                    ->formatStateUsing(fn ($s) => OnlineOrder::STATUSES[$s] ?? $s)
+                    ->badge()
+                    ->colors([
+                        'warning' => ['new'],
+                        'info' => ['confirmed', 'packed'],
+                        'primary' => ['shipped'],
+                        'success' => ['delivered'],
+                        'danger' => ['cancelled'],
+                    ]),
+                Tables\Columns\TextColumn::make('total')->money('MDL')->alignRight(),
+            ])
+            ->defaultSort('created_at', 'desc')
+            ->emptyStateHeading('Nicio comandă încă');
+    }
+}
@@ -5,10 +5,13 @@ namespace App\Http\Controllers;
 use App\Models\Tenant\Client;
 use App\Models\Tenant\ShopCustomer;
 use App\Tenancy\TenantManager;
+use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Password;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 class ShopAuthController extends Controller
@@ -117,6 +120,61 @@ class ShopAuthController extends Controller
        ]);
    }

+    public function showForgotPassword()
+    {
+        $tenant = $this->tenantOrFail();
+        return view('shop.auth.forgot', ['tenant' => $tenant, 'cartCount' => $this->cartCount()]);
+    }
+
+    public function sendResetLink(Request $request)
+    {
+        $this->tenantOrFail();
+        $data = $request->validate(['email' => 'required|email']);
+
+        // Send (always returns generic "sent" message — don't disclose if email exists).
+        Password::broker('shop_customers')->sendResetLink(['email' => $data['email']]);
+
+        return back()->with('status', 'Dacă există un cont cu acest email, am trimis un link de resetare.');
+    }
+
+    public function showResetPassword(string $token, Request $request)
+    {
+        $tenant = $this->tenantOrFail();
+        return view('shop.auth.reset', [
+            'tenant' => $tenant,
+            'token' => $token,
+            'email' => $request->query('email'),
+            'cartCount' => $this->cartCount(),
+        ]);
+    }
+
+    public function resetPassword(Request $request)
+    {
+        $this->tenantOrFail();
+        $data = $request->validate([
+            'token' => 'required|string',
+            'email' => 'required|email',
+            'password' => 'required|string|min:6|confirmed',
+        ]);
+
+        $status = Password::broker('shop_customers')->reset(
+            $data,
+            function (ShopCustomer $customer, string $password) {
+                $customer->forceFill([
+                    'password' => Hash::make($password),
+                    'remember_token' => Str::random(60),
+                ])->save();
+                event(new PasswordReset($customer));
+            }
+        );
+
+        if ($status === Password::PASSWORD_RESET) {
+            return redirect('/shop/login')->with('status', 'Parola a fost resetată. Te poți loga acum.');
+        }
+
+        return back()->withErrors(['email' => 'Link invalid sau expirat. Cere unul nou.'])->withInput();
+    }
+
    private function cartCount(): int
    {
        $tenant = app(TenantManager::class)->current();
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\Central\Company;
+use App\Models\Tenant\OnlineOrder;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ShopOrderConfirmationMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public function __construct(
+        public OnlineOrder $order,
+        public Company $company,
+    ) {}
+
+    public function envelope(): Envelope
+    {
+        $brand = $this->company->display_name ?? $this->company->name;
+        return new Envelope(
+            subject: "Comanda #{$this->order->number} primită — {$brand}",
+        );
+    }
+
+    public function content(): Content
+    {
+        return new Content(
+            view: 'emails.shop.order-confirmation',
+            with: [
+                'order' => $this->order,
+                'company' => $this->company,
+                'items' => $this->order->items()->get(),
+                'trackingUrl' => $this->order->trackingUrl(),
+                'currency' => $this->company->settings['currency'] ?? 'MDL',
+            ],
+        );
+    }
+}
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\Central\Company;
+use App\Models\Tenant\ShopCustomer;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ShopPasswordResetMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public function __construct(
+        public ShopCustomer $customer,
+        public Company $company,
+        public string $resetUrl,
+    ) {}
+
+    public function envelope(): Envelope
+    {
+        $brand = $this->company->display_name ?? $this->company->name;
+        return new Envelope(
+            subject: "Resetare parolă — {$brand}",
+        );
+    }
+
+    public function content(): Content
+    {
+        return new Content(
+            view: 'emails.shop.password-reset',
+            with: [
+                'customer' => $this->customer,
+                'company' => $this->company,
+                'resetUrl' => $this->resetUrl,
+            ],
+        );
+    }
+}
@@ -16,7 +16,8 @@ class Part extends Model implements HasMedia

    public function registerMediaCollections(): void
    {
-        $this->addMediaCollection('image')->singleFile();
+        // Multi-image gallery (catalog uses imageUrl() = first; detail page renders all).
+        $this->addMediaCollection('image');
    }

    public function imageUrl(): ?string
@@ -27,6 +28,15 @@ class Part extends Model implements HasMedia
        return $m->getUrl();
    }

+    /** @return list<string> All published image URLs (excluding any whose file is missing). */
+    public function imageUrls(): array
+    {
+        return $this->getMedia('image')
+            ->filter(fn ($m) => @file_exists($m->getPath()))
+            ->map(fn ($m) => $m->getUrl())
+            ->values()->all();
+    }
+
    public const CATEGORIES = [
        'Ulei', 'Filtre', 'Frâne', 'Suspensie', 'Lichide',
        'Distribuție', 'Anvelope', 'Electrică', 'Caroserie', 'Altele',
@@ -39,4 +39,18 @@ class ShopCustomer extends Authenticatable
    {
        return 'id';
    }
+
+    /** Send custom reset mail with a /shop/password/reset URL on the tenant subdomain. */
+    public function sendPasswordResetNotification($token): void
+    {
+        $tenant = \App\Models\Central\Company::withoutGlobalScopes()->find($this->company_id);
+        if (! $tenant || ! $this->email) return;
+
+        $central = config('app.central_domain') ?: config('tenancy.central_domains.0', 'service.mir.md');
+        $url = "https://{$tenant->slug}.{$central}/shop/password/reset/{$token}?email=" . urlencode($this->email);
+
+        \Illuminate\Support\Facades\Mail::to($this->email)->send(
+            new \App\Mail\ShopPasswordResetMail($this, $tenant, $url)
+        );
+    }
 }
@@ -54,5 +54,17 @@ class ShopOrderNotifier
                $this->telegram->sendMessage($company, (string) $client->telegram_chat_id, $text);
            }
        }
+
+        // ── Customer: email confirmation when address given ──
+        if ($order->customer_email) {
+            try {
+                \Illuminate\Support\Facades\Mail::to($order->customer_email)
+                    ->send(new \App\Mail\ShopOrderConfirmationMail($order, $company));
+            } catch (\Throwable $e) {
+                \Illuminate\Support\Facades\Log::warning('shop order confirmation mail failed', [
+                    'order' => $order->id, 'err' => $e->getMessage(),
+                ]);
+            }
+        }
    }
 }