subscription trials don’t error (closes #73)

edalzell · Mar 26, 2020 · 95b8f84 · 95b8f84
1 parent ccc1fd4
commit 95b8f84
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Charge/Traits/HasSubscriptions.php b/Charge/Traits/HasSubscriptions.php
@@ -39,8 +39,8 @@ public function postSubscription(Request $request)
             $customer = $this->getOrCreateCustomer($details['payment_method']);
 
             /*
-                    if there's a fixed billing date set the billing-cycle-anchor
-                    if prorate, set prorate to true
+                if there's a fixed billing date set the billing-cycle-anchor
+                if prorate, set prorate to true
             */
             $planId = $details['plan'];
             $plan = Plan::retrieve(['id' => $planId, 'expand' => ['product']]);
@@ -76,7 +76,7 @@ public function postSubscription(Request $request)
 
             $subscription = Subscription::create($subscription);
 
-            if ($subscription->latest_invoice->payment_intent->status == 'requires_action') {
+            if (isset($subscription->latest_invoice->payment_intent) && $subscription->latest_invoice->payment_intent->status == 'requires_action') {
                 return $this->subscriptionRequiresAction($subscription, $details);
             }
 
@@ -143,7 +143,7 @@ public function deleteSubscription($id)
     }
 
     /**
-     * The {{ charge:create_subscription_form }} tag
+     * The {{ charge:create_subscription_form }} tag.
      *
      * @return string|array
      */
@@ -153,27 +153,27 @@ public function createSubscriptionForm()
     }
 
     /**
-     * The {{ charge:update_subscription_form }} tag
+     * The {{ charge:update_subscription_form }} tag.
      *
      * @return string|array
      */
     public function updateSubscriptionForm()
     {
-        return $this->createForm('subscription/' . $this->getParam('id'), [], 'PATCH');
+        return $this->createForm('subscription/'.$this->getParam('id'), [], 'PATCH');
     }
 
     /**
-     * The {{ charge:cancel_subscription_form }} tag
+     * The {{ charge:cancel_subscription_form }} tag.
      *
      * @return string
      */
     public function cancelSubscriptionForm()
     {
-        return $this->createForm('subscription/' . $this->getParam('id'), [], 'DELETE');
+        return $this->createForm('subscription/'.$this->getParam('id'), [], 'DELETE');
     }
 
     /**
-     * Get the plan details
+     * Get the plan details.
      *
      * @return string
      */
@@ -183,7 +183,7 @@ public function plan()
     }
 
     /**
-     * Get the Stripe plans
+     * Get the Stripe plans.
      *
      * @return string
      */
@@ -193,15 +193,15 @@ public function plans()
         $plans = Plan::all(
             [
                 'expand' => ['data.product'],
-                'limit' => $limit
+                'limit' => $limit,
             ]
         )->toArray();
 
         return $this->parseLoop($plans['data']);
     }
 
     /**
-     * The {{ charge:cancel_subscription_url }} tag
+     * The {{ charge:cancel_subscription_url }} tag.
      *
      * @return string
      */
@@ -211,7 +211,7 @@ public function cancelSubscriptionUrl()
     }
 
     /**
-     * The {{ charge:renew_subscription_url }} tag
+     * The {{ charge:renew_subscription_url }} tag.
      *
      * @return string
      */
@@ -226,7 +226,7 @@ private function makeUrl($action)
 
         // if they want to redirect, add it as a queary param
         if ($redirect = $this->getParam('redirect')) {
-            $url .= '?redirect=' . $redirect;
+            $url .= '?redirect='.$redirect;
         }
 
         return $url;
@@ -249,7 +249,7 @@ public function getSubscriptions(): array
                     'expiry_date' => $subscription['current_period_end'],
                     'plan' => $subscription['plan']['product']['name'],
                     'amount' => $subscription['plan']['amount'],
-                    'auto_renew' => !$subscription['cancel_at_period_end'],
+                    'auto_renew' => ! $subscription['cancel_at_period_end'],
                     'has_subscription' => true,
                 ];
             })->toArray();

diff --git a/Charge/meta.yaml b/Charge/meta.yaml
@@ -1,5 +1,5 @@
 name: Charge
-version: 3.1.1
+version: 3.1.2
 description: Allows you to charge (one-time or subscription) your customer via Stripe
 url: silentzconsulting.com/addons/charge
 developer: Erin Dalzell