Merge pull request #315 from NativePHP/ultra-improvements

Admin UX improvements: impersonate, mobile viewport, ticket UI

Author: simonhamp

app/Enums/PriceTier.php

@@ -12,7 +12,7 @@ public function label(): string
     {
         return match ($this) {
             self::Regular => 'Regular',
-            self::Subscriber => 'Pro/Max Subscriber',
+            self::Subscriber => 'Subscriber',
             self::Eap => 'Early Access',
         };
     }
@@ -21,7 +21,7 @@ public function description(): string
     {
         return match ($this) {
             self::Regular => 'Standard pricing for all customers',
-            self::Subscriber => 'Discounted pricing for Pro and Max license holders',
+            self::Subscriber => 'Discounted pricing for subscribers',
             self::Eap => 'Special pricing for Early Access Program customers',
         };
     }

app/Filament/Resources/SupportTicketResource.php

@@ -51,8 +51,9 @@ public static function infolist(Schema $schema): Schema
                         Infolists\Components\TextEntry::make('issue_type')
                             ->label('Issue Type')
                             ->placeholder('N/A'),
-                        Infolists\Components\TextEntry::make('user.email')
+                        Infolists\Components\TextEntry::make('user.name')
                             ->label('User')
+                            ->formatStateUsing(fn (SupportTicket $record): string => ($record->user->name ?? '').' ('.$record->user->email.')')
                             ->url(fn (SupportTicket $record): string => UserResource::getUrl('edit', ['record' => $record->user_id])),
                         Infolists\Components\TextEntry::make('created_at')
                             ->label('Created')
@@ -96,9 +97,10 @@ public static function table(Table $table): Table
                     ->sortable()
                     ->limit(50),
 
-                Tables\Columns\TextColumn::make('user.email')
+                Tables\Columns\TextColumn::make('user.name')
                     ->label('User')
-                    ->searchable()
+                    ->formatStateUsing(fn (SupportTicket $record): string => ($record->user->name ?? '').' ('.$record->user->email.')')
+                    ->searchable(query: fn ($query, string $search) => $query->whereHas('user', fn ($q) => $q->where('name', 'like', "%{$search}%")->orWhere('email', 'like', "%{$search}%")))
                     ->sortable(),
 
                 Tables\Columns\TextColumn::make('product')

app/Filament/Resources/SupportTicketResource/Pages/ViewSupportTicket.php

@@ -8,6 +8,7 @@
 use Filament\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Resources\Pages\ViewRecord;
