[14.x] Fix soft deleted customers (#1599)

* Fix soft deleted customers * wip
laravel · Nov 8, 2023 · 3a676cc · 3a676cc
1 parent 2d7c343
commit 3a676cc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Cashier.php b/src/Cashier.php
@@ -2,6 +2,7 @@
 
 namespace Laravel\Cashier;
 
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Money\Currencies\ISOCurrencies;
 use Money\Currency;
 use Money\Formatter\IntlMoneyFormatter;
@@ -107,7 +108,13 @@ public static function findBillable($stripeId)
     {
         $stripeId = $stripeId instanceof StripeCustomer ? $stripeId->id : $stripeId;
 
-        return $stripeId ? (new static::$customerModel)->where('stripe_id', $stripeId)->first() : null;
+        $model = static::$customerModel;
+
+        $builder = in_array(SoftDeletes::class, class_uses_recursive($model))
+            ? $model::withTrashed()
+            : new $model;
+
+        return $stripeId ? $builder->where('stripe_id', $stripeId)->first() : null;
     }
 
     /**