chore(deps): bump laravel/cashier from 9.3.5 to 10.0.0 (#2901)

app/Http/Controllers/Settings/SubscriptionsController.php

@@ -4,9 +4,14 @@ namespace App\Http\Controllers\Settings;
 
 use App\Helpers\DateHelper;
 use Illuminate\Http\Request;
+use Laravel\Cashier\Cashier;
+use Laravel\Cashier\Payment;
 use App\Helpers\InstanceHelper;
 use App\Exceptions\StripeException;
+use Illuminate\Support\Facades\App;
 use App\Http\Controllers\Controller;
+use Stripe\PaymentIntent as StripePaymentIntent;
+use Laravel\Cashier\Exceptions\IncompletePayment;
 
 class SubscriptionsController extends Controller
 {
@@ -21,7 +26,8 @@ class SubscriptionsController extends Controller
             return redirect()->route('settings.index');
         }
 
-        if (! auth()->user()->account->isSubscribed()) {
+        $subscription = auth()->user()->account->getSubscribedPlan();
+        if (! auth()->user()->account->isSubscribed() && (! $subscription || $subscription->ended())) {
             return view('settings.subscriptions.blank', [
                 'numberOfCustomers' => InstanceHelper::getNumberOfPaidSubscribers(),
             ]);
@@ -34,9 +40,18 @@ class SubscriptionsController extends Controller
             $nextBillingDate = trans('app.unknown');
         }
 
+        $hasInvoices = auth()->user()->account->hasStripeId() && auth()->user()->account->hasInvoices();
+        $invoices = null;
+        if ($hasInvoices) {
+            $invoices = auth()->user()->account->invoices();
+        }
+
         return view('settings.subscriptions.account', [
             'planInformation' => InstanceHelper::getPlanInformationFromConfig($planId),
             'nextBillingDate' => $nextBillingDate,
+            'subscription' => $subscription,
+            'hasInvoices' => $hasInvoices,
+            'invoices' => $invoices,
         ]);
     }
 
@@ -59,7 +74,23 @@ class SubscriptionsController extends Controller
 
         return view('settings.subscriptions.upgrade', [
             'planInformation' => InstanceHelper::getPlanInformationFromConfig($plan),
-            'nextTheoriticalBillingDate' => DateHelper::getShortDate(DateHelper::getNextTheoriticalBillingDate($plan)),
+            'nextTheoriticalBillingDate' => DateHelper::getFullDate(DateHelper::getNextTheoriticalBillingDate($plan)),
+            'intent' => auth()->user()->account->createSetupIntent(),
+        ]);
+    }
+
+    /**
+     * Display the confirm view page.
+     *
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
+     */
+    public function confirmPayment($id)
+    {
+        return view('settings.subscriptions.confirm', [
+            'payment' => new Payment(
+                StripePaymentIntent::retrieve($id, Cashier::stripeOptions())
+            ),
+            'redirect' => request('redirect'),
         ]);
     }
 
@@ -102,7 +133,8 @@ class SubscriptionsController extends Controller
             return redirect()->route('settings.index');
         }
 
-        if (! auth()->user()->account->isSubscribed()) {
+        $subscription = auth()->user()->account->getSubscribedPlan();
+        if (! auth()->user()->account->isSubscribed() && ! $subscription) {
             return redirect()->route('settings.index');
         }
 
@@ -120,11 +152,18 @@ class SubscriptionsController extends Controller
             return redirect()->route('settings.subscriptions.downgrade');
         }
 
-        if (! auth()->user()->account->isSubscribed()) {
+        $subscription = auth()->user()->account->getSubscribedPlan();
+        if (! auth()->user()->account->isSubscribed() && ! $subscription) {
             return redirect()->route('settings.index');
         }
 
-        auth()->user()->account->subscriptionCancel();
+        try {
+            auth()->user()->account->subscriptionCancel();
+        } catch (StripeException $e) {
+            return back()
+                ->withInput()
+                ->withErrors($e->getMessage());
+        }
 
         return redirect()->route('settings.subscriptions.downgrade.success');
     }
@@ -142,7 +181,12 @@ class SubscriptionsController extends Controller
 
         try {
             auth()->user()->account
-                ->subscribe($request->input('stripeToken'), $request->input('plan'));
+                ->subscribe($request->input('payment_method'), $request->input('plan'));
+        } catch (IncompletePayment $e) {
+            return redirect()->route(
+                'settings.subscriptions.confirm',
+                [$e->payment->asStripePaymentIntent()->id, 'redirect' => route('settings.subscriptions.upgrade.success')]
+            );
         } catch (StripeException $e) {
             return back()
                 ->withInput()
@@ -164,4 +208,22 @@ class SubscriptionsController extends Controller
             'product' => trans('settings.subscriptions_pdf_title', ['name' => config('monica.paid_plan_monthly_friendly_name')]),
         ]);
     }
+
+    /**
+     * Download the invoice as PDF.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function forceCompletePaymentOnTesting(Request $request)
+    {
+        if (App::environment('production')) {
+            return;
+        }
+        $subscription = auth()->user()->account->getSubscribedPlan();
+        $subscription->stripe_status = 'active';
+        $subscription->save();
+
+        return redirect()->route('settings.subscriptions.index');
+    }
 }