fix: subscriptions

app/Http/Controllers/ServerController.php

@@ -12,7 +12,7 @@ class ServerController extends Controller
 
     public function new_server()
     {
-        if (!is_cloud() || isInstanceAdmin()) {
+        if (!is_cloud()) {
             return view('server.create', [
                 'limit_reached' => false,
                 'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),

app/Http/Livewire/Subscription/PricingPlans.php

@@ -48,8 +48,8 @@ class PricingPlans extends Component
                 'enabled' => true,
             ],
             'mode' => 'subscription',
-            'success_url' => route('subscription.success'),
-            'cancel_url' => route('subscription.index',['cancelled' => true]),
+            'success_url' => route('dashboard', ['success' => true]),
+            'cancel_url' => route('subscription.index', ['cancelled' => true]),
         ];
         $customer = currentTeam()->subscription?->stripe_customer_id ?? null;
         if ($customer) {

app/Jobs/CleanupInstanceStuffsJob.php

@@ -37,7 +37,7 @@ class CleanupInstanceStuffsJob implements ShouldQueue, ShouldBeUnique
 
     private function cleanup_waitlist()
     {
-        $waitlist = Waitlist::whereVerified(false)->where('created_at', '<', now()->subMinutes(config('constants.waitlist.confirmation_valid_for_minutes')))->get();
+        $waitlist = Waitlist::whereVerified(false)->where('created_at', '<', now()->subMinutes(config('constants.waitlist.expiration')))->get();
         foreach ($waitlist as $item) {
             $item->delete();
         }

app/Jobs/SubscriptionInvoiceFailedJob.php

@@ -9,7 +9,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Stripe\Stripe;
 
 class SubscriptionInvoiceFailedJob implements ShouldQueue
 {

app/Models/Subscription.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 
 class Subscription extends Model
 {
@@ -14,19 +15,44 @@ class Subscription extends Model
     }
     public function type()
     {
-        $basic = explode(',', config('subscription.lemon_squeezy_basic_plan_ids'));
-        $pro = explode(',', config('subscription.lemon_squeezy_pro_plan_ids'));
-        $ultimate = explode(',', config('subscription.lemon_squeezy_ultimate_plan_ids'));
+        if (isLemon()) {
+            $basic = explode(',', config('subscription.lemon_squeezy_basic_plan_ids'));
+            $pro = explode(',', config('subscription.lemon_squeezy_pro_plan_ids'));
+            $ultimate = explode(',', config('subscription.lemon_squeezy_ultimate_plan_ids'));
 
-        $subscription = $this->lemon_variant_id;
-        if (in_array($subscription, $basic)) {
-            return 'basic';
+            $subscription = $this->lemon_variant_id;
+            if (in_array($subscription, $basic)) {
+                return 'basic';
+            }
+            if (in_array($subscription, $pro)) {
+                return 'pro';
+            }
+            if (in_array($subscription, $ultimate)) {
+                return 'ultimate';
+            }
         }
-        if (in_array($subscription, $pro)) {
-            return 'pro';
-        }
-        if (in_array($subscription, $ultimate)) {
-            return 'ultimate';
+        if (isStripe()) {
+            if (!$this->stripe_plan_id) {
+                return  'unknown';
+            }
+            $subscription = Subscription::where('id', $this->id)->first();
+            if (!$subscription) {
+                return null;
+            }
+            $subscriptionPlanId = data_get($subscription,'stripe_plan_id');
+            if (!$subscriptionPlanId) {
+                return null;
+            }
+            $subscriptionConfigs = collect(config('subscription'));
+            $stripePlanId = null;
+            $subscriptionConfigs->map(function ($value, $key) use ($subscriptionPlanId, &$stripePlanId) {
+                if ($value === $subscriptionPlanId){
+                    $stripePlanId = $key;
+                };
+            })->first();
+            if ($stripePlanId) {
+                return Str::of($stripePlanId)->after('stripe_price_id_')->before('_')->lower();
+            }
         }
         return 'unknown';
     }

app/Models/User.php

@@ -32,7 +32,7 @@ class User extends Authenticatable implements SendsEmail
             $team = [
                 'name' => $user->name . "'s Team",
                 'personal_team' => true,
-                'boarding' => true
+                'show_boarding' => true
             ];
             if ($user->id === 0) {
                 $team['id'] = 0;
@@ -94,7 +94,7 @@ class User extends Authenticatable implements SendsEmail
 
     public function currentTeam()
     {
-        return session('currentTeam');
+        return Team::find(session('currentTeam')->id);
     }
 
     public function otherTeams()