From ba424efd39474cee60c8cd95ceed01ac919407c2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 27 Oct 2023 10:17:13 +0200
Subject: [PATCH] cloud: fix subs

---
 app/Models/Subscription.php | 8 ++++++--
 config/sentry.php           | 2 +-
 config/version.php          | 2 +-
 routes/webhooks.php         | 4 ++--
 versions.json               | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index 23ed70f8f..cd35dc477 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -39,14 +39,18 @@ class Subscription extends Model
             if (!$subscription) {
                 return null;
             }
-            $subscriptionPlanId = data_get($subscription,'stripe_plan_id');
+            $subscriptionPlanId = data_get($subscription, 'stripe_plan_id');
             if (!$subscriptionPlanId) {
                 return null;
             }
+            $subscriptionInvoicePaid = data_get($subscription, 'stripe_invoice_paid');
+            if (!$subscriptionInvoicePaid) {
+                return null;
+            }
             $subscriptionConfigs = collect(config('subscription'));
             $stripePlanId = null;
             $subscriptionConfigs->map(function ($value, $key) use ($subscriptionPlanId, &$stripePlanId) {
-                if ($value === $subscriptionPlanId){
+                if ($value === $subscriptionPlanId) {
                     $stripePlanId = $key;
                 };
             })->first();
diff --git a/config/sentry.php b/config/sentry.php
index 826794a5a..4b4820837 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.105',
+    'release' => '4.0.0-beta.106',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 5bcfd4f1b..95806e408 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.105';
+return '4.0.0-beta.106';
diff --git a/routes/webhooks.php b/routes/webhooks.php
index d2857c75e..ef75bbea8 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -305,11 +305,11 @@ Route::post('/payments/stripe/events', function () {
                     'stripe_plan_id' => $planId,
                     'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
                 ]);
-                if ($status === 'paused') {
+                if ($status === 'paused' || $status === 'incomplete_expired') {
                     $subscription->update([
                         'stripe_invoice_paid' => false,
                     ]);
-                    send_internal_notification('Subscription paused for team: ' . $subscription->team->id);
+                    send_internal_notification('Subscription paused or incomplete for team: ' . $subscription->team->id);
                 }
 
                 // Trial ended but subscribed, reactive servers
diff --git a/versions.json b/versions.json
index cf69f206f..e658db6af 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.105"
+            "version": "4.0.0-beta.106"
         }
     }
 }