Fix fetching of cashier customer model (#28)

* Fix fetching of cashier customer model Properly fetch the customer model via `Cashier::$customerModel` instead from config (config option is deprecated for Cashier 13) * Style update * Refer to stripe_price instead of the plan. Co-authored-by: Rudolf Halas <[email protected]>
LimeDeck · May 11, 2022 · fb40bc0 · fb40bc0
1 parent f658a9e
commit fb40bc0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Http/Controllers/DatabaseSubscriptionsController.php b/src/Http/Controllers/DatabaseSubscriptionsController.php
@@ -2,6 +2,7 @@
 
 namespace LimeDeck\NovaCashierOverview\Http\Controllers;
 
+use Laravel\Cashier\Cashier;
 use Laravel\Cashier\Subscription;
 
 class DatabaseSubscriptionsController extends Controller
@@ -12,10 +13,11 @@ class DatabaseSubscriptionsController extends Controller
      */
     public function show($billableId)
     {
-        $stripeModel = $this->config->get('cashier.model');
+        $customerModel = Cashier::$customerModel;
 
         /** @var \Illuminate\Database\Eloquent\Model $billableModel */
-        $billableModel = (new $stripeModel());
+        $billableModel = (new $customerModel());
+
         /** @var \Laravel\Cashier\Billable|\Illuminate\Database\Eloquent\Model $billable */
         $billable = $billableModel->find($billableId);
 
@@ -42,7 +44,7 @@ public function show($billableId)
     protected function formatSubscription(Subscription $subscription)
     {
         return array_merge($subscription->toArray(), [
-            'plan'            => $subscription->stripe_plan,
+            'plan'            => $subscription->stripe_price,
             'ended'           => $subscription->ended(),
             'cancelled'       => $subscription->cancelled(),
             'active'          => $subscription->active(),