Merge branch 'main' into add-mobile-search-input

Author: HassanZahirnia

app/Enums/Subscription.php

@@ -29,8 +29,10 @@ public static function fromStripePriceId(string $priceId): self
             config('subscriptions.plans.mini.stripe_price_id'),
             config('subscriptions.plans.mini.stripe_price_id_eap') => self::Mini,
             config('subscriptions.plans.pro.stripe_price_id'),
+            config('subscriptions.plans.pro.stripe_price_id_discounted'),
             config('subscriptions.plans.pro.stripe_price_id_eap') => self::Pro,
             config('subscriptions.plans.max.stripe_price_id'),
+            config('subscriptions.plans.max.stripe_price_id_discounted'),
             config('subscriptions.plans.max.stripe_price_id_eap') => self::Max,
             default => throw new RuntimeException("Unknown Stripe price id: {$priceId}"),
         };
@@ -53,12 +55,18 @@ public function name(): string
         return config("subscriptions.plans.{$this->value}.name");
     }
 
-    public function stripePriceId(bool $forceEap = false): string
+    public function stripePriceId(bool $forceEap = false, bool $discounted = false): string
     {
         // EAP ends June 1st at midnight UTC
-        return now()->isBefore('2025-06-01 00:00:00') || $forceEap
-            ? config("subscriptions.plans.{$this->value}.stripe_price_id_eap")
-            : config("subscriptions.plans.{$this->value}.stripe_price_id");
+        if (now()->isBefore('2025-06-01 00:00:00') || $forceEap) {
+            return config("subscriptions.plans.{$this->value}.stripe_price_id_eap");
+        }
+
+        if ($discounted) {
+            return config("subscriptions.plans.{$this->value}.stripe_price_id_discounted");
+        }
+
+        return config("subscriptions.plans.{$this->value}.stripe_price_id");
     }
 
     public function stripePaymentLink(): string

app/Filament/Resources/WallOfLoveSubmissionResource.php

@@ -49,25 +49,6 @@ public static function form(Form $form): Form
                             ->maxLength(1000)
                             ->rows(4),
                     ]),
-
-                Forms\Components\Section::make('Review Information')
-                    ->schema([
-                        Forms\Components\Select::make('user_id')
-                            ->relationship('user', 'name')
-                            ->required()
-                            ->disabled(),
-
-                        Forms\Components\DateTimePicker::make('approved_at')
-                            ->label('Approved At'),
-
-                        Forms\Components\Select::make('approved_by')
-                            ->relationship('approvedBy', 'name')
-                            ->label('Approved By'),
-
-                        Forms\Components\Placeholder::make('created_at')
-                            ->label('Submitted At')
-                            ->content(fn (WallOfLoveSubmission $record): ?string => $record->created_at?->diffForHumans()),
-                    ]),
             ]);
     }
 

app/Filament/Resources/WallOfLoveSubmissionResource/Pages/EditWallOfLoveSubmission.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\WallOfLoveSubmissionResource\Pages;
 
+use App\Filament\Resources\UserResource;
 use App\Filament\Resources\WallOfLoveSubmissionResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -14,6 +15,11 @@ protected function getHeaderActions(): array
     {
         return [
             Actions\DeleteAction::make(),
+            Actions\Action::make('user')
+                ->icon('heroicon-s-user')
+                ->action(function ($record) {
+                    return redirect(UserResource::getUrl('edit', ['record' => $record]));
+                }),
         ];
     }
 }

app/Http/Controllers/Api/LicenseController.php

