Merge branch 'trunk' into develop

Author: Kristófer R

changelog.txt

@@ -2,6 +2,9 @@
 
 = 7.1.0 - 2022-xx-xx =
 
+= 7.0.1 - 2022-11-11 =
+* Fix - Issue where subscription renewal payments were being charged twice no longer present.
+
 = 7.0.0 - 2022-11-10 =
 * Add - Update Express Checkout section UI.
 * Add - Auto-complete first and last name on checkout form when using Link payment method.

includes/admin/class-wc-stripe-inbox-notes.php

@@ -55,7 +55,7 @@ public static function create_upe_notes() {
 		WC_Stripe_UPE_Availability_Note::init();
 
 		require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-stripelink-note.php';
-		WC_Stripe_UPE_StripeLink_Note::init( new WC_Stripe_UPE_Payment_Gateway() );
+		WC_Stripe_UPE_StripeLink_Note::init( WC_Stripe::get_instance()->get_main_stripe_gateway() );
 	}
 
 	public static function get_campaign_2020_cutoff() {

includes/notes/class-wc-stripe-upe-stripelink-note.php

@@ -67,12 +67,12 @@ private static function get_note_class() {
 	/**
 	 * Init Link payment method notification
 	 *
-	 * @param WC_Stripe_UPE_Payment_Gateway $gateway
+	 * @param WC_Stripe_Payment_Gateway $gateway
 	 *
 	 * @return void
 	 * @throws \Automattic\WooCommerce\Admin\Notes\NotesUnavailableException
 	 */
-	public static function init( WC_Stripe_UPE_Payment_Gateway $gateway ) {
+	public static function init( WC_Stripe_Payment_Gateway $gateway ) {
 		if ( ! WC_Stripe_Feature_Flags::is_upe_checkout_enabled() ) {
 			return;
 		}
@@ -84,6 +84,10 @@ public static function init( WC_Stripe_UPE_Payment_Gateway $gateway ) {
 			return;
 		}
 
+		if ( ! is_a( $gateway, 'WC_Stripe_UPE_Payment_Gateway' ) ) {
+			return;
+		}
+
 		// If store currency is not USD, skip
 		if ( 'USD' !== get_woocommerce_currency() ) {
 			return;

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-gateway-stripe",
   "title": "WooCommerce Gateway Stripe",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "license": "GPL-3.0",
   "homepage": "http://wordpress.org/plugins/woocommerce-gateway-stripe/",
   "repository": {

package.json

@@ -4,7 +4,7 @@ Tags: credit card, stripe, apple pay, payment request, google pay, sepa, sofort,
 Requires at least: 5.7
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 7.0.0
+Stable tag: 7.0.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Attributions: thorsten-stripe

readme.txt

@@ -5,7 +5,7 @@
  * Description: Take credit card payments on your store using Stripe.
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
- * Version: 7.0.0
+ * Version: 7.0.1
  * Requires at least: 5.8
  * Tested up to: 6.0
  * WC requires at least: 6.8
@@ -21,7 +21,7 @@
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '7.0.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_STRIPE_VERSION', '7.0.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_STRIPE_MIN_PHP_VER', '7.3.0' );
 define( 'WC_STRIPE_MIN_WC_VER', '6.8' );
 define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '6.9' );
@@ -63,14 +63,14 @@ class WC_Stripe {
 			/**
 			 * The *Singleton* instance of this class
 			 *
-			 * @var Singleton
+			 * @var WC_Stripe
 			 */
 			private static $instance;
 
 			/**
 			 * Returns the *Singleton* instance of this class.
 			 *
-			 * @return Singleton The *Singleton* instance.
+			 * @return WC_Stripe The *Singleton* instance.
 			 */
 			public static function get_instance() {
 				if ( null === self::$instance ) {