From 3b942049a23011c2cc26e5178e20d15170d6b94e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 23 Feb 2024 13:50:48 +0100
Subject: [PATCH] Refactor subscription handling logic in middleware and model

---
 app/Http/Middleware/DecideWhatToDoWithUser.php | 2 +-
 app/Models/Subscription.php                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.php
index 30780910b..f4adaaa9b 100644
--- a/app/Http/Middleware/DecideWhatToDoWithUser.php
+++ b/app/Http/Middleware/DecideWhatToDoWithUser.php
@@ -44,7 +44,7 @@ class DecideWhatToDoWithUser
         if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') {
             return redirect(RouteServiceProvider::HOME);
         }
-        if (isSubscriptionActive() && $request->path() === 'subscription') {
+        if (isSubscriptionActive() && $request->routeIs('subscription.index')) {
             return redirect(RouteServiceProvider::HOME);
         }
         return $next($request);
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index 668394bc4..4b8c6d70e 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -54,7 +54,6 @@ class Subscription extends Model
                 };
             })->first();
             if ($stripePlanId) {
-                raY($stripePlanId);
                 return str($stripePlanId)->after('stripe_price_id_')->before('_')->lower();
             }
         }