Update setting trial periods

laravel · Oct 5, 2020 · 01496b8 · 01496b8
1 parent f2f54f2
commit 01496b8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/SubscriptionBuilder.php b/src/SubscriptionBuilder.php
@@ -298,15 +298,15 @@ public function create($paymentMethod = null, array $customerOptions = [], array
      */
     public function checkout(array $sessionOptions = [], array $customerOptions = [])
     {
-        // Checkout Sessions are active for 24 hours after their creation and within that time frame the customer
-        // can complete the payment at any time. Stripe requires the trial end at least 48 hours in the future
-        // so that there is still at least a one day trial if your customer pays at the end of the 24 hours.
-        $minimumTrialPeriod = Carbon::now()->addHours(48);
+        if (! $this->skipTrial && $this->trialExpires) {
+            // Checkout Sessions are active for 24 hours after their creation and within that time frame the customer
+            // can complete the payment at any time. Stripe requires the trial end at least 48 hours in the future
+            // so that there is still at least a one day trial if your customer pays at the end of the 24 hours.
+            $minimumTrialPeriod = Carbon::now()->addHours(48);
 
-        if ($this->trialExpires && $this->trialExpires->gt($minimumTrialPeriod)) {
-            $trialEnd = $this->trialExpires;
+            $trialEnd = $this->trialExpires->gt($minimumTrialPeriod) ? $this->trialExpires : $minimumTrialPeriod;
         } else {
-            $trialEnd = $minimumTrialPeriod;
+            $trialEnd = null;
         }
 
         return Checkout::create($this->owner, array_merge([
@@ -315,7 +315,7 @@ public function checkout(array $sessionOptions = [], array $customerOptions = []
             'default_tax_rates' => $this->getTaxRatesForPayload(),
             'subscription_data' => [
                 'coupon' => $this->coupon,
-                'trial_end' => $trialEnd->getTimestamp(),
+                'trial_end' => $trialEnd ? $trialEnd->getTimestamp() : null,
                 'metadata' => array_merge($this->metadata, ['name' => $this->name]),
             ],
         ], $sessionOptions), $customerOptions);