@@ -16,6 +16,19 @@
 
 class LicenseController extends Controller
 {
+    public function index(Request $request)
+    {
+        $email = $request->query('email');
+
+        $user = User::where('email', $email)->firstOrFail();
+
+        if ($request->has('source')) {
+            $licenses = $user->licenses()->where('source', $request->query('source'))->get();
+        }
+
+        return LicenseResource::collection($licenses ?? $user->licenses);
+    }
+
     public function store(Request $request)
     {
         $validated = $request->validate([

app/Http/Controllers/Api/TemporaryLinkController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Enums\LicenseSource;
+use App\Enums\Subscription;
+use App\Http\Controllers\Controller;
+use App\Http\Resources\Api\LicenseResource;
+use App\Jobs\CreateAnystackLicenseJob;
+use App\Models\License;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rules\Enum;
+
+class TemporaryLinkController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'email' => 'required|email',
+            'route' => 'required|string',
+        ]);
+
+        $url = URL::temporarySignedRoute(
+            $validated['route'],
+            now()->addMinutes($request->integer('expiration', 30)),
+            [
+                'email' => $validated['email']
+            ]
+        );
+
+        return response()->json(['url' => $url]);
+    }
+}

app/Http/Resources/LicenseCollection.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class LicenseCollection extends ResourceCollection
+{
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @return array<int|string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return parent::toArray($request);
+    }
+}

app/Livewire/MobilePricing.php

@@ -9,19 +9,35 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
+use Livewire\Attributes\Locked;
 use Livewire\Component;
 
 class MobilePricing extends Component
 {
+    #[Locked]
+    public bool $discounted = false;
+
+    #[Locked]
+    public $user;
+
     protected $listeners = [
         'purchase-request-submitted' => 'handlePurchaseRequest',
     ];
 
+    public function mount()
+    {
+        if (request()->has('email')) {
+            $this->user = $this->findOrCreateUser(request()->query('email'));
+        }
+    }
+
     public function handlePurchaseRequest(array $data)
     {
-        $user = $this->findOrCreateUser($data['email']);
+        if (!$this->user) {
+            $user = $this->findOrCreateUser($data['email']);
+        }
 
-        return $this->createCheckoutSession($data['plan'], $user);
+        return $this->createCheckoutSession($data['plan'], $this->user ?? $user);
     }
 
     public function createCheckoutSession(?string $plan, ?User $user = null)
@@ -57,7 +73,7 @@ public function createCheckoutSession(?string $plan, ?User $user = null)
         $user->createOrGetStripeCustomer();
 
         $checkout = $user
-            ->newSubscription('default', $subscription->stripePriceId())
+            ->newSubscription('default', $subscription->stripePriceId(discounted: $this->discounted))
             ->allowPromotionCodes()
             ->checkout([
                 'success_url' => $this->successUrl(),

app/Livewire/PurchaseModal.php

@@ -40,8 +40,6 @@ public function submit(): void
             'email' => $this->email,
             'plan' => $this->selectedPlan,
         ]);
-
-        $this->closeModal();
     }
 
     public function render()

config/subscriptions.php

@@ -14,6 +14,7 @@
             'name' => 'Pro',
             'stripe_price_id' => env('STRIPE_PRO_PRICE_ID'),
             'stripe_price_id_eap' => env('STRIPE_PRO_PRICE_ID_EAP'),
+            'stripe_price_id_discounted' => env('STRIPE_PRO_PRICE_ID_DISCOUNTED'),
             'stripe_payment_link' => env('STRIPE_PRO_PAYMENT_LINK'),
             'anystack_product_id' => env('ANYSTACK_PRODUCT_ID'),
             'anystack_policy_id' => env('ANYSTACK_PRO_POLICY_ID'),
@@ -22,6 +23,7 @@
             'name' => 'Max',
             'stripe_price_id' => env('STRIPE_MAX_PRICE_ID'),
             'stripe_price_id_eap' => env('STRIPE_MAX_PRICE_ID_EAP'),
+            'stripe_price_id_discounted' => env('STRIPE_MAX_PRICE_ID_DISCOUNTED'),
             'stripe_payment_link' => env('STRIPE_MAX_PAYMENT_LINK'),
             'anystack_product_id' => env('ANYSTACK_PRODUCT_ID'),
             'anystack_policy_id' => env('ANYSTACK_MAX_POLICY_ID'),