fix: subscription / plan switch, etc

app/Models/Subscription.php

@@ -30,8 +30,7 @@ class Subscription extends Model
             if (in_array($subscription, $ultimate)) {
                 return 'ultimate';
             }
-        }
-        if (isStripe()) {
+        } else if (isStripe()) {
             if (!$this->stripe_plan_id) {
                 return 'zero';
             }
@@ -55,7 +54,8 @@ class Subscription extends Model
                 };
             })->first();
             if ($stripePlanId) {
-                return Str::of($stripePlanId)->after('stripe_price_id_')->before('_')->lower();
+                raY($stripePlanId);
+                return str($stripePlanId)->after('stripe_price_id_')->before('_')->lower();
             }
         }
         return 'zero';

app/Models/User.php

@@ -159,6 +159,9 @@ class User extends Authenticatable implements SendsEmail
 
     public function role()
     {
+        if (data_get($this, 'pivot')) {
+            return $this->pivot->role;
+        }
         return auth()->user()->teams->where('id', currentTeam()->id)->first()->pivot->role;
     }
 }