Merge pull request #1 from craftcms/develop

Syncing upstream

Author: winterpk

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "craftcms/commerce-stripe",
-  "description": "Stripe integration for Craft Commerce 2",
+  "description": "Stripe integration for Craft Commerce 2 & 3",
   "version": "2.2.3",
   "type": "craft-plugin",
   "keywords": [

src/base/SubscriptionGateway.php

@@ -462,6 +462,33 @@ public function previewSwitchCost(Subscription $subscription, BasePlan $plan): f
         return $currency ? $invoice->total / (10 ** $currency->minorUnit) : $invoice->total;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function handleWebhook(array $data)
+    {
+        switch ($data['type']) {
+            case 'plan.deleted':
+            case 'plan.updated':
+                $this->handlePlanEvent($data);
+                break;
+            case 'invoice.payment_succeeded':
+                $this->handleInvoiceSucceededEvent($data);
+                break;
+            case 'invoice.created':
+                $this->handleInvoiceCreated($data);
+                break;
+            case 'customer.subscription.deleted':
+                $this->handleSubscriptionExpired($data);
+                break;
+            case 'customer.subscription.updated':
+                $this->handleSubscriptionUpdated($data);
+                break;
+        }
+
+        parent::handleWebhook($data);
+    }
+
     // Protected methods
     // =========================================================================
 
@@ -715,33 +742,4 @@ protected function saveSubscriptionInvoice(array $stripeInvoice, Subscription $s
 
         return $invoice;
     }
-
-    /**
-     * @inheritdoc
-     */
-    protected function handleWebhook(array $data)
-    {
-        switch ($data['type']) {
-            case 'plan.deleted':
-            case 'plan.updated':
-                $this->handlePlanEvent($data);
-                break;
-            case 'invoice.payment_succeeded':
-                $this->handleInvoiceSucceededEvent($data);
-                break;
-            case 'invoice.created':
-                $this->handleInvoiceCreated($data);
-                break;
-            case 'customer.subscription.deleted':
-                $this->handleSubscriptionExpired($data);
-                break;
-            case 'customer.subscription.updated':
-                $this->handleSubscriptionUpdated($data);
-                break;
-        }
-
-        parent::handleWebhook($data);
-    }
-
-
 }

src/gateways/Gateway.php

@@ -259,21 +259,20 @@ public function getHasBillingIssues(Subscription $subscription): bool
         throw new NotImplementedException('This gateway does not support that functionality');
     }
 
-
-    // Protected methods
-    // =========================================================================
-
     /**
      * @inheritdoc
      */
-    protected function handleWebhook(array $data) {
+    public function handleWebhook(array $data) {
         if (!empty($data['data']['object']['metadata']['three_d_secure_flow'])) {
             $this->handle3DSecureFlowEvent($data);
         }
 
         parent::handleWebhook($data);
     }
 
+    // Protected methods
+    // =========================================================================
+
     /**
      * Handle a 3D Secure related event.
      *

src/gateways/PaymentIntents.php

@@ -398,14 +398,10 @@ public function getHasBillingIssues(Subscription $subscription): bool
         return in_array($subscriptionData['status'], ['incomplete', 'past_due', 'unpaid']) && in_array($intentData['status'], ['requires_payment_method', 'requires_confirmation', 'requires_action']);
     }
 
-
-    // Protected methods
-    // =========================================================================
-
     /**
      * @inheritdoc
      */
-    protected function handleWebhook(array $data)
+    public function handleWebhook(array $data)
     {
         switch ($data['type']) {
             case 'invoice.payment_failed':
@@ -416,6 +412,9 @@ protected function handleWebhook(array $data)
         parent::handleWebhook($data);
     }
 
+    // Protected methods
+    // =========================================================================
+
     /**
      * Handle a failed invoice by updating the subscription data for the subscription it failed.
      * @param $data

src/web/assets/intentsform/js/paymentForm.js

@@ -40,7 +40,7 @@ function PaymentIntents(publishableKey, container) {
         var style = {
             base: {
                 // Add your base input styles here. For example:
-                fontSize: '14px',
+                fontSize: '16px',
                 lineHeight: '21px'
             }
         };