+use STS\FilamentImpersonate\Actions\Impersonate;
 
 class ViewSupportTicket extends ViewRecord
 {
@@ -16,6 +17,8 @@ class ViewSupportTicket extends ViewRecord
     protected function getHeaderActions(): array
     {
         return [
+            Impersonate::make()->impersonateRecord(fn () => $this->getRecord()->user),
+
             Actions\Action::make('updateStatus')
                 ->label('Update Status')
                 ->icon('heroicon-o-arrow-path')

app/Filament/Resources/SupportTicketResource/Widgets/TicketRepliesWidget.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\SupportTicketResource\Widgets;
 
+use App\Models\SupportTicket\Reply;
 use App\Notifications\SupportTicketReplied;
 use Filament\Widgets\Widget;
 use Illuminate\Database\Eloquent\Model;
@@ -42,4 +43,22 @@ public function sendReply(): void
         $this->newMessage = '';
         $this->isNote = false;
     }
+
+    public function togglePin(int $replyId): void
+    {
+        $reply = Reply::where('support_ticket_id', $this->record->id)
+            ->where('id', $replyId)
+            ->where('note', true)
+            ->firstOrFail();
+
+        if ($reply->pinned) {
+            $reply->update(['pinned' => false]);
+        } else {
+            Reply::where('support_ticket_id', $this->record->id)
+                ->where('pinned', true)
+                ->update(['pinned' => false]);
+
+            $reply->update(['pinned' => true]);
+        }
+    }
 }

app/Filament/Resources/UserResource.php

@@ -12,6 +12,7 @@
 use Filament\Schemas\Schema;
 use Filament\Tables;
 use Filament\Tables\Table;
+use STS\FilamentImpersonate\Actions\Impersonate;
 
 class UserResource extends Resource
 {
@@ -89,6 +90,7 @@ public static function table(Table $table): Table
                 //
             ])
             ->actions([
+                Impersonate::make(),
                 Actions\ActionGroup::make([
                     Actions\EditAction::make(),
                     Actions\Action::make('view_on_stripe')

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -13,6 +13,7 @@
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\Facades\Password;
+use STS\FilamentImpersonate\Actions\Impersonate;
 
 class EditUser extends EditRecord
 {
@@ -21,6 +22,8 @@ class EditUser extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
+            Impersonate::make()->record($this->getRecord()),
+
             Actions\ActionGroup::make([
                 Actions\Action::make('createStripeCustomer')
                     ->label('Create Stripe Customer')

app/Http/Controllers/UltraController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\PluginStatus;
+use App\Enums\PluginType;
+use App\Models\Plugin;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
+
+class UltraController extends Controller
+{
+    public function index(): View|RedirectResponse
+    {
+        $user = Auth::user();
+
+        if (! $user->hasActiveUltraSubscription()) {
+            return to_route('pricing');
+        }
+
+        $subscription = $user->subscription();
+
+        $plugins = Plugin::query()
+            ->where('is_official', true)
+            ->where('is_active', true)
+            ->where('status', PluginStatus::Approved)
+            ->where('type', PluginType::Paid)
+            ->orderBy('name')
+            ->get();
+
+        return view('customer.ultra.index', [
+            'subscription' => $subscription,
+            'plugins' => $plugins,
+        ]);
+    }
+}

app/Livewire/Customer/Support/Show.php

@@ -7,6 +7,7 @@
 use App\SupportTicket\Status;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\RateLimiter;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
 use Livewire\Component;
@@ -33,10 +34,22 @@ public function reply(): void
     {
         $this->authorize('reply', $this->supportTicket);
 
+        $key = 'support-reply:'.auth()->id();
+
+        if (RateLimiter::tooManyAttempts($key, 10)) {
+            $seconds = RateLimiter::availableIn($key);
+
+            $this->addError('replyMessage', "You're sending messages too quickly. Please wait {$seconds} seconds.");
+
+            return;
+        }
+
         $this->validate([
             'replyMessage' => ['required', 'string', 'max:5000'],
         ]);
 
+        RateLimiter::hit($key, 60);
+
         $reply = $this->supportTicket->replies()->create([
             'user_id' => auth()->id(),
             'message' => $this->replyMessage,
@@ -48,8 +61,6 @@ public function reply(): void
 
         $this->replyMessage = '';
         $this->supportTicket->load(['user', 'replies.user']);
-
-        session()->flash('success', 'Your reply has been sent.');
     }
 
     public function closeTicket(): void
@@ -60,7 +71,30 @@ public function closeTicket(): void
             'status' => Status::CLOSED,
         ]);
 
-        session()->flash('success', __('account.support_ticket.close_ticket.success'));
+        $this->supportTicket->replies()->create([
+            'user_id' => null,
+            'message' => auth()->user()->name.' closed this ticket.',
+            'note' => false,
+        ]);
+
+        $this->supportTicket->load(['user', 'replies.user']);
+    }
+
+    public function reopenTicket(): void
+    {
+        $this->authorize('reopenTicket', $this->supportTicket);
+
+        $this->supportTicket->update([
+            'status' => Status::OPEN,
+        ]);
+
+        $this->supportTicket->replies()->create([
+            'user_id' => null,
+            'message' => auth()->user()->name.' reopened this ticket.',
+            'note' => false,
+        ]);
+
+        $this->supportTicket->load(['user', 'replies.user']);
     }
 
     public function render(): View

app/Models/Plugin.php

@@ -64,6 +64,13 @@ public function routeParams(): array
 
     protected static function booted(): void
     {
+        static::saving(function (Plugin $plugin): void {
+            if ($plugin->isDirty('name') && $plugin->name && ! $plugin->isDirty('is_official')) {
+                $vendor = explode('/', $plugin->name)[0] ?? null;
+                $plugin->is_official = $vendor === 'nativephp';
+            }
+        });
+
         static::created(function (Plugin $plugin): void {
             $plugin->recordActivity(
                 PluginActivityType::Submitted,
@@ -185,16 +192,6 @@ public function getBestPriceForUser(?User $user): ?PluginPrice
             ->orderBy('amount', 'asc')
             ->first();
 
-        // Ultra subscribers get official plugins for free
-        if ($bestPrice && $user && $this->isOfficial() && $user->hasUltraAccess()) {
-            $freePrice = $bestPrice->replicate();
-            $freePrice->amount = 0;
-            $freePrice->id = $bestPrice->id;
-            $freePrice->exists = true;
-
-            return $freePrice;
-        }
-
         return $bestPrice;
     }
 

app/Models/SupportTicket.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class SupportTicket extends Model
@@ -54,6 +55,14 @@ public function replies(): HasMany
             ->orderBy('created_at', 'desc');
     }
 
+    public function pinnedNote(): HasOne
+    {
+        return $this->hasOne(Reply::class)
+            ->where('note', true)
+            ->where('pinned', true)
+            ->latestOfMany();
+    }
+
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);